This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11178

keywork: use `update_file_p1` instead of `normallookup`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb9086ec4d28b: keyword: use `update_file_p1` instead of `normallookup`
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:10 AM
Alphare accepted this revision.Jul 19 2021, 12:29 PM
This revision is now accepted and ready to land.Jul 19 2021, 12:29 PM
baymax updated this revision to Diff 29523.Jul 19 2021, 4:04 PM

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

phloxic added a subscriber: phloxic.Jul 20 2021, 5:10 AM

s/keywork/keyword/

marmoute added a commit: rHGb9086ec4d28b: keyword: use `update_file_p1` instead of `normallookup`.Jul 20 2021, 4:40 PM
Closed by commit rHGb9086ec4d28b: keyword: use `update_file_p1` instead of `normallookup` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/keyword.py (9 lines)

Diff 29679

hgext/keyword.py

if found: if found:
self.ui.note(msg % f) self.ui.note(msg % f)
fp = self.repo.wvfs(f, b"wb", atomictemp=True) fp = self.repo.wvfs(f, b"wb", atomictemp=True)
fp.write(data) fp.write(data)
fp.close() fp.close()
if kwcmd: if kwcmd:
self.repo.dirstate.set_clean(f) self.repo.dirstate.set_clean(f)
elif self.postcommit: elif self.postcommit:
self.repo.dirstate.normallookup(f) self.repo.dirstate.update_file_p1(f, p1_tracked=True)
def shrink(self, fname, text): def shrink(self, fname, text):
'''Returns text with all keyword substitutions removed.''' '''Returns text with all keyword substitutions removed.'''
if self.match(fname) and not stringutil.binary(text): if self.match(fname) and not stringutil.binary(text):
return _shrinktext(text, self.rekwexp.sub) return _shrinktext(text, self.rekwexp.sub)
return text return text
def shrinklines(self, fname, lines): def shrinklines(self, fname, lines):
kwt.match = origmatch kwt.match = origmatch
def kw_amend(orig, ui, repo, old, extra, pats, opts): def kw_amend(orig, ui, repo, old, extra, pats, opts):
'''Wraps cmdutil.amend expanding keywords after amend.''' '''Wraps cmdutil.amend expanding keywords after amend.'''
kwt = getattr(repo, '_keywordkwt', None) kwt = getattr(repo, '_keywordkwt', None)
if kwt is None: if kwt is None:
return orig(ui, repo, old, extra, pats, opts) return orig(ui, repo, old, extra, pats, opts)
with repo.wlock(): with repo.wlock(), repo.dirstate.parentchange():
kwt.postcommit = True kwt.postcommit = True
newid = orig(ui, repo, old, extra, pats, opts) newid = orig(ui, repo, old, extra, pats, opts)
if newid != old.node(): if newid != old.node():
ctx = repo[newid] ctx = repo[newid]
kwt.restrict = True kwt.restrict = True
kwt.overwrite(ctx, ctx.files(), False, True) kwt.overwrite(ctx, ctx.files(), False, True)
kwt.restrict = False kwt.restrict = False
return newid return newid
kwt.postcommit = True kwt.postcommit = True
ctx = repo[b'.'] ctx = repo[b'.']
wstatus = ctx.status() wstatus = ctx.status()
ret = orig(ui, repo, commitfunc, *pats, **opts) ret = orig(ui, repo, commitfunc, *pats, **opts)
recctx = repo[b'.'] recctx = repo[b'.']
if ctx != recctx: if ctx != recctx:
modified, added = _preselect(wstatus, recctx.files()) modified, added = _preselect(wstatus, recctx.files())
kwt.restrict = False kwt.restrict = False
with repo.dirstate.parentchange():
kwt.overwrite(recctx, modified, False, True) kwt.overwrite(recctx, modified, False, True)
kwt.overwrite(recctx, added, False, True, True) kwt.overwrite(recctx, added, False, True, True)
kwt.restrict = True kwt.restrict = True
return ret return ret
def kwfilectx_cmp(orig, self, fctx): def kwfilectx_cmp(orig, self, fctx):
if fctx._customcmp: if fctx._customcmp:
return fctx.cmp(self) return fctx.cmp(self)
kwt = getattr(self._repo, '_keywordkwt', None) kwt = getattr(self._repo, '_keywordkwt', None)