Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 48543:608a35db186c
filemerge: stop returning always-`True` value
Now that we've removed some more leftovers from "merge driver", it's
clear that the first element of `filemerge()`'s return value is always
`True`.
Differential Revision: https://phab.mercurial-scm.org/D11885
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 07 Dec 2021 21:17:18 -0800 |
| parents | 40522aea2f27 |
| children | 5151b0f6519e |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Dec 06 13:43:00 2021 -0800 +++ b/mercurial/filemerge.py Tue Dec 07 21:17:18 2021 -0800 @@ -1031,7 +1031,7 @@ a boolean indicating whether the file was deleted from disk.""" if not fco.cmp(fcd): # files identical? - return True, None, False + return None, False ui = repo.ui fd = fcd.path() @@ -1089,8 +1089,7 @@ toolconf = tool, toolpath, binary, symlink, scriptfn if mergetype == nomerge: - r, deleted = func(repo, mynode, fcd, fco, fca, toolconf, labels) - return True, r, deleted + return func(repo, mynode, fcd, fco, fca, toolconf, labels) if orig != fco.path(): ui.status( @@ -1109,7 +1108,7 @@ b'in-memory merge does not support merge conflicts' ) ui.warn(onfailure % fduipath) - return True, 1, False + return 1, False backup = _makebackup(repo, ui, wctx, fcd) r = 1 @@ -1150,7 +1149,7 @@ ) # we're done if premerge was successful (r is 0) if not r: - return not r, r, False + return r, False needcheck, r, deleted = func( repo, @@ -1177,7 +1176,7 @@ ui.warn(onfailure % fduipath) _onfilemergefailure(ui) - return True, r, deleted + return r, deleted finally: if not r and backup is not None: backup.remove()