This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11168

mergestate: use `update_file` to handle `for ACTION_ADD_MODIFIED`
ClosedPublic

Authored by marmoute on Jul 19 2021, 10:09 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8e2e8d0a9a56: mergestate: use `update_file` to handle for `ACTION_ADD_MODIFIED`
Summary

This is the newer, more semantic API.

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 19 2021, 10:09 AM
Alphare accepted this revision.Jul 19 2021, 12:28 PM
This revision is now accepted and ready to land.Jul 19 2021, 12:28 PM
baymax updated this revision to Diff 29513.Jul 19 2021, 4:03 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jul 20 2021, 3:44 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (4 lines)

Diff 29669

mercurial/mergestate.py

# re-add # re-add
for f, args, msg in actions.get(ACTION_ADD, []): for f, args, msg in actions.get(ACTION_ADD, []):
repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True) 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.update_file(
f, p1_tracked=True, wc_tracked=True, possibly_dirty=True
)
else: else:
repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True) 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