facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

mergestate: allow storing and retrieving change/delete conflicts

Browse Source 
We introduce a new record type, 'C', to indicate change/delete conflicts. This
is a separate record type because older versions of Mercurial will not be able
to handle these conflicts.

We aren't actually storing any change/delete conflicts yet -- that will come in
future patches.
This commit is contained in:
Siddharth Agarwal 2015-11-18 15:46:45 -08:00
parent caf17cd48e
commit c5b488f2d2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial/merge.py
View File

@ -16,6 +16,7 @@ from .i18n import _
from .node import (
bin,
hex,
nullhex,
nullid,
nullrev,
)
@ -58,6 +59,7 @@ class mergestate(object):
L: the node of the "local" part of the merge (hexified version)
O: the node of the "other" part of the merge (hexified version)
F: a file to be merged entry
C: a change/delete or delete/change conflict
D: a file that the external merge driver will merge internally
(experimental)
m: the external merge driver defined for this merge plus its run state
@ -143,7 +145,7 @@ class mergestate(object):
self._readmergedriver = bits[0]
self._mdstate = mdstate
elif rtype in 'FD':
elif rtype in 'FDC':
bits = record.split('\0')
self._state[bits[0]] = bits[1:]
elif not rtype.islower():
@ -315,6 +317,10 @@ class mergestate(object):
for d, v in self._state.iteritems():
if v[0] == 'd':
records.append(('D', '\0'.join([d] + v)))
# v[1] == local ('cd'), v[6] == other ('dc') -- not supported by
# older versions of Mercurial
elif v[1] == nullhex or v[6] == nullhex:
records.append(('C', '\0'.join([d] + v)))
else:
records.append(('F', '\0'.join([d] + v)))
return records