facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

subrepo: do not report known files inside repositories as unknown

Browse Source
This commit is contained in:
Oleg Stepanov 2011-01-04 03:53:11 -08:00
parent 54d45ad369
commit 501d7926e8
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/dirstate.py
View File

@ -503,7 +503,7 @@ class dirstate(object):
i, j = 0, 0
while i < len(files) and j < len(subrepos):
subpath = subrepos[j] + "/"
if not files[i].startswith(subpath):
if files[i] < subpath:
i += 1
continue
while files and files[i].startswith(subpath):

19
tests/test-subrepo.t
View File

@ -656,3 +656,22 @@ Try to push from the other side
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Check status of files when none of them belong to the first
subrepository:
$ hg init subrepo-status
$ cd subrepo-status
$ hg init subrepo-1
$ hg init subrepo-2
$ cd subrepo-2
$ touch file
$ hg add file
$ cd ..
$ echo subrepo-1 = subrepo-1 > .hgsub
$ echo subrepo-2 = subrepo-2 >> .hgsub
$ hg add .hgsub
$ hg ci -m 'Added subrepos'
committing subrepository subrepo-1
committing subrepository subrepo-2
$ hg st subrepo-2/file