Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mergestate.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 | 921853391276 |
| children | b0aa9b0b9c21 |
line wrap: on
line diff
--- a/mercurial/mergestate.py Mon Dec 06 13:43:00 2021 -0800 +++ b/mercurial/mergestate.py Tue Dec 07 21:17:18 2021 -0800 @@ -354,7 +354,7 @@ self._restore_backup(wctx[dfile], localkey, flags) else: wctx[dfile].remove(ignoremissing=True) - complete, merge_ret, deleted = filemerge.filemerge( + merge_ret, deleted = filemerge.filemerge( self._repo, wctx, self._local, @@ -371,26 +371,25 @@ elif not merge_ret: self.mark(dfile, MERGE_RECORD_RESOLVED) - if complete: - action = None - if deleted: - if fcd.isabsent(): - # dc: local picked. Need to drop if present, which may - # happen on re-resolves. - action = ACTION_FORGET + action = None + if deleted: + if fcd.isabsent(): + # dc: local picked. Need to drop if present, which may + # happen on re-resolves. + action = ACTION_FORGET + else: + # cd: remote picked (or otherwise deleted) + action = ACTION_REMOVE + else: + if fcd.isabsent(): # dc: remote picked + action = ACTION_GET + elif fco.isabsent(): # cd: local picked + if dfile in self.localctx: + action = ACTION_ADD_MODIFIED else: - # cd: remote picked (or otherwise deleted) - action = ACTION_REMOVE - else: - if fcd.isabsent(): # dc: remote picked - action = ACTION_GET - elif fco.isabsent(): # cd: local picked - if dfile in self.localctx: - action = ACTION_ADD_MODIFIED - else: - action = ACTION_ADD - # else: regular merges (no action necessary) - self._results[dfile] = merge_ret, action + action = ACTION_ADD + # else: regular merges (no action necessary) + self._results[dfile] = merge_ret, action return merge_ret