Mercurial > hg
changeset 45159:e05a488cbed0
mergestate: rename addpath() -> addpathonflict() to prevent confusion
addpath() seems to imply that we are adding a new path/entry to the mergestate.
Differential Revision: https://phab.mercurial-scm.org/D8715
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 09 Jul 2020 14:44:58 +0530 |
| parents | ed58ecd59030 |
| children | fcd0cff3400a |
| files | mercurial/merge.py mercurial/mergestate.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Jul 18 12:35:55 2020 +0200 +++ b/mercurial/merge.py Thu Jul 09 14:44:58 2020 +0530 @@ -1264,7 +1264,7 @@ else: s(_(b"the remote file has been renamed to %s\n") % f1) s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f) - ms.addpath(f, f1, fo) + ms.addpathconflict(f, f1, fo) progress.increment(item=f) # When merging in-memory, we can't support worker processes, so set the
--- a/mercurial/mergestate.py Sat Jul 18 12:35:55 2020 +0200 +++ b/mercurial/mergestate.py Thu Jul 09 14:44:58 2020 +0530 @@ -540,7 +540,7 @@ self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())} self._dirty = True - def addpath(self, path, frename, forigin): + def addpathconflict(self, path, frename, forigin): """add a new conflicting path to the merge state path: the path that conflicts frename: the filename the conflicting file was renamed to