This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1739

filemerge: only raise InMemoryMergeConflictsError when running _xmerge
ClosedPublic

Authored by phillco on Dec 20 2017, 6:22 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGef7e667a4f7b: filemerge: only raise InMemoryMergeConflictsError when running _xmerge
Summary

The old code here was overly broad and would raise in cases when we didn't end
up calling xmerge and resolved using an internal tool (such as when
premerge=True).

Instead, let's swap out _xmerge if IMM is enabled and have the new tool raise
when called, which is the behavior we want.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Dec 20 2017, 6:22 PM
durin42 accepted this revision.Dec 20 2017, 8:33 PM
This revision is now accepted and ready to land.Dec 20 2017, 8:33 PM
Closed by commit rHGef7e667a4f7b: filemerge: only raise InMemoryMergeConflictsError when running _xmerge (authored by phillco). · Explain WhyDec 21 2017, 1:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (22 lines)

Diff 4567

mercurial/filemerge.py

def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=None): labels=None):
""" """
Creates three versions of the files as same as :dump, but omits premerge. Creates three versions of the files as same as :dump, but omits premerge.
""" """
return _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, return _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=labels) labels=labels)
def _xmergeimm(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
# In-memory merge simply raises an exception on all external merge tools,
# for now.
#
# It would be possible to run most tools with temporary files, but this
# raises the question of what to do if the user only partially resolves the
# file -- we can't leave a merge state. (Copy to somewhere in the .hg/
# directory and tell the user how to get it is my best idea, but it's
# clunky.)
raise error.InMemoryMergeConflictsError('in-memory merge does not support '
'external merge tools')
def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
tool, toolpath, binary, symlink = toolconf tool, toolpath, binary, symlink = toolconf
if fcd.isabsent() or fco.isabsent(): if fcd.isabsent() or fco.isabsent():
repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
'for %s\n') % (tool, fcd.path())) 'for %s\n') % (tool, fcd.path()))
return False, 1, None return False, 1, None
unused, unused, unused, back = files unused, unused, unused, back = files
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
pycompat.bytestr(changedelete))) pycompat.bytestr(changedelete)))
if tool in internals: if tool in internals:
func = internals[tool] func = internals[tool]
mergetype = func.mergetype mergetype = func.mergetype
onfailure = func.onfailure onfailure = func.onfailure
precheck = func.precheck precheck = func.precheck
else: else:
if wctx.isinmemory():
func = _xmergeimm
else:
func = _xmerge func = _xmerge
mergetype = fullmerge mergetype = fullmerge
onfailure = _("merging %s failed!\n") onfailure = _("merging %s failed!\n")
precheck = None precheck = None
if wctx.isinmemory():
raise error.InMemoryMergeConflictsError('in-memory merge does not '
'support external merge '
'tools')
toolconf = tool, toolpath, binary, symlink toolconf = tool, toolpath, binary, symlink
if mergetype == nomerge: if mergetype == nomerge:
r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
return True, r, deleted return True, r, deleted
if premerge: if premerge:
if orig != fco.path(): if orig != fco.path():