##// 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:

r43347:687b865b default
r46724:bdc2bf68 default
Show More
node.py
49 lines | 1.5 KiB | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # node.py - basic nodeid manipulation for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
mpm@selenic.com
Break apart hg.py...
r1089
Gregory Szorc
node: use absolute_import
r25962 from __future__ import absolute_import
Matt Mackall
Replace demandload with new demandimport
r3877 import binascii
mpm@selenic.com
Break apart hg.py...
r1089
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980 # This ugly style has a noticeable effect in manifest parsing
hex = binascii.hexlify
Augie Fackler
node: make bin() be a wrapper instead of just an alias...
r36256 # Adapt to Python 3 API changes. If this ends up showing up in
# profiles, we can use this version only on Python 3, and forward
# binascii.unhexlify like we used to on Python 2.
def bin(s):
try:
return binascii.unhexlify(s)
except binascii.Error as e:
raise TypeError(e)
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 nullrev = -1
Kyle Lippincott
nodes: expand/comment the magic nodes so they are more easily searchable...
r39178 # In hex, this is '0000000000000000000000000000000000000000'
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 nullid = b"\0" * 20
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980 nullhex = hex(nullid)
mpm@selenic.com
Break apart hg.py...
r1089
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360 # Phony node value to stand-in for new files in some uses of
# manifests.
Kyle Lippincott
nodes: expand/comment the magic nodes so they are more easily searchable...
r39178 # In hex, this is '2121212121212121212121212121212121212121'
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 newnodeid = b'!!!!!!!!!!!!!!!!!!!!'
Yuya Nishihara
node: correct hex representation of pseudo node ids
r39231 # In hex, this is '3030303030303030303030303030306164646564'
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 addednodeid = b'000000000000000added'
Yuya Nishihara
node: correct hex representation of pseudo node ids
r39231 # In hex, this is '3030303030303030303030306d6f646966696564'
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 modifiednodeid = b'000000000000modified'
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Yuya Nishihara
node: rename wdirnodes to clarify they are for manifest/filelogs...
r37466 wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737 # pseudo identifiers for working directory
# (they are experimental, so don't add too many dependencies on them)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 wdirrev = 0x7FFFFFFF
Kyle Lippincott
nodes: expand/comment the magic nodes so they are more easily searchable...
r39178 # In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 wdirid = b"\xff" * 20
Yuya Nishihara
revlog: add support for partial matching of wdir node id...
r32684 wdirhex = hex(wdirid)
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
mpm@selenic.com
Break apart hg.py...
r1089 def short(node):
return hex(node[:6])