##// END OF EJS Templates
tests: remove GNU quoting in test-subrepo-deep-nested-change.t...
Mads Kiilerich -
r17113:d7493da2 default
parent child Browse files
Show More
@@ -1,265 +1,264 b''
1 Preparing the subrepository 'sub2'
1 Preparing the subrepository 'sub2'
2
2
3 $ hg init sub2
3 $ hg init sub2
4 $ echo sub2 > sub2/sub2
4 $ echo sub2 > sub2/sub2
5 $ hg add -R sub2
5 $ hg add -R sub2
6 adding sub2/sub2 (glob)
6 adding sub2/sub2 (glob)
7 $ hg commit -R sub2 -m "sub2 import"
7 $ hg commit -R sub2 -m "sub2 import"
8
8
9 Preparing the 'sub1' repo which depends on the subrepo 'sub2'
9 Preparing the 'sub1' repo which depends on the subrepo 'sub2'
10
10
11 $ hg init sub1
11 $ hg init sub1
12 $ echo sub1 > sub1/sub1
12 $ echo sub1 > sub1/sub1
13 $ echo "sub2 = ../sub2" > sub1/.hgsub
13 $ echo "sub2 = ../sub2" > sub1/.hgsub
14 $ hg clone sub2 sub1/sub2
14 $ hg clone sub2 sub1/sub2
15 updating to branch default
15 updating to branch default
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 $ hg add -R sub1
17 $ hg add -R sub1
18 adding sub1/.hgsub (glob)
18 adding sub1/.hgsub (glob)
19 adding sub1/sub1 (glob)
19 adding sub1/sub1 (glob)
20 $ hg commit -R sub1 -m "sub1 import"
20 $ hg commit -R sub1 -m "sub1 import"
21
21
22 Preparing the 'main' repo which depends on the subrepo 'sub1'
22 Preparing the 'main' repo which depends on the subrepo 'sub1'
23
23
24 $ hg init main
24 $ hg init main
25 $ echo main > main/main
25 $ echo main > main/main
26 $ echo "sub1 = ../sub1" > main/.hgsub
26 $ echo "sub1 = ../sub1" > main/.hgsub
27 $ hg clone sub1 main/sub1
27 $ hg clone sub1 main/sub1
28 updating to branch default
28 updating to branch default
29 cloning subrepo sub2 from $TESTTMP/sub2
29 cloning subrepo sub2 from $TESTTMP/sub2
30 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
30 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
31 $ hg add -R main
31 $ hg add -R main
32 adding main/.hgsub (glob)
32 adding main/.hgsub (glob)
33 adding main/main (glob)
33 adding main/main (glob)
34 $ hg commit -R main -m "main import"
34 $ hg commit -R main -m "main import"
35
35
36 Cleaning both repositories, just as a clone -U
36 Cleaning both repositories, just as a clone -U
37
37
38 $ hg up -C -R sub2 null
38 $ hg up -C -R sub2 null
39 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
39 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
40 $ hg up -C -R sub1 null
40 $ hg up -C -R sub1 null
41 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
41 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
42 $ hg up -C -R main null
42 $ hg up -C -R main null
43 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
43 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
44 $ rm -rf main/sub1
44 $ rm -rf main/sub1
45 $ rm -rf sub1/sub2
45 $ rm -rf sub1/sub2
46
46
47 Clone main
47 Clone main
48
48
49 $ hg clone main cloned
49 $ hg clone main cloned
50 updating to branch default
50 updating to branch default
51 cloning subrepo sub1 from $TESTTMP/sub1
51 cloning subrepo sub1 from $TESTTMP/sub1
52 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
52 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
53 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
53 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
54
54
55 Checking cloned repo ids
55 Checking cloned repo ids
56
56
57 $ printf "cloned " ; hg id -R cloned
57 $ printf "cloned " ; hg id -R cloned
58 cloned 7f491f53a367 tip
58 cloned 7f491f53a367 tip
59 $ printf "cloned/sub1 " ; hg id -R cloned/sub1
59 $ printf "cloned/sub1 " ; hg id -R cloned/sub1
60 cloned/sub1 fc3b4ce2696f tip
60 cloned/sub1 fc3b4ce2696f tip
61 $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
61 $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
62 cloned/sub1/sub2 c57a0840e3ba tip
62 cloned/sub1/sub2 c57a0840e3ba tip
63
63
64 debugsub output for main and sub1
64 debugsub output for main and sub1
65
65
66 $ hg debugsub -R cloned
66 $ hg debugsub -R cloned
67 path sub1
67 path sub1
68 source ../sub1
68 source ../sub1
69 revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
69 revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
70 $ hg debugsub -R cloned/sub1
70 $ hg debugsub -R cloned/sub1
71 path sub2
71 path sub2
72 source ../sub2
72 source ../sub2
73 revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
73 revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
74
74
75 Modifying deeply nested 'sub2'
75 Modifying deeply nested 'sub2'
76
76
77 $ echo modified > cloned/sub1/sub2/sub2
77 $ echo modified > cloned/sub1/sub2/sub2
78 $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
78 $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
79 committing subrepository sub1
79 committing subrepository sub1
80 committing subrepository sub1/sub2 (glob)
80 committing subrepository sub1/sub2 (glob)
81
81
82 Checking modified node ids
82 Checking modified node ids
83
83
84 $ printf "cloned " ; hg id -R cloned
84 $ printf "cloned " ; hg id -R cloned
85 cloned ffe6649062fe tip
85 cloned ffe6649062fe tip
86 $ printf "cloned/sub1 " ; hg id -R cloned/sub1
86 $ printf "cloned/sub1 " ; hg id -R cloned/sub1
87 cloned/sub1 2ecb03bf44a9 tip
87 cloned/sub1 2ecb03bf44a9 tip
88 $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
88 $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
89 cloned/sub1/sub2 53dd3430bcaf tip
89 cloned/sub1/sub2 53dd3430bcaf tip
90
90
91 debugsub output for main and sub1
91 debugsub output for main and sub1
92
92
93 $ hg debugsub -R cloned
93 $ hg debugsub -R cloned
94 path sub1
94 path sub1
95 source ../sub1
95 source ../sub1
96 revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
96 revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
97 $ hg debugsub -R cloned/sub1
97 $ hg debugsub -R cloned/sub1
98 path sub2
98 path sub2
99 source ../sub2
99 source ../sub2
100 revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
100 revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
101
101
102 Check that deep archiving works
102 Check that deep archiving works
103
103
104 $ cd cloned
104 $ cd cloned
105 $ echo 'test' > sub1/sub2/test.txt
105 $ echo 'test' > sub1/sub2/test.txt
106 $ hg --config extensions.largefiles=! add sub1/sub2/test.txt
106 $ hg --config extensions.largefiles=! add sub1/sub2/test.txt
107 $ mkdir sub1/sub2/folder
107 $ mkdir sub1/sub2/folder
108 $ echo 'subfolder' > sub1/sub2/folder/test.txt
108 $ echo 'subfolder' > sub1/sub2/folder/test.txt
109 $ hg --config extensions.largefiles=! add sub1/sub2/folder/test.txt
109 $ hg --config extensions.largefiles=! add sub1/sub2/folder/test.txt
110 $ hg ci -Sm "add test.txt"
110 $ hg ci -Sm "add test.txt"
111 committing subrepository sub1
111 committing subrepository sub1
112 committing subrepository sub1/sub2 (glob)
112 committing subrepository sub1/sub2 (glob)
113 $ hg --config extensions.largefiles=! archive -S ../archive_all
113 $ hg --config extensions.largefiles=! archive -S ../archive_all
114 $ find ../archive_all | sort
114 $ find ../archive_all | sort
115 ../archive_all
115 ../archive_all
116 ../archive_all/.hg_archival.txt
116 ../archive_all/.hg_archival.txt
117 ../archive_all/.hgsub
117 ../archive_all/.hgsub
118 ../archive_all/.hgsubstate
118 ../archive_all/.hgsubstate
119 ../archive_all/main
119 ../archive_all/main
120 ../archive_all/sub1
120 ../archive_all/sub1
121 ../archive_all/sub1/.hgsub
121 ../archive_all/sub1/.hgsub
122 ../archive_all/sub1/.hgsubstate
122 ../archive_all/sub1/.hgsubstate
123 ../archive_all/sub1/sub1
123 ../archive_all/sub1/sub1
124 ../archive_all/sub1/sub2
124 ../archive_all/sub1/sub2
125 ../archive_all/sub1/sub2/folder
125 ../archive_all/sub1/sub2/folder
126 ../archive_all/sub1/sub2/folder/test.txt
126 ../archive_all/sub1/sub2/folder/test.txt
127 ../archive_all/sub1/sub2/sub2
127 ../archive_all/sub1/sub2/sub2
128 ../archive_all/sub1/sub2/test.txt
128 ../archive_all/sub1/sub2/test.txt
129
129
130 Check that archive -X works in deep subrepos
130 Check that archive -X works in deep subrepos
131
131
132 $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
132 $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
133 $ find ../archive_exclude | sort
133 $ find ../archive_exclude | sort
134 ../archive_exclude
134 ../archive_exclude
135 ../archive_exclude/.hg_archival.txt
135 ../archive_exclude/.hg_archival.txt
136 ../archive_exclude/.hgsub
136 ../archive_exclude/.hgsub
137 ../archive_exclude/.hgsubstate
137 ../archive_exclude/.hgsubstate
138 ../archive_exclude/main
138 ../archive_exclude/main
139 ../archive_exclude/sub1
139 ../archive_exclude/sub1
140 ../archive_exclude/sub1/.hgsub
140 ../archive_exclude/sub1/.hgsub
141 ../archive_exclude/sub1/.hgsubstate
141 ../archive_exclude/sub1/.hgsubstate
142 ../archive_exclude/sub1/sub1
142 ../archive_exclude/sub1/sub1
143 ../archive_exclude/sub1/sub2
143 ../archive_exclude/sub1/sub2
144 ../archive_exclude/sub1/sub2/sub2
144 ../archive_exclude/sub1/sub2/sub2
145
145
146 $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
146 $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
147 $ find ../archive_include | sort
147 $ find ../archive_include | sort
148 ../archive_include
148 ../archive_include
149 ../archive_include/sub1
149 ../archive_include/sub1
150 ../archive_include/sub1/sub2
150 ../archive_include/sub1/sub2
151 ../archive_include/sub1/sub2/folder
151 ../archive_include/sub1/sub2/folder
152 ../archive_include/sub1/sub2/folder/test.txt
152 ../archive_include/sub1/sub2/folder/test.txt
153 ../archive_include/sub1/sub2/test.txt
153 ../archive_include/sub1/sub2/test.txt
154
154
155 Check that deep archive works with largefiles (which overrides hgsubrepo impl)
155 Check that deep archive works with largefiles (which overrides hgsubrepo impl)
156 This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo
156 This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo
157 subrepos are archived properly.
157 subrepos are archived properly.
158 Note that add --large through a subrepo currently adds the file as a normal file
158 Note that add --large through a subrepo currently adds the file as a normal file
159
159
160 $ echo "large" > sub1/sub2/large.bin
160 $ echo "large" > sub1/sub2/large.bin
161 $ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin
161 $ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin
162 $ echo "large" > large.bin
162 $ echo "large" > large.bin
163 $ hg --config extensions.largefiles= add --large large.bin
163 $ hg --config extensions.largefiles= add --large large.bin
164 $ hg --config extensions.largefiles= ci -S -m "add large files"
164 $ hg --config extensions.largefiles= ci -S -m "add large files"
165 committing subrepository sub1
165 committing subrepository sub1
166 committing subrepository sub1/sub2 (glob)
166 committing subrepository sub1/sub2 (glob)
167
167
168 $ hg --config extensions.largefiles= archive -S ../archive_lf
168 $ hg --config extensions.largefiles= archive -S ../archive_lf
169 $ find ../archive_lf | sort
169 $ find ../archive_lf | sort
170 ../archive_lf
170 ../archive_lf
171 ../archive_lf/.hg_archival.txt
171 ../archive_lf/.hg_archival.txt
172 ../archive_lf/.hgsub
172 ../archive_lf/.hgsub
173 ../archive_lf/.hgsubstate
173 ../archive_lf/.hgsubstate
174 ../archive_lf/large.bin
174 ../archive_lf/large.bin
175 ../archive_lf/main
175 ../archive_lf/main
176 ../archive_lf/sub1
176 ../archive_lf/sub1
177 ../archive_lf/sub1/.hgsub
177 ../archive_lf/sub1/.hgsub
178 ../archive_lf/sub1/.hgsubstate
178 ../archive_lf/sub1/.hgsubstate
179 ../archive_lf/sub1/sub1
179 ../archive_lf/sub1/sub1
180 ../archive_lf/sub1/sub2
180 ../archive_lf/sub1/sub2
181 ../archive_lf/sub1/sub2/folder
181 ../archive_lf/sub1/sub2/folder
182 ../archive_lf/sub1/sub2/folder/test.txt
182 ../archive_lf/sub1/sub2/folder/test.txt
183 ../archive_lf/sub1/sub2/large.bin
183 ../archive_lf/sub1/sub2/large.bin
184 ../archive_lf/sub1/sub2/sub2
184 ../archive_lf/sub1/sub2/sub2
185 ../archive_lf/sub1/sub2/test.txt
185 ../archive_lf/sub1/sub2/test.txt
186 $ rm -rf ../archive_lf
186 $ rm -rf ../archive_lf
187
187
188 Exclude large files from main and sub-sub repo
188 Exclude large files from main and sub-sub repo
189
189
190 $ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf
190 $ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf
191 $ find ../archive_lf | sort
191 $ find ../archive_lf | sort
192 ../archive_lf
192 ../archive_lf
193 ../archive_lf/.hg_archival.txt
193 ../archive_lf/.hg_archival.txt
194 ../archive_lf/.hgsub
194 ../archive_lf/.hgsub
195 ../archive_lf/.hgsubstate
195 ../archive_lf/.hgsubstate
196 ../archive_lf/main
196 ../archive_lf/main
197 ../archive_lf/sub1
197 ../archive_lf/sub1
198 ../archive_lf/sub1/.hgsub
198 ../archive_lf/sub1/.hgsub
199 ../archive_lf/sub1/.hgsubstate
199 ../archive_lf/sub1/.hgsubstate
200 ../archive_lf/sub1/sub1
200 ../archive_lf/sub1/sub1
201 ../archive_lf/sub1/sub2
201 ../archive_lf/sub1/sub2
202 ../archive_lf/sub1/sub2/folder
202 ../archive_lf/sub1/sub2/folder
203 ../archive_lf/sub1/sub2/folder/test.txt
203 ../archive_lf/sub1/sub2/folder/test.txt
204 ../archive_lf/sub1/sub2/sub2
204 ../archive_lf/sub1/sub2/sub2
205 ../archive_lf/sub1/sub2/test.txt
205 ../archive_lf/sub1/sub2/test.txt
206 $ rm -rf ../archive_lf
206 $ rm -rf ../archive_lf
207
207
208 Exclude normal files from main and sub-sub repo
208 Exclude normal files from main and sub-sub repo
209
209
210 $ hg --config extensions.largefiles= archive -S -X '**.txt' ../archive_lf
210 $ hg --config extensions.largefiles= archive -S -X '**.txt' ../archive_lf
211 $ find ../archive_lf | sort
211 $ find ../archive_lf | sort
212 ../archive_lf
212 ../archive_lf
213 ../archive_lf/.hgsub
213 ../archive_lf/.hgsub
214 ../archive_lf/.hgsubstate
214 ../archive_lf/.hgsubstate
215 ../archive_lf/large.bin
215 ../archive_lf/large.bin
216 ../archive_lf/main
216 ../archive_lf/main
217 ../archive_lf/sub1
217 ../archive_lf/sub1
218 ../archive_lf/sub1/.hgsub
218 ../archive_lf/sub1/.hgsub
219 ../archive_lf/sub1/.hgsubstate
219 ../archive_lf/sub1/.hgsubstate
220 ../archive_lf/sub1/sub1
220 ../archive_lf/sub1/sub1
221 ../archive_lf/sub1/sub2
221 ../archive_lf/sub1/sub2
222 ../archive_lf/sub1/sub2/large.bin
222 ../archive_lf/sub1/sub2/large.bin
223 ../archive_lf/sub1/sub2/sub2
223 ../archive_lf/sub1/sub2/sub2
224 $ rm -rf ../archive_lf
224 $ rm -rf ../archive_lf
225
225
226 Include normal files from within a largefiles subrepo
226 Include normal files from within a largefiles subrepo
227
227
228 $ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf
228 $ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf
229 $ find ../archive_lf | sort
229 $ find ../archive_lf | sort
230 ../archive_lf
230 ../archive_lf
231 ../archive_lf/.hg_archival.txt
231 ../archive_lf/.hg_archival.txt
232 ../archive_lf/sub1
232 ../archive_lf/sub1
233 ../archive_lf/sub1/sub2
233 ../archive_lf/sub1/sub2
234 ../archive_lf/sub1/sub2/folder
234 ../archive_lf/sub1/sub2/folder
235 ../archive_lf/sub1/sub2/folder/test.txt
235 ../archive_lf/sub1/sub2/folder/test.txt
236 ../archive_lf/sub1/sub2/test.txt
236 ../archive_lf/sub1/sub2/test.txt
237 $ rm -rf ../archive_lf
237 $ rm -rf ../archive_lf
238
238
239 Include large files from within a largefiles subrepo
239 Include large files from within a largefiles subrepo
240
240
241 $ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf
241 $ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf
242 $ find ../archive_lf | sort
242 $ find ../archive_lf | sort
243 ../archive_lf
243 ../archive_lf
244 ../archive_lf/large.bin
244 ../archive_lf/large.bin
245 ../archive_lf/sub1
245 ../archive_lf/sub1
246 ../archive_lf/sub1/sub2
246 ../archive_lf/sub1/sub2
247 ../archive_lf/sub1/sub2/large.bin
247 ../archive_lf/sub1/sub2/large.bin
248 $ rm -rf ../archive_lf
248 $ rm -rf ../archive_lf
249
249
250 Find an exact largefile match in a largefiles subrepo
250 Find an exact largefile match in a largefiles subrepo
251
251
252 $ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf
252 $ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf
253 $ find ../archive_lf | sort
253 $ find ../archive_lf | sort
254 ../archive_lf
254 ../archive_lf
255 ../archive_lf/sub1
255 ../archive_lf/sub1
256 ../archive_lf/sub1/sub2
256 ../archive_lf/sub1/sub2
257 ../archive_lf/sub1/sub2/large.bin
257 ../archive_lf/sub1/sub2/large.bin
258 $ rm -rf ../archive_lf
258 $ rm -rf ../archive_lf
259
259
260 Find an exact match to a standin (should archive nothing)
260 Find an exact match to a standin (should archive nothing)
261 $ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
261 $ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
262 $ find ../archive_lf | sort
262 $ find ../archive_lf 2> /dev/null | sort
263 find: `../archive_lf': No such file or directory
264
263
265 $ cd ..
264 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now