This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11663

narrow: raise StateError when working copy is stale (for detailed exit code)
ClosedPublic

Authored by martinvonz on Oct 14 2021, 11:58 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7ed0fc687220: narrow: raise StateError when working copy is stale (for detailed exit code)

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.Oct 14 2021, 11:58 AM
pulkit accepted this revision.Oct 14 2021, 2:44 PM
This revision is now accepted and ready to land.Oct 14 2021, 2:44 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (2 lines)
Mtests/test-narrow-share.t (6 lines)

Diff 30817

mercurial/narrowspec.py

def checkworkingcopynarrowspec(repo): def checkworkingcopynarrowspec(repo):
# Avoid infinite recursion when updating the working copy # Avoid infinite recursion when updating the working copy
if getattr(repo, '_updatingnarrowspec', False): if getattr(repo, '_updatingnarrowspec', False):
return return
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( raise error.StateError(
_(b"working copy's narrowspec is stale"), _(b"working copy's narrowspec is stale"),
hint=_(b"run 'hg tracked --update-working-copy'"), hint=_(b"run 'hg tracked --update-working-copy'"),
) )
def updateworkingcopy(repo, assumeclean=False): def updateworkingcopy(repo, assumeclean=False):
"""updates the working copy and dirstate from the store narrowspec """updates the working copy and dirstate from the store narrowspec

tests/test-narrow-share.t

deleting meta/d3/00manifest.i (tree !) deleting meta/d3/00manifest.i (tree !)
deleting meta/d5/00manifest.i (tree !) deleting meta/d5/00manifest.i (tree !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg -R main tracked $ hg -R main tracked
I path:d7 I path:d7
$ 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] [20]
$ 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 unknown file d3/untracked
not deleting ignored file d3/ignored 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
share/d7/f share/d7/f
$ hg -R main tracked $ hg -R main tracked
I path:d1 I path:d1
I path:d3 I path:d3
I path:d7 I path:d7
$ 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] [20]
$ hg -R main tracked --update-working-copy $ hg -R main tracked --update-working-copy
# d1/f, d3/f should be back # d1/f, d3/f should be back
$ 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 d1/f M d1/f
A d3/g A d3/g
R d7/f R d7/f
Make it look like a repo from before narrow+share was supported Make it look like a repo from before narrow+share was supported
$ rm .hg/narrowspec.dirstate $ rm .hg/narrowspec.dirstate
$ hg ci -Am test $ hg ci -Am test
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] [20]
$ hg tracked --update-working-copy $ hg tracked --update-working-copy
$ hg st $ hg st
M d1/f M d1/f
A d3/g A d3/g
R d7/f R d7/f
$ cd .. $ cd ..