Show More
@@ -1,676 +1,676 b'' | |||||
1 | $ fileset() { |
|
1 | $ fileset() { | |
2 | > hg debugfileset "$@" |
|
2 | > hg debugfileset "$@" | |
3 | > } |
|
3 | > } | |
4 |
|
4 | |||
5 | $ hg init repo |
|
5 | $ hg init repo | |
6 | $ cd repo |
|
6 | $ cd repo | |
7 | $ echo a > a1 |
|
7 | $ echo a > a1 | |
8 | $ echo a > a2 |
|
8 | $ echo a > a2 | |
9 | $ echo b > b1 |
|
9 | $ echo b > b1 | |
10 | $ echo b > b2 |
|
10 | $ echo b > b2 | |
11 | $ hg ci -Am addfiles |
|
11 | $ hg ci -Am addfiles | |
12 | adding a1 |
|
12 | adding a1 | |
13 | adding a2 |
|
13 | adding a2 | |
14 | adding b1 |
|
14 | adding b1 | |
15 | adding b2 |
|
15 | adding b2 | |
16 |
|
16 | |||
17 | Test operators and basic patterns |
|
17 | Test operators and basic patterns | |
18 |
|
18 | |||
19 | $ fileset -v a1 |
|
19 | $ fileset -v a1 | |
20 | (symbol 'a1') |
|
20 | (symbol 'a1') | |
21 | a1 |
|
21 | a1 | |
22 | $ fileset -v 'a*' |
|
22 | $ fileset -v 'a*' | |
23 | (symbol 'a*') |
|
23 | (symbol 'a*') | |
24 | a1 |
|
24 | a1 | |
25 | a2 |
|
25 | a2 | |
26 | $ fileset -v '"re:a\d"' |
|
26 | $ fileset -v '"re:a\d"' | |
27 | (string 're:a\\d') |
|
27 | (string 're:a\\d') | |
28 | a1 |
|
28 | a1 | |
29 | a2 |
|
29 | a2 | |
30 | $ fileset -v '!re:"a\d"' |
|
30 | $ fileset -v '!re:"a\d"' | |
31 | (not |
|
31 | (not | |
32 | (kindpat |
|
32 | (kindpat | |
33 | (symbol 're') |
|
33 | (symbol 're') | |
34 | (string 'a\\d'))) |
|
34 | (string 'a\\d'))) | |
35 | b1 |
|
35 | b1 | |
36 | b2 |
|
36 | b2 | |
37 | $ fileset -v 'path:a1 or glob:b?' |
|
37 | $ fileset -v 'path:a1 or glob:b?' | |
38 | (or |
|
38 | (or | |
39 | (kindpat |
|
39 | (kindpat | |
40 | (symbol 'path') |
|
40 | (symbol 'path') | |
41 | (symbol 'a1')) |
|
41 | (symbol 'a1')) | |
42 | (kindpat |
|
42 | (kindpat | |
43 | (symbol 'glob') |
|
43 | (symbol 'glob') | |
44 | (symbol 'b?'))) |
|
44 | (symbol 'b?'))) | |
45 | a1 |
|
45 | a1 | |
46 | b1 |
|
46 | b1 | |
47 | b2 |
|
47 | b2 | |
48 | $ fileset -v 'a1 or a2' |
|
48 | $ fileset -v 'a1 or a2' | |
49 | (or |
|
49 | (or | |
50 | (symbol 'a1') |
|
50 | (symbol 'a1') | |
51 | (symbol 'a2')) |
|
51 | (symbol 'a2')) | |
52 | a1 |
|
52 | a1 | |
53 | a2 |
|
53 | a2 | |
54 | $ fileset 'a1 | a2' |
|
54 | $ fileset 'a1 | a2' | |
55 | a1 |
|
55 | a1 | |
56 | a2 |
|
56 | a2 | |
57 | $ fileset 'a* and "*1"' |
|
57 | $ fileset 'a* and "*1"' | |
58 | a1 |
|
58 | a1 | |
59 | $ fileset 'a* & "*1"' |
|
59 | $ fileset 'a* & "*1"' | |
60 | a1 |
|
60 | a1 | |
61 | $ fileset 'not (r"a*")' |
|
61 | $ fileset 'not (r"a*")' | |
62 | b1 |
|
62 | b1 | |
63 | b2 |
|
63 | b2 | |
64 | $ fileset '! ("a*")' |
|
64 | $ fileset '! ("a*")' | |
65 | b1 |
|
65 | b1 | |
66 | b2 |
|
66 | b2 | |
67 | $ fileset 'a* - a1' |
|
67 | $ fileset 'a* - a1' | |
68 | a2 |
|
68 | a2 | |
69 | $ fileset 'a_b' |
|
69 | $ fileset 'a_b' | |
70 | $ fileset '"\xy"' |
|
70 | $ fileset '"\xy"' | |
71 | hg: parse error: invalid \x escape |
|
71 | hg: parse error: invalid \x escape | |
72 | [255] |
|
72 | [255] | |
73 |
|
73 | |||
74 | Test invalid syntax |
|
74 | Test invalid syntax | |
75 |
|
75 | |||
76 | $ fileset -v '"added"()' |
|
76 | $ fileset -v '"added"()' | |
77 | (func |
|
77 | (func | |
78 | (string 'added') |
|
78 | (string 'added') | |
79 | None) |
|
79 | None) | |
80 | hg: parse error: not a symbol |
|
80 | hg: parse error: not a symbol | |
81 | [255] |
|
81 | [255] | |
82 | $ fileset -v '()()' |
|
82 | $ fileset -v '()()' | |
83 | (func |
|
83 | (func | |
84 | (group |
|
84 | (group | |
85 | None) |
|
85 | None) | |
86 | None) |
|
86 | None) | |
87 | hg: parse error: not a symbol |
|
87 | hg: parse error: not a symbol | |
88 | [255] |
|
88 | [255] | |
89 | $ fileset -v -- '-x' |
|
89 | $ fileset -v -- '-x' | |
90 | (negate |
|
90 | (negate | |
91 | (symbol 'x')) |
|
91 | (symbol 'x')) | |
92 | hg: parse error: can't use negate operator in this context |
|
92 | hg: parse error: can't use negate operator in this context | |
93 | [255] |
|
93 | [255] | |
94 | $ fileset -v -- '-()' |
|
94 | $ fileset -v -- '-()' | |
95 | (negate |
|
95 | (negate | |
96 | (group |
|
96 | (group | |
97 | None)) |
|
97 | None)) | |
98 | hg: parse error: can't use negate operator in this context |
|
98 | hg: parse error: can't use negate operator in this context | |
99 | [255] |
|
99 | [255] | |
100 |
|
100 | |||
101 | $ fileset '"path":.' |
|
101 | $ fileset '"path":.' | |
102 | hg: parse error: not a symbol |
|
102 | hg: parse error: not a symbol | |
103 | [255] |
|
103 | [255] | |
104 | $ fileset 'path:foo bar' |
|
104 | $ fileset 'path:foo bar' | |
105 | hg: parse error at 9: invalid token |
|
105 | hg: parse error at 9: invalid token | |
106 | [255] |
|
106 | [255] | |
107 | $ fileset 'foo:bar:baz' |
|
107 | $ fileset 'foo:bar:baz' | |
108 | hg: parse error: not a symbol |
|
108 | hg: parse error: not a symbol | |
109 | [255] |
|
109 | [255] | |
110 | $ fileset 'foo:bar()' |
|
110 | $ fileset 'foo:bar()' | |
111 | hg: parse error: pattern must be a string |
|
111 | hg: parse error: pattern must be a string | |
112 | [255] |
|
112 | [255] | |
113 | $ fileset 'foo:bar' |
|
113 | $ fileset 'foo:bar' | |
114 | hg: parse error: invalid pattern kind: foo |
|
114 | hg: parse error: invalid pattern kind: foo | |
115 | [255] |
|
115 | [255] | |
116 |
|
116 | |||
117 | Test files status |
|
117 | Test files status | |
118 |
|
118 | |||
119 | $ rm a1 |
|
119 | $ rm a1 | |
120 | $ hg rm a2 |
|
120 | $ hg rm a2 | |
121 | $ echo b >> b2 |
|
121 | $ echo b >> b2 | |
122 | $ hg cp b1 c1 |
|
122 | $ hg cp b1 c1 | |
123 | $ echo c > c2 |
|
123 | $ echo c > c2 | |
124 | $ echo c > c3 |
|
124 | $ echo c > c3 | |
125 | $ cat > .hgignore <<EOF |
|
125 | $ cat > .hgignore <<EOF | |
126 | > \.hgignore |
|
126 | > \.hgignore | |
127 | > 2$ |
|
127 | > 2$ | |
128 | > EOF |
|
128 | > EOF | |
129 | $ fileset 'modified()' |
|
129 | $ fileset 'modified()' | |
130 | b2 |
|
130 | b2 | |
131 | $ fileset 'added()' |
|
131 | $ fileset 'added()' | |
132 | c1 |
|
132 | c1 | |
133 | $ fileset 'removed()' |
|
133 | $ fileset 'removed()' | |
134 | a2 |
|
134 | a2 | |
135 | $ fileset 'deleted()' |
|
135 | $ fileset 'deleted()' | |
136 | a1 |
|
136 | a1 | |
137 | $ fileset 'missing()' |
|
137 | $ fileset 'missing()' | |
138 | a1 |
|
138 | a1 | |
139 | $ fileset 'unknown()' |
|
139 | $ fileset 'unknown()' | |
140 | c3 |
|
140 | c3 | |
141 | $ fileset 'ignored()' |
|
141 | $ fileset 'ignored()' | |
142 | .hgignore |
|
142 | .hgignore | |
143 | c2 |
|
143 | c2 | |
144 | $ fileset 'hgignore()' |
|
144 | $ fileset 'hgignore()' | |
145 | a2 |
|
145 | a2 | |
146 | b2 |
|
146 | b2 | |
147 | $ fileset 'clean()' |
|
147 | $ fileset 'clean()' | |
148 | b1 |
|
148 | b1 | |
149 | $ fileset 'copied()' |
|
149 | $ fileset 'copied()' | |
150 | c1 |
|
150 | c1 | |
151 |
|
151 | |||
152 | Test files status in different revisions |
|
152 | Test files status in different revisions | |
153 |
|
153 | |||
154 | $ hg status -m |
|
154 | $ hg status -m | |
155 | M b2 |
|
155 | M b2 | |
156 | $ fileset -r0 'revs("wdir()", modified())' --traceback |
|
156 | $ fileset -r0 'revs("wdir()", modified())' --traceback | |
157 | b2 |
|
157 | b2 | |
158 | $ hg status -a |
|
158 | $ hg status -a | |
159 | A c1 |
|
159 | A c1 | |
160 | $ fileset -r0 'revs("wdir()", added())' |
|
160 | $ fileset -r0 'revs("wdir()", added())' | |
161 | c1 |
|
161 | c1 | |
162 | $ hg status --change 0 -a |
|
162 | $ hg status --change 0 -a | |
163 | A a1 |
|
163 | A a1 | |
164 | A a2 |
|
164 | A a2 | |
165 | A b1 |
|
165 | A b1 | |
166 | A b2 |
|
166 | A b2 | |
167 | $ hg status -mru |
|
167 | $ hg status -mru | |
168 | M b2 |
|
168 | M b2 | |
169 | R a2 |
|
169 | R a2 | |
170 | ? c3 |
|
170 | ? c3 | |
171 | $ fileset -r0 'added() and revs("wdir()", modified() or removed() or unknown())' |
|
171 | $ fileset -r0 'added() and revs("wdir()", modified() or removed() or unknown())' | |
172 | b2 |
|
172 | b2 | |
173 | a2 |
|
173 | a2 | |
174 | $ fileset -r0 'added() or revs("wdir()", added())' |
|
174 | $ fileset -r0 'added() or revs("wdir()", added())' | |
175 | a1 |
|
175 | a1 | |
176 | a2 |
|
176 | a2 | |
177 | b1 |
|
177 | b1 | |
178 | b2 |
|
178 | b2 | |
179 | c1 |
|
179 | c1 | |
180 |
|
180 | |||
181 | Test files properties |
|
181 | Test files properties | |
182 |
|
182 | |||
183 | >>> open('bin', 'wb').write(b'\0a') and None |
|
183 | >>> open('bin', 'wb').write(b'\0a') and None | |
184 | $ fileset 'binary()' |
|
184 | $ fileset 'binary()' | |
185 | $ fileset 'binary() and unknown()' |
|
185 | $ fileset 'binary() and unknown()' | |
186 | bin |
|
186 | bin | |
187 | $ echo '^bin$' >> .hgignore |
|
187 | $ echo '^bin$' >> .hgignore | |
188 | $ fileset 'binary() and ignored()' |
|
188 | $ fileset 'binary() and ignored()' | |
189 | bin |
|
189 | bin | |
190 | $ hg add bin |
|
190 | $ hg add bin | |
191 | $ fileset 'binary()' |
|
191 | $ fileset 'binary()' | |
192 | bin |
|
192 | bin | |
193 |
|
193 | |||
194 | $ fileset 'grep("b{1}")' |
|
194 | $ fileset 'grep("b{1}")' | |
195 | b2 |
|
195 | b2 | |
196 | c1 |
|
196 | c1 | |
197 | b1 |
|
197 | b1 | |
198 | $ fileset 'grep("missingparens(")' |
|
198 | $ fileset 'grep("missingparens(")' | |
199 | hg: parse error: invalid match pattern: unbalanced parenthesis |
|
199 | hg: parse error: invalid match pattern: unbalanced parenthesis | |
200 | [255] |
|
200 | [255] | |
201 |
|
201 | |||
202 | #if execbit |
|
202 | #if execbit | |
203 | $ chmod +x b2 |
|
203 | $ chmod +x b2 | |
204 | $ fileset 'exec()' |
|
204 | $ fileset 'exec()' | |
205 | b2 |
|
205 | b2 | |
206 | #endif |
|
206 | #endif | |
207 |
|
207 | |||
208 | #if symlink |
|
208 | #if symlink | |
209 | $ ln -s b2 b2link |
|
209 | $ ln -s b2 b2link | |
210 | $ fileset 'symlink() and unknown()' |
|
210 | $ fileset 'symlink() and unknown()' | |
211 | b2link |
|
211 | b2link | |
212 | $ hg add b2link |
|
212 | $ hg add b2link | |
213 | #endif |
|
213 | #endif | |
214 |
|
214 | |||
215 | #if no-windows |
|
215 | #if no-windows | |
216 | $ echo foo > con.xml |
|
216 | $ echo foo > con.xml | |
217 | $ fileset 'not portable()' |
|
217 | $ fileset 'not portable()' | |
218 | con.xml |
|
218 | con.xml | |
219 | $ hg --config ui.portablefilenames=ignore add con.xml |
|
219 | $ hg --config ui.portablefilenames=ignore add con.xml | |
220 | #endif |
|
220 | #endif | |
221 |
|
221 | |||
222 | >>> open('1k', 'wb').write(b' '*1024) and None |
|
222 | >>> open('1k', 'wb').write(b' '*1024) and None | |
223 | >>> open('2k', 'wb').write(b' '*2048) and None |
|
223 | >>> open('2k', 'wb').write(b' '*2048) and None | |
224 | $ hg add 1k 2k |
|
224 | $ hg add 1k 2k | |
225 | $ fileset 'size("bar")' |
|
225 | $ fileset 'size("bar")' | |
226 | hg: parse error: couldn't parse size: bar |
|
226 | hg: parse error: couldn't parse size: bar | |
227 | [255] |
|
227 | [255] | |
228 | $ fileset '(1k, 2k)' |
|
228 | $ fileset '(1k, 2k)' | |
229 | hg: parse error: can't use a list in this context |
|
229 | hg: parse error: can't use a list in this context | |
230 | (see hg help "filesets.x or y") |
|
230 | (see hg help "filesets.x or y") | |
231 | [255] |
|
231 | [255] | |
232 | $ fileset 'size(1k)' |
|
232 | $ fileset 'size(1k)' | |
233 | 1k |
|
233 | 1k | |
234 | $ fileset '(1k or 2k) and size("< 2k")' |
|
234 | $ fileset '(1k or 2k) and size("< 2k")' | |
235 | 1k |
|
235 | 1k | |
236 | $ fileset '(1k or 2k) and size("<=2k")' |
|
236 | $ fileset '(1k or 2k) and size("<=2k")' | |
237 | 1k |
|
237 | 1k | |
238 | 2k |
|
238 | 2k | |
239 | $ fileset '(1k or 2k) and size("> 1k")' |
|
239 | $ fileset '(1k or 2k) and size("> 1k")' | |
240 | 2k |
|
240 | 2k | |
241 | $ fileset '(1k or 2k) and size(">=1K")' |
|
241 | $ fileset '(1k or 2k) and size(">=1K")' | |
242 | 1k |
|
242 | 1k | |
243 | 2k |
|
243 | 2k | |
244 | $ fileset '(1k or 2k) and size(".5KB - 1.5kB")' |
|
244 | $ fileset '(1k or 2k) and size(".5KB - 1.5kB")' | |
245 | 1k |
|
245 | 1k | |
246 | $ fileset 'size("1M")' |
|
246 | $ fileset 'size("1M")' | |
247 | $ fileset 'size("1 GB")' |
|
247 | $ fileset 'size("1 GB")' | |
248 |
|
248 | |||
249 | Test merge states |
|
249 | Test merge states | |
250 |
|
250 | |||
251 | $ hg ci -m manychanges |
|
251 | $ hg ci -m manychanges | |
252 | $ hg file -r . 'set:copied() & modified()' |
|
252 | $ hg file -r . 'set:copied() & modified()' | |
253 | [1] |
|
253 | [1] | |
254 | $ hg up -C 0 |
|
254 | $ hg up -C 0 | |
255 | * files updated, 0 files merged, * files removed, 0 files unresolved (glob) |
|
255 | * files updated, 0 files merged, * files removed, 0 files unresolved (glob) | |
256 | $ echo c >> b2 |
|
256 | $ echo c >> b2 | |
257 | $ hg ci -m diverging b2 |
|
257 | $ hg ci -m diverging b2 | |
258 | created new head |
|
258 | created new head | |
259 | $ fileset 'resolved()' |
|
259 | $ fileset 'resolved()' | |
260 | $ fileset 'unresolved()' |
|
260 | $ fileset 'unresolved()' | |
261 | $ hg merge |
|
261 | $ hg merge | |
262 | merging b2 |
|
262 | merging b2 | |
263 | warning: conflicts while merging b2! (edit, then use 'hg resolve --mark') |
|
263 | warning: conflicts while merging b2! (edit, then use 'hg resolve --mark') | |
264 | * files updated, 0 files merged, 1 files removed, 1 files unresolved (glob) |
|
264 | * files updated, 0 files merged, 1 files removed, 1 files unresolved (glob) | |
265 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
265 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
266 | [1] |
|
266 | [1] | |
267 | $ fileset 'resolved()' |
|
267 | $ fileset 'resolved()' | |
268 | $ fileset 'unresolved()' |
|
268 | $ fileset 'unresolved()' | |
269 | b2 |
|
269 | b2 | |
270 | $ echo e > b2 |
|
270 | $ echo e > b2 | |
271 | $ hg resolve -m b2 |
|
271 | $ hg resolve -m b2 | |
272 | (no more unresolved files) |
|
272 | (no more unresolved files) | |
273 | $ fileset 'resolved()' |
|
273 | $ fileset 'resolved()' | |
274 | b2 |
|
274 | b2 | |
275 | $ fileset 'unresolved()' |
|
275 | $ fileset 'unresolved()' | |
276 | $ hg ci -m merge |
|
276 | $ hg ci -m merge | |
277 |
|
277 | |||
278 | Test subrepo predicate |
|
278 | Test subrepo predicate | |
279 |
|
279 | |||
280 | $ hg init sub |
|
280 | $ hg init sub | |
281 | $ echo a > sub/suba |
|
281 | $ echo a > sub/suba | |
282 | $ hg -R sub add sub/suba |
|
282 | $ hg -R sub add sub/suba | |
283 | $ hg -R sub ci -m sub |
|
283 | $ hg -R sub ci -m sub | |
284 | $ echo 'sub = sub' > .hgsub |
|
284 | $ echo 'sub = sub' > .hgsub | |
285 | $ hg init sub2 |
|
285 | $ hg init sub2 | |
286 | $ echo b > sub2/b |
|
286 | $ echo b > sub2/b | |
287 | $ hg -R sub2 ci -Am sub2 |
|
287 | $ hg -R sub2 ci -Am sub2 | |
288 | adding b |
|
288 | adding b | |
289 | $ echo 'sub2 = sub2' >> .hgsub |
|
289 | $ echo 'sub2 = sub2' >> .hgsub | |
290 | $ fileset 'subrepo()' |
|
290 | $ fileset 'subrepo()' | |
291 | $ hg add .hgsub |
|
291 | $ hg add .hgsub | |
292 | $ fileset 'subrepo()' |
|
292 | $ fileset 'subrepo()' | |
293 | sub |
|
293 | sub | |
294 | sub2 |
|
294 | sub2 | |
295 | $ fileset 'subrepo("sub")' |
|
295 | $ fileset 'subrepo("sub")' | |
296 | sub |
|
296 | sub | |
297 | $ fileset 'subrepo("glob:*")' |
|
297 | $ fileset 'subrepo("glob:*")' | |
298 | sub |
|
298 | sub | |
299 | sub2 |
|
299 | sub2 | |
300 | $ hg ci -m subrepo |
|
300 | $ hg ci -m subrepo | |
301 |
|
301 | |||
302 | Test that .hgsubstate is updated as appropriate during a conversion. The |
|
302 | Test that .hgsubstate is updated as appropriate during a conversion. The | |
303 | saverev property is enough to alter the hashes of the subrepo. |
|
303 | saverev property is enough to alter the hashes of the subrepo. | |
304 |
|
304 | |||
305 | $ hg init ../converted |
|
305 | $ hg init ../converted | |
306 | $ hg --config extensions.convert= convert --config convert.hg.saverev=True \ |
|
306 | $ hg --config extensions.convert= convert --config convert.hg.saverev=True \ | |
307 | > sub ../converted/sub |
|
307 | > sub ../converted/sub | |
308 | initializing destination ../converted/sub repository |
|
308 | initializing destination ../converted/sub repository | |
309 | scanning source... |
|
309 | scanning source... | |
310 | sorting... |
|
310 | sorting... | |
311 | converting... |
|
311 | converting... | |
312 | 0 sub |
|
312 | 0 sub | |
313 | $ hg clone -U sub2 ../converted/sub2 |
|
313 | $ hg clone -U sub2 ../converted/sub2 | |
314 | $ hg --config extensions.convert= convert --config convert.hg.saverev=True \ |
|
314 | $ hg --config extensions.convert= convert --config convert.hg.saverev=True \ | |
315 | > . ../converted |
|
315 | > . ../converted | |
316 | scanning source... |
|
316 | scanning source... | |
317 | sorting... |
|
317 | sorting... | |
318 | converting... |
|
318 | converting... | |
319 | 4 addfiles |
|
319 | 4 addfiles | |
320 | 3 manychanges |
|
320 | 3 manychanges | |
321 | 2 diverging |
|
321 | 2 diverging | |
322 | 1 merge |
|
322 | 1 merge | |
323 | 0 subrepo |
|
323 | 0 subrepo | |
324 | no ".hgsubstate" updates will be made for "sub2" |
|
324 | no ".hgsubstate" updates will be made for "sub2" | |
325 | $ hg up -q -R ../converted -r tip |
|
325 | $ hg up -q -R ../converted -r tip | |
326 | $ hg --cwd ../converted cat sub/suba sub2/b -r tip |
|
326 | $ hg --cwd ../converted cat sub/suba sub2/b -r tip | |
327 | a |
|
327 | a | |
328 | b |
|
328 | b | |
329 | $ oldnode=`hg log -r tip -T "{node}\n"` |
|
329 | $ oldnode=`hg log -r tip -T "{node}\n"` | |
330 | $ newnode=`hg log -R ../converted -r tip -T "{node}\n"` |
|
330 | $ newnode=`hg log -R ../converted -r tip -T "{node}\n"` | |
331 | $ [ "$oldnode" != "$newnode" ] || echo "nothing changed" |
|
331 | $ [ "$oldnode" != "$newnode" ] || echo "nothing changed" | |
332 |
|
332 | |||
333 | Test with a revision |
|
333 | Test with a revision | |
334 |
|
334 | |||
335 | $ hg log -G --template '{rev} {desc}\n' |
|
335 | $ hg log -G --template '{rev} {desc}\n' | |
336 | @ 4 subrepo |
|
336 | @ 4 subrepo | |
337 | | |
|
337 | | | |
338 | o 3 merge |
|
338 | o 3 merge | |
339 | |\ |
|
339 | |\ | |
340 | | o 2 diverging |
|
340 | | o 2 diverging | |
341 | | | |
|
341 | | | | |
342 | o | 1 manychanges |
|
342 | o | 1 manychanges | |
343 | |/ |
|
343 | |/ | |
344 | o 0 addfiles |
|
344 | o 0 addfiles | |
345 |
|
345 | |||
346 | $ echo unknown > unknown |
|
346 | $ echo unknown > unknown | |
347 | $ fileset -r1 'modified()' |
|
347 | $ fileset -r1 'modified()' | |
348 | b2 |
|
348 | b2 | |
349 | $ fileset -r1 'added() and c1' |
|
349 | $ fileset -r1 'added() and c1' | |
350 | c1 |
|
350 | c1 | |
351 | $ fileset -r1 'removed()' |
|
351 | $ fileset -r1 'removed()' | |
352 | a2 |
|
352 | a2 | |
353 | $ fileset -r1 'deleted()' |
|
353 | $ fileset -r1 'deleted()' | |
354 | $ fileset -r1 'unknown()' |
|
354 | $ fileset -r1 'unknown()' | |
355 | $ fileset -r1 'ignored()' |
|
355 | $ fileset -r1 'ignored()' | |
356 | $ fileset -r1 'hgignore()' |
|
356 | $ fileset -r1 'hgignore()' | |
357 | b2 |
|
357 | b2 | |
358 | bin |
|
358 | bin | |
359 | $ fileset -r1 'binary()' |
|
359 | $ fileset -r1 'binary()' | |
360 | bin |
|
360 | bin | |
361 | $ fileset -r1 'size(1k)' |
|
361 | $ fileset -r1 'size(1k)' | |
362 | 1k |
|
362 | 1k | |
363 | $ fileset -r3 'resolved()' |
|
363 | $ fileset -r3 'resolved()' | |
364 | $ fileset -r3 'unresolved()' |
|
364 | $ fileset -r3 'unresolved()' | |
365 |
|
365 | |||
366 | #if execbit |
|
366 | #if execbit | |
367 | $ fileset -r1 'exec()' |
|
367 | $ fileset -r1 'exec()' | |
368 | b2 |
|
368 | b2 | |
369 | #endif |
|
369 | #endif | |
370 |
|
370 | |||
371 | #if symlink |
|
371 | #if symlink | |
372 | $ fileset -r1 'symlink()' |
|
372 | $ fileset -r1 'symlink()' | |
373 | b2link |
|
373 | b2link | |
374 | #endif |
|
374 | #endif | |
375 |
|
375 | |||
376 | #if no-windows |
|
376 | #if no-windows | |
377 | $ fileset -r1 'not portable()' |
|
377 | $ fileset -r1 'not portable()' | |
378 | con.xml |
|
378 | con.xml | |
379 | $ hg forget 'con.xml' |
|
379 | $ hg forget 'con.xml' | |
380 | #endif |
|
380 | #endif | |
381 |
|
381 | |||
382 | $ fileset -r4 'subrepo("re:su.*")' |
|
382 | $ fileset -r4 'subrepo("re:su.*")' | |
383 | sub |
|
383 | sub | |
384 | sub2 |
|
384 | sub2 | |
385 | $ fileset -r4 'subrepo(re:su.*)' |
|
385 | $ fileset -r4 'subrepo(re:su.*)' | |
386 | sub |
|
386 | sub | |
387 | sub2 |
|
387 | sub2 | |
388 | $ fileset -r4 'subrepo("sub")' |
|
388 | $ fileset -r4 'subrepo("sub")' | |
389 | sub |
|
389 | sub | |
390 | $ fileset -r4 'b2 or c1' |
|
390 | $ fileset -r4 'b2 or c1' | |
391 | b2 |
|
391 | b2 | |
392 | c1 |
|
392 | c1 | |
393 |
|
393 | |||
394 | >>> open('dos', 'wb').write(b"dos\r\n") and None |
|
394 | >>> open('dos', 'wb').write(b"dos\r\n") and None | |
395 | >>> open('mixed', 'wb').write(b"dos\r\nunix\n") and None |
|
395 | >>> open('mixed', 'wb').write(b"dos\r\nunix\n") and None | |
396 | >>> open('mac', 'wb').write(b"mac\r") and None |
|
396 | >>> open('mac', 'wb').write(b"mac\r") and None | |
397 | $ hg add dos mixed mac |
|
397 | $ hg add dos mixed mac | |
398 |
|
398 | |||
399 | (remove a1, to examine safety of 'eol' on removed files) |
|
399 | (remove a1, to examine safety of 'eol' on removed files) | |
400 | $ rm a1 |
|
400 | $ rm a1 | |
401 |
|
401 | |||
402 | $ fileset 'eol(dos)' |
|
402 | $ fileset 'eol(dos)' | |
403 | dos |
|
403 | dos | |
404 | mixed |
|
404 | mixed | |
405 | $ fileset 'eol(unix)' |
|
405 | $ fileset 'eol(unix)' | |
406 | mixed |
|
406 | mixed | |
407 | .hgsub |
|
407 | .hgsub | |
408 | .hgsubstate |
|
408 | .hgsubstate | |
409 | b1 |
|
409 | b1 | |
410 | b2 |
|
410 | b2 | |
411 | c1 |
|
411 | c1 | |
412 | $ fileset 'eol(mac)' |
|
412 | $ fileset 'eol(mac)' | |
413 | mac |
|
413 | mac | |
414 |
|
414 | |||
415 | Test safety of 'encoding' on removed files |
|
415 | Test safety of 'encoding' on removed files | |
416 |
|
416 | |||
417 | $ fileset 'encoding("ascii")' |
|
417 | $ fileset 'encoding("ascii")' | |
418 | dos |
|
418 | dos | |
419 | mac |
|
419 | mac | |
420 | mixed |
|
420 | mixed | |
421 | .hgsub |
|
421 | .hgsub | |
422 | .hgsubstate |
|
422 | .hgsubstate | |
423 | 1k |
|
423 | 1k | |
424 | 2k |
|
424 | 2k | |
425 | b1 |
|
425 | b1 | |
426 | b2 |
|
426 | b2 | |
427 | b2link (symlink !) |
|
427 | b2link (symlink !) | |
428 | bin |
|
428 | bin | |
429 | c1 |
|
429 | c1 | |
430 |
|
430 | |||
431 | Test detection of unintentional 'matchctx.existing()' invocation |
|
431 | Test detection of unintentional 'matchctx.existing()' invocation | |
432 |
|
432 | |||
433 | $ cat > $TESTTMP/existingcaller.py <<EOF |
|
433 | $ cat > $TESTTMP/existingcaller.py <<EOF | |
434 | > from mercurial import registrar |
|
434 | > from mercurial import registrar | |
435 | > |
|
435 | > | |
436 | > filesetpredicate = registrar.filesetpredicate() |
|
436 | > filesetpredicate = registrar.filesetpredicate() | |
437 | > @filesetpredicate('existingcaller()', callexisting=False) |
|
437 | > @filesetpredicate(b'existingcaller()', callexisting=False) | |
438 | > def existingcaller(mctx, x): |
|
438 | > def existingcaller(mctx, x): | |
439 | > # this 'mctx.existing()' invocation is unintentional |
|
439 | > # this 'mctx.existing()' invocation is unintentional | |
440 | > return [f for f in mctx.existing()] |
|
440 | > return [f for f in mctx.existing()] | |
441 | > EOF |
|
441 | > EOF | |
442 |
|
442 | |||
443 | $ cat >> .hg/hgrc <<EOF |
|
443 | $ cat >> .hg/hgrc <<EOF | |
444 | > [extensions] |
|
444 | > [extensions] | |
445 | > existingcaller = $TESTTMP/existingcaller.py |
|
445 | > existingcaller = $TESTTMP/existingcaller.py | |
446 | > EOF |
|
446 | > EOF | |
447 |
|
447 | |||
448 | $ fileset 'existingcaller()' 2>&1 | tail -1 |
|
448 | $ fileset 'existingcaller()' 2>&1 | tail -1 | |
449 | AssertionError: unexpected existing() invocation |
|
449 | AssertionError: unexpected existing() invocation | |
450 |
|
450 | |||
451 | Test 'revs(...)' |
|
451 | Test 'revs(...)' | |
452 | ================ |
|
452 | ================ | |
453 |
|
453 | |||
454 | small reminder of the repository state |
|
454 | small reminder of the repository state | |
455 |
|
455 | |||
456 | $ hg log -G |
|
456 | $ hg log -G | |
457 | @ changeset: 4:* (glob) |
|
457 | @ changeset: 4:* (glob) | |
458 | | tag: tip |
|
458 | | tag: tip | |
459 | | user: test |
|
459 | | user: test | |
460 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
460 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
461 | | summary: subrepo |
|
461 | | summary: subrepo | |
462 | | |
|
462 | | | |
463 | o changeset: 3:* (glob) |
|
463 | o changeset: 3:* (glob) | |
464 | |\ parent: 2:55b05bdebf36 |
|
464 | |\ parent: 2:55b05bdebf36 | |
465 | | | parent: 1:* (glob) |
|
465 | | | parent: 1:* (glob) | |
466 | | | user: test |
|
466 | | | user: test | |
467 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
467 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
468 | | | summary: merge |
|
468 | | | summary: merge | |
469 | | | |
|
469 | | | | |
470 | | o changeset: 2:55b05bdebf36 |
|
470 | | o changeset: 2:55b05bdebf36 | |
471 | | | parent: 0:8a9576c51c1f |
|
471 | | | parent: 0:8a9576c51c1f | |
472 | | | user: test |
|
472 | | | user: test | |
473 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
473 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
474 | | | summary: diverging |
|
474 | | | summary: diverging | |
475 | | | |
|
475 | | | | |
476 | o | changeset: 1:* (glob) |
|
476 | o | changeset: 1:* (glob) | |
477 | |/ user: test |
|
477 | |/ user: test | |
478 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
478 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
479 | | summary: manychanges |
|
479 | | summary: manychanges | |
480 | | |
|
480 | | | |
481 | o changeset: 0:8a9576c51c1f |
|
481 | o changeset: 0:8a9576c51c1f | |
482 | user: test |
|
482 | user: test | |
483 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
483 | date: Thu Jan 01 00:00:00 1970 +0000 | |
484 | summary: addfiles |
|
484 | summary: addfiles | |
485 |
|
485 | |||
486 | $ hg status --change 0 |
|
486 | $ hg status --change 0 | |
487 | A a1 |
|
487 | A a1 | |
488 | A a2 |
|
488 | A a2 | |
489 | A b1 |
|
489 | A b1 | |
490 | A b2 |
|
490 | A b2 | |
491 | $ hg status --change 1 |
|
491 | $ hg status --change 1 | |
492 | M b2 |
|
492 | M b2 | |
493 | A 1k |
|
493 | A 1k | |
494 | A 2k |
|
494 | A 2k | |
495 | A b2link (no-windows !) |
|
495 | A b2link (no-windows !) | |
496 | A bin |
|
496 | A bin | |
497 | A c1 |
|
497 | A c1 | |
498 | A con.xml (no-windows !) |
|
498 | A con.xml (no-windows !) | |
499 | R a2 |
|
499 | R a2 | |
500 | $ hg status --change 2 |
|
500 | $ hg status --change 2 | |
501 | M b2 |
|
501 | M b2 | |
502 | $ hg status --change 3 |
|
502 | $ hg status --change 3 | |
503 | M b2 |
|
503 | M b2 | |
504 | A 1k |
|
504 | A 1k | |
505 | A 2k |
|
505 | A 2k | |
506 | A b2link (no-windows !) |
|
506 | A b2link (no-windows !) | |
507 | A bin |
|
507 | A bin | |
508 | A c1 |
|
508 | A c1 | |
509 | A con.xml (no-windows !) |
|
509 | A con.xml (no-windows !) | |
510 | R a2 |
|
510 | R a2 | |
511 | $ hg status --change 4 |
|
511 | $ hg status --change 4 | |
512 | A .hgsub |
|
512 | A .hgsub | |
513 | A .hgsubstate |
|
513 | A .hgsubstate | |
514 | $ hg status |
|
514 | $ hg status | |
515 | A dos |
|
515 | A dos | |
516 | A mac |
|
516 | A mac | |
517 | A mixed |
|
517 | A mixed | |
518 | R con.xml (no-windows !) |
|
518 | R con.xml (no-windows !) | |
519 | ! a1 |
|
519 | ! a1 | |
520 | ? b2.orig |
|
520 | ? b2.orig | |
521 | ? c3 |
|
521 | ? c3 | |
522 | ? unknown |
|
522 | ? unknown | |
523 |
|
523 | |||
524 | Test files at -r0 should be filtered by files at wdir |
|
524 | Test files at -r0 should be filtered by files at wdir | |
525 | ----------------------------------------------------- |
|
525 | ----------------------------------------------------- | |
526 |
|
526 | |||
527 | $ fileset -r0 '* and revs("wdir()", *)' |
|
527 | $ fileset -r0 '* and revs("wdir()", *)' | |
528 | a1 |
|
528 | a1 | |
529 | b1 |
|
529 | b1 | |
530 | b2 |
|
530 | b2 | |
531 |
|
531 | |||
532 | Test that "revs()" work at all |
|
532 | Test that "revs()" work at all | |
533 | ------------------------------ |
|
533 | ------------------------------ | |
534 |
|
534 | |||
535 | $ fileset "revs('2', modified())" |
|
535 | $ fileset "revs('2', modified())" | |
536 | b2 |
|
536 | b2 | |
537 |
|
537 | |||
538 | Test that "revs()" work for file missing in the working copy/current context |
|
538 | Test that "revs()" work for file missing in the working copy/current context | |
539 | ---------------------------------------------------------------------------- |
|
539 | ---------------------------------------------------------------------------- | |
540 |
|
540 | |||
541 | (a2 not in working copy) |
|
541 | (a2 not in working copy) | |
542 |
|
542 | |||
543 | $ fileset "revs('0', added())" |
|
543 | $ fileset "revs('0', added())" | |
544 | a1 |
|
544 | a1 | |
545 | a2 |
|
545 | a2 | |
546 | b1 |
|
546 | b1 | |
547 | b2 |
|
547 | b2 | |
548 |
|
548 | |||
549 | (none of the file exist in "0") |
|
549 | (none of the file exist in "0") | |
550 |
|
550 | |||
551 | $ fileset -r 0 "revs('4', added())" |
|
551 | $ fileset -r 0 "revs('4', added())" | |
552 | .hgsub |
|
552 | .hgsub | |
553 | .hgsubstate |
|
553 | .hgsubstate | |
554 |
|
554 | |||
555 | Call with empty revset |
|
555 | Call with empty revset | |
556 | -------------------------- |
|
556 | -------------------------- | |
557 |
|
557 | |||
558 | $ fileset "revs('2-2', modified())" |
|
558 | $ fileset "revs('2-2', modified())" | |
559 |
|
559 | |||
560 | Call with revset matching multiple revs |
|
560 | Call with revset matching multiple revs | |
561 | --------------------------------------- |
|
561 | --------------------------------------- | |
562 |
|
562 | |||
563 | $ fileset "revs('0+4', added())" |
|
563 | $ fileset "revs('0+4', added())" | |
564 | a1 |
|
564 | a1 | |
565 | a2 |
|
565 | a2 | |
566 | b1 |
|
566 | b1 | |
567 | b2 |
|
567 | b2 | |
568 | .hgsub |
|
568 | .hgsub | |
569 | .hgsubstate |
|
569 | .hgsubstate | |
570 |
|
570 | |||
571 | overlapping set |
|
571 | overlapping set | |
572 |
|
572 | |||
573 | $ fileset "revs('1+2', modified())" |
|
573 | $ fileset "revs('1+2', modified())" | |
574 | b2 |
|
574 | b2 | |
575 |
|
575 | |||
576 | test 'status(...)' |
|
576 | test 'status(...)' | |
577 | ================= |
|
577 | ================= | |
578 |
|
578 | |||
579 | Simple case |
|
579 | Simple case | |
580 | ----------- |
|
580 | ----------- | |
581 |
|
581 | |||
582 | $ fileset "status(3, 4, added())" |
|
582 | $ fileset "status(3, 4, added())" | |
583 | .hgsub |
|
583 | .hgsub | |
584 | .hgsubstate |
|
584 | .hgsubstate | |
585 |
|
585 | |||
586 | use rev to restrict matched file |
|
586 | use rev to restrict matched file | |
587 | ----------------------------------------- |
|
587 | ----------------------------------------- | |
588 |
|
588 | |||
589 | $ hg status --removed --rev 0 --rev 1 |
|
589 | $ hg status --removed --rev 0 --rev 1 | |
590 | R a2 |
|
590 | R a2 | |
591 | $ fileset "status(0, 1, removed())" |
|
591 | $ fileset "status(0, 1, removed())" | |
592 | a2 |
|
592 | a2 | |
593 | $ fileset "* and status(0, 1, removed())" |
|
593 | $ fileset "* and status(0, 1, removed())" | |
594 | $ fileset -r 4 "status(0, 1, removed())" |
|
594 | $ fileset -r 4 "status(0, 1, removed())" | |
595 | a2 |
|
595 | a2 | |
596 | $ fileset -r 4 "* and status(0, 1, removed())" |
|
596 | $ fileset -r 4 "* and status(0, 1, removed())" | |
597 | $ fileset "revs('4', * and status(0, 1, removed()))" |
|
597 | $ fileset "revs('4', * and status(0, 1, removed()))" | |
598 | $ fileset "revs('0', * and status(0, 1, removed()))" |
|
598 | $ fileset "revs('0', * and status(0, 1, removed()))" | |
599 | a2 |
|
599 | a2 | |
600 |
|
600 | |||
601 | check wdir() |
|
601 | check wdir() | |
602 | ------------ |
|
602 | ------------ | |
603 |
|
603 | |||
604 | $ hg status --removed --rev 4 |
|
604 | $ hg status --removed --rev 4 | |
605 | R con.xml (no-windows !) |
|
605 | R con.xml (no-windows !) | |
606 | $ fileset "status(4, 'wdir()', removed())" |
|
606 | $ fileset "status(4, 'wdir()', removed())" | |
607 | con.xml (no-windows !) |
|
607 | con.xml (no-windows !) | |
608 |
|
608 | |||
609 | $ hg status --removed --rev 2 |
|
609 | $ hg status --removed --rev 2 | |
610 | R a2 |
|
610 | R a2 | |
611 | $ fileset "status('2', 'wdir()', removed())" |
|
611 | $ fileset "status('2', 'wdir()', removed())" | |
612 | a2 |
|
612 | a2 | |
613 |
|
613 | |||
614 | test backward status |
|
614 | test backward status | |
615 | -------------------- |
|
615 | -------------------- | |
616 |
|
616 | |||
617 | $ hg status --removed --rev 0 --rev 4 |
|
617 | $ hg status --removed --rev 0 --rev 4 | |
618 | R a2 |
|
618 | R a2 | |
619 | $ hg status --added --rev 4 --rev 0 |
|
619 | $ hg status --added --rev 4 --rev 0 | |
620 | A a2 |
|
620 | A a2 | |
621 | $ fileset "status(4, 0, added())" |
|
621 | $ fileset "status(4, 0, added())" | |
622 | a2 |
|
622 | a2 | |
623 |
|
623 | |||
624 | test cross branch status |
|
624 | test cross branch status | |
625 | ------------------------ |
|
625 | ------------------------ | |
626 |
|
626 | |||
627 | $ hg status --added --rev 1 --rev 2 |
|
627 | $ hg status --added --rev 1 --rev 2 | |
628 | A a2 |
|
628 | A a2 | |
629 | $ fileset "status(1, 2, added())" |
|
629 | $ fileset "status(1, 2, added())" | |
630 | a2 |
|
630 | a2 | |
631 |
|
631 | |||
632 | test with multi revs revset |
|
632 | test with multi revs revset | |
633 | --------------------------- |
|
633 | --------------------------- | |
634 | $ hg status --added --rev 0:1 --rev 3:4 |
|
634 | $ hg status --added --rev 0:1 --rev 3:4 | |
635 | A .hgsub |
|
635 | A .hgsub | |
636 | A .hgsubstate |
|
636 | A .hgsubstate | |
637 | A 1k |
|
637 | A 1k | |
638 | A 2k |
|
638 | A 2k | |
639 | A b2link (no-windows !) |
|
639 | A b2link (no-windows !) | |
640 | A bin |
|
640 | A bin | |
641 | A c1 |
|
641 | A c1 | |
642 | A con.xml (no-windows !) |
|
642 | A con.xml (no-windows !) | |
643 | $ fileset "status('0:1', '3:4', added())" |
|
643 | $ fileset "status('0:1', '3:4', added())" | |
644 | .hgsub |
|
644 | .hgsub | |
645 | .hgsubstate |
|
645 | .hgsubstate | |
646 | 1k |
|
646 | 1k | |
647 | 2k |
|
647 | 2k | |
648 | b2link (no-windows !) |
|
648 | b2link (no-windows !) | |
649 | bin |
|
649 | bin | |
650 | c1 |
|
650 | c1 | |
651 | con.xml (no-windows !) |
|
651 | con.xml (no-windows !) | |
652 |
|
652 | |||
653 | tests with empty value |
|
653 | tests with empty value | |
654 | ---------------------- |
|
654 | ---------------------- | |
655 |
|
655 | |||
656 | Fully empty revset |
|
656 | Fully empty revset | |
657 |
|
657 | |||
658 | $ fileset "status('', '4', added())" |
|
658 | $ fileset "status('', '4', added())" | |
659 | hg: parse error: first argument to status must be a revision |
|
659 | hg: parse error: first argument to status must be a revision | |
660 | [255] |
|
660 | [255] | |
661 | $ fileset "status('2', '', added())" |
|
661 | $ fileset "status('2', '', added())" | |
662 | hg: parse error: second argument to status must be a revision |
|
662 | hg: parse error: second argument to status must be a revision | |
663 | [255] |
|
663 | [255] | |
664 |
|
664 | |||
665 | Empty revset will error at the revset layer |
|
665 | Empty revset will error at the revset layer | |
666 |
|
666 | |||
667 | $ fileset "status(' ', '4', added())" |
|
667 | $ fileset "status(' ', '4', added())" | |
668 | hg: parse error at 1: not a prefix: end |
|
668 | hg: parse error at 1: not a prefix: end | |
669 | ( |
|
669 | ( | |
670 | ^ here) |
|
670 | ^ here) | |
671 | [255] |
|
671 | [255] | |
672 | $ fileset "status('2', ' ', added())" |
|
672 | $ fileset "status('2', ' ', added())" | |
673 | hg: parse error at 1: not a prefix: end |
|
673 | hg: parse error at 1: not a prefix: end | |
674 | ( |
|
674 | ( | |
675 | ^ here) |
|
675 | ^ here) | |
676 | [255] |
|
676 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now