| Alphare |
| hg-reviewers |
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.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/overrides.py (2 lines) | |||
| M | mercurial/filemerge.py (11 lines) | |||
| M | mercurial/mergestate.py (39 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| ) | ) | ||||
| % (lfutil.splitstandin(orig), ahash, dhash, ohash), | % (lfutil.splitstandin(orig), ahash, dhash, ohash), | ||||
| 0, | 0, | ||||
| ) | ) | ||||
| == 1 | == 1 | ||||
| ) | ) | ||||
| ): | ): | ||||
| repo.wwrite(fcd.path(), fco.data(), fco.flags()) | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | ||||
| return True, 0, False | return 0, False | ||||
| @eh.wrapfunction(copiesmod, b'pathcopies') | @eh.wrapfunction(copiesmod, b'pathcopies') | ||||
| def copiespathcopies(orig, ctx1, ctx2, match=None): | def copiespathcopies(orig, ctx1, ctx2, match=None): | ||||
| copies = orig(ctx1, ctx2, match=match) | copies = orig(ctx1, ctx2, match=match) | ||||
| updated = {} | updated = {} | ||||
| for k, v in pycompat.iteritems(copies): | for k, v in pycompat.iteritems(copies): | ||||
| 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? | if not fco.cmp(fcd): # files identical? | ||||
| return True, None, False | 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() | ||||
| mergetype = fullmerge | mergetype = fullmerge | ||||
| onfailure = _(b"merging %s failed!\n") | onfailure = _(b"merging %s failed!\n") | ||||
| precheck = None | precheck = None | ||||
| isexternal = True | isexternal = True | ||||
| toolconf = tool, toolpath, binary, symlink, scriptfn | toolconf = tool, toolpath, binary, symlink, scriptfn | ||||
| if mergetype == nomerge: | if mergetype == nomerge: | ||||
| r, deleted = func(repo, mynode, fcd, fco, fca, toolconf, labels) | return func(repo, mynode, fcd, fco, fca, toolconf, labels) | ||||
| return True, r, deleted | |||||
| if orig != fco.path(): | if orig != fco.path(): | ||||
| ui.status( | ui.status( | ||||
| _(b"merging %s and %s to %s\n") | _(b"merging %s and %s to %s\n") | ||||
| % (uipathfn(orig), uipathfn(fco.path()), fduipath) | % (uipathfn(orig), uipathfn(fco.path()), fduipath) | ||||
| ) | ) | ||||
| else: | else: | ||||
| ui.status(_(b"merging %s\n") % fduipath) | ui.status(_(b"merging %s\n") % fduipath) | ||||
| ui.debug(b"my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ui.debug(b"my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ||||
| if precheck and not precheck(repo, mynode, fcd, fco, fca, toolconf): | if precheck and not precheck(repo, mynode, fcd, fco, fca, toolconf): | ||||
| if onfailure: | if onfailure: | ||||
| if wctx.isinmemory(): | if wctx.isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError( | raise error.InMemoryMergeConflictsError( | ||||
| b'in-memory merge does not support merge conflicts' | b'in-memory merge does not support merge conflicts' | ||||
| ) | ) | ||||
| ui.warn(onfailure % fduipath) | ui.warn(onfailure % fduipath) | ||||
| return True, 1, False | return 1, False | ||||
| backup = _makebackup(repo, ui, wctx, fcd) | backup = _makebackup(repo, ui, wctx, fcd) | ||||
| r = 1 | r = 1 | ||||
| try: | try: | ||||
| internalmarkerstyle = ui.config(b'ui', b'mergemarkers') | internalmarkerstyle = ui.config(b'ui', b'mergemarkers') | ||||
| if isexternal: | if isexternal: | ||||
| markerstyle = _toolstr(ui, tool, b'mergemarkers') | markerstyle = _toolstr(ui, tool, b'mergemarkers') | ||||
| else: | else: | ||||
| repo, fcd, fco, fca, premergelabels, tool=labeltool | repo, fcd, fco, fca, premergelabels, tool=labeltool | ||||
| ) | ) | ||||
| r = _premerge( | r = _premerge( | ||||
| repo, fcd, fco, fca, toolconf, backup, labels=premergelabels | repo, fcd, fco, fca, toolconf, backup, labels=premergelabels | ||||
| ) | ) | ||||
| # 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 not r, r, False | return r, False | ||||
| needcheck, r, deleted = func( | needcheck, r, deleted = func( | ||||
| repo, | repo, | ||||
| mynode, | mynode, | ||||
| fcd, | fcd, | ||||
| fco, | fco, | ||||
| fca, | fca, | ||||
| toolconf, | toolconf, | ||||
| raise error.InMemoryMergeConflictsError( | raise error.InMemoryMergeConflictsError( | ||||
| b'in-memory merge ' | b'in-memory merge ' | ||||
| b'does not support ' | b'does not support ' | ||||
| b'merge conflicts' | b'merge conflicts' | ||||
| ) | ) | ||||
| ui.warn(onfailure % fduipath) | ui.warn(onfailure % fduipath) | ||||
| _onfilemergefailure(ui) | _onfilemergefailure(ui) | ||||
| return True, r, deleted | return r, deleted | ||||
| finally: | finally: | ||||
| if not r and backup is not None: | if not r and backup is not None: | ||||
| backup.remove() | backup.remove() | ||||
| def _haltmerge(): | def _haltmerge(): | ||||
| msg = _(b'merge halted after failed merge (see hg resolve)') | msg = _(b'merge halted after failed merge (see hg resolve)') | ||||
| raise error.InterventionRequired(msg) | raise error.InterventionRequired(msg) | ||||
| ) | ) | ||||
| 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) | ||||
| complete, 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 merge_ret is None: | ||||
| # If return value of merge is None, then there are no real conflict | # If return value of merge is None, then there are no real conflict | ||||
| del self._state[dfile] | del self._state[dfile] | ||||
| self._dirty = True | self._dirty = True | ||||
| elif not merge_ret: | elif not merge_ret: | ||||
| self.mark(dfile, MERGE_RECORD_RESOLVED) | self.mark(dfile, MERGE_RECORD_RESOLVED) | ||||
| if complete: | |||||
| 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 | ||||
| # happen on re-resolves. | # happen on re-resolves. | ||||
| action = ACTION_FORGET | action = ACTION_FORGET | ||||
| else: | else: | ||||
| # cd: remote picked (or otherwise deleted) | # cd: remote picked (or otherwise deleted) | ||||
| action = ACTION_REMOVE | action = ACTION_REMOVE | ||||
| else: | else: | ||||
| if fcd.isabsent(): # dc: remote picked | if fcd.isabsent(): # dc: remote picked | ||||
| action = ACTION_GET | action = ACTION_GET | ||||
| elif fco.isabsent(): # cd: local picked | elif fco.isabsent(): # cd: local picked | ||||
| if dfile in self.localctx: | if dfile in self.localctx: | ||||
| action = ACTION_ADD_MODIFIED | action = ACTION_ADD_MODIFIED | ||||
| else: | else: | ||||
| action = ACTION_ADD | action = ACTION_ADD | ||||
| # else: regular merges (no action necessary) | # else: regular merges (no action necessary) | ||||
| self._results[dfile] = merge_ret, action | self._results[dfile] = merge_ret, action | ||||
| return merge_ret | return merge_ret | ||||
| def counts(self): | def counts(self): | ||||
| """return counts for updated, merged and removed files in this | """return counts for updated, merged and removed files in this | ||||
| session""" | session""" | ||||
| updated, merged, removed = 0, 0, 0 | updated, merged, removed = 0, 0, 0 | ||||
| for r, action in pycompat.itervalues(self._results): | for r, action in pycompat.itervalues(self._results): | ||||