This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11019

dirstate: add a `set_untracked` method for "hg remove"-like usage
ClosedPublic

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

Details

Reviewers
durin42
martinvonz
Alphare
Group Reviewers
hg-reviewers
Commits
rHGcce51119bfe6: dirstate: add a `set_untracked` method for "hg remove"-like usage
Summary

This is a step further toward clarifying the semantic of various dirstate call.
See the justification for adding set_tracked for details.

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
marmoute updated this revision to Diff 28963.Jul 8 2021, 4:17 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 dirstate: add a set_untracked method for "hg remove"-like usage to dirstate: add a `set_untracked` method for "hg remove"-like usage.Jul 10 2021, 5:02 PM
marmoute edited the summary of this revision. (Show Details)
baymax updated this revision to Diff 29164.Jul 11 2021, 7:16 AM

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

baymax updated this revision to Diff 29255.Jul 15 2021, 12:04 PM

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

Revision Contents
Changeset List

Diff 29277

hgext/largefiles/lfutil.py

class largefilesdirstate(dirstate.dirstate): class largefilesdirstate(dirstate.dirstate):
def __getitem__(self, key): def __getitem__(self, key):
return super(largefilesdirstate, self).__getitem__(unixpath(key)) return super(largefilesdirstate, self).__getitem__(unixpath(key))
def set_tracked(self, f): def set_tracked(self, f):
return super(largefilesdirstate, self).set_tracked(unixpath(f)) return super(largefilesdirstate, self).set_tracked(unixpath(f))
def set_untracked(self, f):
return super(largefilesdirstate, self).set_untracked(unixpath(f))
def normal(self, f): def normal(self, f):
return super(largefilesdirstate, self).normal(unixpath(f)) return super(largefilesdirstate, self).normal(unixpath(f))
def remove(self, f): def remove(self, f):
return super(largefilesdirstate, self).remove(unixpath(f)) return super(largefilesdirstate, self).remove(unixpath(f))
def add(self, f): def add(self, f):
return super(largefilesdirstate, self).add(unixpath(f)) return super(largefilesdirstate, self).add(unixpath(f))

hgext/narrow/narrowdirstate.py

def normal(self, *args, **kwargs): def normal(self, *args, **kwargs):
return super(narrowdirstate, self).normal(*args, **kwargs) return super(narrowdirstate, self).normal(*args, **kwargs)
@_editfunc @_editfunc
def set_tracked(self, *args): def set_tracked(self, *args):
return super(narrowdirstate, self).set_tracked(*args) return super(narrowdirstate, self).set_tracked(*args)
@_editfunc @_editfunc
def set_untracked(self, *args):
return super(narrowdirstate, self).set_untracked(*args)
@_editfunc
def add(self, *args): def add(self, *args):
return super(narrowdirstate, self).add(*args) return super(narrowdirstate, self).add(*args)
@_editfunc @_editfunc
def normallookup(self, *args): def normallookup(self, *args):
return super(narrowdirstate, self).normallookup(*args) return super(narrowdirstate, self).normallookup(*args)
@_editfunc @_editfunc

hgext/sparse.py

return orig(self, parent, allfiles, changedfiles) return orig(self, parent, allfiles, changedfiles)
extensions.wrapfunction(dirstate.dirstate, b'rebuild', _rebuild) extensions.wrapfunction(dirstate.dirstate, b'rebuild', _rebuild)
# Prevent adding files that are outside the sparse checkout # Prevent adding files that are outside the sparse checkout
editfuncs = [ editfuncs = [
b'normal', b'normal',
b'set_tracked', b'set_tracked',
b'set_untracked',
b'add', b'add',
b'normallookup', b'normallookup',
b'copy', b'copy',
b'remove', b'remove',
b'merge', b'merge',
] ]
hint = _( hint = _(
b'include file with `hg debugsparse --include <pattern>` or use ' b'include file with `hg debugsparse --include <pattern>` or use '

mercurial/dirstate.py

if entry is None: if entry is None:
self._add(filename) self._add(filename)
return True return True
elif not entry.tracked: elif not entry.tracked:
self.normallookup(filename) self.normallookup(filename)
return True return True
return False return False
@requires_no_parents_change
def set_untracked(self, filename):
"""a "public" method for generic code to mark a file as untracked
This function is to be called outside of "update/merge" case. For
example by a command like `hg remove X`.
return True the file was previously tracked, False otherwise.
"""
entry = self._map.get(filename)
if entry is None:
return False
elif entry.added:
self._drop(filename)
return True
else:
self._remove(filename)
return True
@requires_parents_change @requires_parents_change
def update_file_reference( def update_file_reference(
self, self,
filename, filename,
p1_tracked, p1_tracked,
): ):
"""Set a file as tracked in the parent (or not) """Set a file as tracked in the parent (or not)