Mercurial > hg
comparison mercurial/dirstate.py @ 13233:0b30e6148ec5 stable
subrepo: do not report known files inside repositories as unknown
author | Oleg Stepanov <oleg.stepanov@jetbrains.com> |
---|---|
date | Tue, 04 Jan 2011 03:53:11 -0800 |
parents | e255a5dc29e6 |
children | 0935ff767285 22167be007ed |
comparison
equal
deleted
inserted
replaced
13232:b25b5ad0cca8 | 13233:0b30e6148ec5 |
---|---|
501 files = sorted(match.files()) | 501 files = sorted(match.files()) |
502 subrepos.sort() | 502 subrepos.sort() |
503 i, j = 0, 0 | 503 i, j = 0, 0 |
504 while i < len(files) and j < len(subrepos): | 504 while i < len(files) and j < len(subrepos): |
505 subpath = subrepos[j] + "/" | 505 subpath = subrepos[j] + "/" |
506 if not files[i].startswith(subpath): | 506 if files[i] < subpath: |
507 i += 1 | 507 i += 1 |
508 continue | 508 continue |
509 while files and files[i].startswith(subpath): | 509 while files and files[i].startswith(subpath): |
510 del files[i] | 510 del files[i] |
511 j += 1 | 511 j += 1 |