Tue, 18 Feb 2020 19:11:13 +0100 nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 18 Feb 2020 19:11:13 +0100] rev 44445
nodemap: warm the persistent nodemap on disk with debugupdatecache When appropriate, the nodemap cache file will be created. Differential Revision: https://phab.mercurial-scm.org/D8173
Sat, 29 Feb 2020 19:31:33 +0100 copies-tests: update to null after setup for output stability
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 29 Feb 2020 19:31:33 +0100] rev 44444
copies-tests: update to null after setup for output stability This avoid having '@' moving around in graph output when the graph evolves. after this change, graph evolution is still noisy, but less. Differential Revision: https://phab.mercurial-scm.org/D8236
Tue, 03 Mar 2020 08:55:27 +0100 copies-tests: remove extra log call at the end of the chain-merge test file
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 03 Mar 2020 08:55:27 +0100] rev 44443
copies-tests: remove extra log call at the end of the chain-merge test file We do not actually need theses as the graph is displayed earlier anyway. I think they are the remain of me trying to understand that case better. Differential Revision: https://phab.mercurial-scm.org/D8235
Thu, 05 Mar 2020 08:37:08 -0800 commit: print debug message when clearing dirstate and wdir clean
Martin von Zweigbergk <martinvonz@google.com> [Thu, 05 Mar 2020 08:37:08 -0800] rev 44442
commit: print debug message when clearing dirstate and wdir clean This case is a little weird, so let's have a debug message. Differential Revision: https://phab.mercurial-scm.org/D8231
Thu, 05 Mar 2020 10:46:31 -0800 merge with stable
Martin von Zweigbergk <martinvonz@google.com> [Thu, 05 Mar 2020 10:46:31 -0800] rev 44441
merge with stable
Thu, 05 Mar 2020 10:52:51 -0500 merge with stable
Augie Fackler <augie@google.com> [Thu, 05 Mar 2020 10:52:51 -0500] rev 44440
merge with stable
Wed, 04 Mar 2020 14:21:23 -0500 commands: switch one call of check_at_most_one_arg to strings
Augie Fackler <augie@google.com> [Wed, 04 Mar 2020 14:21:23 -0500] rev 44439
commands: switch one call of check_at_most_one_arg to strings This opts hasn't been through the byteskwargs mulcher, so we can just use strings here instead of bytes. Fixes the test changes from D8204 on Python 3, which was the only place this was a problem. Differential Revision: https://phab.mercurial-scm.org/D8222
Fri, 28 Feb 2020 11:32:27 -0800 cleanup: remove redundant clearing of mergestate in rebase and shelve
Martin von Zweigbergk <martinvonz@google.com> [Fri, 28 Feb 2020 11:32:27 -0800] rev 44438
cleanup: remove redundant clearing of mergestate in rebase and shelve `repo.commit()` now clears the merge state even if it ends up not creating a commit because there were no changes to commit. Differential Revision: https://phab.mercurial-scm.org/D8197
Fri, 28 Feb 2020 11:32:02 -0800 commit: clear resolved mergestate even if working copy is clean
Martin von Zweigbergk <martinvonz@google.com> [Fri, 28 Feb 2020 11:32:02 -0800] rev 44437
commit: clear resolved mergestate even if working copy is clean If the mergestate has resolved conflicts and a commit is successfully created (either because there are changes in the working copy or because ui.allowemptycommit=yes), we will also clear the merge state. However, if the working copy is clean (and ui.allowemptycommit=no), we leave the mergestate there. The user may notice it in `hg resolve -l` output (but not in `hg status -v` output). It's not clear how the user should clear it, but probably via `hg co -C .`. It's also quite likely that they won't even notice it and it will get cleared by a later `hg commit` (of unrelated changes). This patch makes it so that `hg commit` also clears resolved merge conflicts even if the command doesn't end up writing a commit because the working copy was empty. That's probably a little weird (commands that abort should generally avoid changing the repo), but it still seems mostly harmless, and it reduces the risk of more bugs like https://bz.mercurial-scm.org/show_bug.cgi?id=5494. I just ran into a version of that bug in the Evolve extension and that's what triggered this series. Differential Revision: https://phab.mercurial-scm.org/D8196
Wed, 04 Mar 2020 00:45:54 -0500 phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com> [Wed, 04 Mar 2020 00:45:54 -0500] rev 44436
phabricator: avoid a stacktrace when command arguments are missing Previously, the TypeError wasn't properly converted to a SignatureError when improper arguments were supplied to the inner function, because the stack depth is 2 inside the vcrcommand decorator. The `__name__` and `__doc__` attributes need to be reassigned to the new wrapper so that the help summary is available. Differential Revision: https://phab.mercurial-scm.org/D8209
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 tip