##// END OF EJS Templates
mergetools: add new conflict marker format with diffs in...
mergetools: add new conflict marker format with diffs in I use 3-way conflict markers. Often when I resolve them, I manually compare one the base with one side and apply the differences to the other side. That can be hard when the conflict marker is large. This patch introduces a new type of conflict marker, which I'm hoping will make it easier to resolve conflicts. The new format uses `<<<<<<<` and `>>>>>>>` to open and close the markers, just like our existing 2-way and 3-way conflict markers. Instead of having 2 or 3 snapshots (left+right or left+base+right), it has a sequence of diffs. A diff looks like this: ``` ------- base +++++++ left a -b +c d ``` A diff that adds one side ("diff from nothing") has a `=======` header instead and does not have have `+` prefixed on its lines. A regular 3-way merge can be viewed as adding one side plus a diff between the base and the other side. It thus has two ways of being represented, depending on which side is being diffed: ``` <<<<<<< ======= left contents on left ------- base +++++++ right contents on -left +right >>>>>>> ``` or ``` <<<<<<< ------- base +++++++ left contents on -right +left ======= right contents on right >>>>>>> ``` I've made it so the new merge tool tries to pick a version that has the most common lines (no difference in the example above). I've called the new tool "mergediff" to stick to the convention of starting with "merge" if the tool tries a regular 3-way merge. The idea came from my pet VCS (placeholder name `jj`), which has support for octopus merges and other ways of ending up with merges of more than 3 versions. I wanted to be able to represent such conflicts in the working copy and therefore thought of this format (although I have not yet implemented it in my VCS). I then attended a meeting with Larry McVoy, who said BitKeeper has an option (`bk smerge -g`) for showing a similar format, which reminded me to actually attempt this in Mercurial. Differential Revision: https://phab.mercurial-scm.org/D9551

File last commit:

r46554:89a2afe3 default
r46724:bdc2bf68 default
Show More
txnutil.py
36 lines | 1.0 KiB | text/x-python | PythonLexer
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 # txnutil.py - transaction related utilities
#
# Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import errno
Augie Fackler
formatting: blacken the codebase...
r43346 from . import encoding
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050
def mayhavepending(root):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """return whether 'root' may have pending changes, which are
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 visible to this process.
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return root == encoding.environ.get(b'HG_PENDING')
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050
Augie Fackler
formatting: blacken the codebase...
r43346
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 def trypending(root, vfs, filename, **kwargs):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """Open file to be read according to HG_PENDING environment variable
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050
This opens '.pending' of specified 'filename' only when HG_PENDING
is equal to 'root'.
This returns '(fp, is_pending_opened)' tuple.
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 if mayhavepending(root):
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return (vfs(b'%s.pending' % filename, **kwargs), True)
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 except IOError as inst:
if inst.errno != errno.ENOENT:
raise
return (vfs(filename, **kwargs), False)