This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8920

mergestate: use _stateextras instead of merge records for commit related info
ClosedPublic

Authored by pulkit on Aug 10 2020, 7:17 AM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0652a533fe3c: mergestate: use _stateextras instead of merge records for commit related info
Summary

There is a set of information related to a merge which is needed on commit. We
want to store such information in the mergestate so that we can read it while
committing.

For this purpose, we are using merge records and introduced a merge
entry state for that. However this won't scale and is not clean way to implement
this.

This patch reworks the existing logic related to this to use _stateextras and
read from it.

Right now the information stored is not very descriptive but it will be in next
patch.

Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be
kept for BC.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mmercurial/commit.py (5 lines)
Mmercurial/mergestate.py (16 lines)

Diff 22423

mercurial/commands.py

b'D', b'D',
), ),
} }
for f in ms: for f in ms:
if not m(f): if not m(f):
continue continue
if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
continue
label, key = mergestateinfo[ms[f]] label, key = mergestateinfo[ms[f]]
fm.startitem() fm.startitem()
fm.context(ctx=wctx) fm.context(ctx=wctx)
fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label) fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
fm.data(path=f) fm.data(path=f)
fm.plain(b'%s\n' % uipathfn(f), label=label) fm.plain(b'%s\n' % uipathfn(f), label=label)
fm.end() fm.end()
return 0 return 0
# Treat all invalid / unrecognized values as 'none'. # Treat all invalid / unrecognized values as 'none'.
markcheck = False markcheck = False
for f in ms: for f in ms:
if not m(f): if not m(f):
continue continue
didwork = True didwork = True
if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
continue
# don't let driver-resolved files be marked, and run the conclude # don't let driver-resolved files be marked, and run the conclude
# step if asked to resolve # step if asked to resolve
if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
exact = m.exact(f) exact = m.exact(f)
if mark: if mark:
if exact: if exact:
ui.warn( ui.warn(
_(b'not marking %s as it is driver-resolved\n') _(b'not marking %s as it is driver-resolved\n')

mercurial/commit.py

fparentancestors = flog.commonancestorsheads(fparent1, fparent2) fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
if fparent1 in fparentancestors: if fparent1 in fparentancestors:
fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
elif fparent2 in fparentancestors: elif fparent2 in fparentancestors:
fparent2 = nullid fparent2 = nullid
elif not fparentancestors: elif not fparentancestors:
# TODO: this whole if-else might be simplified much more # TODO: this whole if-else might be simplified much more
ms = mergestate.mergestate.read(repo) ms = mergestate.mergestate.read(repo)
if ( if ms.extras(fname).get(b'filenode-source') == b'other':
fname in ms
and ms[fname] == mergestate.MERGE_RECORD_MERGED_OTHER
):
fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
# is the file changed? # is the file changed?
text = fctx.data() text = fctx.data()
if fparent2 != nullid or meta or flog.cmp(fparent1, text): if fparent2 != nullid or meta or flog.cmp(fparent1, text):
if touched is None: # do not overwrite added if touched is None: # do not overwrite added
touched = 'modified' touched = 'modified'
fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2) fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2)

mercurial/mergestate.py

