##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: include progress for test-remove
timeless -
r28606:8cc51c5a default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -7,6 +7,18 b''
7 > hg up -C
7 > hg up -C
8 > }
8 > }
9
9
10 $ cat >> $HGRCPATH <<EOF
11 > [progress]
12 > disable=False
13 > assume-tty = 1
14 > delay = 0
15 > # set changedelay really large so we don't see nested topics
16 > changedelay = 30000
17 > format = topic bar number
18 > refresh = 0
19 > width = 60
20 > EOF
21
10 $ hg init a
22 $ hg init a
11 $ cd a
23 $ cd a
12 $ echo a > foo
24 $ echo a > foo
@@ -34,6 +46,9 b' 00 state added, options none'
34 A bar
46 A bar
35 ./bar
47 ./bar
36 ./foo
48 ./foo
49 \r (no-eol) (esc)
50 updating [===========================================>] 1/1\r (no-eol) (esc)
51 \r (no-eol) (esc)
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
52 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
38
53
39 01 state clean, options none
54 01 state clean, options none
@@ -43,6 +58,9 b' 01 state clean, options none'
43 R foo
58 R foo
44 ? bar
59 ? bar
45 ./bar
60 ./bar
61 \r (no-eol) (esc)
62 updating [===========================================>] 1/1\r (no-eol) (esc)
63 \r (no-eol) (esc)
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
47
65
48 02 state modified, options none
66 02 state modified, options none
@@ -55,6 +73,9 b' 02 state modified, options none'
55 ? bar
73 ? bar
56 ./bar
74 ./bar
57 ./foo
75 ./foo
76 \r (no-eol) (esc)
77 updating [===========================================>] 1/1\r (no-eol) (esc)
78 \r (no-eol) (esc)
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
59
80
60 03 state missing, options none
81 03 state missing, options none
@@ -65,6 +86,9 b' 03 state missing, options none'
65 R foo
86 R foo
66 ? bar
87 ? bar
67 ./bar
88 ./bar
89 \r (no-eol) (esc)
90 updating [===========================================>] 1/1\r (no-eol) (esc)
91 \r (no-eol) (esc)
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69
93
70 10 state added, options -f
94 10 state added, options -f
@@ -84,6 +108,9 b' 11 state clean, options -f'
84 $ remove -f foo
108 $ remove -f foo
85 exit code: 0
109 exit code: 0
86 R foo
110 R foo
111 \r (no-eol) (esc)
112 updating [===========================================>] 1/1\r (no-eol) (esc)
113 \r (no-eol) (esc)
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
88
115
89 12 state modified, options -f
116 12 state modified, options -f
@@ -92,6 +119,9 b' 12 state modified, options -f'
92 $ remove -f foo
119 $ remove -f foo
93 exit code: 0
120 exit code: 0
94 R foo
121 R foo
122 \r (no-eol) (esc)
123 updating [===========================================>] 1/1\r (no-eol) (esc)
124 \r (no-eol) (esc)
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
96
126
97 13 state missing, options -f
127 13 state missing, options -f
@@ -100,6 +130,9 b' 13 state missing, options -f'
100 $ remove -f foo
130 $ remove -f foo
101 exit code: 0
131 exit code: 0
102 R foo
132 R foo
133 \r (no-eol) (esc)
134 updating [===========================================>] 1/1\r (no-eol) (esc)
135 \r (no-eol) (esc)
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
136 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
104
137
105 20 state added, options -A
138 20 state added, options -A
@@ -112,6 +145,9 b' 20 state added, options -A'
112 A bar
145 A bar
113 ./bar
146 ./bar
114 ./foo
147 ./foo
148 \r (no-eol) (esc)
149 updating [===========================================>] 1/1\r (no-eol) (esc)
150 \r (no-eol) (esc)
115 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
151 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
116
152
117 21 state clean, options -A
153 21 state clean, options -A
@@ -134,6 +170,9 b' 22 state modified, options -A'
134 ? bar
170 ? bar
135 ./bar
171 ./bar
136 ./foo
172 ./foo
173 \r (no-eol) (esc)
174 updating [===========================================>] 1/1\r (no-eol) (esc)
175 \r (no-eol) (esc)
137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
138
177
139 23 state missing, options -A
178 23 state missing, options -A
@@ -144,6 +183,9 b' 23 state missing, options -A'
144 R foo
183 R foo
145 ? bar
184 ? bar
146 ./bar
185 ./bar
186 \r (no-eol) (esc)
187 updating [===========================================>] 1/1\r (no-eol) (esc)
188 \r (no-eol) (esc)
147 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
189 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
148
190
149 30 state added, options -Af
191 30 state added, options -Af
@@ -164,6 +206,9 b' 31 state clean, options -Af'
164 exit code: 0
206 exit code: 0
165 R foo
207 R foo
166 ./foo
208 ./foo
209 \r (no-eol) (esc)
210 updating [===========================================>] 1/1\r (no-eol) (esc)
211 \r (no-eol) (esc)
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
168
213
169 32 state modified, options -Af
214 32 state modified, options -Af
@@ -173,6 +218,9 b' 32 state modified, options -Af'
173 exit code: 0
218 exit code: 0
174 R foo
219 R foo
175 ./foo
220 ./foo
221 \r (no-eol) (esc)
222 updating [===========================================>] 1/1\r (no-eol) (esc)
223 \r (no-eol) (esc)
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
177
225
178 33 state missing, options -Af
226 33 state missing, options -Af
@@ -181,6 +229,9 b' 33 state missing, options -Af'
181 $ remove -Af foo
229 $ remove -Af foo
182 exit code: 0
230 exit code: 0
183 R foo
231 R foo
232 \r (no-eol) (esc)
233 updating [===========================================>] 1/1\r (no-eol) (esc)
234 \r (no-eol) (esc)
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
235 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
185
236
186 test some directory stuff
237 test some directory stuff
@@ -202,6 +253,9 b' dir, options none'
202 R test/bar
253 R test/bar
203 R test/foo
254 R test/foo
204 ./foo
255 ./foo
256 \r (no-eol) (esc)
257 updating [===========================================>] 2/2\r (no-eol) (esc)
258 \r (no-eol) (esc)
205 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
259 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
206
260
207 dir, options -f
261 dir, options -f
@@ -214,6 +268,9 b' dir, options -f'
214 R test/bar
268 R test/bar
215 R test/foo
269 R test/foo
216 ./foo
270 ./foo
271 \r (no-eol) (esc)
272 updating [===========================================>] 2/2\r (no-eol) (esc)
273 \r (no-eol) (esc)
217 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
274 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
218
275
219 dir, options -A
276 dir, options -A
@@ -226,6 +283,9 b' dir, options -A'
226 R test/bar
283 R test/bar
227 ./foo
284 ./foo
228 ./test/foo
285 ./test/foo
286 \r (no-eol) (esc)
287 updating [===========================================>] 1/1\r (no-eol) (esc)
288 \r (no-eol) (esc)
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
230
290
231 dir, options -Af
291 dir, options -Af
@@ -239,6 +299,9 b' dir, options -Af'
239 R test/foo
299 R test/foo
240 ./foo
300 ./foo
241 ./test/foo
301 ./test/foo
302 \r (no-eol) (esc)
303 updating [===========================================>] 2/2\r (no-eol) (esc)
304 \r (no-eol) (esc)
242 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
305 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
243
306
244 test remove dropping empty trees (issue1861)
307 test remove dropping empty trees (issue1861)
Show file before | Show file after | Hide comments
@@ -2,6 +2,15 b''
2 > [extdiff]
2 > [extdiff]
3 > # for portability:
3 > # for portability:
4 > pdiff = sh "$RUNTESTDIR/pdiff"
4 > pdiff = sh "$RUNTESTDIR/pdiff"
5 > [progress]
6 > disable=False
7 > assume-tty = 1
8 > delay = 0
9 > # set changedelay really large so we don't see nested topics
10 > changedelay = 30000
11 > format = topic bar number
12 > refresh = 0
13 > width = 60
5 > EOF
14 > EOF
6
15
7 Preparing the subrepository 'sub2'
16 Preparing the subrepository 'sub2'
@@ -18,6 +27,17 b" Preparing the 'sub1' repo which depends "
18 $ echo sub1 > sub1/sub1
27 $ echo sub1 > sub1/sub1
19 $ echo "sub2 = ../sub2" > sub1/.hgsub
28 $ echo "sub2 = ../sub2" > sub1/.hgsub
20 $ hg clone sub2 sub1/sub2
29 $ hg clone sub2 sub1/sub2
30 \r (no-eol) (esc)
31 linking [ <=> ] 1\r (no-eol) (esc)
32 linking [ <=> ] 2\r (no-eol) (esc)
33 linking [ <=> ] 3\r (no-eol) (esc)
34 linking [ <=> ] 4\r (no-eol) (esc)
35 linking [ <=> ] 5\r (no-eol) (esc)
36 linking [ <=> ] 6\r (no-eol) (esc)
37 \r (no-eol) (esc)
38 \r (no-eol) (esc)
39 updating [===========================================>] 1/1\r (no-eol) (esc)
40 \r (no-eol) (esc)
21 updating to branch default
41 updating to branch default
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
23 $ hg add -R sub1
43 $ hg add -R sub1
@@ -31,6 +51,20 b" Preparing the 'main' repo which depends "
31 $ echo main > main/main
51 $ echo main > main/main
32 $ echo "sub1 = ../sub1" > main/.hgsub
52 $ echo "sub1 = ../sub1" > main/.hgsub
33 $ hg clone sub1 main/sub1
53 $ hg clone sub1 main/sub1
54 \r (no-eol) (esc)
55 linking [ <=> ] 1\r (no-eol) (esc)
56 linking [ <=> ] 2\r (no-eol) (esc)
57 linking [ <=> ] 3\r (no-eol) (esc)
58 linking [ <=> ] 4\r (no-eol) (esc)
59 linking [ <=> ] 5\r (no-eol) (esc)
60 linking [ <=> ] 6\r (no-eol) (esc)
61 linking [ <=> ] 7\r (no-eol) (esc)
62 linking [ <=> ] 8\r (no-eol) (esc)
63 \r (no-eol) (esc)
64 \r (no-eol) (esc)
65 updating [===========================================>] 3/3\r (no-eol) (esc)
66 updating [===========================================>] 1/1\r (no-eol) (esc)
67 \r (no-eol) (esc)
34 updating to branch default
68 updating to branch default
35 cloning subrepo sub2 from $TESTTMP/sub2
69 cloning subrepo sub2 from $TESTTMP/sub2
36 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
70 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -42,10 +76,28 b" Preparing the 'main' repo which depends "
42 Cleaning both repositories, just as a clone -U
76 Cleaning both repositories, just as a clone -U
43
77
44 $ hg up -C -R sub2 null
78 $ hg up -C -R sub2 null
79 \r (no-eol) (esc)
80 updating [===========================================>] 1/1\r (no-eol) (esc)
81 \r (no-eol) (esc)
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
46 $ hg up -C -R sub1 null
83 $ hg up -C -R sub1 null
84 \r (no-eol) (esc)
85 updating [===========================================>] 1/1\r (no-eol) (esc)
86 \r (no-eol) (esc)
87 \r (no-eol) (esc)
88 updating [===========================================>] 3/3\r (no-eol) (esc)
89 \r (no-eol) (esc)
47 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
90 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
48 $ hg up -C -R main null
91 $ hg up -C -R main null
92 \r (no-eol) (esc)
93 updating [===========================================>] 1/1\r (no-eol) (esc)
94 \r (no-eol) (esc)
95 \r (no-eol) (esc)
96 updating [===========================================>] 3/3\r (no-eol) (esc)
97 \r (no-eol) (esc)
98 \r (no-eol) (esc)
99 updating [===========================================>] 3/3\r (no-eol) (esc)
100 \r (no-eol) (esc)
49 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
101 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
50 $ rm -rf main/sub1
102 $ rm -rf main/sub1
51 $ rm -rf sub1/sub2
103 $ rm -rf sub1/sub2
@@ -53,6 +105,21 b' Cleaning both repositories, just as a cl'
53 Clone main
105 Clone main
54
106
55 $ hg --config extensions.largefiles= clone main cloned
107 $ hg --config extensions.largefiles= clone main cloned
108 \r (no-eol) (esc)
109 linking [ <=> ] 1\r (no-eol) (esc)
110 linking [ <=> ] 2\r (no-eol) (esc)
111 linking [ <=> ] 3\r (no-eol) (esc)
112 linking [ <=> ] 4\r (no-eol) (esc)
113 linking [ <=> ] 5\r (no-eol) (esc)
114 linking [ <=> ] 6\r (no-eol) (esc)
115 linking [ <=> ] 7\r (no-eol) (esc)
116 linking [ <=> ] 8\r (no-eol) (esc)
117 \r (no-eol) (esc)
118 \r (no-eol) (esc)
119 updating [===========================================>] 3/3\r (no-eol) (esc)
120 updating [===========================================>] 3/3\r (no-eol) (esc)
121 updating [===========================================>] 1/1\r (no-eol) (esc)
122 \r (no-eol) (esc)
56 updating to branch default
123 updating to branch default
57 cloning subrepo sub1 from $TESTTMP/sub1
124 cloning subrepo sub1 from $TESTTMP/sub1
58 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
125 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
@@ -165,6 +232,9 b' Test relative path printing + subrepos'
165 $ cd foo
232 $ cd foo
166 $ touch bar/abc
233 $ touch bar/abc
167 $ hg addremove -S ..
234 $ hg addremove -S ..
235 \r (no-eol) (esc)
236 searching for exact renames [ ] 0/1\r (no-eol) (esc)
237 \r (no-eol) (esc)
168 adding ../sub1/sub2/folder/test.txt (glob)
238 adding ../sub1/sub2/folder/test.txt (glob)
169 removing ../sub1/sub2/test.txt (glob)
239 removing ../sub1/sub2/test.txt (glob)
170 adding ../sub1/foo (glob)
240 adding ../sub1/foo (glob)
@@ -178,6 +248,24 b' Test relative path printing + subrepos'
178 Archive wdir() with subrepos
248 Archive wdir() with subrepos
179 $ hg rm main
249 $ hg rm main
180 $ hg archive -S -r 'wdir()' ../wdir
250 $ hg archive -S -r 'wdir()' ../wdir
251 \r (no-eol) (esc)
252 archiving [ ] 0/3\r (no-eol) (esc)
253 archiving [=============> ] 1/3\r (no-eol) (esc)
254 archiving [===========================> ] 2/3\r (no-eol) (esc)
255 archiving [==========================================>] 3/3\r (no-eol) (esc)
256 \r (no-eol) (esc)
257 \r (no-eol) (esc)
258 archiving (sub1) [ ] 0/4\r (no-eol) (esc)
259 archiving (sub1) [========> ] 1/4\r (no-eol) (esc)
260 archiving (sub1) [=================> ] 2/4\r (no-eol) (esc)
261 archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc)
262 archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
263 \r (no-eol) (esc)
264 \r (no-eol) (esc)
265 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
266 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
267 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
268 \r (no-eol) (esc)
181 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
269 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
182 Only in ../wdir: .hg_archival.txt
270 Only in ../wdir: .hg_archival.txt
183
271
@@ -205,6 +293,23 b" Attempting to archive 'wdir()' with a mi"
205 $ rm sub1/sub1
293 $ rm sub1/sub1
206 $ rm -r ../wdir
294 $ rm -r ../wdir
207 $ hg archive -v -S -r 'wdir()' ../wdir
295 $ hg archive -v -S -r 'wdir()' ../wdir
296 \r (no-eol) (esc)
297 archiving [ ] 0/3\r (no-eol) (esc)
298 archiving [=============> ] 1/3\r (no-eol) (esc)
299 archiving [===========================> ] 2/3\r (no-eol) (esc)
300 archiving [==========================================>] 3/3\r (no-eol) (esc)
301 \r (no-eol) (esc)
302 \r (no-eol) (esc)
303 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
304 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
305 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
306 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
307 \r (no-eol) (esc)
308 \r (no-eol) (esc)
309 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
310 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
311 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
312 \r (no-eol) (esc)
208 $ find ../wdir -type f | sort
313 $ find ../wdir -type f | sort
209 ../wdir/.hg_archival.txt
314 ../wdir/.hg_archival.txt
210 ../wdir/.hgsub
315 ../wdir/.hgsub
@@ -220,6 +325,24 b' Continue relative path printing + subrep'
220 $ hg update -Cq
325 $ hg update -Cq
221 $ rm -r ../wdir
326 $ rm -r ../wdir
222 $ hg archive -S -r 'wdir()' ../wdir
327 $ hg archive -S -r 'wdir()' ../wdir
328 \r (no-eol) (esc)
329 archiving [ ] 0/3\r (no-eol) (esc)
330 archiving [=============> ] 1/3\r (no-eol) (esc)
331 archiving [===========================> ] 2/3\r (no-eol) (esc)
332 archiving [==========================================>] 3/3\r (no-eol) (esc)
333 \r (no-eol) (esc)
334 \r (no-eol) (esc)
335 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
336 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
337 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
338 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
339 \r (no-eol) (esc)
340 \r (no-eol) (esc)
341 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
342 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
343 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
344 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
345 \r (no-eol) (esc)
223 $ cat ../wdir/.hg_archival.txt
346 $ cat ../wdir/.hg_archival.txt
224 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
347 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
225 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
348 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
@@ -333,6 +456,24 b' Files sees uncommitted adds and removes '
333 $ hg up -Cq
456 $ hg up -Cq
334
457
335 $ hg --config extensions.largefiles=! archive -S ../archive_all
458 $ hg --config extensions.largefiles=! archive -S ../archive_all
459 \r (no-eol) (esc)
460 archiving [ ] 0/3\r (no-eol) (esc)
461 archiving [=============> ] 1/3\r (no-eol) (esc)
462 archiving [===========================> ] 2/3\r (no-eol) (esc)
463 archiving [==========================================>] 3/3\r (no-eol) (esc)
464 \r (no-eol) (esc)
465 \r (no-eol) (esc)
466 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
467 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
468 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
469 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
470 \r (no-eol) (esc)
471 \r (no-eol) (esc)
472 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
473 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
474 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
475 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
476 \r (no-eol) (esc)
336 $ find ../archive_all | sort
477 $ find ../archive_all | sort
337 ../archive_all
478 ../archive_all
338 ../archive_all/.hg_archival.txt
479 ../archive_all/.hg_archival.txt
@@ -352,6 +493,22 b' Files sees uncommitted adds and removes '
352 Check that archive -X works in deep subrepos
493 Check that archive -X works in deep subrepos
353
494
354 $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
495 $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
496 \r (no-eol) (esc)
497 archiving [ ] 0/3\r (no-eol) (esc)
498 archiving [=============> ] 1/3\r (no-eol) (esc)
499 archiving [===========================> ] 2/3\r (no-eol) (esc)
500 archiving [==========================================>] 3/3\r (no-eol) (esc)
501 \r (no-eol) (esc)
502 \r (no-eol) (esc)
503 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
504 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
505 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
506 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
507 \r (no-eol) (esc)
508 \r (no-eol) (esc)
509 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
510 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
511 \r (no-eol) (esc)
355 $ find ../archive_exclude | sort
512 $ find ../archive_exclude | sort
356 ../archive_exclude
513 ../archive_exclude
357 ../archive_exclude/.hg_archival.txt
514 ../archive_exclude/.hg_archival.txt
@@ -366,6 +523,14 b' Check that archive -X works in deep subr'
366 ../archive_exclude/sub1/sub2/sub2
523 ../archive_exclude/sub1/sub2/sub2
367
524
368 $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
525 $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
526 \r (no-eol) (esc)
527 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
528 \r (no-eol) (esc)
529 \r (no-eol) (esc)
530 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
531 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
532 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
533 \r (no-eol) (esc)
369 $ find ../archive_include | sort
534 $ find ../archive_include | sort
370 ../archive_include
535 ../archive_include
371 ../archive_include/sub1
536 ../archive_include/sub1
@@ -726,6 +891,31 b' Interaction with extdiff, largefiles and'
726 $ hg --config extensions.extdiff= pdiff -S
891 $ hg --config extensions.extdiff= pdiff -S
727
892
728 $ hg --config extensions.extdiff= pdiff -r '.^' -S
893 $ hg --config extensions.extdiff= pdiff -r '.^' -S
894 \r (no-eol) (esc)
895 archiving [ ] 0/2\r (no-eol) (esc)
896 archiving [====================> ] 1/2\r (no-eol) (esc)
897 archiving [==========================================>] 2/2\r (no-eol) (esc)
898 \r (no-eol) (esc)
899 \r (no-eol) (esc)
900 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
901 \r (no-eol) (esc)
902 \r (no-eol) (esc)
903 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
904 \r (no-eol) (esc)
905 \r (no-eol) (esc)
906 archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
907 \r (no-eol) (esc)
908 \r (no-eol) (esc)
909 archiving [ ] 0/2\r (no-eol) (esc)
910 archiving [====================> ] 1/2\r (no-eol) (esc)
911 archiving [==========================================>] 2/2\r (no-eol) (esc)
912 \r (no-eol) (esc)
913 \r (no-eol) (esc)
914 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
915 \r (no-eol) (esc)
916 \r (no-eol) (esc)
917 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
918 \r (no-eol) (esc)
729 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
919 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
730 --- cloned.*/.hgsub * (glob)
920 --- cloned.*/.hgsub * (glob)
731 +++ cloned/.hgsub * (glob)
921 +++ cloned/.hgsub * (glob)
@@ -741,6 +931,45 b' Interaction with extdiff, largefiles and'
741 [1]
931 [1]
742
932
743 $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
933 $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
934 \r (no-eol) (esc)
935 archiving [ ] 0/3\r (no-eol) (esc)
936 archiving [=============> ] 1/3\r (no-eol) (esc)
937 archiving [===========================> ] 2/3\r (no-eol) (esc)
938 archiving [==========================================>] 3/3\r (no-eol) (esc)
939 \r (no-eol) (esc)
940 \r (no-eol) (esc)
941 archiving (sub1) [ ] 0/1\r (no-eol) (esc)
942 archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
943 \r (no-eol) (esc)
944 \r (no-eol) (esc)
945 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
946 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
947 \r (no-eol) (esc)
948 \r (no-eol) (esc)
949 archiving [ ] 0/8\r (no-eol) (esc)
950 archiving [====> ] 1/8\r (no-eol) (esc)
951 archiving [=========> ] 2/8\r (no-eol) (esc)
952 archiving [===============> ] 3/8\r (no-eol) (esc)
953 archiving [====================> ] 4/8\r (no-eol) (esc)
954 archiving [=========================> ] 5/8\r (no-eol) (esc)
955 archiving [===============================> ] 6/8\r (no-eol) (esc)
956 archiving [====================================> ] 7/8\r (no-eol) (esc)
957 archiving [==========================================>] 8/8\r (no-eol) (esc)
958 \r (no-eol) (esc)
959 \r (no-eol) (esc)
960 archiving (sub1) [ ] 0/1\r (no-eol) (esc)
961 archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
962 \r (no-eol) (esc)
963 \r (no-eol) (esc)
964 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
965 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
966 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
967 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
968 \r (no-eol) (esc)
969 \r (no-eol) (esc)
970 archiving (sub3) [ ] 0/1\r (no-eol) (esc)
971 archiving (sub3) [===================================>] 1/1\r (no-eol) (esc)
972 \r (no-eol) (esc)
744 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
973 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
745 --- cloned.*/.hglf/b.dat * (glob)
974 --- cloned.*/.hglf/b.dat * (glob)
746 +++ cloned.*/.hglf/b.dat * (glob)
975 +++ cloned.*/.hglf/b.dat * (glob)
@@ -806,6 +1035,13 b' Interaction with extdiff, largefiles and'
806
1035
807 $ echo mod > sub1/sub2/sub2
1036 $ echo mod > sub1/sub2/sub2
808 $ hg --config extensions.extdiff= pdiff -S
1037 $ hg --config extensions.extdiff= pdiff -S
1038 \r (no-eol) (esc)
1039 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
1040 \r (no-eol) (esc)
1041 \r (no-eol) (esc)
1042 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
1043 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
1044 \r (no-eol) (esc)
809 --- */cloned.*/sub1/sub2/sub2 * (glob)
1045 --- */cloned.*/sub1/sub2/sub2 * (glob)
810 +++ */cloned/sub1/sub2/sub2 * (glob)
1046 +++ */cloned/sub1/sub2/sub2 * (glob)
811 @@ -1* +1* @@ (glob)
1047 @@ -1* +1* @@ (glob)
General Comments 0
You need to be logged in to leave comments. Login now