This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5512

narrow: use merge.ACTION_GET instead of duplicating 'g' constant
ClosedPublic

Authored by martinvonz on Jan 7 2019, 3:45 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5838afea8213: narrow: use merge.ACTION_GET instead of duplicating 'g' constant
Summary

As suggested by Yuya.

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

martinvonz created this revision.Jan 7 2019, 3:45 AM
martinvonz updated this revision to Diff 13061.Jan 7 2019, 2:02 PM
pulkit accepted this revision.Jan 10 2019, 2:10 PM
Closed by commit rHG5838afea8213: narrow: use merge.ACTION_GET instead of duplicating 'g' constant (authored by martinvonz). · Explain WhyJan 10 2019, 2:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (2 lines)

Diff 13142

mercurial/narrowspec.py

# These two are extracted for extensions (specifically for Google's CitC file # These two are extracted for extensions (specifically for Google's CitC file
# system) # system)
def _deletecleanfiles(repo, files): def _deletecleanfiles(repo, files):
for f in files: for f in files:
repo.wvfs.unlinkpath(f) repo.wvfs.unlinkpath(f)
def _writeaddedfiles(repo, pctx, files): def _writeaddedfiles(repo, pctx, files):
actions = merge.emptyactions() actions = merge.emptyactions()
addgaction = actions['g'].append addgaction = actions[merge.ACTION_GET].append
mf = repo['.'].manifest() mf = repo['.'].manifest()
for f in files: for f in files:
if not repo.wvfs.exists(f): if not repo.wvfs.exists(f):
addgaction((f, (mf.flags(f), False), "narrowspec updated")) addgaction((f, (mf.flags(f), False), "narrowspec updated"))
merge.applyupdates(repo, actions, wctx=repo[None], merge.applyupdates(repo, actions, wctx=repo[None],
mctx=repo['.'], overwrite=False) mctx=repo['.'], overwrite=False)
def checkworkingcopynarrowspec(repo): def checkworkingcopynarrowspec(repo):