This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6265

narrow: also warn when not deleting untracked or ignored files
ClosedPublic

Authored by martinvonz on Apr 17 2019, 1:58 PM.

Details

Reviewers
durin42
rdamazio
pulkit
Group Reviewers
hg-reviewers
Commits
rHG84bd6ae2d1f6: narrow: also warn when not deleting untracked or ignored files
rHGaa8f83923aef: narrow: also warn when not deleting untracked or ignored files
Summary

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

martinvonz created this revision.Apr 17 2019, 1:58 PM
rdamazio added a subscriber: rdamazio.Apr 17 2019, 3:51 PM
rdamazio added inline comments.
mercurial/narrowspec.py
311

Just do a loop for each one? You probably also don't need them to be sets.

martinvonz added inline comments.Apr 17 2019, 5:16 PM
mercurial/narrowspec.py
311

I did it that way at first. Then I changed it because I figured it might be a harder to read if dirty, untracked, and ignored files in single a directory were spread out in three places. OTOH, both hg status and hg revert already do it that way, so I guess we should follow them. I'll change it back here.

martinvonz updated this revision to Diff 14807.Apr 17 2019, 5:19 PM
rdamazio accepted this revision.Apr 17 2019, 6:44 PM
pulkit accepted this revision.Apr 18 2019, 7:20 AM
Closed by commit rHGaa8f83923aef: narrow: also warn when not deleting untracked or ignored files (authored by martinvonz). · Explain WhyApr 18 2019, 7:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (8 lines)
Mtests/test-narrow-share.t (13 lines)

Diff 14839

mercurial/narrowspec.py

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=True,
clean=True, unknown=False) 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 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(_('not deleting possibly dirty file %s\n') % uipathfn(f)) repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f))
for f in sorted(status.unknown):
repo.ui.status(_('not deleting unknown file %s\n') % uipathfn(f))
for f in sorted(status.ignored):
rdamazioUnsubmitted
Not Done

Just do a loop for each one? You probably also don't need them to be sets.

rdamazio: Just do a loop for each one? You probably also don't need them to be sets.
martinvonzAuthorUnsubmitted
Not Done

I did it that way at first. Then I changed it because I figured it might be a harder to read if dirty, untracked, and ignored files in single a directory were spread out in three places. OTOH, both hg status and hg revert already do it that way, so I guess we should follow them. I'll change it back here.

martinvonz: I did it that way at first. Then I changed it because I figured it might be a harder to read if…
repo.ui.status(_('not deleting ignored file %s\n') % uipathfn(f))
for f in 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)

tests/test-narrow-share.t

> hg add d$x/f > hg add d$x/f
> hg commit -m "add d$x/f" > hg commit -m "add d$x/f"
> done > done
$ cd .. $ cd ..
$ hg clone --narrow ssh://user@dummy/remote main -q \ $ hg clone --narrow ssh://user@dummy/remote main -q \
> --include d1 --include d3 --include d5 --include d7 > --include d1 --include d3 --include d5 --include d7
Ignore file called "ignored"
$ echo ignored > main/.hgignore
$ hg share main share $ hg share main share
updating working directory updating working directory
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R share tracked $ hg -R share tracked
I path:d1 I path:d1
I path:d3 I path:d3
I path:d5 I path:d5
I path:d7 I path:d7
$ hg -R main debugdirstate --no-dates $ hg -R main debugdirstate --no-dates
n 644 2 set d1/f n 644 2 set d1/f
n 644 2 set d3/f n 644 2 set d3/f
n 644 2 set d5/f n 644 2 set d5/f
n 644 2 set d7/f n 644 2 set d7/f
# Make d3/f dirty # Make d3/f dirty
$ echo x >> main/d3/f $ echo x >> main/d3/f
$ echo y >> main/d3/g $ echo y >> main/d3/g
$ touch main/d3/ignored
$ touch main/d3/untracked
$ hg add main/d3/g $ hg add main/d3/g
$ hg -R main st $ hg -R main st
M d3/f M d3/f
A d3/g A d3/g
? d3/untracked
# Make d5/f not match the dirstate timestamp even though it's clean # Make d5/f not match the dirstate timestamp even though it's clean
$ sleep 2 $ sleep 2
$ hg -R main st $ hg -R main st
M d3/f M d3/f
A d3/g A d3/g
? d3/untracked
$ hg -R main debugdirstate --no-dates $ hg -R main debugdirstate --no-dates
n 644 2 set d1/f n 644 2 set d1/f
n 644 2 set d3/f n 644 2 set d3/f
a 0 -1 unset d3/g a 0 -1 unset d3/g
n 644 2 set d5/f n 644 2 set d5/f
n 644 2 set d7/f n 644 2 set d7/f
$ touch main/d5/f $ touch main/d5/f
$ hg -R share tracked --removeinclude d1 --removeinclude d3 --removeinclude d5 $ hg -R share tracked --removeinclude d1 --removeinclude d3 --removeinclude d5
$ hg -R main files $ hg -R main files
abort: working copy's narrowspec is stale abort: working copy's narrowspec is stale
(run 'hg tracked --update-working-copy') (run 'hg tracked --update-working-copy')
[255] [255]
$ hg -R main tracked --update-working-copy $ hg -R main tracked --update-working-copy
not deleting possibly dirty file d3/f not deleting possibly dirty file d3/f
not deleting possibly dirty file d3/g not deleting possibly dirty file d3/g
not deleting possibly dirty file d5/f not deleting possibly dirty file d5/f
not deleting unknown file d3/untracked
not deleting ignored file d3/ignored
# d1/f, d3/f, d3/g and d5/f should no longer be reported # d1/f, d3/f, d3/g and d5/f should no longer be reported
$ hg -R main files $ hg -R main files
main/d7/f main/d7/f
# d1/f should no longer be there, d3/f should be since it was dirty, d3/g should be there since # d1/f should no longer be there, d3/f should be since it was dirty, d3/g should be there since
# it was added, and d5/f should be since we couldn't be sure it was clean # it was added, and d5/f should be since we couldn't be sure it was clean
$ find main/d* -type f | sort $ find main/d* -type f | sort
main/d3/f main/d3/f
main/d3/g main/d3/g
main/d3/ignored
main/d3/untracked
main/d5/f main/d5/f
main/d7/f main/d7/f
Widen the share and check that the main repo's working copy gets updated Widen the share and check that the main repo's working copy gets updated
$ hg -R share tracked --addinclude d1 --addinclude d3 -q $ hg -R share tracked --addinclude d1 --addinclude d3 -q
$ hg -R share tracked $ hg -R share tracked
I path:d1 I path:d1
$ hg -R main files $ hg -R main files
main/d1/f main/d1/f
main/d3/f main/d3/f
main/d7/f main/d7/f
# d3/f should be modified (not clobbered by the widening), and d3/g should be untracked # d3/f should be modified (not clobbered by the widening), and d3/g should be untracked
$ hg -R main st --all $ hg -R main st --all
M d3/f M d3/f
? d3/g ? d3/g
? d3/untracked
I d3/ignored
C d1/f C d1/f
C d7/f C d7/f
We should also be able to unshare without breaking everything: We should also be able to unshare without breaking everything:
$ hg share main share-unshare $ hg share main share-unshare
updating working directory updating working directory
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved