This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11858

filemerge: merge `premerge()` into `filemerge()`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG921853391276: filemerge: merge `premerge()` into `filemerge()`

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:28 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:28 AM
martinvonz added a commit: rHG921853391276: filemerge: merge `premerge()` into `filemerge()`.Dec 8 2021, 3:17 AM
Closed by commit rHG921853391276: filemerge: merge `premerge()` into `filemerge()` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (15 lines)
Mmercurial/mergestate.py (13 lines)

Diff 31310

mercurial/filemerge.py

return r return r
def _workingpath(repo, ctx): def _workingpath(repo, ctx):
return repo.wjoin(ctx.path()) return repo.wjoin(ctx.path())
def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge( complete, merge_ret, deleted = _filemerge(
True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
) )
if not complete:
complete, merge_ret, deleted = _filemerge(
def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(
False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
) )
return complete, merge_ret, deleted
def loadinternalmerge(ui, extname, registrarobj): def loadinternalmerge(ui, extname, registrarobj):
"""Load internal merge tool from specified registrarobj""" """Load internal merge tool from specified registrarobj"""
for name, func in pycompat.iteritems(registrarobj._table): for name, func in pycompat.iteritems(registrarobj._table):
fullname = b':' + name fullname = b':' + name
internals[fullname] = func internals[fullname] = func
internals[b'internal:' + name] = func internals[b'internal:' + name] = func

mercurial/mergestate.py

) )
elif flags == fla: elif flags == fla:
flags = flo flags = flo
# 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(
self._repo,
wctx,
self._local,
lfile,
fcd,
fco,
fca,
labels=self._labels,
)
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,
labels=self._labels, labels=self._labels,
) )
if merge_ret is None: if merge_ret is None:
# If return value of merge is None, then there are no real conflict # If return value of merge is None, then there are no real conflict
del self._state[dfile] del self._state[dfile]
self._dirty = True self._dirty = True
elif not merge_ret: elif not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED) self.mark(dfile, MERGE_RECORD_RESOLVED)
if complete: if complete: