This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12149

filemerge: when not keeping premerge, don't write markers to context
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG86e4b86df932: filemerge: when not keeping premerge, don't write markers to context
Summary

When premerge is enabled (as it is for non-binary inputs by default)
and the markers are not kept, we currently still write it to the
output context and then restore the previous content right after. With
the refactoring in the previous patch, we can easily avoid that step
and instead write the output in the opposite case (i.e. when it's
successful or when the markers are supposed to be kept).

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/filemerge.py (19 lines)

Diff 32193

mercurial/filemerge.py

def _verifytext(input, ui): def _verifytext(input, ui):
"""verifies that text is non-binary""" """verifies that text is non-binary"""
if stringutil.binary(input.text()): if stringutil.binary(input.text()):
msg = _(b"%s looks like a binary file.") % input.fctx.path() msg = _(b"%s looks like a binary file.") % input.fctx.path()
ui.warn(_(b'warning: %s\n') % msg) ui.warn(_(b'warning: %s\n') % msg)
raise error.Abort(msg) raise error.Abort(msg)
def _premerge(repo, local, other, base, toolconf, backup): def _premerge(repo, local, other, base, toolconf):
tool, toolpath, binary, symlink, scriptfn = toolconf tool, toolpath, binary, symlink, scriptfn = toolconf
if symlink or local.fctx.isabsent() or other.fctx.isabsent(): if symlink or local.fctx.isabsent() or other.fctx.isabsent():
return 1 return 1
ui = repo.ui ui = repo.ui
validkeep = [b'keep', b'keep-merge3', b'keep-mergediff'] validkeep = [b'keep', b'keep-merge3', b'keep-mergediff']
mode = b'merge3' mode = b'merge3'
if any( if any(
stringutil.binary(input.text()) for input in (local, base, other) stringutil.binary(input.text()) for input in (local, base, other)
): ):
return 1 # continue merging return 1 # continue merging
merged_text, conflicts = simplemerge.simplemerge( merged_text, conflicts = simplemerge.simplemerge(
ui, local, base, other, mode=mode ui, local, base, other, mode=mode
) )
if not conflicts or premerge in validkeep:
# fcd.flags() already has the merged flags (done in # fcd.flags() already has the merged flags (done in
# mergestate.resolve()) # mergestate.resolve())
local.fctx.write(merged_text, local.fctx.flags()) local.fctx.write(merged_text, local.fctx.flags())
if not conflicts: if not conflicts:
ui.debug(b" premerge successful\n") ui.debug(b" premerge successful\n")
return 0 return 0
if premerge not in validkeep:
# restore from backup and try again
_restorebackup(local.fctx, backup)
return 1 # continue merging return 1 # continue merging
def _mergecheck(repo, mynode, fcd, fco, fca, toolconf): def _mergecheck(repo, mynode, fcd, fco, fca, toolconf):
tool, toolpath, binary, symlink, scriptfn = toolconf tool, toolpath, binary, symlink, scriptfn = toolconf
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
if symlink: if symlink:
repo.ui.warn( repo.ui.warn(
} }
return { return {
b"l": b" [%s]" % labels[0], b"l": b" [%s]" % labels[0],
b"o": b" [%s]" % labels[1], b"o": b" [%s]" % labels[1],
} }
def _restorebackup(fcd, backup):
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use
# util.copy here instead.
fcd.write(backup.data(), fcd.flags())
def _makebackup(repo, ui, wctx, fcd): def _makebackup(repo, ui, wctx, fcd):
"""Makes and returns a filectx-like object for ``fcd``'s backup file. """Makes and returns a filectx-like object for ``fcd``'s backup file.
In addition to preserving the user's pre-existing modifications to `fcd` In addition to preserving the user's pre-existing modifications to `fcd`
(if any), the backup is used to undo certain premerges, confirm whether a (if any), the backup is used to undo certain premerges, confirm whether a
merge changed anything, and determine what line endings the new file should merge changed anything, and determine what line endings the new file should
have. have.
) )
r = _premerge( r = _premerge(
repo, repo,
local, local,
other, other,
base, base,
toolconf, toolconf,
backup,
) )
# we're done if premerge was successful (r is 0) # we're done if premerge was successful (r is 0)
if not r: if not r:
return r, False return r, False
# Reset to basic labels # Reset to basic labels
local.label_detail = None local.label_detail = None
other.label_detail = None other.label_detail = None