- 13 Jun, 2020 2 commits
-
-
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
-
Matt Harbison authored
Stupid copy/paste error in 8a3d999837ef, which caused the substitution to fail when trying to view a file from the search panel (but not the status panel for some reason). --HG-- branch : stable
-
- 06 Jun, 2020 2 commits
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
- 01 Jun, 2020 1 commit
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
- 30 May, 2020 1 commit
-
-
Manuel Jacob authored
--HG-- branch : stable
-
- 02 Jun, 2020 1 commit
-
-
Aay Jay Chan authored
--HG-- branch : stable
-
- 31 May, 2020 2 commits
-
-
Matt Harbison authored
The simplest case is to commit a file, rename it, and then try to amend it. Previously, the removed file was hidden, and the added file was not selected. If amended at that point, it did something weird where the amend succeeded (even though all files were excluded with `--exclude /path/to/repo` and the message didn't change), any content changes in the file were NOT picked up by the new commit, and the output of the command said: % hg commit --verbose "--message=commit src" --amend --exclude "C:\Users\Matt\projects\test" -- amending changeset 0e6721740d8d copying changeset 0e6721740d8d to d76f533dd335 committing files: src.txt committing manifest committing changelog committing files: src.txt committing manifest committing changelog committed changeset 19:fe0197ce7354 [command completed successfully Sun May 31 20:26:09 2020] Now both are selected by default, so content changes are applied and the rename takes place. (There is no copy record, because this is ultimately just an add with a different name.) The extra status call is unfortunate, but I don't see any other way to deal with this. Anything changed in wdir should be in the list of files being passed to the command. This slipped through the cracks, and was missed with a similar change in 0bc65a11f482. That change seems to handle the reverse where a file is removed, committed, reverted back to added, and then amended. --HG-- branch : stable
-
Matt Harbison authored
This was special cased in b64381bf9057, but I suspect that it should have only excluded '!' status files. By not selecting removed files, they don't get passed to the amend command, and then `hg mv` operations are converted to `hg cp` with an uncommitted removed file by default. I also tried amending with a '!' file, but then got a prompt to remove the file, with the only options being to accept or cancel. So it seems like the handling around this error has shifted past the usefulness of this check anyway. There's a separate (but related) problem with rename + amend in that the removed file is missed by the status call, so it isn't put into the list of files filtered through this check. That will be fixed next. But since the original code stated it fixed a bug, it seemed worth changing this in isolation. --HG-- branch : stable
-
- 01 Jun, 2020 1 commit
-
-
Matt Harbison authored
This is needed for Windows. --HG-- branch : stable
-
- 23 May, 2020 1 commit
-
-
Manuel Jacob authored
--HG-- branch : stable
-
- 16 May, 2020 3 commits
-
-
Stepan Saiko authored
This fixes an empty file diff in shelve (left side) because DiffBrowser expects unicode status. --HG-- branch : stable
-
Yuya Nishihara authored
--HG-- branch : stable
-
Yuya Nishihara authored
--HG-- branch : stable
-
- 15 May, 2020 2 commits
-
-
Stepan Saiko authored
This fixes a crash that happens when whole file moved in shelve dialog. --HG-- branch : stable
-
Stepan Saiko authored
This fixes a crash that happens when whole file moved in shelve dialog. --HG-- branch : stable
-
- 14 May, 2020 7 commits
-
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
`path` is already bytes, as can be seen in _fixState(). --HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
- 12 May, 2020 1 commit
-
-
Sergey Orlov authored
--HG-- branch : stable
-
- 10 May, 2020 1 commit
-
-
Sergey Orlov authored
When open shelve dialog and shelve patch already exists mercurial.error.ProgrammingError: unsupported changeid '/.../.hg/shelves/patch' of type <class 'bytes'> --HG-- branch : stable
-
- 09 May, 2020 1 commit
-
-
Aay Jay Chan authored
This fixes a crash that happens when detecting renamed files with identical contents. --HG-- branch : stable
-
- 08 May, 2020 1 commit
-
-
Sergey Orlov authored
--HG-- branch : stable
-
- 29 Apr, 2020 1 commit
-
-
Sergey Orlov authored
1. Viewing mq patch 2. Refresh mq patch 3. Import to mq patch --HG-- branch : stable
-
- 05 May, 2020 1 commit
-
-
Steve Borho authored
--HG-- branch : stable
-
- 29 Apr, 2020 2 commits
-
-
Steve Borho authored
Allow users to configure particular subrepos to be un-checked by default --HG-- branch : stable
-
Steve Borho authored
Without this fix, it was appending a byte representation to the command line: --config paths.default=b'ssh://my/repo/path' which does "Really strange things" (TM) to subrepo pull URLs. Even with this fix, I believe code within the conditional is not right, but I'm not sure how to fix it. --HG-- branch : stable
-
- 27 Apr, 2020 1 commit
-
-
Steve Borho authored
--HG-- branch : stable
-
- 24 Apr, 2020 2 commits
-
-
Aay Jay Chan authored
This fixes a crash that happens when opening file history for a file from the file list of the working directory. --HG-- branch : stable
-
Aay Jay Chan authored
This fixes a crash that happens when showing latest tags. --HG-- branch : stable
-
- 22 Apr, 2020 2 commits
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
Yuya Nishihara authored
--HG-- branch : stable
-
- 09 Apr, 2020 1 commit
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
- 08 Apr, 2020 1 commit
-
-
Aay Jay Chan authored
The literals are passed to RevDetailsWidget.onRevisionSelected(), which expects bytes. This fixes a crash that happens when stripping an ancestor changeset. --HG-- branch : stable
-
- 25 Mar, 2020 1 commit
-
-
w.stott authored
Without this, adding files to repos with largefiles enabled always failed. --HG-- branch : stable
-
- 20 Mar, 2020 1 commit
-
-
w.stott authored
--HG-- branch : stable
-