- 15 Nov, 2019 2 commits
-
-
Manuel Jacob authored
This was enough to make visual diffs work from the GUI. It’s also a step towards making the `thg vdiff` command work (#5476). --HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
- 13 Nov, 2019 4 commits
-
-
Manuel Jacob authored
Doing this is good practice in general, but on Python 3 it’s required because it raised an exception before the fix. --HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
- 12 Nov, 2019 4 commits
-
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
Before the fix, the branch name was shown like this: "b'default'". --HG-- branch : stable
-
Manuel Jacob authored
The called method doesn’t support unicode for this argument. --HG-- branch : stable
-
- 08 Nov, 2019 2 commits
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
Yuya Nishihara authored
-
- 06 Nov, 2019 3 commits
-
-
muxator authored
Before this change, trying to commit something under python3 would fail with a set of messages like the following one: File "/opt/mercurial/thg/tortoisehg/hgqt/commit.py", line 604, in mqPerformAction return self.commit() File "/opt/mercurial/thg/tortoisehg/hgqt/commit.py", line 952, in commit 'issue.linkmandatory') File "/usr/lib/python3/dist-packages/mercurial/ui.py", line 688, in configbool v = self._config(section, name, default, untrusted=untrusted) File "/usr/lib/python3/dist-packages/mercurial/ui.py", line 585, in _config msg %= (section, name) TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'str' And, in addition, this traceback would be triggered when trying to split the 'autoinc' string: File "/opt/mercurial/thg/tortoisehg/hgqt/commit.py", line 604, in mqPerformAction return self.commit() File "/opt/mercurial/thg/tortoisehg/hgqt/commit.py", line 1101, in commit for fname in self.opts.get('autoinc', '').split(b','): TypeError: must be str or None, not bytes Tested compatibility with: - python2.7, mercurial 5.1.2 - python3.7, mercurial 5.2
-
muxator authored
Before this change, on python3.7 and hg 5.2, the commit widget would crash when trying to show the status of the working copy. This was due to problems in populating a configuration structure. This change builds on the work done in f63ca64e4688 on RepoAgent, and redefines readopts() to use a cross-compatible way of loading configuration data. Also changed the other call site for readopts() in merge.py. Please note that in this revision the "commit" functionality is still not working, because of the very same problem. This will be addressed in the next changeset. Tested compatibility with: - python2.7, mercurial 5.1.2 - python3.7, mercurial 5.2
-
muxator authored
Otherwise, when there is an error at startup (for example, when testedwith field in hgversion.py is not updated), thg fails with: Traceback (most recent call last): File "/usr/local/bin/thg", line 91, in <module> tortoisehg.hgqt.run.run() File "/opt/mercurial/thg/tortoisehg/hgqt/run.py", line 80, in run 'error': '\n' + errmsg + '\n', TypeError: can only concatenate str (not "bytes") to str Tested compatibility with: - python2.7, mercurial 5.1.2 - python3.7, mercurial 5.2
-
- 29 Sep, 2019 5 commits
-
-
Yuya Nishihara authored
-
Yuya Nishihara authored
Follows up 5660ef1be6be. Help texts are copied from Mercurial fffd3369aa83. --HG-- branch : stable
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
- 25 Sep, 2019 2 commits
-
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
- 29 Sep, 2019 1 commit
-
-
Yuya Nishihara authored
-
- 22 Sep, 2019 1 commit
-
-
kiilerix authored
See https://www.mercurial-scm.org/repo/hg/rev/9c6473d2038b . --HG-- branch : stable
-
- 19 Aug, 2019 1 commit
-
-
Steve Borho authored
--HG-- branch : stable
-
- 18 Aug, 2019 1 commit
-
-
kiilerix authored
The default value for cur was -1 ... but it was compared with None. That worked on Python2, but Python 3 refuse to do that and would fail with: TypeError: '>=' not supported between instances of 'tuple' and 'int' Fix by using None as default and check for identify instead of using >= .
-
- 26 Sep, 2019 1 commit
-
-
kiilerix authored
-
- 29 Sep, 2019 1 commit
-
-
Yuya Nishihara authored
-
- 25 Sep, 2019 1 commit
-
-
kiilerix authored
-
- 24 Sep, 2019 2 commits
- 16 Sep, 2019 1 commit
-
-
kiilerix authored
-
- 24 Sep, 2019 1 commit
-
-
Yuya Nishihara authored
-
- 31 Aug, 2019 1 commit
-
-
kiilerix authored
-
- 24 Sep, 2019 1 commit
-
-
Yuya Nishihara authored
-
- 31 Aug, 2019 1 commit
-
-
kiilerix authored
Keep htmlui as byte strings even though label styling comes from qtlib unicode land.
-
- 22 Sep, 2019 2 commits
-
-
kiilerix authored
If Mercurial or TortoiseHg should happen to call pushbuffer while using htmlui, it is most certainly because they expect the original pushbuffer semantics of original bytestring data. Thus, drop custom implementation of popbuffer, and just make sure the custom methods write, write_err and label all just call out to original ui functionality if using a buffer. This helps making it more clear when functions should return html and when to behave like Mercurial.
-
kiilerix authored
-
- 21 Sep, 2019 2 commits
-
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-