Mercurial > hg
annotate tests/test-rebuildstate.t @ 23976:344939126579 stable
largefiles: don't interfere with logging normal files
The previous code was adding standin files to the matcher's file list when
neither the standin file nor the original existed in the context. Somehow, this
was confusing the logging code into behaving differently from when the extension
wasn't loaded.
It seems that this was an attempt to support naming a directory that only
contains largefiles, as a test fails if the else clause is dropped entirely.
Therefore, only append the "standin" if it is a directory. This was found by
running the test suite with --config extensions.largefiles=.
The first added test used to log an additional cset that wasn't logged normally.
The only relation it had to file 'a' is that 'a' was the source of a move, but
it isn't clear why having '.hglf/a' in the list causes this change:
@@ -47,6 +47,11 @@
Make sure largefiles doesn't interfere with logging a regular file
$ hg log a --config extensions.largefiles=
+ changeset: 3:2ca5ba701980
+ user: test
+ date: Thu Jan 01 00:00:04 1970 +0000
+ summary: d
+
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
The second added test used to complain about a file not being in the parent
revision:
@@ -1638,10 +1643,8 @@
Ensure that largefiles doesn't intefere with following a normal file
$ hg --config extensions.largefiles= log -f d -T '{desc}' -G
- @ c
- |
- o a
-
+ abort: cannot follow file not in parent revision: ".hglf/d"
+ [255]
$ hg log -f d/a -T '{desc}' -G
@ c
|
Note that there is still something fishy with the largefiles code, because when
using a glob pattern like this:
$ hg log 'glob:sub/*'
the pattern list would contain '.hglf/glob:sub/*'. None of the tests show this
(this test lives in test-largefiles.t at 1349), it was just something that I
noticed when the code was loaded up with print statements.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 30 Jan 2015 20:44:11 -0500 |
parents | ddc17eaf0f1b |
children | 9fbe3545e4bd |
rev | line source |
---|---|
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
1 basic test for hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
2 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
3 $ hg init repo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
4 $ cd repo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
6 $ touch foo bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
7 $ hg ci -Am 'add foo bar' |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
8 adding bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
9 adding foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
11 $ touch baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
12 $ hg add baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
13 $ hg rm bar |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
15 $ hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
16 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
17 state dump after |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
18 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
19 $ hg debugstate --nodates | sort |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
20 n 644 -1 set bar |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
21 n 644 -1 set foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
22 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
23 status |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
25 $ hg st -A |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
26 ! bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
27 ? baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
28 C foo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
29 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15440
diff
changeset
|
30 $ cd .. |