This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11428

dirstate: inline the last two `_drop` usage
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:43 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd459c6b84961: dirstate: inline the last two `_drop` usage
Summary

The function is small and having the associated code directly inline help use to cleanup the dirstate 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.Sep 16 2021, 10:43 AM
Alphare accepted this revision.Sep 20 2021, 6:05 AM
Alphare added a subscriber: Alphare.

This makes two extensions reach into the abstraction but I guess that's unavoidable.

This revision is now accepted and ready to land.Sep 20 2021, 6:05 AM
marmoute added a commit: rHGd459c6b84961: dirstate: inline the last two `_drop` usage.Sep 20 2021, 10:07 AM
Closed by commit rHGd459c6b84961: dirstate: inline the last two `_drop` usage (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30310

hgext/largefiles/lfcommands.py

if lfiles: if lfiles:
lfiles = [f for f in lfiles if f not in dropped] lfiles = [f for f in lfiles if f not in dropped]
for f in dropped: for f in dropped:
repo.wvfs.unlinkpath(lfutil.standin(f)) repo.wvfs.unlinkpath(lfutil.standin(f))
# This needs to happen for dropped files, otherwise they stay in # This needs to happen for dropped files, otherwise they stay in
# the M state. # the M state.
lfdirstate._drop(f) lfdirstate._map.dropfile(f)
statuswriter(_(b'getting changed largefiles\n')) statuswriter(_(b'getting changed largefiles\n'))
cachelfiles(ui, repo, None, lfiles) cachelfiles(ui, repo, None, lfiles)
with lfdirstate.parentchange(): with lfdirstate.parentchange():
for lfile in lfiles: for lfile in lfiles:
update1 = 0 update1 = 0

mercurial/dirstate.py

wc_tracked = entry.tracked wc_tracked = entry.tracked
possibly_dirty = False possibly_dirty = False
if p1_tracked and wc_tracked: if p1_tracked and wc_tracked:
# the underlying reference might have changed, we will have to # the underlying reference might have changed, we will have to
# check it. # check it.
possibly_dirty = True possibly_dirty = True
elif not (p1_tracked or wc_tracked): elif not (p1_tracked or wc_tracked):
# the file is no longer relevant to anyone # the file is no longer relevant to anyone
self._drop(filename) if self._map.dropfile(filename):
self._dirty = True
self._updatedfiles.add(filename)
elif (not p1_tracked) and wc_tracked: elif (not p1_tracked) and wc_tracked:
if entry is not None and entry.added: if entry is not None and entry.added:
return # avoid dropping copy information (maybe?) return # avoid dropping copy information (maybe?)
elif p1_tracked and not wc_tracked: elif p1_tracked and not wc_tracked:
pass pass
else: else:
assert False, 'unreachable' assert False, 'unreachable'
if source is not None: if source is not None:
self.copy(source, f) self.copy(source, f)
return return
elif entry.merged or entry.from_p2: elif entry.merged or entry.from_p2:
return return
self._addpath(f, possibly_dirty=True) self._addpath(f, possibly_dirty=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def _drop(self, filename):
"""internal function to drop a file from the dirstate"""
if self._map.dropfile(filename):
self._dirty = True
self._updatedfiles.add(filename)
def _discoverpath(self, path, normed, ignoremissing, exists, storemap): def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
if exists is None: if exists is None:
exists = os.path.lexists(os.path.join(self._root, path)) exists = os.path.lexists(os.path.join(self._root, path))
if not exists: if not exists:
# Maybe a path component exists # Maybe a path component exists
if not ignoremissing and b'/' in path: if not ignoremissing and b'/' in path:
d, f = path.rsplit(b'/', 1) d, f = path.rsplit(b'/', 1)
d = self._normalize(d, False, ignoremissing, None) d = self._normalize(d, False, ignoremissing, None)
if self._origpl is None: if self._origpl is None:
self._origpl = self._pl self._origpl = self._pl
self._map.setparents(parent, self._nodeconstants.nullid) self._map.setparents(parent, self._nodeconstants.nullid)
for f in to_lookup: for f in to_lookup:
self._normallookup(f) self._normallookup(f)
for f in to_drop: for f in to_drop:
self._drop(f) if self._map.dropfile(f):
self._updatedfiles.add(f)
self._dirty = True self._dirty = True
def identity(self): def identity(self):
"""Return identity of dirstate itself to detect changing in storage """Return identity of dirstate itself to detect changing in storage
If identity of previous dirstate is equal to this, writing If identity of previous dirstate is equal to this, writing
changes based on the former dirstate out can keep consistency. changes based on the former dirstate out can keep consistency.

tests/test-rebuildstate.t

> if nl and drop: > if nl and drop:
> raise error.Abort('drop and normal-lookup are mutually exclusive') > raise error.Abort('drop and normal-lookup are mutually exclusive')
> wlock = repo.wlock() > wlock = repo.wlock()
> try: > try:
> for file in pats: > for file in pats:
> if opts.get('normal_lookup'): > if opts.get('normal_lookup'):
> repo.dirstate._normallookup(file) > repo.dirstate._normallookup(file)
> else: > else:
> repo.dirstate._drop(file) > repo.dirstate._map.dropfile(file)
> repo.dirstate._dirty = True
> >
> repo.dirstate.write(repo.currenttransaction()) > repo.dirstate.write(repo.currenttransaction())
> finally: > finally:
> wlock.release() > wlock.release()
> EOF > EOF
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "debugadddrop=`pwd`/adddrop.py" >> $HGRCPATH $ echo "debugadddrop=`pwd`/adddrop.py" >> $HGRCPATH