This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12379

filemerge: when merge tool uses $output, don't leave markers in $local
ClosedPublic

Authored by martinvonz on Mar 15 2022, 4:52 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa54a866349ed: filemerge: when merge tool uses $output, don't leave markers in $local
Summary

As explained in the previous patch, we incorrectly leave conflict
markers in both $local and $output since D12190. I don't
understand why it broke but the fix is simple and clear after all the
recent refactoring.

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.

Event Timeline

martinvonz created this revision.Mar 15 2022, 4:52 PM
Alphare accepted this revision.Mar 17 2022, 4:57 AM
This revision is now accepted and ready to land.Mar 17 2022, 4:57 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (3 lines)
Mtests/test-merge-tools.t (4 lines)

Diff 32654

mercurial/filemerge.py

outpath = b"" outpath = b""
if b"$output" in args: if b"$output" in args:
# read input from backup, write to original # read input from backup, write to original
outpath = localpath outpath = localpath
localoutputpath = backup.path() localoutputpath = backup.path()
# Remove the .orig to make syntax-highlighting more likely. # Remove the .orig to make syntax-highlighting more likely.
if localoutputpath.endswith(b'.orig'): if localoutputpath.endswith(b'.orig'):
localoutputpath, ext = os.path.splitext(localoutputpath) localoutputpath, ext = os.path.splitext(localoutputpath)
localdata = util.readfile(localpath) files.append((b"local", localoutputpath, backup.data()))
files.append((b"local", localoutputpath, localdata))
with _maketempfiles(files) as temppaths: with _maketempfiles(files) as temppaths:
basepath, otherpath = temppaths[:2] basepath, otherpath = temppaths[:2]
if len(temppaths) == 3: if len(temppaths) == 3:
localpath = temppaths[2] localpath = temppaths[2]
def format_label(input): def format_label(input):
if input.label_detail: if input.label_detail:

tests/test-merge-tools.t

false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output' $ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output'
merging f merging f
revision 0 revision 0
space space
<<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !)
revision 1 revision 1
space space
======= (known-bad-output !)
revision 4 (known-bad-output !)
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4 (known-bad-output !)
revision 4 revision 4
<<<<<<< working copy: ef83787e2614 - test: revision 1 <<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1 revision 1
space space
======= =======
revision 4 revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved