( )⚙ D10063 narrow: remove assertion about working copy being clean

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10063

narrow: remove assertion about working copy being clean
ClosedPublic

Authored by martinvonz on Feb 24 2021, 2:06 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGced66295ea90: narrow: remove assertion about working copy being clean
rHG172141c12303: narrow: remove assertion about working copy being clean
Summary

The user can always modify the working copy, including while they're
running hg tracked --remove-include <path>. Nothing really bad
happens when they do that, and we already have code for printing a
nice warning, so we can safely remove the assertion we had.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Feb 24 2021, 2:06 AM
martinvonz added a commit: rHG172141c12303: narrow: remove assertion about working copy being clean.Feb 24 2021, 11:19 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG172141c12303: narrow: remove assertion about working copy being clean (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (1 line)
Mtests/test-narrow.t (9 lines)

Diff 25805

mercurial/narrowspec.py

ds = repo.dirstate ds = repo.dirstate
lookup, status = ds.status( lookup, status = ds.status(
removedmatch, subrepos=[], ignored=True, clean=True, unknown=True removedmatch, subrepos=[], ignored=True, clean=True, unknown=True
) )
trackeddirty = status.modified + status.added trackeddirty = status.modified + status.added
clean = status.clean clean = status.clean
if assumeclean: if assumeclean:
assert not trackeddirty
clean.extend(lookup) clean.extend(lookup)
else: else:
trackeddirty.extend(lookup) trackeddirty.extend(lookup)
_deletecleanfiles(repo, clean) _deletecleanfiles(repo, clean)
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
for f in sorted(trackeddirty): for f in sorted(trackeddirty):
repo.ui.status( repo.ui.status(
_(b'not deleting possibly dirty file %s\n') % uipathfn(f) _(b'not deleting possibly dirty file %s\n') % uipathfn(f)

tests/test-narrow.t

deleting meta/d2/00manifest.i (tree !) deleting meta/d2/00manifest.i (tree !)
$ ls .hg/strip-backup/ $ ls .hg/strip-backup/
Test removing include while concurrently modifying file in that path Test removing include while concurrently modifying file in that path
$ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \ $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \
> --include d0 --include d1 > --include d0 --include d1
$ cd narrow-concurrent-modify $ cd narrow-concurrent-modify
$ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude d0 2>&1 | grep AssertionError $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude d0
AssertionError comparing with ssh://user@dummy/master
searching for changes
looking for local changes to affected paths
deleting data/d0/f.i
deleting meta/d0/00manifest.i (tree !)
not deleting possibly dirty file d0/f