This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11014

context: use `dirstate.set_tracked` in `context.add`
ClosedPublic

Authored by marmoute on Jul 8 2021, 3:33 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0cef28b121a4: context: use `dirstate.set_tracked` in `context.add`
Summary

This is the new shiny 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 8 2021, 3:33 AM
Alphare accepted this revision.Jul 9 2021, 12:01 PM
This revision is now accepted and ready to land.Jul 9 2021, 12:01 PM
marmoute retitled this revision from context: use `dirstate.set_tracked` in context.add to context: use `dirstate.set_tracked` in `context.add`.Jul 10 2021, 5:01 PM
marmoute edited the summary of this revision. (Show Details)
baymax updated this revision to Diff 29159.Jul 11 2021, 7:16 AM

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

baymax updated this revision to Diff 29250.Jul 15 2021, 12:03 PM

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

marmoute added a commit: rHG0cef28b121a4: context: use `dirstate.set_tracked` in `context.add`.Jul 15 2021, 12:53 PM
Closed by commit rHG0cef28b121a4: context: use `dirstate.set_tracked` in `context.add` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (6 lines)
Mmercurial/dirstate.py (2 lines)

Diff 29272

mercurial/context.py

ui.warn( ui.warn(
_( _(
b"%s not added: only files and symlinks " b"%s not added: only files and symlinks "
b"supported currently\n" b"supported currently\n"
) )
% uipath(f) % uipath(f)
) )
rejected.append(f) rejected.append(f)
elif ds[f] in b'amn': elif not ds.set_tracked(f):
ui.warn(_(b"%s already tracked!\n") % uipath(f)) ui.warn(_(b"%s already tracked!\n") % uipath(f))
elif ds[f] == b'r':
ds.normallookup(f)
else:
ds.add(f)
return rejected return rejected
def forget(self, files, prefix=b""): def forget(self, files, prefix=b""):
with self._repo.wlock(): with self._repo.wlock():
ds = self._repo.dirstate ds = self._repo.dirstate
uipath = lambda f: ds.pathto(pathutil.join(prefix, f)) uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
rejected = [] rejected = []
for f in files: for f in files:

mercurial/dirstate.py

raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
return func(self, *args, **kwargs) return func(self, *args, **kwargs)
return wrap return wrap
def requires_no_parents_change(func): def requires_no_parents_change(func):
def wrap(self, *args, **kwargs): def wrap(self, *args, **kwargs):
if not self.pendingparentchange(): if self.pendingparentchange():
msg = 'calling `%s` inside of a parentchange context' msg = 'calling `%s` inside of a parentchange context'
msg %= func.__name__ msg %= func.__name__
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
return func(self, *args, **kwargs) return func(self, *args, **kwargs)
return wrap return wrap