Show More
@@ -1,161 +1,166 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 | 5 | |
|
6 | 6 | First commit |
|
7 | 7 | |
|
8 | 8 | $ python $TESTDIR/generate-working-copy-states.py base |
|
9 | 9 | $ hg addremove --similarity 0 |
|
10 | 10 | adding content1_content1_content1-tracked |
|
11 | 11 | adding content1_content1_content1-untracked |
|
12 | 12 | adding content1_content1_content3-tracked |
|
13 | 13 | adding content1_content1_content3-untracked |
|
14 | 14 | adding content1_content1_missing-tracked |
|
15 | 15 | adding content1_content1_missing-untracked |
|
16 | 16 | adding content1_content2_content1-tracked |
|
17 | 17 | adding content1_content2_content1-untracked |
|
18 | 18 | adding content1_content2_content2-tracked |
|
19 | 19 | adding content1_content2_content2-untracked |
|
20 | 20 | adding content1_content2_content3-tracked |
|
21 | 21 | adding content1_content2_content3-untracked |
|
22 | 22 | adding content1_content2_missing-tracked |
|
23 | 23 | adding content1_content2_missing-untracked |
|
24 | 24 | adding content1_missing_content1-tracked |
|
25 | 25 | adding content1_missing_content1-untracked |
|
26 | 26 | adding content1_missing_content3-tracked |
|
27 | 27 | adding content1_missing_content3-untracked |
|
28 | 28 | adding content1_missing_missing-tracked |
|
29 | 29 | adding content1_missing_missing-untracked |
|
30 | 30 | $ hg commit -m first |
|
31 | 31 | |
|
32 | 32 | Second commit |
|
33 | 33 | |
|
34 | 34 | $ python $TESTDIR/generate-working-copy-states.py parent |
|
35 | 35 | $ hg addremove --similarity 0 |
|
36 | 36 | removing content1_missing_content1-tracked |
|
37 | 37 | removing content1_missing_content1-untracked |
|
38 | 38 | removing content1_missing_content3-tracked |
|
39 | 39 | removing content1_missing_content3-untracked |
|
40 | 40 | removing content1_missing_missing-tracked |
|
41 | 41 | removing content1_missing_missing-untracked |
|
42 | 42 | adding missing_content2_content2-tracked |
|
43 | 43 | adding missing_content2_content2-untracked |
|
44 | 44 | adding missing_content2_content3-tracked |
|
45 | 45 | adding missing_content2_content3-untracked |
|
46 | 46 | adding missing_content2_missing-tracked |
|
47 | 47 | adding missing_content2_missing-untracked |
|
48 | 48 | $ hg commit -m second |
|
49 | 49 | |
|
50 | 50 | Working copy |
|
51 | 51 | |
|
52 | 52 | $ python $TESTDIR/generate-working-copy-states.py wc |
|
53 | 53 | $ hg addremove --similarity 0 |
|
54 | 54 | adding content1_missing_content1-tracked |
|
55 | 55 | adding content1_missing_content1-untracked |
|
56 | 56 | adding content1_missing_content3-tracked |
|
57 | 57 | adding content1_missing_content3-untracked |
|
58 | 58 | adding content1_missing_missing-tracked |
|
59 | 59 | adding content1_missing_missing-untracked |
|
60 | 60 | adding missing_missing_content3-tracked |
|
61 | 61 | adding missing_missing_content3-untracked |
|
62 | 62 | adding missing_missing_missing-tracked |
|
63 | 63 | adding missing_missing_missing-untracked |
|
64 | 64 | $ hg forget *_*_*-untracked |
|
65 | 65 | $ rm *_*_missing-* |
|
66 | 66 | |
|
67 | 67 | Status compared to parent of the working copy, i.e. the dirstate status |
|
68 | 68 | |
|
69 | 69 | $ hg status -A --rev 1 'glob:missing_content2_content3-tracked' |
|
70 | 70 | M missing_content2_content3-tracked |
|
71 | 71 | $ hg status -A --rev 1 'glob:missing_content2_content2-tracked' |
|
72 | 72 | C missing_content2_content2-tracked |
|
73 | 73 | $ hg status -A --rev 1 'glob:missing_missing_content3-tracked' |
|
74 | 74 | A missing_missing_content3-tracked |
|
75 | 75 | $ hg status -A --rev 1 'glob:missing_missing_content3-untracked' |
|
76 | 76 | ? missing_missing_content3-untracked |
|
77 | 77 | $ hg status -A --rev 1 'glob:missing_content2_*-untracked' |
|
78 | 78 | R missing_content2_content2-untracked |
|
79 | 79 | R missing_content2_content3-untracked |
|
80 | 80 | R missing_content2_missing-untracked |
|
81 | 81 | $ hg status -A --rev 1 'glob:missing_*_missing-tracked' |
|
82 | 82 | ! missing_content2_missing-tracked |
|
83 | 83 | ! missing_missing_missing-tracked |
|
84 | #if windows | |
|
85 | $ hg status -A --rev 1 'glob:missing_missing_missing-untracked' | |
|
86 | missing_missing_missing-untracked: The system cannot find the file specified | |
|
87 | #else | |
|
84 | 88 |
$ |
|
85 | 89 | missing_missing_missing-untracked: No such file or directory |
|
90 | #endif | |
|
86 | 91 | |
|
87 | 92 | Status between first and second commit. Should ignore dirstate status. |
|
88 | 93 | |
|
89 | 94 | $ hg status -A --rev 0:1 'glob:content1_content2_*' |
|
90 | 95 | M content1_content2_content1-tracked |
|
91 | 96 | M content1_content2_content1-untracked |
|
92 | 97 | M content1_content2_content2-tracked |
|
93 | 98 | M content1_content2_content2-untracked |
|
94 | 99 | M content1_content2_content3-tracked |
|
95 | 100 | M content1_content2_content3-untracked |
|
96 | 101 | M content1_content2_missing-tracked |
|
97 | 102 | M content1_content2_missing-untracked |
|
98 | 103 | $ hg status -A --rev 0:1 'glob:content1_content1_*' |
|
99 | 104 | C content1_content1_content1-tracked |
|
100 | 105 | C content1_content1_content1-untracked |
|
101 | 106 | C content1_content1_content3-tracked |
|
102 | 107 | C content1_content1_content3-untracked |
|
103 | 108 | C content1_content1_missing-tracked |
|
104 | 109 | C content1_content1_missing-untracked |
|
105 | 110 | $ hg status -A --rev 0:1 'glob:missing_content2_*' |
|
106 | 111 | A missing_content2_content2-tracked |
|
107 | 112 | A missing_content2_content2-untracked |
|
108 | 113 | A missing_content2_content3-tracked |
|
109 | 114 | A missing_content2_content3-untracked |
|
110 | 115 | A missing_content2_missing-tracked |
|
111 | 116 | A missing_content2_missing-untracked |
|
112 | 117 | $ hg status -A --rev 0:1 'glob:content1_missing_*' |
|
113 | 118 | R content1_missing_content1-tracked |
|
114 | 119 | R content1_missing_content1-untracked |
|
115 | 120 | R content1_missing_content3-tracked |
|
116 | 121 | R content1_missing_content3-untracked |
|
117 | 122 | R content1_missing_missing-tracked |
|
118 | 123 | R content1_missing_missing-untracked |
|
119 | 124 | $ hg status -A --rev 0:1 'glob:missing_missing_*' |
|
120 | 125 | |
|
121 | 126 | Status compared to one revision back, checking that the dirstate status |
|
122 | 127 | is correctly combined with the inter-revision status |
|
123 | 128 | |
|
124 | 129 | $ hg status -A --rev 0 'glob:content1_*_content[23]-tracked' |
|
125 | 130 | M content1_content1_content3-tracked |
|
126 | 131 | M content1_content2_content2-tracked |
|
127 | 132 | M content1_content2_content3-tracked |
|
128 | 133 | M content1_missing_content3-tracked |
|
129 | 134 | $ hg status -A --rev 0 'glob:content1_*_content1-tracked' |
|
130 | 135 | C content1_content1_content1-tracked |
|
131 | 136 | C content1_content2_content1-tracked |
|
132 | 137 | C content1_missing_content1-tracked |
|
133 | 138 | $ hg status -A --rev 0 'glob:missing_*_content?-tracked' |
|
134 | 139 | A missing_content2_content2-tracked |
|
135 | 140 | A missing_content2_content3-tracked |
|
136 | 141 | A missing_missing_content3-tracked |
|
137 | 142 | BROKEN: missing_content2_content[23]-untracked exist, so should be listed |
|
138 | 143 | $ hg status -A --rev 0 'glob:missing_*_content?-untracked' |
|
139 | 144 | ? missing_missing_content3-untracked |
|
140 | 145 | $ hg status -A --rev 0 'glob:content1_*_*-untracked' |
|
141 | 146 | R content1_content1_content1-untracked |
|
142 | 147 | R content1_content1_content3-untracked |
|
143 | 148 | R content1_content1_missing-untracked |
|
144 | 149 | R content1_content2_content1-untracked |
|
145 | 150 | R content1_content2_content2-untracked |
|
146 | 151 | R content1_content2_content3-untracked |
|
147 | 152 | R content1_content2_missing-untracked |
|
148 | 153 | R content1_missing_content1-untracked |
|
149 | 154 | R content1_missing_content3-untracked |
|
150 | 155 | R content1_missing_missing-untracked |
|
151 | 156 | BROKEN: content1_*_missing-tracked appear twice; should just be '!' |
|
152 | 157 | $ hg status -A --rev 0 'glob:*_*_missing-tracked' |
|
153 | 158 | R content1_missing_missing-tracked |
|
154 | 159 | ! content1_content1_missing-tracked |
|
155 | 160 | ! content1_content2_missing-tracked |
|
156 | 161 | ! content1_missing_missing-tracked |
|
157 | 162 | ! missing_content2_missing-tracked |
|
158 | 163 | ! missing_missing_missing-tracked |
|
159 | 164 | C content1_content1_missing-tracked |
|
160 | 165 | C content1_content2_missing-tracked |
|
161 | 166 | $ hg status -A --rev 0 'glob:missing_*_missing-untracked' |
General Comments 0
You need to be logged in to leave comments.
Login now