- 11 Apr, 2021 1 commit
-
-
Matt Harbison authored
I noticed this hacking on some other functionality, but it can be seen with an existing command like this when updated to any recent change: $ python thg vdiff -r 5bfef52bfcc9 tortoisehg/hgqt/qsci.py tortoisehg/hgqt/qtcore.py All of the subsequent file copies that took place between then and now get included in the snapshots, even though they weren't related. Two files need to match to invoke a dirdiff, otherwise the snapshot of the unrelated files occurs, but only the named one is diffed. The same behavior occurs if two of the files in the manifest view of that revision are selected and diffed to local. The filtering might still be a little generous in that it matches either the source or destination. But I'm not sure what the data looks like for a diff from new -> old as opposed to old -> new, and order of revision selection might be a little too subtle in the GUI.
-
- 10 Apr, 2021 1 commit
-
-
Matt Harbison authored
This code goes all the way back to c9bc1c7192c2. I'm not sure what's changed, but the values come from `hglib.difftools()`, which in turn comes from `ui.config()`, so it should have always been bytes.
-
- 09 Apr, 2021 1 commit
-
-
Matt Harbison authored
There are a handful of `annotation-type-mismatch` suppressions for constructs like a function's Text arg being immediately overwritten with the bytes form of the argument. This is an experimental diagnostic that needs to be explicitly enabled in pytype (for now), but such uses also seem to confuse PyCharm. It does seem reasonable to overwrite the argument after converting between bytes and unicode, but one such overwrite at the end of the function wasn't as useful, so it has been elided away.
-
- 10 Apr, 2021 1 commit
-
-
Matt Harbison authored
-
- 07 Apr, 2021 1 commit
-
-
Matt Harbison authored
Since the function could theoretically return a workingctx, there are a couple places that need type assertions where attributes are accessed that are not on basectx. Additionally, pytype flagged the mq module for calling a function on the custom context subclass, so that is now suppressed. I'm assuming these context subclass functions would be better off being unbound methods in a `contextutil` module or similar, because the hidden subclass is confusing the typing some times, and it's weird that some functions on a context return unicode.
-
- 31 Jul, 2020 1 commit
-
-
Matt Harbison authored
This was dropped in hg 8e8fd938ca07 after py2.7.1 compat code was removed from it in hg 5258bffdb1d6, and it simply became an identity function. --HG-- branch : stable
-
- 07 Feb, 2020 1 commit
-
-
Matt Harbison authored
--HG-- branch : stable
-
- 04 Feb, 2020 1 commit
-
-
Matt Harbison authored
The str cast is necessary, otherwise an AttributeError is raised saying (for example) that 'FileNotFoundError' object has no attribute 'decode'. In testing this (by trying to `subprocess.Popen("NULL")`), the error dialog pops up with the title, but nothing else in the box. The following message is printed in the terminal, and the whole process hangs: QObject::startTimer: Timers can only be used with threads started with QThread --HG-- branch : stable
-
- 06 Feb, 2020 1 commit
-
-
Matt Harbison authored
Labels have been bytes since 9464a65a3c76. Without this, the conditional could never be true, and labels were displayed in the diff tool like `fileb'@rev:hash'`. --HG-- branch : stable
-
- 04 Feb, 2020 4 commits
-
-
Matt Harbison authored
By inspection, this string is built up using bytes. But Windows refuses to execute a command made up of bytes. --HG-- branch : stable
-
Matt Harbison authored
--HG-- branch : stable
-
Aay Jay Chan authored
visdiff.launchtool() expects parameter `replace` to be a dict of bytes. This caused a crash when opening diff tool. --HG-- branch : stable
-
Aay Jay Chan authored
This caused a crash when opening files selection dialog when diffing to local. --HG-- branch : stable
-
- 01 Feb, 2020 1 commit
-
-
Aay Jay Chan authored
This caused a crash when opening diff tool. --HG-- branch : stable
-
- 15 Dec, 2019 1 commit
-
-
Matt Harbison authored
-
- 21 Mar, 2021 1 commit
-
-
Matt Harbison authored
-
- 10 Mar, 2021 1 commit
-
-
Matt Harbison authored
-
- 18 Nov, 2019 1 commit
-
-
Matt Harbison authored
-
- 15 Nov, 2019 1 commit
-
-
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
-
- 07 Sep, 2019 1 commit
-
-
kiilerix authored
-
- 11 Sep, 2019 1 commit
-
-
kiilerix authored
- but it still fails in visdiff.snapshot
-
- 20 Sep, 2019 1 commit
-
-
kiilerix authored
-
- 11 Sep, 2019 1 commit
-
-
kiilerix authored
- but it still fails in hglib.difftools.
-
- 07 Sep, 2019 1 commit
-
-
kiilerix authored
Don't change that things are passed as byte string, but accept that the 'replace' dict has system string as key so it can be created as 'dict()' with named parameters.
-
- 31 Aug, 2019 1 commit
-
-
kiilerix authored
Fixes "Diff to local" in file context menu
-
- 25 Aug, 2019 1 commit
-
-
kiilerix authored
Debugging and print statements can tell more about failing asserts, but it is nice to get *some* information up front, also to make it easier to reproduce. General guidelines: Try to avoid anything that must compute something and thus can fail - try to just inspect local variables (or whatever assert looked at). For type related asserts, try to add repr(). Sometimes, multiple variables are relevant - in that case use tuples.
-
- 23 Aug, 2019 1 commit
-
-
Matt Harbison authored
A couple of notable things: - `tortoisehg.autoresolve` still gets a default value in backout and rebase, even though it is not registered dynamicdefault. - the following were left with '' as the default, because it is used to set text with a QString, and it is unknown how far back None would be accepted. (Any other '' -> None conversions are not used to set text) * email.cc * email.to * gpg.key * hostfingerprints.* (strange the default here is a list) - `tortoisehg.overlayicons` in nautilus-thg needs to be registered, as does `debug.delaylock`. - `web.name` still takes a default because it is dynamicdefault
-
- 13 Jun, 2020 1 commit
-
-
Matt Harbison authored
Double clicking any file in a merge commit that is a descendant of a commit with copies was triggering a crash dialog. It didn't seem to happen in the original commit, or other merges in a private repo where the problem was discovered. --HG-- branch : stable
-
- 19 May, 2019 1 commit
-
-
Matt Harbison authored
Fixed up after running `2to3 -w -n -f unicode .`, and re-adding the dropped u'' prefixes. The pycompat.unicode() hack is copied into setup.py because that module declares the dependency on mercurial.
-
- 14 Apr, 2019 1 commit
-
-
Matt Harbison authored
There are two other instances of immediate open() and close() that seem fine to leave alone.
-
- 12 Apr, 2019 1 commit
-
-
Matt Harbison authored
Converted with `2to3 -w -n -f dict .`, and then remove a bunch of list() wrapping.
-
- 24 Mar, 2019 1 commit
-
-
Matt Harbison authored
Fixed up after running `2to3 -w -n -f map .` It also replaced map+lambda with a list comprehension in qt_repotreemodel_test.py.
-
- 23 Mar, 2019 1 commit
-
-
Matt Harbison authored
This used `2to3 -w -n -f except .`, fixed an extra parenthesis in bugreport.py, and a commented out clause in pbranch.py.
-
- 08 Oct, 2018 1 commit
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
- 03 Oct, 2018 1 commit
-
-
Matt Harbison authored
I triggered this by accidentally double clicking a file in the shelved half of the shelf widget: Traceback (most recent call last): File "tortoisehg\hgqt\chunks.pyo", line 166, in vdiff File "tortoisehg\hgqt\visdiff.pyo", line 216, in visualdiff File "tortoisehg\hgqt\thgrepo.pyo", line 772, in __getitem__ File "mercurial\localrepo.pyo", line 856, in __getitem__ File "mercurial\context.pyo", line 439, in __init__ ProgrammingError: unsupported changeid 'patch' of type <type 'str'> Now it pops up a message saying 'Unable to find changeset'. Oddly, the value of --change in this case is 'patch', and I wasn't able to trigger this with visual diff. --HG-- branch : stable
-
- 26 May, 2018 2 commits
-
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
- 06 Dec, 2017 1 commit
-
-
Yuya Nishihara authored
Since Mercurial 4.4, ui.configbool('merge-tools', whatever) returns None by default. This is the minimal workaround for the problem. --HG-- branch : stable
-
- 25 Sep, 2016 1 commit
-
-
Yuya Nishihara authored
Dropped star imports to help static analysis tools.
-
- 08 Dec, 2015 1 commit
-
-
Yuya Nishihara authored
-