##### #####
MERGE_RECORD_UNRESOLVED = b'u' MERGE_RECORD_UNRESOLVED = b'u'
MERGE_RECORD_RESOLVED = b'r' MERGE_RECORD_RESOLVED = b'r'
MERGE_RECORD_UNRESOLVED_PATH = b'pu' MERGE_RECORD_UNRESOLVED_PATH = b'pu'
MERGE_RECORD_RESOLVED_PATH = b'pr' MERGE_RECORD_RESOLVED_PATH = b'pr'
MERGE_RECORD_DRIVER_RESOLVED = b'd' MERGE_RECORD_DRIVER_RESOLVED = b'd'
# represents that the file was automatically merged in favor # represents that the file was automatically merged in favor
# of other version. This info is used on commit. # of other version. This info is used on commit.
# This is now deprecated and commit related information is now
# stored in RECORD_FILE_VALUES
MERGE_RECORD_MERGED_OTHER = b'o' MERGE_RECORD_MERGED_OTHER = b'o'
##### #####
# top level record which stores other unknown records. Multiple of these can # top level record which stores other unknown records. Multiple of these can
# exists # exists
##### #####
RECORD_OVERRIDE = b't' RECORD_OVERRIDE = b't'
elif rtype in ( elif rtype in (
RECORD_MERGED, RECORD_MERGED,
RECORD_CHANGEDELETE_CONFLICT, RECORD_CHANGEDELETE_CONFLICT,
RECORD_PATH_CONFLICT, RECORD_PATH_CONFLICT,
RECORD_MERGE_DRIVER_MERGE, RECORD_MERGE_DRIVER_MERGE,
LEGACY_RECORD_RESOLVED_OTHER, LEGACY_RECORD_RESOLVED_OTHER,
): ):
bits = record.split(b'\0') bits = record.split(b'\0')
# merge entry type MERGE_RECORD_MERGED_OTHER is deprecated
# and we now store related information in _stateextras, so
# lets write to _stateextras directly
if bits[1] == MERGE_RECORD_MERGED_OTHER:
self._stateextras[bits[0]][b'filenode-source'] = b'other'
else:
self._state[bits[0]] = bits[1:] self._state[bits[0]] = bits[1:]
elif rtype == RECORD_FILE_VALUES: elif rtype == RECORD_FILE_VALUES:
filename, rawextras = record.split(b'\0', 1) filename, rawextras = record.split(b'\0', 1)
extraparts = rawextras.split(b'\0') extraparts = rawextras.split(b'\0')
extras = {} extras = {}
i = 0 i = 0
while i < len(extraparts): while i < len(extraparts):
extras[extraparts[i]] = extraparts[i + 1] extras[extraparts[i]] = extraparts[i + 1]
i += 2 i += 2
MERGE_RECORD_UNRESOLVED_PATH, MERGE_RECORD_UNRESOLVED_PATH,
MERGE_RECORD_RESOLVED_PATH, MERGE_RECORD_RESOLVED_PATH,
): ):
# Path conflicts. These are stored in 'P' records. The current # Path conflicts. These are stored in 'P' records. The current
# resolution state ('pu' or 'pr') is stored within the record. # resolution state ('pu' or 'pr') is stored within the record.
records.append( records.append(
(RECORD_PATH_CONFLICT, b'\0'.join([filename] + v)) (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
) )
elif v[0] == MERGE_RECORD_MERGED_OTHER:
records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
elif v[1] == nullhex or v[6] == nullhex: elif v[1] == nullhex or v[6] == nullhex:
# Change/Delete or Delete/Change conflicts. These are stored in # Change/Delete or Delete/Change conflicts. These are stored in
# 'C' records. v[1] is the local file, and is nullhex when the # 'C' records. v[1] is the local file, and is nullhex when the
# file is deleted locally ('dc'). v[6] is the remote file, and # file is deleted locally ('dc'). v[6] is the remote file, and
# is nullhex when the file is deleted remotely ('cd'). # is nullhex when the file is deleted remotely ('cd').
records.append( records.append(
(RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v)) (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
) )
path: the path that conflicts path: the path that conflicts
frename: the filename the conflicting file was renamed to frename: the filename the conflicting file was renamed to
forigin: origin of the file ('l' or 'r' for local/remote) forigin: origin of the file ('l' or 'r' for local/remote)
""" """
self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin] self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
self._dirty = True self._dirty = True
def addmergedother(self, path): def addmergedother(self, path):
self._state[path] = [MERGE_RECORD_MERGED_OTHER, nullhex, nullhex] self._stateextras[path] = {b'filenode-source': b'other'}
self._dirty = True self._dirty = True
def __contains__(self, dfile): def __contains__(self, dfile):
return dfile in self._state return dfile in self._state
def __getitem__(self, dfile): def __getitem__(self, dfile):
return self._state[dfile][0] return self._state[dfile][0]
def _resolve(self, preresolve, dfile, wctx): def _resolve(self, preresolve, dfile, wctx):
"""rerun merge process for file path `dfile`. """rerun merge process for file path `dfile`.
Returns whether the merge was completed and the return value of merge Returns whether the merge was completed and the return value of merge
obtained from filemerge._filemerge(). obtained from filemerge._filemerge().
""" """
if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED): if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
return True, 0 return True, 0
if self._state[dfile][0] == MERGE_RECORD_MERGED_OTHER:
return True, 0
stateentry = self._state[dfile] stateentry = self._state[dfile]
state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry
octx = self._repo[self._other] octx = self._repo[self._other]
extras = self.extras(dfile) extras = self.extras(dfile)
anccommitnode = extras.get(b'ancestorlinknode') anccommitnode = extras.get(b'ancestorlinknode')
if anccommitnode: if anccommitnode:
actx = self._repo[anccommitnode] actx = self._repo[anccommitnode]
else: else: