This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5511

narrow: reuse narrowspec.updateworkingcopy() when narrowing
ClosedPublic

Authored by martinvonz on Jan 7 2019, 3:45 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8c366af085f4: narrow: reuse narrowspec.updateworkingcopy() when narrowing
rHG8a26faac4a45: narrow: reuse narrowspec.updateworkingcopy() when narrowing
Summary

Similar to the previous patch for widening, but here we also need to
teach updateworkingcopy() to forcefully delete files that are not
recorded in the dirstate as clean. That should be safe because the
narrowing command (e.g. hg tracked --removeinclude) has already
checked that the working copy is clean.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (17 lines)
Mmercurial/narrowspec.py (19 lines)

Diff 13248

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.
break break
if visit == 'all': if visit == 'all':
break break
if not include: if not include:
todelete.append(f) todelete.append(f)
repo.destroying() repo.destroying()
with repo.transaction("narrowing"): with repo.transaction('narrowing'):
# Update narrowspec before removing revlogs, so repo won't be # Update narrowspec before removing revlogs, so repo won't be
# corrupt in case of crash # corrupt in case of crash
repo.setnarrowpats(newincludes, newexcludes) repo.setnarrowpats(newincludes, newexcludes)
narrowspec.copytoworkingcopy(repo)
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)
_narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes, narrowspec.updateworkingcopy(repo, assumeclean=True)
newexcludes, oldmatch, newmatch) narrowspec.copytoworkingcopy(repo)
repo.destroyed() repo.destroyed()
def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes, def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes,
newincludes, newexcludes): newincludes, newexcludes):
newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
# for now we assume that if a server has ellipses enabled, we will be # for now we assume that if a server has ellipses enabled, we will be

mercurial/narrowspec.py

def checkworkingcopynarrowspec(repo): def checkworkingcopynarrowspec(repo):
storespec = repo.svfs.tryread(FILENAME) storespec = repo.svfs.tryread(FILENAME)
wcspec = repo.vfs.tryread(DIRSTATE_FILENAME) wcspec = repo.vfs.tryread(DIRSTATE_FILENAME)
if wcspec != storespec: if wcspec != storespec:
raise error.Abort(_("working copy's narrowspec is stale"), raise error.Abort(_("working copy's narrowspec is stale"),
hint=_("run 'hg tracked --update-working-copy'")) hint=_("run 'hg tracked --update-working-copy'"))
def updateworkingcopy(repo): def updateworkingcopy(repo, assumeclean=False):
"""updates the working copy and dirstate from the store narrowspec
When assumeclean=True, files that are not known to be clean will also
be deleted. It is then up to the caller to make sure they are clean.
"""
oldspec = repo.vfs.tryread(DIRSTATE_FILENAME) oldspec = repo.vfs.tryread(DIRSTATE_FILENAME)
newspec = repo.svfs.tryread(FILENAME) newspec = repo.svfs.tryread(FILENAME)
oldincludes, oldexcludes = parseconfig(repo.ui, oldspec) oldincludes, oldexcludes = parseconfig(repo.ui, oldspec)
newincludes, newexcludes = parseconfig(repo.ui, newspec) newincludes, newexcludes = parseconfig(repo.ui, newspec)
oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes) oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes)
newmatch = match(repo.root, include=newincludes, exclude=newexcludes) newmatch = match(repo.root, include=newincludes, exclude=newexcludes)
addedmatch = matchmod.differencematcher(newmatch, oldmatch) addedmatch = matchmod.differencematcher(newmatch, oldmatch)
removedmatch = matchmod.differencematcher(oldmatch, newmatch) removedmatch = matchmod.differencematcher(oldmatch, newmatch)
ds = repo.dirstate ds = repo.dirstate
lookup, status = ds.status(removedmatch, subrepos=[], ignored=False, lookup, status = ds.status(removedmatch, subrepos=[], ignored=False,
clean=True, unknown=False) clean=True, unknown=False)
_deletecleanfiles(repo, status.clean) trackeddirty = status.modified + status.added
trackeddirty = lookup + status.modified + status.added clean = status.clean
if assumeclean:
assert not trackeddirty
clean.extend(lookup)
else:
trackeddirty.extend(lookup)
_deletecleanfiles(repo, clean)
for f in sorted(trackeddirty): for f in sorted(trackeddirty):
repo.ui.status(_('not deleting possibly dirty file %s\n') % f) repo.ui.status(_('not deleting possibly dirty file %s\n') % f)
for f in status.clean + trackeddirty: for f in clean + trackeddirty:
ds.drop(f) ds.drop(f)
repo.narrowpats = newincludes, newexcludes repo.narrowpats = newincludes, newexcludes
repo._narrowmatch = newmatch repo._narrowmatch = newmatch
pctx = repo['.'] pctx = repo['.']
newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds] newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds]
for f in newfiles: for f in newfiles:
ds.normallookup(f) ds.normallookup(f)
_writeaddedfiles(repo, pctx, newfiles) _writeaddedfiles(repo, pctx, newfiles)