Boris Feld <boris.feld@octobus.net> [Mon, 09 Oct 2017 16:31:43 +0200] rev 34563
configitems: update default value of 'phases.new-commit'
Now that mq is cleaned up, we can rely on the config register for the default
value. We switch the default from the integer to human readable value to help
with future automatic documentation that could be generated from the config
register.
Boris Feld <boris.feld@octobus.net> [Mon, 09 Oct 2017 17:33:03 +0200] rev 34562
mq: use the newcommitphase utility
We use the official API instead of doing the operation manually. This will help
storing the default value for phases properly in the next changeset.
Denis Laxalde <denis.laxalde@logilab.fr> [Tue, 26 Sep 2017 18:17:47 +0200] rev 34561
patch: rename "header" variable into "hdr" in diff()
The "header" variable was hiding the eponymous class, hence preventing its
usage.
Mark Thomas <mbthomas@fb.com> [Thu, 05 Oct 2017 08:03:57 -0700] rev 34560
merge: improve comments in mergestate._makerecords
Differential Revision: https://phab.mercurial-scm.org/D955
Mark Thomas <mbthomas@fb.com> [Mon, 02 Oct 2017 14:05:30 -0700] rev 34559
commands: tidy up merge state decoding in resolve
Make the mapping from merge state to label and display key explicit, and move
construction of the dict out of the loop.
Differential Revision: https://phab.mercurial-scm.org/D861
Mark Thomas <mbthomas@fb.com> [Mon, 02 Oct 2017 14:05:30 -0700] rev 34558
tests: add test for path conflicts during merge
Differential Revision: https://phab.mercurial-scm.org/D787