Mercurial > hg
annotate tests/test-empty-dir.t @ 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 | 3b165c127690 |
children |
rev | line source |
---|---|
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
1 $ hg init |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
2 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
3 $ echo 123 > a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
4 $ hg add a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
5 $ hg commit -m "first" a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
6 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
7 $ mkdir sub |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
8 $ echo 321 > sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
9 $ hg add sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
10 $ hg commit -m "second" sub/b |
578 | 11 |
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
12 $ cat sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
13 321 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
14 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
15 $ hg co 0 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
16 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
578 | 17 |
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
18 $ cat sub/b 2>/dev/null || echo "sub/b not present" |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
19 sub/b not present |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
20 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
21 $ test -d sub || echo "sub not present" |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
22 sub not present |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
23 |