( )⚙ D8715 mergestate: rename addpath() -> addpathonflict() to prevent confusion

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8715

mergestate: rename addpath() -> addpathonflict() to prevent confusion
ClosedPublic

Authored by pulkit on Jul 9 2020, 8:36 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe05a488cbed0: mergestate: rename addpath() -> addpathonflict() to prevent confusion
Summary

addpath() seems to imply that we are adding a new path/entry to the mergestate.

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.

Event Timeline

pulkit created this revision.Jul 9 2020, 8:36 AM
pulkit updated this revision to Diff 21886.Jul 14 2020, 8:29 AM
pulkit added a commit: rHGe05a488cbed0: mergestate: rename addpath() -> addpathonflict() to prevent confusion.Jul 19 2020, 6:37 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe05a488cbed0: mergestate: rename addpath() -> addpathonflict() to prevent confusion (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)
Mmercurial/mergestate.py (2 lines)

Diff 21967

mercurial/merge.py

) )
% f % f
) )
if fo == b'l': if fo == b'l':
s(_(b"the local file has been renamed to %s\n") % f1) s(_(b"the local file has been renamed to %s\n") % f1)
else: else:
s(_(b"the remote file has been renamed to %s\n") % f1) s(_(b"the remote file has been renamed to %s\n") % f1)
s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f) 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) progress.increment(item=f)
# When merging in-memory, we can't support worker processes, so set the # When merging in-memory, we can't support worker processes, so set the
# per-item cost at 0 in that case. # per-item cost at 0 in that case.
cost = 0 if wctx.isinmemory() else 0.001 cost = 0 if wctx.isinmemory() else 0.001
# remove in parallel (must come before resolving path conflicts and getting) # remove in parallel (must come before resolving path conflicts and getting)
prog = worker.worker( prog = worker.worker(

mercurial/mergestate.py

hex(fca.filenode()), hex(fca.filenode()),
fco.path(), fco.path(),
hex(fco.filenode()), hex(fco.filenode()),
fcl.flags(), fcl.flags(),
] ]
self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())} self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())}
self._dirty = True self._dirty = True
def addpath(self, path, frename, forigin): def addpathconflict(self, path, frename, forigin):
"""add a new conflicting path to the merge state """add a new conflicting path to the merge state
path: the path that conflicts path: the path that conflicts
frename: the filename the conflicting file was renamed to frename: the filename the conflicting file was renamed to
forigin: origin of the file ('l' or 'r' for local/remote) forigin: origin of the file ('l' or 'r' for local/remote)
""" """
self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin] self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
self._dirty = True self._dirty = True