This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11856

mergestate: make `_resolve()` do both preresolve and resolve
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc25a67cfc291: mergestate: make `_resolve()` do both preresolve and resolve
Summary

This patch removes the preresolve argument from _resolve() and
makes it do both the "preresolve" and "resolve" steps without the
caller having to call it twice.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Dec 4 2021, 2:06 AM
Alphare accepted this revision.Dec 7 2021, 10:27 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:27 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (58 lines)

Diff 31308

mercurial/mergestate.py

def allextras(self): def allextras(self):
"""return all extras information stored with the mergestate""" """return all extras information stored with the mergestate"""
return self._stateextras return self._stateextras
def extras(self, filename): def extras(self, filename):
"""return extras stored with the mergestate for the given filename""" """return extras stored with the mergestate for the given filename"""
return self._stateextras[filename] return self._stateextras[filename]
def _resolve(self, preresolve, dfile, wctx): def _resolve(self, 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 the return value of merge obtained from filemerge._filemerge().
obtained from filemerge._filemerge().
""" """
if self[dfile] in ( if self[dfile] in (
MERGE_RECORD_RESOLVED, MERGE_RECORD_RESOLVED,
LEGACY_RECORD_DRIVER_RESOLVED, LEGACY_RECORD_DRIVER_RESOLVED,
): ):
return True, 0 return 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:
actx = None actx = None
fcd = _filectxorabsent(localkey, wctx, dfile) fcd = _filectxorabsent(localkey, wctx, dfile)
fco = _filectxorabsent(onode, octx, ofile) fco = _filectxorabsent(onode, octx, ofile)
# TODO: move this to filectxorabsent # TODO: move this to filectxorabsent
fca = self._repo.filectx(afile, fileid=anode, changectx=actx) fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
# "premerge" x flags # "premerge" x flags
flo = fco.flags() flo = fco.flags()
fla = fca.flags() fla = fca.flags()
if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: if b'x' in flags + flo + fla and b'l' not in flags + flo + fla:
if fca.rev() == nullrev and flags != flo: if fca.rev() == nullrev and flags != flo:
if preresolve:
self._repo.ui.warn( self._repo.ui.warn(
_( _(
b'warning: cannot merge flags for %s ' b'warning: cannot merge flags for %s '
b'without common ancestor - keeping local flags\n' b'without common ancestor - keeping local flags\n'
) )
% afile % afile
) )
elif flags == fla: elif flags == fla:
flags = flo flags = flo
if preresolve:
# restore local # restore local
if localkey != self._repo.nodeconstants.nullhex: if localkey != self._repo.nodeconstants.nullhex:
self._restore_backup(wctx[dfile], localkey, flags) self._restore_backup(wctx[dfile], localkey, flags)
else: else:
wctx[dfile].remove(ignoremissing=True) wctx[dfile].remove(ignoremissing=True)
complete, merge_ret, deleted = filemerge.premerge( complete, merge_ret, deleted = filemerge.premerge(
self._repo, self._repo,
wctx, wctx,
self._local, self._local,
lfile, lfile,
fcd, fcd,
fco, fco,
fca, fca,
labels=self._labels, labels=self._labels,
) )
else: if not complete:
complete, merge_ret, deleted = filemerge.filemerge( complete, merge_ret, deleted = filemerge.filemerge(
self._repo, self._repo,
wctx, wctx,
self._local, self._local,
lfile, lfile,
fcd, fcd,
fco, fco,
fca, fca,
elif fco.isabsent(): # cd: local picked elif fco.isabsent(): # cd: local picked
if dfile in self.localctx: if dfile in self.localctx:
action = ACTION_ADD_MODIFIED action = ACTION_ADD_MODIFIED
else: else:
action = ACTION_ADD action = ACTION_ADD
# else: regular merges (no action necessary) # else: regular merges (no action necessary)
self._results[dfile] = merge_ret, action self._results[dfile] = merge_ret, action
return complete, merge_ret return merge_ret
def resolve(self, dfile, wctx): def resolve(self, dfile, wctx):
"""run merge process for dfile """run merge process for dfile
Returns the exit code of the merge.""" Returns the exit code of the merge."""
complete, r = self._resolve(True, dfile, wctx) return self._resolve(dfile, wctx)
if not complete:
r = self._resolve(False, dfile, wctx)[1]
return r
def counts(self): def counts(self):
"""return counts for updated, merged and removed files in this """return counts for updated, merged and removed files in this
session""" session"""
updated, merged, removed = 0, 0, 0 updated, merged, removed = 0, 0, 0
for r, action in pycompat.itervalues(self._results): for r, action in pycompat.itervalues(self._results):
if r is None: if r is None:
updated += 1 updated += 1