This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12154

filemerge: move check for identical sides out of filemerge()
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG93d6f0e7ba2f: filemerge: move check for identical sides out of filemerge()
Summary

filemerge.filemerge() returns None if no merge was necessary
because the two sides were identical. I don't think it should be that
function's responsibility to handle that case; we should ideally not
even call filemerge.filemerge() if the two inputs identical. This
patch therefore moves the check out to the caller (mergestate.py).

The largefiles test changed because we now notice that the two sides
made the same change, so we don't consider it a merge. Also note that
the new message better matches the line above it in the test output.

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

Diff 32197

mercurial/filemerge.py

mynode = parent node before merge mynode = parent node before merge
orig = original local filename before merge orig = original local filename before merge
fco = other file context fco = other file context
fca = ancestor file context fca = ancestor file context
fcd = local file context for current/destination file fcd = local file context for current/destination file
Returns whether the merge is complete, the return value of the merge, and Returns whether the merge is complete, the return value of the merge, and
a boolean indicating whether the file was deleted from disk.""" a boolean indicating whether the file was deleted from disk."""
if not fco.cmp(fcd): # files identical?
return None, False
ui = repo.ui ui = repo.ui
fd = fcd.path() fd = fcd.path()
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
fduipath = uipathfn(fd) fduipath = uipathfn(fd)
binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
symlink = b'l' in fcd.flags() + fco.flags() symlink = b'l' in fcd.flags() + fco.flags()
changedelete = fcd.isabsent() or fco.isabsent() changedelete = fcd.isabsent() or fco.isabsent()
tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete)

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)
if not fco.cmp(fcd): # files identical?
# If return value of merge is None, then there are no real conflict
del self._state[dfile]
self._results[dfile] = None, None
self._dirty = True
return None
merge_ret, deleted = filemerge.filemerge( 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 return value of merge is None, then there are no real conflict
del self._state[dfile]
self._results[dfile] = None, None
self._dirty = True
return None
if not merge_ret: if not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED) self.mark(dfile, MERGE_RECORD_RESOLVED)
action = None action = None
if deleted: if deleted:
if fcd.isabsent(): if fcd.isabsent():
# dc: local picked. Need to drop if present, which may # dc: local picked. Need to drop if present, which may

tests/test-largefiles-misc.t

M f-unchanged-2 M f-unchanged-2
$ hg merge $ hg merge
largefile f-different has a merge conflict largefile f-different has a merge conflict
ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a. you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a.
what do you want to do? l what do you want to do? l
getting changed largefiles getting changed largefiles
1 largefiles updated, 0 removed 1 largefiles updated, 0 removed
0 files updated, 4 files merged, 0 files removed, 0 files unresolved 1 files updated, 3 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ cat f-different $ cat f-different
1 1
$ cat f-same $ cat f-same
1 1
$ cat f-unchanged-1 $ cat f-unchanged-1
1 1
$ cat f-unchanged-2 $ cat f-unchanged-2