Mercurial > hg
annotate tests/test-backwards-remove.t @ 22097:7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
Before this patch, newly added (but not yet committed) largefiles
aren't treated as unknown ("?") after "hg rollback".
After "hg rollback", lfdirstate still contains "A" status entries for
such largefiles, even though corresponding entries for standins are
already dropped from dirstate.
Such "orphan" entries in lfdirstate prevent unknown (large)files in
the working directory from being listed up in "unknown" list. The code
path in "if working" route of "lfilesrepo.status" below drops
largefiles tracked in lfdirstate from "unknown" list:
lfiles = set(lfdirstate._map)
# Unknown files
result[4] = set(result[4]).difference(lfiles)
This patch drops orphan entries from lfdristate at "hg rollback".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, lfdirstate should
be rollback-ed as a part of transaction, as same as dirstate.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 11 Aug 2014 22:29:43 +0900 |
parents | 4c94b6d0fb1c |
children | 5c2a4f37eace |
rev | line source |
---|---|
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
1 $ hg init |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
2 $ echo This is file a1 > a |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
3 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11857
diff
changeset
|
4 $ hg commit -m "commit #0" |
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
5 $ ls |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
6 a |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
7 $ echo This is file b1 > b |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
8 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11857
diff
changeset
|
9 $ hg commit -m "commit #1" |
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
10 $ hg co 0 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
12 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
13 B should disappear |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
14 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
15 $ ls |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
16 a |