##// END OF EJS Templates
tests: replace "cp -r" with "cp -R"...
Jun Wu -
r30556:c059286a default
parent child Browse files
Show More
@@ -572,8 +572,8 b' pull --update works the same as pull && '
572
572
573 $ hg bookmark -r3 Y
573 $ hg bookmark -r3 Y
574 moving bookmark 'Y' forward from db815d6d32e6
574 moving bookmark 'Y' forward from db815d6d32e6
575 $ cp -r ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
575 $ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
576 $ cp -r ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
576 $ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
577
577
578 (manual version)
578 (manual version)
579
579
@@ -339,7 +339,7 b' phases.new-commit option is.'
339
339
340 New-commit as draft (default)
340 New-commit as draft (default)
341
341
342 $ cp -r base simple-draft
342 $ cp -R base simple-draft
343 $ cd simple-draft
343 $ cd simple-draft
344 $ hg histedit -r 'b449568bf7fc' --commands - << EOF
344 $ hg histedit -r 'b449568bf7fc' --commands - << EOF
345 > edit b449568bf7fc 11 f
345 > edit b449568bf7fc 11 f
@@ -378,7 +378,7 b' New-commit as draft (default)'
378
378
379 New-commit as secret (config)
379 New-commit as secret (config)
380
380
381 $ cp -r base simple-secret
381 $ cp -R base simple-secret
382 $ cd simple-secret
382 $ cd simple-secret
383 $ cat >> .hg/hgrc << EOF
383 $ cat >> .hg/hgrc << EOF
384 > [phases]
384 > [phases]
@@ -425,7 +425,7 b' Changeset reordering'
425 If a secret changeset is put before a draft one, all descendant should be secret.
425 If a secret changeset is put before a draft one, all descendant should be secret.
426 It seems more important to present the secret phase.
426 It seems more important to present the secret phase.
427
427
428 $ cp -r base reorder
428 $ cp -R base reorder
429 $ cd reorder
429 $ cd reorder
430 $ hg histedit -r 'b449568bf7fc' --commands - << EOF
430 $ hg histedit -r 'b449568bf7fc' --commands - << EOF
431 > pick b449568bf7fc 11 f
431 > pick b449568bf7fc 11 f
@@ -462,7 +462,7 b' better safe than sorry). Folding between'
462
462
463 Note that there is a few reordering in this series for more extensive test
463 Note that there is a few reordering in this series for more extensive test
464
464
465 $ cp -r base folding
465 $ cp -R base folding
466 $ cd folding
466 $ cd folding
467 $ cat >> .hg/hgrc << EOF
467 $ cat >> .hg/hgrc << EOF
468 > [phases]
468 > [phases]
@@ -23,7 +23,7 b' Check that obsolete properly strip heads'
23 $ mkcommit base
23 $ mkcommit base
24 $ hg phase --public .
24 $ hg phase --public .
25 $ cd ..
25 $ cd ..
26 $ cp -r remote base
26 $ cp -R remote base
27 $ hg clone remote local
27 $ hg clone remote local
28 updating to branch default
28 updating to branch default
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -54,7 +54,7 b' setup'
54 |/
54 |/
55 o b4952fcf48cf (public) add base
55 o b4952fcf48cf (public) add base
56
56
57 $ cp -r ../remote ../backup1
57 $ cp -R ../remote ../backup1
58
58
59 old exists remotely as draft. It is obsoleted by new that we now push.
59 old exists remotely as draft. It is obsoleted by new that we now push.
60 Push should not warn about creating new head
60 Push should not warn about creating new head
@@ -73,7 +73,7 b' old head is now public (public local ver'
73 setup
73 setup
74
74
75 $ rm -fr ../remote
75 $ rm -fr ../remote
76 $ cp -r ../backup1 ../remote
76 $ cp -R ../backup1 ../remote
77 $ hg -R ../remote phase --public c70b08862e08
77 $ hg -R ../remote phase --public c70b08862e08
78 $ hg pull -v
78 $ hg pull -v
79 pulling from $TESTTMP/remote (glob)
79 pulling from $TESTTMP/remote (glob)
@@ -104,7 +104,7 b' TODO: Not implemented yet.'
104 # setup
104 # setup
105 #
105 #
106 # $ rm -fr ../remote
106 # $ rm -fr ../remote
107 # $ cp -r ../backup1 ../remote
107 # $ cp -R ../backup1 ../remote
108 # $ hg -R ../remote phase --public c70b08862e08
108 # $ hg -R ../remote phase --public c70b08862e08
109 # $ hg phase --draft --force c70b08862e08
109 # $ hg phase --draft --force c70b08862e08
110 # $ hg log -G --hidden
110 # $ hg log -G --hidden
@@ -131,7 +131,7 b' old head is obsolete but replacement is '
131 setup
131 setup
132
132
133 $ rm -fr ../remote
133 $ rm -fr ../remote
134 $ cp -r ../backup1 ../remote
134 $ cp -R ../backup1 ../remote
135 $ hg phase --draft --force '(0::) - 0'
135 $ hg phase --draft --force '(0::) - 0'
136 $ hg up -q '.^'
136 $ hg up -q '.^'
137 $ mkcommit other
137 $ mkcommit other
@@ -206,7 +206,7 b' setup. (The obsolete marker is known loc'
206 |/
206 |/
207 @ b4952fcf48cf (public) add base
207 @ b4952fcf48cf (public) add base
208
208
209 $ cp -r ../remote ../backup2
209 $ cp -R ../remote ../backup2
210
210
211 Push should not warn about adding new heads. We create one, but we'll delete
211 Push should not warn about adding new heads. We create one, but we'll delete
212 one anyway.
212 one anyway.
@@ -226,7 +226,7 b' Remote head is unknown but obsoleted by '
226 setup
226 setup
227
227
228 $ rm -fr ../remote
228 $ rm -fr ../remote
229 $ cp -r ../backup1 ../remote
229 $ cp -R ../backup1 ../remote
230 $ cd ..
230 $ cd ..
231 $ rm -rf local
231 $ rm -rf local
232 $ hg clone remote local -r 0
232 $ hg clone remote local -r 0
@@ -784,7 +784,7 b' Test revert --all to parent content'
784
784
785 (setup from reference repo)
785 (setup from reference repo)
786
786
787 $ cp -r revert-ref revert-parent-all
787 $ cp -R revert-ref revert-parent-all
788 $ cd revert-parent-all
788 $ cd revert-parent-all
789
789
790 check revert output
790 check revert output
@@ -841,7 +841,7 b' Test revert --all to "base" content'
841
841
842 (setup from reference repo)
842 (setup from reference repo)
843
843
844 $ cp -r revert-ref revert-base-all
844 $ cp -R revert-ref revert-base-all
845 $ cd revert-base-all
845 $ cd revert-base-all
846
846
847 check revert output
847 check revert output
@@ -896,7 +896,7 b' Test revert to parent content with expli'
896
896
897 (setup from reference repo)
897 (setup from reference repo)
898
898
899 $ cp -r revert-ref revert-parent-explicit
899 $ cp -R revert-ref revert-parent-explicit
900 $ cd revert-parent-explicit
900 $ cd revert-parent-explicit
901
901
902 revert all files individually and check the output
902 revert all files individually and check the output
@@ -989,7 +989,7 b' Test revert to "base" content with expli'
989
989
990 (setup from reference repo)
990 (setup from reference repo)
991
991
992 $ cp -r revert-ref revert-base-explicit
992 $ cp -R revert-ref revert-base-explicit
993 $ cd revert-base-explicit
993 $ cd revert-base-explicit
994
994
995 revert all files individually and check the output
995 revert all files individually and check the output
@@ -1518,8 +1518,8 b' Forgetting an explicit path in a subrepo'
1518 Courtesy phases synchronisation to publishing server does not block the push
1518 Courtesy phases synchronisation to publishing server does not block the push
1519 (issue3781)
1519 (issue3781)
1520
1520
1521 $ cp -r main issue3781
1521 $ cp -R main issue3781
1522 $ cp -r main issue3781-dest
1522 $ cp -R main issue3781-dest
1523 $ cd issue3781-dest/s
1523 $ cd issue3781-dest/s
1524 $ hg phase tip # show we have draft changeset
1524 $ hg phase tip # show we have draft changeset
1525 5: draft
1525 5: draft
@@ -458,7 +458,7 b' Excludes with a glob should not exclude '
458 b/bar/fruits.txt (glob)
458 b/bar/fruits.txt (glob)
459 b/bar/orange/fly/gnat.py (glob)
459 b/bar/orange/fly/gnat.py (glob)
460 b/bar/orange/fly/housefly.txt (glob)
460 b/bar/orange/fly/housefly.txt (glob)
461 $ cp -r .hg/store .hg/store-copy
461 $ cp -R .hg/store .hg/store-copy
462
462
463 Test files for a subdirectory.
463 Test files for a subdirectory.
464
464
@@ -468,7 +468,7 b' Test files for a subdirectory.'
468 b/bar/orange/fly/gnat.py (glob)
468 b/bar/orange/fly/gnat.py (glob)
469 b/bar/orange/fly/housefly.txt (glob)
469 b/bar/orange/fly/housefly.txt (glob)
470 b/foo/apple/bees/flower.py (glob)
470 b/foo/apple/bees/flower.py (glob)
471 $ cp -r .hg/store-copy/. .hg/store
471 $ cp -R .hg/store-copy/. .hg/store
472
472
473 Test files with just includes and excludes.
473 Test files with just includes and excludes.
474
474
@@ -477,7 +477,7 b' Test files with just includes and exclud'
477 $ rm -r .hg/store/meta/b/foo/apple/bees
477 $ rm -r .hg/store/meta/b/foo/apple/bees
478 $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
478 $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
479 b/bar/fruits.txt (glob)
479 b/bar/fruits.txt (glob)
480 $ cp -r .hg/store-copy/. .hg/store
480 $ cp -R .hg/store-copy/. .hg/store
481
481
482 Test files for a subdirectory, excluding a directory within it.
482 Test files for a subdirectory, excluding a directory within it.
483
483
@@ -487,7 +487,7 b' Test files for a subdirectory, excluding'
487 b/bar/fruits.txt (glob)
487 b/bar/fruits.txt (glob)
488 b/bar/orange/fly/gnat.py (glob)
488 b/bar/orange/fly/gnat.py (glob)
489 b/bar/orange/fly/housefly.txt (glob)
489 b/bar/orange/fly/housefly.txt (glob)
490 $ cp -r .hg/store-copy/. .hg/store
490 $ cp -R .hg/store-copy/. .hg/store
491
491
492 Test files for a sub directory, including only a directory within it, and
492 Test files for a sub directory, including only a directory within it, and
493 including an unrelated directory.
493 including an unrelated directory.
@@ -497,7 +497,7 b' including an unrelated directory.'
497 $ hg files -r . -I path:b/bar/orange -I path:a b
497 $ hg files -r . -I path:b/bar/orange -I path:a b
498 b/bar/orange/fly/gnat.py (glob)
498 b/bar/orange/fly/gnat.py (glob)
499 b/bar/orange/fly/housefly.txt (glob)
499 b/bar/orange/fly/housefly.txt (glob)
500 $ cp -r .hg/store-copy/. .hg/store
500 $ cp -R .hg/store-copy/. .hg/store
501
501
502 Test files for a pattern, including a directory, and excluding a directory
502 Test files for a pattern, including a directory, and excluding a directory
503 within that.
503 within that.
@@ -507,7 +507,7 b' within that.'
507 $ rm -r .hg/store/meta/b/bar/orange
507 $ rm -r .hg/store/meta/b/bar/orange
508 $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
508 $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
509 b/bar/fruits.txt (glob)
509 b/bar/fruits.txt (glob)
510 $ cp -r .hg/store-copy/. .hg/store
510 $ cp -R .hg/store-copy/. .hg/store
511
511
512 Add some more changes to the deep repo
512 Add some more changes to the deep repo
513 $ echo narf >> b/bar/fruits.txt
513 $ echo narf >> b/bar/fruits.txt
@@ -553,7 +553,7 b' Finish first server'
553 $ killdaemons.py
553 $ killdaemons.py
554
554
555 Back up the recently added revlogs
555 Back up the recently added revlogs
556 $ cp -r .hg/store .hg/store-newcopy
556 $ cp -R .hg/store .hg/store-newcopy
557
557
558 Verify reports missing dirlog
558 Verify reports missing dirlog
559 $ rm .hg/store/meta/b/00manifest.*
559 $ rm .hg/store/meta/b/00manifest.*
@@ -582,7 +582,7 b' Verify reports missing dirlog'
582 8 integrity errors encountered!
582 8 integrity errors encountered!
583 (first damaged changeset appears to be 0)
583 (first damaged changeset appears to be 0)
584 [1]
584 [1]
585 $ cp -r .hg/store-newcopy/. .hg/store
585 $ cp -R .hg/store-newcopy/. .hg/store
586
586
587 Verify reports missing dirlog entry
587 Verify reports missing dirlog entry
588 $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/
588 $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/
@@ -607,7 +607,7 b' Verify reports missing dirlog entry'
607 8 integrity errors encountered!
607 8 integrity errors encountered!
608 (first damaged changeset appears to be 1)
608 (first damaged changeset appears to be 1)
609 [1]
609 [1]
610 $ cp -r .hg/store-newcopy/. .hg/store
610 $ cp -R .hg/store-newcopy/. .hg/store
611
611
612 Test cloning a treemanifest repo over http.
612 Test cloning a treemanifest repo over http.
613 $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
613 $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
@@ -69,10 +69,10 b' Set up a repo for testing missing revlog'
69 $ cd missing-entries
69 $ cd missing-entries
70 $ echo 0 > file
70 $ echo 0 > file
71 $ hg ci -Aqm0
71 $ hg ci -Aqm0
72 $ cp -r .hg/store .hg/store-partial
72 $ cp -R .hg/store .hg/store-partial
73 $ echo 1 > file
73 $ echo 1 > file
74 $ hg ci -Aqm1
74 $ hg ci -Aqm1
75 $ cp -r .hg/store .hg/store-full
75 $ cp -R .hg/store .hg/store-full
76
76
77 Entire changelog missing
77 Entire changelog missing
78
78
@@ -84,7 +84,7 b' Entire changelog missing'
84 3 integrity errors encountered!
84 3 integrity errors encountered!
85 (first damaged changeset appears to be 0)
85 (first damaged changeset appears to be 0)
86 [1]
86 [1]
87 $ cp -r .hg/store-full/. .hg/store
87 $ cp -R .hg/store-full/. .hg/store
88
88
89 Entire manifest log missing
89 Entire manifest log missing
90
90
@@ -94,7 +94,7 b' Entire manifest log missing'
94 1 integrity errors encountered!
94 1 integrity errors encountered!
95 (first damaged changeset appears to be 0)
95 (first damaged changeset appears to be 0)
96 [1]
96 [1]
97 $ cp -r .hg/store-full/. .hg/store
97 $ cp -R .hg/store-full/. .hg/store
98
98
99 Entire filelog missing
99 Entire filelog missing
100
100
@@ -109,7 +109,7 b' Entire filelog missing'
109 3 integrity errors encountered!
109 3 integrity errors encountered!
110 (first damaged changeset appears to be 0)
110 (first damaged changeset appears to be 0)
111 [1]
111 [1]
112 $ cp -r .hg/store-full/. .hg/store
112 $ cp -R .hg/store-full/. .hg/store
113
113
114 Entire changelog and manifest log missing
114 Entire changelog and manifest log missing
115
115
@@ -118,7 +118,7 b' Entire changelog and manifest log missin'
118 $ hg verify -q
118 $ hg verify -q
119 warning: orphan revlog 'data/file.i'
119 warning: orphan revlog 'data/file.i'
120 1 warnings encountered!
120 1 warnings encountered!
121 $ cp -r .hg/store-full/. .hg/store
121 $ cp -R .hg/store-full/. .hg/store
122
122
123 Entire changelog and filelog missing
123 Entire changelog and filelog missing
124
124
@@ -137,7 +137,7 b' Entire changelog and filelog missing'
137 6 integrity errors encountered!
137 6 integrity errors encountered!
138 (first damaged changeset appears to be 0)
138 (first damaged changeset appears to be 0)
139 [1]
139 [1]
140 $ cp -r .hg/store-full/. .hg/store
140 $ cp -R .hg/store-full/. .hg/store
141
141
142 Entire manifest log and filelog missing
142 Entire manifest log and filelog missing
143
143
@@ -152,7 +152,7 b' Entire manifest log and filelog missing'
152 2 integrity errors encountered!
152 2 integrity errors encountered!
153 (first damaged changeset appears to be 0)
153 (first damaged changeset appears to be 0)
154 [1]
154 [1]
155 $ cp -r .hg/store-full/. .hg/store
155 $ cp -R .hg/store-full/. .hg/store
156
156
157 Changelog missing entry
157 Changelog missing entry
158
158
@@ -165,7 +165,7 b' Changelog missing entry'
165 1 warnings encountered!
165 1 warnings encountered!
166 3 integrity errors encountered!
166 3 integrity errors encountered!
167 [1]
167 [1]
168 $ cp -r .hg/store-full/. .hg/store
168 $ cp -R .hg/store-full/. .hg/store
169
169
170 Manifest log missing entry
170 Manifest log missing entry
171
171
@@ -176,7 +176,7 b' Manifest log missing entry'
176 2 integrity errors encountered!
176 2 integrity errors encountered!
177 (first damaged changeset appears to be 1)
177 (first damaged changeset appears to be 1)
178 [1]
178 [1]
179 $ cp -r .hg/store-full/. .hg/store
179 $ cp -R .hg/store-full/. .hg/store
180
180
181 Filelog missing entry
181 Filelog missing entry
182
182
@@ -186,7 +186,7 b' Filelog missing entry'
186 1 integrity errors encountered!
186 1 integrity errors encountered!
187 (first damaged changeset appears to be 1)
187 (first damaged changeset appears to be 1)
188 [1]
188 [1]
189 $ cp -r .hg/store-full/. .hg/store
189 $ cp -R .hg/store-full/. .hg/store
190
190
191 Changelog and manifest log missing entry
191 Changelog and manifest log missing entry
192
192
@@ -199,7 +199,7 b' Changelog and manifest log missing entry'
199 1 warnings encountered!
199 1 warnings encountered!
200 2 integrity errors encountered!
200 2 integrity errors encountered!
201 [1]
201 [1]
202 $ cp -r .hg/store-full/. .hg/store
202 $ cp -R .hg/store-full/. .hg/store
203
203
204 Changelog and filelog missing entry
204 Changelog and filelog missing entry
205
205
@@ -211,7 +211,7 b' Changelog and filelog missing entry'
211 file@?: manifest refers to unknown revision c10f2164107d
211 file@?: manifest refers to unknown revision c10f2164107d
212 3 integrity errors encountered!
212 3 integrity errors encountered!
213 [1]
213 [1]
214 $ cp -r .hg/store-full/. .hg/store
214 $ cp -R .hg/store-full/. .hg/store
215
215
216 Manifest and filelog missing entry
216 Manifest and filelog missing entry
217
217
@@ -222,7 +222,7 b' Manifest and filelog missing entry'
222 1 integrity errors encountered!
222 1 integrity errors encountered!
223 (first damaged changeset appears to be 1)
223 (first damaged changeset appears to be 1)
224 [1]
224 [1]
225 $ cp -r .hg/store-full/. .hg/store
225 $ cp -R .hg/store-full/. .hg/store
226
226
227 Corrupt changelog base node to cause failure to read revision
227 Corrupt changelog base node to cause failure to read revision
228
228
@@ -238,7 +238,7 b' Corrupt changelog base node to cause fai'
238 4 integrity errors encountered!
238 4 integrity errors encountered!
239 (first damaged changeset appears to be 0)
239 (first damaged changeset appears to be 0)
240 [1]
240 [1]
241 $ cp -r .hg/store-full/. .hg/store
241 $ cp -R .hg/store-full/. .hg/store
242
242
243 Corrupt manifest log base node to cause failure to read revision
243 Corrupt manifest log base node to cause failure to read revision
244
244
@@ -250,7 +250,7 b' Corrupt manifest log base node to cause '
250 2 integrity errors encountered!
250 2 integrity errors encountered!
251 (first damaged changeset appears to be 0)
251 (first damaged changeset appears to be 0)
252 [1]
252 [1]
253 $ cp -r .hg/store-full/. .hg/store
253 $ cp -R .hg/store-full/. .hg/store
254
254
255 Corrupt filelog base node to cause failure to read revision
255 Corrupt filelog base node to cause failure to read revision
256
256
@@ -261,7 +261,7 b' Corrupt filelog base node to cause failu'
261 1 integrity errors encountered!
261 1 integrity errors encountered!
262 (first damaged changeset appears to be 0)
262 (first damaged changeset appears to be 0)
263 [1]
263 [1]
264 $ cp -r .hg/store-full/. .hg/store
264 $ cp -R .hg/store-full/. .hg/store
265
265
266 $ cd ..
266 $ cd ..
267
267
General Comments 0
You need to be logged in to leave comments. Login now