Mercurial > hg
diff mercurial/narrowspec.py @ 41238:8c366af085f4
narrow: reuse narrowspec.updateworkingcopy() when narrowing
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.
Differential Revision: https://phab.mercurial-scm.org/D5511
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 30 Dec 2018 00:15:38 -0800 |
parents | 50ca531f1f24 |
children | 88a7c211b21e |
line wrap: on
line diff
--- a/mercurial/narrowspec.py Fri Dec 21 10:05:37 2018 -0800 +++ b/mercurial/narrowspec.py Sun Dec 30 00:15:38 2018 -0800 @@ -273,7 +273,12 @@ raise error.Abort(_("working copy's narrowspec is stale"), 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) newspec = repo.svfs.tryread(FILENAME) @@ -287,11 +292,17 @@ ds = repo.dirstate lookup, status = ds.status(removedmatch, subrepos=[], ignored=False, clean=True, unknown=False) - _deletecleanfiles(repo, status.clean) - trackeddirty = lookup + status.modified + status.added + trackeddirty = 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): 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) repo.narrowpats = newincludes, newexcludes