This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8615

merge: move an inspection of the dirstate from record to calculate phase
ClosedPublic

Authored by martinvonz on Jun 5 2020, 9:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG818b4f19ef23: merge: move an inspection of the dirstate from record to calculate phase
Summary

The intent is clearly to have calculateupdates() figure out what
actions need to be taken and recordupdates() to make necessary
modifications to the dirstate. However, in the
ACTION_PATH_CONFLICT_RESOLVE case, there was one little inspection
of copy information done in recordupdates(). This patch moves that
to calculateupdates(). That will help with the next patch, which
makes merge.update() work better with overlayworkingctx (copies
should be recorded there too, even though we skip the
recordupdates() step).

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)
Mmercurial/mergestate.py (3 lines)

Diff 21580

mercurial/merge.py

# manifest. # manifest.
invalidconflicts.add(p) invalidconflicts.add(p)
# Rename all local conflicting files that have not been deleted. # Rename all local conflicting files that have not been deleted.
for p in localconflicts: for p in localconflicts:
if p not in deletedfiles: if p not in deletedfiles:
ctxname = bytes(wctx).rstrip(b'+') ctxname = bytes(wctx).rstrip(b'+')
pnew = util.safename(p, ctxname, wctx, set(actions.keys())) pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
porig = wctx[p].copysource() or p
actions[pnew] = ( actions[pnew] = (
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
(p,), (p, porig),
b'local path conflict', b'local path conflict',
) )
actions[p] = ( actions[p] = (
mergestatemod.ACTION_PATH_CONFLICT, mergestatemod.ACTION_PATH_CONFLICT,
(pnew, b'l'), (pnew, b'l'),
b'path conflict', b'path conflict',
) )
) )
for i, item in prog: for i, item in prog:
progress.increment(step=i, item=item) progress.increment(step=i, item=item)
removed = len(actions[mergestatemod.ACTION_REMOVE]) removed = len(actions[mergestatemod.ACTION_REMOVE])
# resolve path conflicts (must come before getting) # resolve path conflicts (must come before getting)
for f, args, msg in actions[mergestatemod.ACTION_PATH_CONFLICT_RESOLVE]: for f, args, msg in actions[mergestatemod.ACTION_PATH_CONFLICT_RESOLVE]:
repo.ui.debug(b" %s: %s -> pr\n" % (f, msg)) repo.ui.debug(b" %s: %s -> pr\n" % (f, msg))
(f0,) = args (f0, origf0) = args
if wctx[f0].lexists(): if wctx[f0].lexists():
repo.ui.note(_(b"moving %s to %s\n") % (f0, f)) repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
wctx[f].audit() wctx[f].audit()
wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags()) wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
wctx[f0].remove() wctx[f0].remove()
progress.increment(item=f) progress.increment(item=f)
# get in parallel. # get in parallel.

mercurial/mergestate.py

repo.dirstate.drop(f) repo.dirstate.drop(f)
# forget (must come first) # forget (must come first)
for f, args, msg in actions.get(ACTION_FORGET, []): for f, args, msg in actions.get(ACTION_FORGET, []):
repo.dirstate.drop(f) repo.dirstate.drop(f)
# resolve path conflicts # resolve path conflicts
for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []): for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []):
(f0,) = args (f0, origf0) = args
origf0 = repo.dirstate.copied(f0) or f0
repo.dirstate.add(f) repo.dirstate.add(f)
repo.dirstate.copy(origf0, f) repo.dirstate.copy(origf0, f)
if f0 == origf0: if f0 == origf0:
repo.dirstate.remove(f0) repo.dirstate.remove(f0)
else: else:
repo.dirstate.drop(f0) repo.dirstate.drop(f0)
# re-add # re-add