This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4681

narrow: extract wdir cleanup function to make it extensible
ClosedPublic

Authored by spectral on Sep 20 2018, 3:20 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG9d5c919b6dc3: narrow: extract wdir cleanup function to make it extensible
Summary

We have an overlay filesystem which shows the entire repository, and unlinking
a file that's in the underlying data store will create "tombstone" entries,
which are going to cause our automatic tracking to re-add these directories. We
need to use a different (non-posix) interface to clean up items in the working
directory that are no longer relevant.

Extracting this to a function lets us use extensions.wrappedfunction and perform
this cleanup work, even if the paths aren't in the dirstate (they may have been
removed in the past and thus entirely "tombstone" entries already, part of
hgignore, exclusively directories (possibly empty), or other edge cases).

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

spectral created this revision.Sep 20 2018, 3:20 PM
Closed by commit rHG9d5c919b6dc3: narrow: extract wdir cleanup function to make it extensible (authored by spectral). · Explain WhySep 20 2018, 3:46 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (16 lines)

Diff 11238

hgext/narrow/narrowcommands.py

# Mercurial serializes an empty list as '' and deserializes it as # Mercurial serializes an empty list as '' and deserializes it as
# [''], so delete it instead to avoid handling the empty string on # [''], so delete it instead to avoid handling the empty string on
# the server. # the server.
del kwargs['known'] del kwargs['known']
extensions.wrapfunction(exchange,'_pullbundle2extraprepare', extensions.wrapfunction(exchange,'_pullbundle2extraprepare',
pullbundle2extraprepare) pullbundle2extraprepare)
# This is an extension point for filesystems that need to do something other
# than just blindly unlink the files. It's not clear what arguments would be
# useful, so we're passing in a fair number of them, some of them redundant.
def _narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes, newexcludes,
oldmatch, newmatch):
for f in repo.dirstate:
if not newmatch(f):
repo.dirstate.drop(f)
repo.wvfs.unlinkpath(f)
def _narrow(ui, repo, remote, commoninc, oldincludes, oldexcludes, def _narrow(ui, repo, remote, commoninc, oldincludes, oldexcludes,
newincludes, newexcludes, force): newincludes, newexcludes, force):
oldmatch = narrowspec.match(repo.root, oldincludes, oldexcludes) oldmatch = narrowspec.match(repo.root, oldincludes, oldexcludes)
newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
# This is essentially doing "hg outgoing" to find all local-only # This is essentially doing "hg outgoing" to find all local-only
# commits. We will then check that the local-only commits don't # commits. We will then check that the local-only commits don't
# have any changes to files that will be untracked. # have any changes to files that will be untracked.
repo.destroying() repo.destroying()
with repo.transaction("narrowing"): with repo.transaction("narrowing"):
for f in todelete: for f in todelete:
ui.status(_('deleting %s\n') % f) ui.status(_('deleting %s\n') % f)
util.unlinkpath(repo.svfs.join(f)) util.unlinkpath(repo.svfs.join(f))
repo.store.markremoved(f) repo.store.markremoved(f)
for f in repo.dirstate: _narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes,
if not newmatch(f): newexcludes, oldmatch, newmatch)
repo.dirstate.drop(f)
repo.wvfs.unlinkpath(f)
repo.setnarrowpats(newincludes, newexcludes) repo.setnarrowpats(newincludes, newexcludes)
repo.destroyed() repo.destroyed()
def _widen(ui, repo, remote, commoninc, newincludes, newexcludes): def _widen(ui, repo, remote, commoninc, newincludes, newexcludes):
newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):