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

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

test-subrepo-recursion: set progress.changedelay really high...
Augie Fackler -
r24612:30fc7cf4 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,546 +1,548 b''
1 Create test repository:
1 Create test repository:
2
2
3 $ hg init repo
3 $ hg init repo
4 $ cd repo
4 $ cd repo
5 $ echo x1 > x.txt
5 $ echo x1 > x.txt
6
6
7 $ hg init foo
7 $ hg init foo
8 $ cd foo
8 $ cd foo
9 $ echo y1 > y.txt
9 $ echo y1 > y.txt
10
10
11 $ hg init bar
11 $ hg init bar
12 $ cd bar
12 $ cd bar
13 $ echo z1 > z.txt
13 $ echo z1 > z.txt
14
14
15 $ cd ..
15 $ cd ..
16 $ echo 'bar = bar' > .hgsub
16 $ echo 'bar = bar' > .hgsub
17
17
18 $ cd ..
18 $ cd ..
19 $ echo 'foo = foo' > .hgsub
19 $ echo 'foo = foo' > .hgsub
20
20
21 Add files --- .hgsub files must go first to trigger subrepos:
21 Add files --- .hgsub files must go first to trigger subrepos:
22
22
23 $ hg add -S .hgsub
23 $ hg add -S .hgsub
24 $ hg add -S foo/.hgsub
24 $ hg add -S foo/.hgsub
25 $ hg add -S foo/bar
25 $ hg add -S foo/bar
26 adding foo/bar/z.txt (glob)
26 adding foo/bar/z.txt (glob)
27 $ hg add -S
27 $ hg add -S
28 adding x.txt
28 adding x.txt
29 adding foo/y.txt (glob)
29 adding foo/y.txt (glob)
30
30
31 Test recursive status without committing anything:
31 Test recursive status without committing anything:
32
32
33 $ hg status -S
33 $ hg status -S
34 A .hgsub
34 A .hgsub
35 A foo/.hgsub
35 A foo/.hgsub
36 A foo/bar/z.txt
36 A foo/bar/z.txt
37 A foo/y.txt
37 A foo/y.txt
38 A x.txt
38 A x.txt
39
39
40 Test recursive diff without committing anything:
40 Test recursive diff without committing anything:
41
41
42 $ hg diff --nodates -S foo
42 $ hg diff --nodates -S foo
43 diff -r 000000000000 foo/.hgsub
43 diff -r 000000000000 foo/.hgsub
44 --- /dev/null
44 --- /dev/null
45 +++ b/foo/.hgsub
45 +++ b/foo/.hgsub
46 @@ -0,0 +1,1 @@
46 @@ -0,0 +1,1 @@
47 +bar = bar
47 +bar = bar
48 diff -r 000000000000 foo/y.txt
48 diff -r 000000000000 foo/y.txt
49 --- /dev/null
49 --- /dev/null
50 +++ b/foo/y.txt
50 +++ b/foo/y.txt
51 @@ -0,0 +1,1 @@
51 @@ -0,0 +1,1 @@
52 +y1
52 +y1
53 diff -r 000000000000 foo/bar/z.txt
53 diff -r 000000000000 foo/bar/z.txt
54 --- /dev/null
54 --- /dev/null
55 +++ b/foo/bar/z.txt
55 +++ b/foo/bar/z.txt
56 @@ -0,0 +1,1 @@
56 @@ -0,0 +1,1 @@
57 +z1
57 +z1
58
58
59 Commits:
59 Commits:
60
60
61 $ hg commit -m fails
61 $ hg commit -m fails
62 abort: uncommitted changes in subrepository 'foo'
62 abort: uncommitted changes in subrepository 'foo'
63 (use --subrepos for recursive commit)
63 (use --subrepos for recursive commit)
64 [255]
64 [255]
65
65
66 The --subrepos flag overwrite the config setting:
66 The --subrepos flag overwrite the config setting:
67
67
68 $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
68 $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
69 committing subrepository foo
69 committing subrepository foo
70 committing subrepository foo/bar (glob)
70 committing subrepository foo/bar (glob)
71
71
72 $ cd foo
72 $ cd foo
73 $ echo y2 >> y.txt
73 $ echo y2 >> y.txt
74 $ hg commit -m 0-1-0
74 $ hg commit -m 0-1-0
75
75
76 $ cd bar
76 $ cd bar
77 $ echo z2 >> z.txt
77 $ echo z2 >> z.txt
78 $ hg commit -m 0-1-1
78 $ hg commit -m 0-1-1
79
79
80 $ cd ..
80 $ cd ..
81 $ hg commit -m 0-2-1
81 $ hg commit -m 0-2-1
82
82
83 $ cd ..
83 $ cd ..
84 $ hg commit -m 1-2-1
84 $ hg commit -m 1-2-1
85
85
86 Change working directory:
86 Change working directory:
87
87
88 $ echo y3 >> foo/y.txt
88 $ echo y3 >> foo/y.txt
89 $ echo z3 >> foo/bar/z.txt
89 $ echo z3 >> foo/bar/z.txt
90 $ hg status -S
90 $ hg status -S
91 M foo/bar/z.txt
91 M foo/bar/z.txt
92 M foo/y.txt
92 M foo/y.txt
93 $ hg diff --nodates -S
93 $ hg diff --nodates -S
94 diff -r d254738c5f5e foo/y.txt
94 diff -r d254738c5f5e foo/y.txt
95 --- a/foo/y.txt
95 --- a/foo/y.txt
96 +++ b/foo/y.txt
96 +++ b/foo/y.txt
97 @@ -1,2 +1,3 @@
97 @@ -1,2 +1,3 @@
98 y1
98 y1
99 y2
99 y2
100 +y3
100 +y3
101 diff -r 9647f22de499 foo/bar/z.txt
101 diff -r 9647f22de499 foo/bar/z.txt
102 --- a/foo/bar/z.txt
102 --- a/foo/bar/z.txt
103 +++ b/foo/bar/z.txt
103 +++ b/foo/bar/z.txt
104 @@ -1,2 +1,3 @@
104 @@ -1,2 +1,3 @@
105 z1
105 z1
106 z2
106 z2
107 +z3
107 +z3
108
108
109 Status call crossing repository boundaries:
109 Status call crossing repository boundaries:
110
110
111 $ hg status -S foo/bar/z.txt
111 $ hg status -S foo/bar/z.txt
112 M foo/bar/z.txt
112 M foo/bar/z.txt
113 $ hg status -S -I 'foo/?.txt'
113 $ hg status -S -I 'foo/?.txt'
114 M foo/y.txt
114 M foo/y.txt
115 $ hg status -S -I '**/?.txt'
115 $ hg status -S -I '**/?.txt'
116 M foo/bar/z.txt
116 M foo/bar/z.txt
117 M foo/y.txt
117 M foo/y.txt
118 $ hg diff --nodates -S -I '**/?.txt'
118 $ hg diff --nodates -S -I '**/?.txt'
119 diff -r d254738c5f5e foo/y.txt
119 diff -r d254738c5f5e foo/y.txt
120 --- a/foo/y.txt
120 --- a/foo/y.txt
121 +++ b/foo/y.txt
121 +++ b/foo/y.txt
122 @@ -1,2 +1,3 @@
122 @@ -1,2 +1,3 @@
123 y1
123 y1
124 y2
124 y2
125 +y3
125 +y3
126 diff -r 9647f22de499 foo/bar/z.txt
126 diff -r 9647f22de499 foo/bar/z.txt
127 --- a/foo/bar/z.txt
127 --- a/foo/bar/z.txt
128 +++ b/foo/bar/z.txt
128 +++ b/foo/bar/z.txt
129 @@ -1,2 +1,3 @@
129 @@ -1,2 +1,3 @@
130 z1
130 z1
131 z2
131 z2
132 +z3
132 +z3
133
133
134 Status from within a subdirectory:
134 Status from within a subdirectory:
135
135
136 $ mkdir dir
136 $ mkdir dir
137 $ cd dir
137 $ cd dir
138 $ echo a1 > a.txt
138 $ echo a1 > a.txt
139 $ hg status -S
139 $ hg status -S
140 M foo/bar/z.txt
140 M foo/bar/z.txt
141 M foo/y.txt
141 M foo/y.txt
142 ? dir/a.txt
142 ? dir/a.txt
143 $ hg diff --nodates -S
143 $ hg diff --nodates -S
144 diff -r d254738c5f5e foo/y.txt
144 diff -r d254738c5f5e foo/y.txt
145 --- a/foo/y.txt
145 --- a/foo/y.txt
146 +++ b/foo/y.txt
146 +++ b/foo/y.txt
147 @@ -1,2 +1,3 @@
147 @@ -1,2 +1,3 @@
148 y1
148 y1
149 y2
149 y2
150 +y3
150 +y3
151 diff -r 9647f22de499 foo/bar/z.txt
151 diff -r 9647f22de499 foo/bar/z.txt
152 --- a/foo/bar/z.txt
152 --- a/foo/bar/z.txt
153 +++ b/foo/bar/z.txt
153 +++ b/foo/bar/z.txt
154 @@ -1,2 +1,3 @@
154 @@ -1,2 +1,3 @@
155 z1
155 z1
156 z2
156 z2
157 +z3
157 +z3
158
158
159 Status with relative path:
159 Status with relative path:
160
160
161 $ hg status -S ..
161 $ hg status -S ..
162 M ../foo/bar/z.txt
162 M ../foo/bar/z.txt
163 M ../foo/y.txt
163 M ../foo/y.txt
164 ? a.txt
164 ? a.txt
165
165
166 XXX: filtering lfilesrepo.status() in 3.3-rc causes these files to be listed as
166 XXX: filtering lfilesrepo.status() in 3.3-rc causes these files to be listed as
167 added instead of modified.
167 added instead of modified.
168 $ hg status -S .. --config extensions.largefiles=
168 $ hg status -S .. --config extensions.largefiles=
169 M ../foo/bar/z.txt
169 M ../foo/bar/z.txt
170 M ../foo/y.txt
170 M ../foo/y.txt
171 ? a.txt
171 ? a.txt
172
172
173 $ hg diff --nodates -S ..
173 $ hg diff --nodates -S ..
174 diff -r d254738c5f5e foo/y.txt
174 diff -r d254738c5f5e foo/y.txt
175 --- a/foo/y.txt
175 --- a/foo/y.txt
176 +++ b/foo/y.txt
176 +++ b/foo/y.txt
177 @@ -1,2 +1,3 @@
177 @@ -1,2 +1,3 @@
178 y1
178 y1
179 y2
179 y2
180 +y3
180 +y3
181 diff -r 9647f22de499 foo/bar/z.txt
181 diff -r 9647f22de499 foo/bar/z.txt
182 --- a/foo/bar/z.txt
182 --- a/foo/bar/z.txt
183 +++ b/foo/bar/z.txt
183 +++ b/foo/bar/z.txt
184 @@ -1,2 +1,3 @@
184 @@ -1,2 +1,3 @@
185 z1
185 z1
186 z2
186 z2
187 +z3
187 +z3
188 $ cd ..
188 $ cd ..
189
189
190 Cleanup and final commit:
190 Cleanup and final commit:
191
191
192 $ rm -r dir
192 $ rm -r dir
193 $ hg commit --subrepos -m 2-3-2
193 $ hg commit --subrepos -m 2-3-2
194 committing subrepository foo
194 committing subrepository foo
195 committing subrepository foo/bar (glob)
195 committing subrepository foo/bar (glob)
196
196
197 Test explicit path commands within subrepos: add/forget
197 Test explicit path commands within subrepos: add/forget
198 $ echo z1 > foo/bar/z2.txt
198 $ echo z1 > foo/bar/z2.txt
199 $ hg status -S
199 $ hg status -S
200 ? foo/bar/z2.txt
200 ? foo/bar/z2.txt
201 $ hg add foo/bar/z2.txt
201 $ hg add foo/bar/z2.txt
202 $ hg status -S
202 $ hg status -S
203 A foo/bar/z2.txt
203 A foo/bar/z2.txt
204 $ hg forget foo/bar/z2.txt
204 $ hg forget foo/bar/z2.txt
205 $ hg status -S
205 $ hg status -S
206 ? foo/bar/z2.txt
206 ? foo/bar/z2.txt
207 $ hg forget foo/bar/z2.txt
207 $ hg forget foo/bar/z2.txt
208 not removing foo/bar/z2.txt: file is already untracked (glob)
208 not removing foo/bar/z2.txt: file is already untracked (glob)
209 [1]
209 [1]
210 $ hg status -S
210 $ hg status -S
211 ? foo/bar/z2.txt
211 ? foo/bar/z2.txt
212 $ rm foo/bar/z2.txt
212 $ rm foo/bar/z2.txt
213
213
214 Log with the relationships between repo and its subrepo:
214 Log with the relationships between repo and its subrepo:
215
215
216 $ hg log --template '{rev}:{node|short} {desc}\n'
216 $ hg log --template '{rev}:{node|short} {desc}\n'
217 2:1326fa26d0c0 2-3-2
217 2:1326fa26d0c0 2-3-2
218 1:4b3c9ff4f66b 1-2-1
218 1:4b3c9ff4f66b 1-2-1
219 0:23376cbba0d8 0-0-0
219 0:23376cbba0d8 0-0-0
220
220
221 $ hg -R foo log --template '{rev}:{node|short} {desc}\n'
221 $ hg -R foo log --template '{rev}:{node|short} {desc}\n'
222 3:65903cebad86 2-3-2
222 3:65903cebad86 2-3-2
223 2:d254738c5f5e 0-2-1
223 2:d254738c5f5e 0-2-1
224 1:8629ce7dcc39 0-1-0
224 1:8629ce7dcc39 0-1-0
225 0:af048e97ade2 0-0-0
225 0:af048e97ade2 0-0-0
226
226
227 $ hg -R foo/bar log --template '{rev}:{node|short} {desc}\n'
227 $ hg -R foo/bar log --template '{rev}:{node|short} {desc}\n'
228 2:31ecbdafd357 2-3-2
228 2:31ecbdafd357 2-3-2
229 1:9647f22de499 0-1-1
229 1:9647f22de499 0-1-1
230 0:4904098473f9 0-0-0
230 0:4904098473f9 0-0-0
231
231
232 Status between revisions:
232 Status between revisions:
233
233
234 $ hg status -S
234 $ hg status -S
235 $ hg status -S --rev 0:1
235 $ hg status -S --rev 0:1
236 M .hgsubstate
236 M .hgsubstate
237 M foo/.hgsubstate
237 M foo/.hgsubstate
238 M foo/bar/z.txt
238 M foo/bar/z.txt
239 M foo/y.txt
239 M foo/y.txt
240 $ hg diff --nodates -S -I '**/?.txt' --rev 0:1
240 $ hg diff --nodates -S -I '**/?.txt' --rev 0:1
241 diff -r af048e97ade2 -r d254738c5f5e foo/y.txt
241 diff -r af048e97ade2 -r d254738c5f5e foo/y.txt
242 --- a/foo/y.txt
242 --- a/foo/y.txt
243 +++ b/foo/y.txt
243 +++ b/foo/y.txt
244 @@ -1,1 +1,2 @@
244 @@ -1,1 +1,2 @@
245 y1
245 y1
246 +y2
246 +y2
247 diff -r 4904098473f9 -r 9647f22de499 foo/bar/z.txt
247 diff -r 4904098473f9 -r 9647f22de499 foo/bar/z.txt
248 --- a/foo/bar/z.txt
248 --- a/foo/bar/z.txt
249 +++ b/foo/bar/z.txt
249 +++ b/foo/bar/z.txt
250 @@ -1,1 +1,2 @@
250 @@ -1,1 +1,2 @@
251 z1
251 z1
252 +z2
252 +z2
253
253
254 Enable progress extension for archive tests:
254 Enable progress extension for archive tests:
255
255
256 $ cp $HGRCPATH $HGRCPATH.no-progress
256 $ cp $HGRCPATH $HGRCPATH.no-progress
257 $ cat >> $HGRCPATH <<EOF
257 $ cat >> $HGRCPATH <<EOF
258 > [extensions]
258 > [extensions]
259 > progress =
259 > progress =
260 > [progress]
260 > [progress]
261 > assume-tty = 1
261 > assume-tty = 1
262 > delay = 0
262 > delay = 0
263 > # set changedelay really large so we don't see nested topics
264 > changedelay = 30000
263 > format = topic bar number
265 > format = topic bar number
264 > refresh = 0
266 > refresh = 0
265 > width = 60
267 > width = 60
266 > EOF
268 > EOF
267
269
268 Test archiving to a directory tree (the doubled lines in the output
270 Test archiving to a directory tree (the doubled lines in the output
269 only show up in the test output, not in real usage):
271 only show up in the test output, not in real usage):
270
272
271 $ hg archive --subrepos ../archive
273 $ hg archive --subrepos ../archive
272 \r (no-eol) (esc)
274 \r (no-eol) (esc)
273 archiving [ ] 0/3\r (no-eol) (esc)
275 archiving [ ] 0/3\r (no-eol) (esc)
274 archiving [ ] 0/3\r (no-eol) (esc)
276 archiving [ ] 0/3\r (no-eol) (esc)
275 archiving [=============> ] 1/3\r (no-eol) (esc)
277 archiving [=============> ] 1/3\r (no-eol) (esc)
276 archiving [=============> ] 1/3\r (no-eol) (esc)
278 archiving [=============> ] 1/3\r (no-eol) (esc)
277 archiving [===========================> ] 2/3\r (no-eol) (esc)
279 archiving [===========================> ] 2/3\r (no-eol) (esc)
278 archiving [===========================> ] 2/3\r (no-eol) (esc)
280 archiving [===========================> ] 2/3\r (no-eol) (esc)
279 archiving [==========================================>] 3/3\r (no-eol) (esc)
281 archiving [==========================================>] 3/3\r (no-eol) (esc)
280 archiving [==========================================>] 3/3\r (no-eol) (esc)
282 archiving [==========================================>] 3/3\r (no-eol) (esc)
281 \r (no-eol) (esc)
283 \r (no-eol) (esc)
282 \r (no-eol) (esc)
284 \r (no-eol) (esc)
283 archiving (foo) [ ] 0/3\r (no-eol) (esc)
285 archiving (foo) [ ] 0/3\r (no-eol) (esc)
284 archiving (foo) [ ] 0/3\r (no-eol) (esc)
286 archiving (foo) [ ] 0/3\r (no-eol) (esc)
285 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
287 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
286 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
288 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
287 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
289 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
288 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
290 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
289 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
291 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
290 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
292 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
291 \r (no-eol) (esc)
293 \r (no-eol) (esc)
292 \r (no-eol) (esc)
294 \r (no-eol) (esc)
293 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
295 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
294 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
296 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
295 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
297 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
296 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
298 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
297 \r (no-eol) (esc)
299 \r (no-eol) (esc)
298 $ find ../archive | sort
300 $ find ../archive | sort
299 ../archive
301 ../archive
300 ../archive/.hg_archival.txt
302 ../archive/.hg_archival.txt
301 ../archive/.hgsub
303 ../archive/.hgsub
302 ../archive/.hgsubstate
304 ../archive/.hgsubstate
303 ../archive/foo
305 ../archive/foo
304 ../archive/foo/.hgsub
306 ../archive/foo/.hgsub
305 ../archive/foo/.hgsubstate
307 ../archive/foo/.hgsubstate
306 ../archive/foo/bar
308 ../archive/foo/bar
307 ../archive/foo/bar/z.txt
309 ../archive/foo/bar/z.txt
308 ../archive/foo/y.txt
310 ../archive/foo/y.txt
309 ../archive/x.txt
311 ../archive/x.txt
310
312
311 Test archiving to zip file (unzip output is unstable):
313 Test archiving to zip file (unzip output is unstable):
312
314
313 $ hg archive --subrepos ../archive.zip
315 $ hg archive --subrepos ../archive.zip
314 \r (no-eol) (esc)
316 \r (no-eol) (esc)
315 archiving [ ] 0/3\r (no-eol) (esc)
317 archiving [ ] 0/3\r (no-eol) (esc)
316 archiving [ ] 0/3\r (no-eol) (esc)
318 archiving [ ] 0/3\r (no-eol) (esc)
317 archiving [=============> ] 1/3\r (no-eol) (esc)
319 archiving [=============> ] 1/3\r (no-eol) (esc)
318 archiving [=============> ] 1/3\r (no-eol) (esc)
320 archiving [=============> ] 1/3\r (no-eol) (esc)
319 archiving [===========================> ] 2/3\r (no-eol) (esc)
321 archiving [===========================> ] 2/3\r (no-eol) (esc)
320 archiving [===========================> ] 2/3\r (no-eol) (esc)
322 archiving [===========================> ] 2/3\r (no-eol) (esc)
321 archiving [==========================================>] 3/3\r (no-eol) (esc)
323 archiving [==========================================>] 3/3\r (no-eol) (esc)
322 archiving [==========================================>] 3/3\r (no-eol) (esc)
324 archiving [==========================================>] 3/3\r (no-eol) (esc)
323 \r (no-eol) (esc)
325 \r (no-eol) (esc)
324 \r (no-eol) (esc)
326 \r (no-eol) (esc)
325 archiving (foo) [ ] 0/3\r (no-eol) (esc)
327 archiving (foo) [ ] 0/3\r (no-eol) (esc)
326 archiving (foo) [ ] 0/3\r (no-eol) (esc)
328 archiving (foo) [ ] 0/3\r (no-eol) (esc)
327 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
329 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
328 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
330 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
329 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
331 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
330 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
332 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
331 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
333 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
332 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
334 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
333 \r (no-eol) (esc)
335 \r (no-eol) (esc)
334 \r (no-eol) (esc)
336 \r (no-eol) (esc)
335 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
337 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
336 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
338 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
337 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
339 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
338 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
340 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
339 \r (no-eol) (esc)
341 \r (no-eol) (esc)
340
342
341 Test archiving a revision that references a subrepo that is not yet
343 Test archiving a revision that references a subrepo that is not yet
342 cloned:
344 cloned:
343
345
344 $ hg clone -U . ../empty
346 $ hg clone -U . ../empty
345 \r (no-eol) (esc)
347 \r (no-eol) (esc)
346 linking [ <=> ] 1\r (no-eol) (esc)
348 linking [ <=> ] 1\r (no-eol) (esc)
347 linking [ <=> ] 2\r (no-eol) (esc)
349 linking [ <=> ] 2\r (no-eol) (esc)
348 linking [ <=> ] 3\r (no-eol) (esc)
350 linking [ <=> ] 3\r (no-eol) (esc)
349 linking [ <=> ] 4\r (no-eol) (esc)
351 linking [ <=> ] 4\r (no-eol) (esc)
350 linking [ <=> ] 5\r (no-eol) (esc)
352 linking [ <=> ] 5\r (no-eol) (esc)
351 linking [ <=> ] 6\r (no-eol) (esc)
353 linking [ <=> ] 6\r (no-eol) (esc)
352 linking [ <=> ] 7\r (no-eol) (esc)
354 linking [ <=> ] 7\r (no-eol) (esc)
353 linking [ <=> ] 8\r (no-eol) (esc)
355 linking [ <=> ] 8\r (no-eol) (esc)
354 \r (no-eol) (esc)
356 \r (no-eol) (esc)
355 $ cd ../empty
357 $ cd ../empty
356 $ hg archive --subrepos -r tip ../archive.tar.gz
358 $ hg archive --subrepos -r tip ../archive.tar.gz
357 \r (no-eol) (esc)
359 \r (no-eol) (esc)
358 archiving [ ] 0/3\r (no-eol) (esc)
360 archiving [ ] 0/3\r (no-eol) (esc)
359 archiving [ ] 0/3\r (no-eol) (esc)
361 archiving [ ] 0/3\r (no-eol) (esc)
360 archiving [=============> ] 1/3\r (no-eol) (esc)
362 archiving [=============> ] 1/3\r (no-eol) (esc)
361 archiving [=============> ] 1/3\r (no-eol) (esc)
363 archiving [=============> ] 1/3\r (no-eol) (esc)
362 archiving [===========================> ] 2/3\r (no-eol) (esc)
364 archiving [===========================> ] 2/3\r (no-eol) (esc)
363 archiving [===========================> ] 2/3\r (no-eol) (esc)
365 archiving [===========================> ] 2/3\r (no-eol) (esc)
364 archiving [==========================================>] 3/3\r (no-eol) (esc)
366 archiving [==========================================>] 3/3\r (no-eol) (esc)
365 archiving [==========================================>] 3/3\r (no-eol) (esc)
367 archiving [==========================================>] 3/3\r (no-eol) (esc)
366 \r (no-eol) (esc)
368 \r (no-eol) (esc)
367 \r (no-eol) (esc)
369 \r (no-eol) (esc)
368 linking [ <=> ] 1\r (no-eol) (esc)
370 linking [ <=> ] 1\r (no-eol) (esc)
369 linking [ <=> ] 2\r (no-eol) (esc)
371 linking [ <=> ] 2\r (no-eol) (esc)
370 linking [ <=> ] 3\r (no-eol) (esc)
372 linking [ <=> ] 3\r (no-eol) (esc)
371 linking [ <=> ] 4\r (no-eol) (esc)
373 linking [ <=> ] 4\r (no-eol) (esc)
372 linking [ <=> ] 5\r (no-eol) (esc)
374 linking [ <=> ] 5\r (no-eol) (esc)
373 linking [ <=> ] 6\r (no-eol) (esc)
375 linking [ <=> ] 6\r (no-eol) (esc)
374 linking [ <=> ] 7\r (no-eol) (esc)
376 linking [ <=> ] 7\r (no-eol) (esc)
375 linking [ <=> ] 8\r (no-eol) (esc)
377 linking [ <=> ] 8\r (no-eol) (esc)
376 \r (no-eol) (esc)
378 \r (no-eol) (esc)
377 \r (no-eol) (esc)
379 \r (no-eol) (esc)
378 archiving (foo) [ ] 0/3\r (no-eol) (esc)
380 archiving (foo) [ ] 0/3\r (no-eol) (esc)
379 archiving (foo) [ ] 0/3\r (no-eol) (esc)
381 archiving (foo) [ ] 0/3\r (no-eol) (esc)
380 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
382 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
381 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
383 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
382 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
384 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
383 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
385 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
384 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
386 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
385 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
387 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
386 \r (no-eol) (esc)
388 \r (no-eol) (esc)
387 \r (no-eol) (esc)
389 \r (no-eol) (esc)
388 linking [ <=> ] 1\r (no-eol) (esc)
390 linking [ <=> ] 1\r (no-eol) (esc)
389 linking [ <=> ] 2\r (no-eol) (esc)
391 linking [ <=> ] 2\r (no-eol) (esc)
390 linking [ <=> ] 3\r (no-eol) (esc)
392 linking [ <=> ] 3\r (no-eol) (esc)
391 linking [ <=> ] 4\r (no-eol) (esc)
393 linking [ <=> ] 4\r (no-eol) (esc)
392 linking [ <=> ] 5\r (no-eol) (esc)
394 linking [ <=> ] 5\r (no-eol) (esc)
393 linking [ <=> ] 6\r (no-eol) (esc)
395 linking [ <=> ] 6\r (no-eol) (esc)
394 \r (no-eol) (esc)
396 \r (no-eol) (esc)
395 \r (no-eol) (esc)
397 \r (no-eol) (esc)
396 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
398 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
397 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
399 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
398 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
400 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
399 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
401 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
400 \r (no-eol) (esc)
402 \r (no-eol) (esc)
401 cloning subrepo foo from $TESTTMP/repo/foo
403 cloning subrepo foo from $TESTTMP/repo/foo
402 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
404 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
403
405
404 The newly cloned subrepos contain no working copy:
406 The newly cloned subrepos contain no working copy:
405
407
406 $ hg -R foo summary
408 $ hg -R foo summary
407 parent: -1:000000000000 (no revision checked out)
409 parent: -1:000000000000 (no revision checked out)
408 branch: default
410 branch: default
409 commit: (clean)
411 commit: (clean)
410 update: 4 new changesets (update)
412 update: 4 new changesets (update)
411
413
412 Disable progress extension and cleanup:
414 Disable progress extension and cleanup:
413
415
414 $ mv $HGRCPATH.no-progress $HGRCPATH
416 $ mv $HGRCPATH.no-progress $HGRCPATH
415
417
416 Test archiving when there is a directory in the way for a subrepo
418 Test archiving when there is a directory in the way for a subrepo
417 created by archive:
419 created by archive:
418
420
419 $ hg clone -U . ../almost-empty
421 $ hg clone -U . ../almost-empty
420 $ cd ../almost-empty
422 $ cd ../almost-empty
421 $ mkdir foo
423 $ mkdir foo
422 $ echo f > foo/f
424 $ echo f > foo/f
423 $ hg archive --subrepos -r tip archive
425 $ hg archive --subrepos -r tip archive
424 cloning subrepo foo from $TESTTMP/empty/foo
426 cloning subrepo foo from $TESTTMP/empty/foo
425 abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo) (glob)
427 abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo) (glob)
426 [255]
428 [255]
427
429
428 Clone and test outgoing:
430 Clone and test outgoing:
429
431
430 $ cd ..
432 $ cd ..
431 $ hg clone repo repo2
433 $ hg clone repo repo2
432 updating to branch default
434 updating to branch default
433 cloning subrepo foo from $TESTTMP/repo/foo
435 cloning subrepo foo from $TESTTMP/repo/foo
434 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
436 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
435 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
437 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
436 $ cd repo2
438 $ cd repo2
437 $ hg outgoing -S
439 $ hg outgoing -S
438 comparing with $TESTTMP/repo (glob)
440 comparing with $TESTTMP/repo (glob)
439 searching for changes
441 searching for changes
440 no changes found
442 no changes found
441 comparing with $TESTTMP/repo/foo
443 comparing with $TESTTMP/repo/foo
442 searching for changes
444 searching for changes
443 no changes found
445 no changes found
444 comparing with $TESTTMP/repo/foo/bar
446 comparing with $TESTTMP/repo/foo/bar
445 searching for changes
447 searching for changes
446 no changes found
448 no changes found
447 [1]
449 [1]
448
450
449 Make nested change:
451 Make nested change:
450
452
451 $ echo y4 >> foo/y.txt
453 $ echo y4 >> foo/y.txt
452 $ hg diff --nodates -S
454 $ hg diff --nodates -S
453 diff -r 65903cebad86 foo/y.txt
455 diff -r 65903cebad86 foo/y.txt
454 --- a/foo/y.txt
456 --- a/foo/y.txt
455 +++ b/foo/y.txt
457 +++ b/foo/y.txt
456 @@ -1,3 +1,4 @@
458 @@ -1,3 +1,4 @@
457 y1
459 y1
458 y2
460 y2
459 y3
461 y3
460 +y4
462 +y4
461 $ hg commit --subrepos -m 3-4-2
463 $ hg commit --subrepos -m 3-4-2
462 committing subrepository foo
464 committing subrepository foo
463 $ hg outgoing -S
465 $ hg outgoing -S
464 comparing with $TESTTMP/repo (glob)
466 comparing with $TESTTMP/repo (glob)
465 searching for changes
467 searching for changes
466 changeset: 3:2655b8ecc4ee
468 changeset: 3:2655b8ecc4ee
467 tag: tip
469 tag: tip
468 user: test
470 user: test
469 date: Thu Jan 01 00:00:00 1970 +0000
471 date: Thu Jan 01 00:00:00 1970 +0000
470 summary: 3-4-2
472 summary: 3-4-2
471
473
472 comparing with $TESTTMP/repo/foo
474 comparing with $TESTTMP/repo/foo
473 searching for changes
475 searching for changes
474 changeset: 4:e96193d6cb36
476 changeset: 4:e96193d6cb36
475 tag: tip
477 tag: tip
476 user: test
478 user: test
477 date: Thu Jan 01 00:00:00 1970 +0000
479 date: Thu Jan 01 00:00:00 1970 +0000
478 summary: 3-4-2
480 summary: 3-4-2
479
481
480 comparing with $TESTTMP/repo/foo/bar
482 comparing with $TESTTMP/repo/foo/bar
481 searching for changes
483 searching for changes
482 no changes found
484 no changes found
483
485
484
486
485 Switch to original repo and setup default path:
487 Switch to original repo and setup default path:
486
488
487 $ cd ../repo
489 $ cd ../repo
488 $ echo '[paths]' >> .hg/hgrc
490 $ echo '[paths]' >> .hg/hgrc
489 $ echo 'default = ../repo2' >> .hg/hgrc
491 $ echo 'default = ../repo2' >> .hg/hgrc
490
492
491 Test incoming:
493 Test incoming:
492
494
493 $ hg incoming -S
495 $ hg incoming -S
494 comparing with $TESTTMP/repo2 (glob)
496 comparing with $TESTTMP/repo2 (glob)
495 searching for changes
497 searching for changes
496 changeset: 3:2655b8ecc4ee
498 changeset: 3:2655b8ecc4ee
497 tag: tip
499 tag: tip
498 user: test
500 user: test
499 date: Thu Jan 01 00:00:00 1970 +0000
501 date: Thu Jan 01 00:00:00 1970 +0000
500 summary: 3-4-2
502 summary: 3-4-2
501
503
502 comparing with $TESTTMP/repo2/foo
504 comparing with $TESTTMP/repo2/foo
503 searching for changes
505 searching for changes
504 changeset: 4:e96193d6cb36
506 changeset: 4:e96193d6cb36
505 tag: tip
507 tag: tip
506 user: test
508 user: test
507 date: Thu Jan 01 00:00:00 1970 +0000
509 date: Thu Jan 01 00:00:00 1970 +0000
508 summary: 3-4-2
510 summary: 3-4-2
509
511
510 comparing with $TESTTMP/repo2/foo/bar
512 comparing with $TESTTMP/repo2/foo/bar
511 searching for changes
513 searching for changes
512 no changes found
514 no changes found
513
515
514 $ hg incoming -S --bundle incoming.hg
516 $ hg incoming -S --bundle incoming.hg
515 abort: cannot combine --bundle and --subrepos
517 abort: cannot combine --bundle and --subrepos
516 [255]
518 [255]
517
519
518 Test missing subrepo:
520 Test missing subrepo:
519
521
520 $ rm -r foo
522 $ rm -r foo
521 $ hg status -S
523 $ hg status -S
522 warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"
524 warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"
523
525
524 Issue2619: IndexError: list index out of range on hg add with subrepos
526 Issue2619: IndexError: list index out of range on hg add with subrepos
525 The subrepo must sorts after the explicit filename.
527 The subrepo must sorts after the explicit filename.
526
528
527 $ cd ..
529 $ cd ..
528 $ hg init test
530 $ hg init test
529 $ cd test
531 $ cd test
530 $ hg init x
532 $ hg init x
531 $ echo abc > abc.txt
533 $ echo abc > abc.txt
532 $ hg ci -Am "abc"
534 $ hg ci -Am "abc"
533 adding abc.txt
535 adding abc.txt
534 $ echo "x = x" >> .hgsub
536 $ echo "x = x" >> .hgsub
535 $ hg add .hgsub
537 $ hg add .hgsub
536 $ touch a x/a
538 $ touch a x/a
537 $ hg add a x/a
539 $ hg add a x/a
538
540
539 $ hg ci -Sm "added x"
541 $ hg ci -Sm "added x"
540 committing subrepository x
542 committing subrepository x
541 $ echo abc > x/a
543 $ echo abc > x/a
542 $ hg revert --rev '.^' "set:subrepo('glob:x*')"
544 $ hg revert --rev '.^' "set:subrepo('glob:x*')"
543 abort: subrepository 'x' does not exist in 25ac2c9b3180!
545 abort: subrepository 'x' does not exist in 25ac2c9b3180!
544 [255]
546 [255]
545
547
546 $ cd ..
548 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now