Mercurial > hg
annotate tests/test-hg-parseurl.py.out @ 24213:e0c1328df872
workingctx: use normal dirs() instead of dirstate.dirs()
The workingctx class was using dirstate.dirs() as it's implementation. The
sparse extension maintains a pruned down version of the dirstate, so this
resulted in the workingctx reporting an incorrect listing of directories
during merge calculations (it was detecting directory renames when it
shouldn't have).
The fix is to use the default implementation, which uses workingctx._manifest,
which unions the manifest with the dirstate to produce the correct overall
picture. This also produces more accurate output since it will no longer
return directories that have been entirely deleted in the dirstate.
Tests will be added to the sparse extension to detect regressions for this.
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 05 Mar 2015 22:16:28 -0800 |
parents | 375872fdadba |
children |
rev | line source |
---|---|
11322
3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents:
10365
diff
changeset
|
1 http://example.com/no/anchor, branches: (None, []) |
3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents:
10365
diff
changeset
|
2 http://example.com/an/anchor, branches: ('foo', []) |
3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents:
10365
diff
changeset
|
3 http://example.com/no/anchor/branches, branches: (None, ['foo']) |
3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents:
10365
diff
changeset
|
4 http://example.com/an/anchor/branches, branches: ('bar', ['foo']) |
3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents:
10365
diff
changeset
|
5 http://example.com/an/anchor/branches-None, branches: ('foo', []) |
13897
375872fdadba
hg: make parseurl() consistently return normalised path
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11322
diff
changeset
|
6 http://example.com/, branches: (None, []) |
375872fdadba
hg: make parseurl() consistently return normalised path
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11322
diff
changeset
|
7 http://example.com/, branches: (None, []) |
375872fdadba
hg: make parseurl() consistently return normalised path
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11322
diff
changeset
|
8 http://example.com/, branches: ('foo', []) |