This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11077

mergestate: use dirstate.update_file API in recordupdates()
ClosedPublic

Authored by marmoute on Jul 11 2021, 7:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8b16ccc71001: mergestate: use dirstate.update_file API in recordupdates()
Summary

Let's use the new single function to replace multiple different functions. This
is part of dirstate API refactor to make it more clearer and generic so that it
can be replicated in Rust.

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

marmoute created this revision.Jul 11 2021, 7:38 AM
Alphare accepted this revision.Jul 12 2021, 5:55 AM
This revision is now accepted and ready to land.Jul 12 2021, 5:55 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (55 lines)

Diff 29291

mercurial/mergestate.py

fctx.write(self._backups[localkey], flags) fctx.write(self._backups[localkey], flags)
def recordupdates(repo, actions, branchmerge, getfiledata): def recordupdates(repo, actions, branchmerge, getfiledata):
"""record merge actions to the dirstate""" """record merge actions to the dirstate"""
# remove (must come first) # remove (must come first)
for f, args, msg in actions.get(ACTION_REMOVE, []): for f, args, msg in actions.get(ACTION_REMOVE, []):
if branchmerge: if branchmerge:
repo.dirstate.remove(f) repo.dirstate.update_file(f, p1_tracked=True, wc_tracked=False)
else: else:
repo.dirstate.drop(f) repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=False)
# 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.update_file(f, p1_tracked=False, wc_tracked=False)
# 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, origf0) = args (f0, origf0) = args
repo.dirstate.add(f) repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True)
repo.dirstate.copy(origf0, f) repo.dirstate.copy(origf0, f)
if f0 == origf0: if f0 == origf0:
repo.dirstate.remove(f0) repo.dirstate.update_file(f0, p1_tracked=True, wc_tracked=False)
else: else:
repo.dirstate.drop(f0) repo.dirstate.update_file(f0, p1_tracked=False, wc_tracked=False)
# re-add # re-add
for f, args, msg in actions.get(ACTION_ADD, []): for f, args, msg in actions.get(ACTION_ADD, []):
repo.dirstate.add(f) repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True)
# re-add/mark as modified # re-add/mark as modified
for f, args, msg in actions.get(ACTION_ADD_MODIFIED, []): for f, args, msg in actions.get(ACTION_ADD_MODIFIED, []):
if branchmerge: if branchmerge:
repo.dirstate.normallookup(f) repo.dirstate.normallookup(f)
else: else:
repo.dirstate.add(f) repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True)
# exec change # exec change
for f, args, msg in actions.get(ACTION_EXEC, []): for f, args, msg in actions.get(ACTION_EXEC, []):
repo.dirstate.normallookup(f) repo.dirstate.normallookup(f)
# keep # keep
for f, args, msg in actions.get(ACTION_KEEP, []): for f, args, msg in actions.get(ACTION_KEEP, []):
pass pass
# keep deleted # keep deleted
for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []): for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []):
pass pass
# keep new # keep new
for f, args, msg in actions.get(ACTION_KEEP_NEW, []): for f, args, msg in actions.get(ACTION_KEEP_NEW, []):
pass pass
# get # get
for f, args, msg in actions.get(ACTION_GET, []): for f, args, msg in actions.get(ACTION_GET, []):
if branchmerge: if branchmerge:
repo.dirstate.otherparent(f) # tracked in p1 can be True also but update_file should not care
repo.dirstate.update_file(
f,
p1_tracked=False,
p2_tracked=True,
wc_tracked=True,
clean_p2=True,
)
else: else:
parentfiledata = getfiledata[f] if getfiledata else None parentfiledata = getfiledata[f] if getfiledata else None
repo.dirstate.normal(f, parentfiledata=parentfiledata) repo.dirstate.update_parent_file_data(f, parentfiledata)
# merge # merge
for f, args, msg in actions.get(ACTION_MERGE, []): for f, args, msg in actions.get(ACTION_MERGE, []):
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if branchmerge: if branchmerge:
# We've done a branch merge, mark this file as merged # We've done a branch merge, mark this file as merged
# so that we properly record the merger later # so that we properly record the merger later
repo.dirstate.merge(f) repo.dirstate.update_file(
f, p1_tracked=True, wc_tracked=True, merged=True
)
if f1 != f2: # copy/rename if f1 != f2: # copy/rename
if move: if move:
repo.dirstate.remove(f1) repo.dirstate.update_file(
f1, p1_tracked=True, wc_tracked=False
)
if f1 != f: if f1 != f:
repo.dirstate.copy(f1, f) repo.dirstate.copy(f1, f)
else: else:
repo.dirstate.copy(f2, f) repo.dirstate.copy(f2, f)
else: else:
# We've update-merged a locally modified file, so # We've update-merged a locally modified file, so
# we set the dirstate to emulate a normal checkout # we set the dirstate to emulate a normal checkout
# of that file some time in the past. Thus our # of that file some time in the past. Thus our
# merge will appear as a normal local file # merge will appear as a normal local file
# modification. # modification.
if f2 == f: # file not locally copied/moved if f2 == f: # file not locally copied/moved
repo.dirstate.normallookup(f) repo.dirstate.update_file(
f, p1_tracked=True, wc_tracked=True, possibly_dirty=True
)
if move: if move:
repo.dirstate.drop(f1) repo.dirstate.update_file(
f1, p1_tracked=False, wc_tracked=False
)
# directory rename, move local # directory rename, move local
for f, args, msg in actions.get(ACTION_DIR_RENAME_MOVE_LOCAL, []): for f, args, msg in actions.get(ACTION_DIR_RENAME_MOVE_LOCAL, []):
f0, flag = args f0, flag = args
if branchmerge: if branchmerge:
repo.dirstate.add(f) repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True)
repo.dirstate.remove(f0) repo.dirstate.update_file(f0, p1_tracked=True, wc_tracked=False)
repo.dirstate.copy(f0, f) repo.dirstate.copy(f0, f)
else: else:
repo.dirstate.normal(f) repo.dirstate.update_file(f, p1_tracked=True, wc_tracked=True)
repo.dirstate.drop(f0) repo.dirstate.update_file(f0, p1_tracked=False, wc_tracked=False)
# directory rename, get # directory rename, get
for f, args, msg in actions.get(ACTION_LOCAL_DIR_RENAME_GET, []): for f, args, msg in actions.get(ACTION_LOCAL_DIR_RENAME_GET, []):
f0, flag = args f0, flag = args
if branchmerge: if branchmerge:
repo.dirstate.add(f) repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True)
repo.dirstate.copy(f0, f) repo.dirstate.copy(f0, f)
else: else:
repo.dirstate.normal(f) repo.dirstate.update_file(f, p1_tracked=True, wc_tracked=True)