Matt Mackall <mpm@selenic.com> [Wed, 19 Aug 2015 15:32:27 -0500] rev 26658
copies: rename renamedelete to renamedeleteset for clarity
Matt Mackall <mpm@selenic.com> [Wed, 19 Aug 2015 15:26:08 -0500] rev 26657
copies: move _makegetfctx calls into checkcopies
Matt Mackall <mpm@selenic.com> [Wed, 19 Aug 2015 15:17:33 -0500] rev 26656
copies: factor out setupctx into _makegetfctx
This reduces the scope of mergecopies a bit
Matt Mackall <mpm@selenic.com> [Fri, 21 Aug 2015 15:12:58 -0500] rev 26655
copies: avoid reference to c1/c2 in makectx
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2015 03:37:09 -0500] rev 26654
mq: use cmdutil.revert instead of hg.revert
It's the last user.
Siddharth Agarwal <sid0@fb.com> [Wed, 30 Sep 2015 21:48:53 -0700] rev 26653
debugmergestate: add support for printing out driver-resolved files
Siddharth Agarwal <sid0@fb.com> [Wed, 30 Sep 2015 21:47:27 -0700] rev 26652
debugmergestate: add support for printing out merge driver
Siddharth Agarwal <sid0@fb.com> [Wed, 30 Sep 2015 19:43:51 -0700] rev 26651
merge.mergedriver: don't try resolving files marked driver-resolved
The driver is expected to take care of these.
Siddharth Agarwal <sid0@fb.com> [Mon, 28 Sep 2015 18:34:06 -0700] rev 26650
merge.mergestate: add support for persisting driver-resolved files
A driver-resolved file is a file that's handled specially by the driver. A
common use case for this state would be autogenerated files, the generation of
which should happen only after all source conflicts are resolved.
This is done with an uppercase letter because older versions of Mercurial will
not know how to treat such files at all.
Siddharth Agarwal <sid0@fb.com> [Wed, 30 Sep 2015 21:42:52 -0700] rev 26649
merge.mergestate: add support for persisting a custom merge driver
A 'merge driver' is a coordinator for the overall merge process. It will be
able to control:
- tools for individual files, much like the merge-patterns configuration does
today
- tools that can work across groups of files
- the ordering of file resolution
- resolution of automatically generated files
- adding and removing additional files to and from the dirstate
Since it is a critical part of the merge process, it really is part of the
merge state.
This is a lowercase character (i.e. optional) because ignoring this is fine for
older versions of Mercurial -- however, if there are any files that are
specially treated by the driver, we should abort. That will happen in upcoming
patches.
There is a potential security issue with storing the merge driver in the merge
state. See the inline comments for more details.