Show More
@@ -1,109 +1,106 b'' | |||
|
1 | 1 | Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get |
|
2 | 2 | combined correctly with the dirstate status. |
|
3 | 3 | |
|
4 | 4 | $ hg init |
|
5 | $ touch .hgignore | |
|
6 | $ hg add .hgignore | |
|
7 | $ hg commit -m initial | |
|
8 | 5 | |
|
9 | 6 | First commit |
|
10 | 7 | |
|
11 | 8 | $ python $TESTDIR/generate-working-copy-states.py base |
|
12 | 9 | $ hg addremove --similarity 0 |
|
13 | 10 | adding content1_content1_content1-tracked |
|
14 | 11 | adding content1_content1_content1-untracked |
|
15 | 12 | adding content1_content1_content3-tracked |
|
16 | 13 | adding content1_content1_content3-untracked |
|
17 | 14 | adding content1_content1_missing-tracked |
|
18 | 15 | adding content1_content1_missing-untracked |
|
19 | 16 | adding content1_content2_content1-tracked |
|
20 | 17 | adding content1_content2_content1-untracked |
|
21 | 18 | adding content1_content2_content2-tracked |
|
22 | 19 | adding content1_content2_content2-untracked |
|
23 | 20 | adding content1_content2_content3-tracked |
|
24 | 21 | adding content1_content2_content3-untracked |
|
25 | 22 | adding content1_content2_missing-tracked |
|
26 | 23 | adding content1_content2_missing-untracked |
|
27 | 24 | adding content1_missing_content1-tracked |
|
28 | 25 | adding content1_missing_content1-untracked |
|
29 | 26 | adding content1_missing_content3-tracked |
|
30 | 27 | adding content1_missing_content3-untracked |
|
31 | 28 | adding content1_missing_missing-tracked |
|
32 | 29 | adding content1_missing_missing-untracked |
|
33 | 30 | $ hg commit -m first |
|
34 | 31 | |
|
35 | 32 | Second commit |
|
36 | 33 | |
|
37 | 34 | $ python $TESTDIR/generate-working-copy-states.py parent |
|
38 | 35 | $ hg addremove --similarity 0 |
|
39 | 36 | removing content1_missing_content1-tracked |
|
40 | 37 | removing content1_missing_content1-untracked |
|
41 | 38 | removing content1_missing_content3-tracked |
|
42 | 39 | removing content1_missing_content3-untracked |
|
43 | 40 | removing content1_missing_missing-tracked |
|
44 | 41 | removing content1_missing_missing-untracked |
|
45 | 42 | adding missing_content2_content2-tracked |
|
46 | 43 | adding missing_content2_content2-untracked |
|
47 | 44 | adding missing_content2_content3-tracked |
|
48 | 45 | adding missing_content2_content3-untracked |
|
49 | 46 | adding missing_content2_missing-tracked |
|
50 | 47 | adding missing_content2_missing-untracked |
|
51 | 48 | $ hg commit -m second |
|
52 | 49 | |
|
53 | 50 | Working copy |
|
54 | 51 | |
|
55 | 52 | $ python $TESTDIR/generate-working-copy-states.py wc |
|
56 | 53 | $ hg addremove --similarity 0 |
|
57 | 54 | adding content1_missing_content1-tracked |
|
58 | 55 | adding content1_missing_content1-untracked |
|
59 | 56 | adding content1_missing_content3-tracked |
|
60 | 57 | adding content1_missing_content3-untracked |
|
61 | 58 | adding content1_missing_missing-tracked |
|
62 | 59 | adding content1_missing_missing-untracked |
|
63 | 60 | adding missing_missing_content3-tracked |
|
64 | 61 | adding missing_missing_content3-untracked |
|
65 | 62 | adding missing_missing_missing-tracked |
|
66 | 63 | adding missing_missing_missing-untracked |
|
67 | 64 | $ hg forget *_*_*-untracked |
|
68 | 65 | $ rm *_*_missing-* |
|
69 | 66 | |
|
70 | 67 | Status compared to one revision back |
|
71 | 68 | |
|
72 |
$ hg status -A --rev |
|
|
69 | $ hg status -A --rev 0 'glob:content1_*_content[23]-tracked' | |
|
73 | 70 | M content1_content1_content3-tracked |
|
74 | 71 | M content1_content2_content2-tracked |
|
75 | 72 | M content1_content2_content3-tracked |
|
76 | 73 | M content1_missing_content3-tracked |
|
77 |
$ hg status -A --rev |
|
|
74 | $ hg status -A --rev 0 'glob:content1_*_content1-tracked' | |
|
78 | 75 | C content1_content1_content1-tracked |
|
79 | 76 | C content1_content2_content1-tracked |
|
80 | 77 | C content1_missing_content1-tracked |
|
81 |
$ hg status -A --rev |
|
|
78 | $ hg status -A --rev 0 'glob:missing_*_content?-tracked' | |
|
82 | 79 | A missing_content2_content2-tracked |
|
83 | 80 | A missing_content2_content3-tracked |
|
84 | 81 | A missing_missing_content3-tracked |
|
85 | 82 | BROKEN: missing_content2_content[23]-untracked exist, so should be listed |
|
86 |
$ hg status -A --rev |
|
|
83 | $ hg status -A --rev 0 'glob:missing_*_content?-untracked' | |
|
87 | 84 | ? missing_missing_content3-untracked |
|
88 |
$ hg status -A --rev |
|
|
85 | $ hg status -A --rev 0 'glob:content1_*_*-untracked' | |
|
89 | 86 | R content1_content1_content1-untracked |
|
90 | 87 | R content1_content1_content3-untracked |
|
91 | 88 | R content1_content1_missing-untracked |
|
92 | 89 | R content1_content2_content1-untracked |
|
93 | 90 | R content1_content2_content2-untracked |
|
94 | 91 | R content1_content2_content3-untracked |
|
95 | 92 | R content1_content2_missing-untracked |
|
96 | 93 | R content1_missing_content1-untracked |
|
97 | 94 | R content1_missing_content3-untracked |
|
98 | 95 | R content1_missing_missing-untracked |
|
99 | 96 | BROKEN: content1_*_missing-tracked appear twice; should just be '!' |
|
100 |
$ hg status -A --rev |
|
|
97 | $ hg status -A --rev 0 'glob:*_*_missing-tracked' | |
|
101 | 98 | R content1_missing_missing-tracked |
|
102 | 99 | ! content1_content1_missing-tracked |
|
103 | 100 | ! content1_content2_missing-tracked |
|
104 | 101 | ! content1_missing_missing-tracked |
|
105 | 102 | ! missing_content2_missing-tracked |
|
106 | 103 | ! missing_missing_missing-tracked |
|
107 | 104 | C content1_content1_missing-tracked |
|
108 | 105 | C content1_content2_missing-tracked |
|
109 |
$ hg status -A --rev |
|
|
106 | $ hg status -A --rev 0 'glob:missing_*_missing-untracked' |
General Comments 0
You need to be logged in to leave comments.
Login now