##// END OF EJS Templates
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems...
Joerg Sonnenberger -
r45218:5c2a4f37 default
parent child Browse files
Show More
@@ -281,24 +281,36 b' on clone (and update) with various subst'
281 281 $ hg clone -q main main2
282 282 abort: subrepo path contains illegal component: $SUB
283 283 [255]
284 $ ls main2
284 $ ls -A main2
285 .hg
286 .hgsub
287 .hgsubstate
285 288
286 289 $ SUB=sub1 hg clone -q main main3
287 290 abort: subrepo path contains illegal component: $SUB
288 291 [255]
289 $ ls main3
292 $ ls -A main3
293 .hg
294 .hgsub
295 .hgsubstate
290 296
291 297 $ SUB=sub2 hg clone -q main main4
292 298 abort: subrepo path contains illegal component: $SUB
293 299 [255]
294 $ ls main4
300 $ ls -A main4
301 .hg
302 .hgsub
303 .hgsubstate
295 304
296 305 on clone empty subrepo into .hg, then pull (and update), which at least fails:
297 306
298 307 $ SUB=.hg hg clone -qr0 main main5
299 308 abort: subrepo path contains illegal component: $SUB
300 309 [255]
301 $ ls main5
310 $ ls -A main5
311 .hg
312 .hgsub
313 .hgsubstate
302 314 $ test -d main5/.hg/.hg
303 315 [1]
304 316 $ SUB=.hg hg -R main5 pull -u
@@ -320,7 +332,10 b' on clone (and update) into .hg, which at'
320 332 $ SUB=.hg hg clone -q main main6
321 333 abort: subrepo path contains illegal component: $SUB
322 334 [255]
323 $ ls main6
335 $ ls -A main6
336 .hg
337 .hgsub
338 .hgsubstate
324 339 $ cat main6/.hg/hgrc | grep pwned
325 340 [1]
326 341
@@ -329,7 +344,10 b' on clone (and update) into .hg/* subdir:'
329 344 $ SUB=.hg/foo hg clone -q main main7
330 345 abort: subrepo path contains illegal component: $SUB
331 346 [255]
332 $ ls main7
347 $ ls -A main7
348 .hg
349 .hgsub
350 .hgsubstate
333 351 $ test -d main7/.hg/.hg
334 352 [1]
335 353
@@ -338,7 +356,10 b' on clone (and update) into outer tree:'
338 356 $ SUB=../out-of-tree-write hg clone -q main main8
339 357 abort: subrepo path contains illegal component: $SUB
340 358 [255]
341 $ ls main8
359 $ ls -A main8
360 .hg
361 .hgsub
362 .hgsubstate
342 363
343 364 on clone (and update) into e.g. $HOME, which doesn't work since subrepo paths
344 365 are concatenated prior to variable expansion:
@@ -346,8 +367,8 b' are concatenated prior to variable expan'
346 367 $ SUB="$TESTTMP/envvar/fakehome" hg clone -q main main9
347 368 abort: subrepo path contains illegal component: $SUB
348 369 [255]
349 $ ls main9 | wc -l
350 \s*0 (re)
370 $ ls -A main9 | wc -l
371 \s*3 (re)
351 372
352 373 $ ls
353 374 main
@@ -618,7 +639,8 b' then pull (and update):'
618 639 $ SUB="$FAKEHOME" hg clone -qr1 main main6
619 640 abort: subrepo path contains illegal component: $SUB
620 641 [255]
621 $ ls "$FAKEHOME"
642 $ ls -A "$FAKEHOME"
643 .hg
622 644 a
623 645 $ SUB="$FAKEHOME" hg -R main6 pull -u
624 646 pulling from $TESTTMP/envvarsym/main
@@ -631,7 +653,8 b' then pull (and update):'
631 653 .hgsubstate: untracked file differs
632 654 abort: untracked files in working directory differ from files in requested revision
633 655 [255]
634 $ ls "$FAKEHOME"
656 $ ls -A "$FAKEHOME"
657 .hg
635 658 a
636 659
637 660 on clone only symlink with hg-managed fakehome directory,
@@ -642,7 +665,8 b' then pull (and update):'
642 665 $ touch "$FAKEHOME/a"
643 666 $ hg -R "$FAKEHOME" ci -qAm 'add fakehome file'
644 667 $ SUB="$FAKEHOME" hg clone -qr0 main main7
645 $ ls "$FAKEHOME"
668 $ ls -A "$FAKEHOME"
669 .hg
646 670 a
647 671 $ SUB="$FAKEHOME" hg -R main7 pull -uf
648 672 pulling from $TESTTMP/envvarsym/main
@@ -654,7 +678,8 b' then pull (and update):'
654 678 new changesets * (glob)
655 679 abort: subrepo path contains illegal component: $SUB
656 680 [255]
657 $ ls "$FAKEHOME"
681 $ ls -A "$FAKEHOME"
682 .hg
658 683 a
659 684
660 685 $ cd ..
@@ -698,7 +723,10 b' on clone (and update):'
698 723 #else
699 724
700 725 $ hg clone -q driveletter driveletter2
701 $ ls driveletter2
726 $ ls -A driveletter2
727 .hg
728 .hgsub
729 .hgsubstate
702 730 X:
703 731
704 732 #endif
@@ -2,7 +2,8 b''
2 2 $ echo This is file a1 > a
3 3 $ hg add a
4 4 $ hg commit -m "commit #0"
5 $ ls
5 $ ls -A
6 .hg
6 7 a
7 8 $ echo This is file b1 > b
8 9 $ hg add b
@@ -12,5 +13,6 b''
12 13
13 14 B should disappear
14 15
15 $ ls
16 $ ls -A
17 .hg
16 18 a
@@ -1097,7 +1097,8 b' Request to clone a single branch is resp'
1097 1097 no changes found
1098 1098 adding remote bookmark bookA
1099 1099
1100 $ ls share-1anowc
1100 $ ls -A share-1anowc
1101 .hg
1101 1102
1102 1103 Test that auto sharing doesn't cause failure of "hg clone local remote"
1103 1104
@@ -292,7 +292,8 b' Move file in one branch and delete it in'
292 292 rebasing 1:472e38d57782 "mv a b"
293 293 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg
294 294 $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
295 $ ls
295 $ ls -A
296 .hg
296 297 b
297 298 $ cd ..
298 299 $ rm -rf repo
@@ -433,7 +434,8 b' Move one file and add another file in th'
433 434 rebasing 3:ef716627c70b "mod a" (tip)
434 435 merging b and a to b
435 436 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
436 $ ls
437 $ ls -A
438 .hg
437 439 b
438 440 c
439 441 $ cat b
@@ -470,7 +472,8 b' Merge test'
470 472 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
471 473 (branch merge, don't forget to commit)
472 474 $ hg ci -m merge
473 $ ls
475 $ ls -A
476 .hg
474 477 b
475 478 $ cd ..
476 479 $ rm -rf repo
@@ -505,7 +508,8 b' Copy and move file'
505 508 merging b and a to b
506 509 merging c and a to c
507 510 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
508 $ ls
511 $ ls -A
512 .hg
509 513 b
510 514 c
511 515 $ cat b
@@ -558,7 +562,8 b' Do a merge commit with many consequent m'
558 562 |/ desc: mod a
559 563 o rev: 0, phase: draft
560 564 desc: initial
561 $ ls
565 $ ls -A
566 .hg
562 567 c
563 568 $ cd ..
564 569 $ rm -rf repo
@@ -588,7 +593,8 b' Test shelve/unshelve'
588 593 unshelving change 'default'
589 594 rebasing shelved changes
590 595 merging b and a to b
591 $ ls
596 $ ls -A
597 .hg
592 598 b
593 599 $ cat b
594 600 b
@@ -62,7 +62,8 b' should merge c into a'
62 62 merging with 1:d36c0562f908
63 63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 64 new changeset 3:a323a0c43ec4 merges remote changes with local
65 $ ls c
65 $ ls -A c
66 .hg
66 67 a
67 68 b
68 69 c
@@ -1823,7 +1823,8 b' Importing with some success and some err'
1823 1823 $ hg status -c .
1824 1824 C a
1825 1825 C b
1826 $ ls
1826 $ ls -A
1827 .hg
1827 1828 a
1828 1829 a.rej
1829 1830 b
@@ -1870,7 +1871,8 b' Importing with zero success:'
1870 1871 $ hg status -c .
1871 1872 C a
1872 1873 C b
1873 $ ls
1874 $ ls -A
1875 .hg
1874 1876 a
1875 1877 a.rej
1876 1878 b
@@ -1919,7 +1921,8 b' Importing with unknown file:'
1919 1921 $ hg status -c .
1920 1922 C a
1921 1923 C b
1922 $ ls
1924 $ ls -A
1925 .hg
1923 1926 a
1924 1927 a.rej
1925 1928 b
@@ -126,7 +126,9 b' Remove both largefiles and normal files.'
126 126 Invoking status precommit hook
127 127 R large1
128 128 R normal1
129 $ ls
129 $ ls -A
130 .hg
131 .hglf
130 132 sub
131 133 $ echo "testlargefile" > large1-test
132 134 $ hg add --large large1-test
@@ -254,7 +256,8 b' archiving.'
254 256 $ cat sub/large2
255 257 large22
256 258 $ cd ../archive2
257 $ ls
259 $ ls -A
260 .hg_archival.txt
258 261 sub
259 262 $ cat sub/normal2
260 263 normal22
@@ -28,7 +28,8 b' Make a narrow clone then archive it'
28 28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 29
30 30 The clone directory should only contain f1 and f2
31 $ ls -1 narrowclone1 | sort
31 $ ls -A -1 narrowclone1 | sort
32 .hg
32 33 f1
33 34 f2
34 35
@@ -54,7 +54,8 b' Cloning a specific file when stream clon'
54 54 transferred * KB in * seconds (* */sec) (glob)
55 55
56 56 $ cd narrow
57 $ ls
57 $ ls -A
58 .hg
58 59 $ hg tracked
59 60 I path:dir/src/F10
60 61
@@ -180,7 +180,8 b' narrow clone no paths at all'
180 180 $ hg tracked
181 181 $ hg update
182 182 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
183 $ ls
183 $ ls -A
184 .hg
184 185
185 186 $ cd ..
186 187
@@ -26,7 +26,8 b' narrow clone a couple files, f2 and f8'
26 26 updating to branch default
27 27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 28 $ cd narrow
29 $ ls
29 $ ls -A
30 .hg
30 31 f2
31 32 f8
32 33 $ cat f2 f8
@@ -46,7 +46,8 b' narrow clone the inside file'
46 46 $ cd narrow
47 47 $ hg tracked
48 48 I path:inside
49 $ ls
49 $ ls -A
50 .hg
50 51 inside
51 52 $ cat inside/f
52 53 inside
@@ -55,7 +55,8 b' widen from an empty clone'
55 55 added 0 changesets with 1 changes to 1 files
56 56 $ hg tracked
57 57 I path:inside
58 $ ls
58 $ ls -A
59 .hg
59 60 inside
60 61 $ cat inside/f
61 62 inside
@@ -51,7 +51,8 b' narrow clone the inside file'
51 51 $ cd narrow
52 52 $ hg tracked
53 53 I path:inside
54 $ ls
54 $ ls -A
55 .hg
55 56 inside
56 57 $ cat inside/f
57 58 inside
@@ -25,7 +25,9 b' delete an empty directory'
25 25 empty_dir
26 26 $ hg purge -v
27 27 removing directory empty_dir
28 $ ls
28 $ ls -A
29 .hg
30 .hgignore
29 31 directory
30 32 r1
31 33
@@ -41,7 +43,9 b' delete an untracked directory'
41 43 removing file untracked_dir/untracked_file1
42 44 removing file untracked_dir/untracked_file2
43 45 removing directory untracked_dir
44 $ ls
46 $ ls -A
47 .hg
48 .hgignore
45 49 directory
46 50 r1
47 51
@@ -61,7 +65,9 b' delete an untracked file'
61 65 $ hg purge -v
62 66 removing file untracked_file
63 67 removing file untracked_file_readonly
64 $ ls
68 $ ls -A
69 .hg
70 .hgignore
65 71 directory
66 72 r1
67 73
@@ -72,7 +78,9 b' delete an untracked file in a tracked di'
72 78 directory/untracked_file
73 79 $ hg purge -v
74 80 removing file directory/untracked_file
75 $ ls
81 $ ls -A
82 .hg
83 .hgignore
76 84 directory
77 85 r1
78 86
@@ -84,7 +92,9 b' delete nested directories'
84 92 $ hg purge -v
85 93 removing directory untracked_directory/nested_directory
86 94 removing directory untracked_directory
87 $ ls
95 $ ls -A
96 .hg
97 .hgignore
88 98 directory
89 99 r1
90 100
@@ -98,7 +108,9 b' delete nested directories from a subdir'
98 108 removing directory untracked_directory/nested_directory
99 109 removing directory untracked_directory
100 110 $ cd ..
101 $ ls
111 $ ls -A
112 .hg
113 .hgignore
102 114 directory
103 115 r1
104 116
@@ -113,7 +125,9 b' delete only part of the tree'
113 125 removing directory untracked_directory/nested_directory
114 126 removing directory untracked_directory
115 127 $ cd ..
116 $ ls
128 $ ls -A
129 .hg
130 .hgignore
117 131 directory
118 132 r1
119 133 $ ls directory/untracked_file
@@ -135,7 +149,9 b' skip ignored files if -i or --all not sp'
135 149 ignored
136 150 $ hg purge -v -i
137 151 removing file ignored
138 $ ls
152 $ ls -A
153 .hg
154 .hgignore
139 155 directory
140 156 r1
141 157 untracked_file
@@ -189,7 +205,9 b' skip excluded files'
189 205 $ touch excluded_file
190 206 $ hg purge -p -X excluded_file
191 207 $ hg purge -v -X excluded_file
192 $ ls
208 $ ls -A
209 .hg
210 .hgignore
193 211 directory
194 212 excluded_file
195 213 r1
@@ -201,7 +219,9 b' skip files in excluded dirs'
201 219 $ touch excluded_dir/file
202 220 $ hg purge -p -X excluded_dir
203 221 $ hg purge -v -X excluded_dir
204 $ ls
222 $ ls -A
223 .hg
224 .hgignore
205 225 directory
206 226 excluded_dir
207 227 r1
@@ -214,7 +234,9 b' skip excluded empty dirs'
214 234 $ mkdir excluded_dir
215 235 $ hg purge -p -X excluded_dir
216 236 $ hg purge -v -X excluded_dir
217 $ ls
237 $ ls -A
238 .hg
239 .hgignore
218 240 directory
219 241 excluded_dir
220 242 r1
@@ -241,7 +263,9 b' only remove files'
241 263 $ hg purge -v --files
242 264 removing file dir/untracked_file
243 265 removing file untracked_file
244 $ ls
266 $ ls -A
267 .hg
268 .hgignore
245 269 dir
246 270 empty_dir
247 271 $ ls dir
@@ -254,7 +278,9 b' only remove dirs'
254 278 empty_dir
255 279 $ hg purge -v --dirs
256 280 removing directory empty_dir
257 $ ls
281 $ ls -A
282 .hg
283 .hgignore
258 284 dir
259 285 untracked_file
260 286 $ ls dir
@@ -273,6 +299,8 b' remove both files and dirs'
273 299 removing file untracked_file
274 300 removing directory empty_dir
275 301 removing directory dir
276 $ ls
302 $ ls -A
303 .hg
304 .hgignore
277 305
278 306 $ cd ..
@@ -121,7 +121,8 b''
121 121 # unbundle
122 122
123 123 $ clearcache
124 $ ls
124 $ ls -A
125 .hg
125 126 w
126 127 x
127 128 y
@@ -475,14 +475,16 b' Prompt before undeleting file(issue6008)'
475 475 > EOF
476 476 add back removed file a (Yn)? y
477 477 undeleting a
478 $ ls
478 $ ls -A
479 .hg
479 480 a
480 481 $ hg rm a
481 482 $ hg revert -i<<EOF
482 483 > n
483 484 > EOF
484 485 add back removed file a (Yn)? n
485 $ ls
486 $ ls -A
487 .hg
486 488 $ hg revert -a
487 489 undeleting a
488 490 $ cd ..
@@ -24,6 +24,7 b' Should show unknown and b removed'
24 24
25 25 Should show a and unknown
26 26
27 $ ls
27 $ ls -A
28 .hg
28 29 a
29 30 unknown
@@ -73,7 +73,8 b' revert deletion (! status) of a added fi'
73 73 $ hg status b
74 74 b: * (glob)
75 75
76 $ ls
76 $ ls -A
77 .hg
77 78 a
78 79 c
79 80 e
@@ -1249,7 +1249,8 b' Abort unshelve while merging (issue5123)'
1249 1249 record change 2/2 to 'd'?
1250 1250 (enter ? for help) [Ynesfdaq?] n
1251 1251
1252 $ ls
1252 $ ls -A
1253 .hg
1253 1254 b
1254 1255 c
1255 1256 e
@@ -1284,7 +1285,8 b' Abort unshelve while merging (issue5123)'
1284 1285 $ hg status -v
1285 1286 A c
1286 1287 A d
1287 $ ls
1288 $ ls -A
1289 .hg
1288 1290 b
1289 1291 c
1290 1292 d
@@ -28,10 +28,12 b' test sparse'
28 28 Clear rules when there are includes
29 29
30 30 $ hg debugsparse --include *.py
31 $ ls
31 $ ls -A
32 .hg
32 33 data.py
33 34 $ hg debugsparse --clear-rules
34 $ ls
35 $ ls -A
36 .hg
35 37 base.sparse
36 38 data.py
37 39 index.html
@@ -41,12 +43,14 b' Clear rules when there are includes'
41 43 Clear rules when there are excludes
42 44
43 45 $ hg debugsparse --exclude *.sparse
44 $ ls
46 $ ls -A
47 .hg
45 48 data.py
46 49 index.html
47 50 readme.txt
48 51 $ hg debugsparse --clear-rules
49 $ ls
52 $ ls -A
53 .hg
50 54 base.sparse
51 55 data.py
52 56 index.html
@@ -56,18 +60,21 b' Clear rules when there are excludes'
56 60 Clearing rules should not alter profiles
57 61
58 62 $ hg debugsparse --enable-profile webpage.sparse
59 $ ls
63 $ ls -A
64 .hg
60 65 base.sparse
61 66 index.html
62 67 webpage.sparse
63 68 $ hg debugsparse --include *.py
64 $ ls
69 $ ls -A
70 .hg
65 71 base.sparse
66 72 data.py
67 73 index.html
68 74 webpage.sparse
69 75 $ hg debugsparse --clear-rules
70 $ ls
76 $ ls -A
77 .hg
71 78 base.sparse
72 79 index.html
73 80 webpage.sparse
@@ -34,7 +34,8 b' Verify local clone with a sparse profile'
34 34 warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it
35 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 36 $ cd clone1
37 $ ls
37 $ ls -A
38 .hg
38 39 index.html
39 40 $ cd ..
40 41
@@ -44,7 +45,8 b' Verify local clone with include works'
44 45 updating to branch default
45 46 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
46 47 $ cd clone2
47 $ ls
48 $ ls -A
49 .hg
48 50 backend.sparse
49 51 webpage.sparse
50 52 $ cd ..
@@ -55,7 +57,8 b' Verify local clone with exclude works'
55 57 updating to branch default
56 58 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
57 59 $ cd clone3
58 $ ls
60 $ ls -A
61 .hg
59 62 backend.sparse
60 63 index.html
61 64 readme.txt
@@ -67,6 +70,7 b' Verify sparse clone profile over ssh wor'
67 70 $ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4
68 71 warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it
69 72 $ cd clone4
70 $ ls
73 $ ls -A
74 .hg
71 75 index.html
72 76 $ cd ..
@@ -32,7 +32,8 b" Import a rules file against a 'blank' sp"
32 32 > *.py
33 33 > EOF
34 34 $ hg debugsparse --import-rules $TESTTMP/rules_to_import
35 $ ls
35 $ ls -A
36 .hg
36 37 data.py
37 38
38 39 $ hg debugsparse --reset
@@ -44,7 +45,8 b" Import a rules file against a 'blank' sp"
44 45 > *.py
45 46 > EOF
46 47 $ hg debugsparse --import-rules $TESTTMP/rules_to_import
47 $ ls
48 $ ls -A
49 .hg
48 50 base.sparse
49 51 data.py
50 52 webpage.sparse
@@ -65,7 +67,8 b' Start against an existing profile; rules'
65 67 > *.py
66 68 > EOF
67 69 $ hg debugsparse --import-rules $TESTTMP/rules_to_import
68 $ ls
70 $ ls -A
71 .hg
69 72 base.sparse
70 73 index.html
71 74 readme.txt
@@ -28,7 +28,8 b' test merging things outside of the spars'
28 28
29 29 Verify bar was merged temporarily
30 30
31 $ ls
31 $ ls -A
32 .hg
32 33 bar
33 34 foo
34 35 $ hg status
@@ -39,7 +40,8 b' Verify bar disappears automatically when'
39 40 $ hg commit -m "merged"
40 41 cleaned up 1 temporarily added file(s) from the sparse checkout
41 42 $ hg status
42 $ ls
43 $ ls -A
44 .hg
43 45 foo
44 46
45 47 $ hg cat -r . bar
@@ -108,7 +110,9 b' file is excluded from sparse checkout'
108 110 o 0:53f3774ed939 added .hgignore
109 111
110 112 $ hg debugsparse --exclude "d"
111 $ ls
113 $ ls -A
114 .hg
115 .hgignore
112 116 a
113 117
114 118 $ hg merge
@@ -168,7 +172,9 b' another'
168 172 o 0:53f3774ed939 added .hgignore
169 173
170 174 $ hg debugsparse --exclude "a"
171 $ ls
175 $ ls -A
176 .hg
177 .hgignore
172 178 d
173 179
174 180 $ hg merge
@@ -42,7 +42,8 b' Config file without [section] is rejecte'
42 42 Verify enabling a single profile works
43 43
44 44 $ hg debugsparse --enable-profile webpage.sparse
45 $ ls
45 $ ls -A
46 .hg
46 47 backend.sparse
47 48 index.html
48 49 webpage.sparse
@@ -50,7 +51,8 b' Verify enabling a single profile works'
50 51 Verify enabling two profiles works
51 52
52 53 $ hg debugsparse --enable-profile backend.sparse
53 $ ls
54 $ ls -A
55 .hg
54 56 backend.sparse
55 57 data.py
56 58 index.html
@@ -59,7 +61,8 b' Verify enabling two profiles works'
59 61 Verify disabling a profile works
60 62
61 63 $ hg debugsparse --disable-profile webpage.sparse
62 $ ls
64 $ ls -A
65 .hg
63 66 backend.sparse
64 67 data.py
65 68 webpage.sparse
@@ -81,20 +84,23 b' Verify that a profile is updated across '
81 84 $ echo foo >> data.py
82 85
83 86 $ hg ci -m 'edit profile'
84 $ ls
87 $ ls -A
88 .hg
85 89 backend.sparse
86 90 data.py
87 91 readme.txt
88 92 webpage.sparse
89 93
90 94 $ hg up -q 0
91 $ ls
95 $ ls -A
96 .hg
92 97 backend.sparse
93 98 data.py
94 99 webpage.sparse
95 100
96 101 $ hg up -q 1
97 $ ls
102 $ ls -A
103 .hg
98 104 backend.sparse
99 105 data.py
100 106 readme.txt
@@ -111,7 +117,8 b' Introduce a conflicting .hgsparse change'
111 117 $ echo bar >> data.py
112 118
113 119 $ hg ci -qAm "edit profile other"
114 $ ls
120 $ ls -A
121 .hg
115 122 backend.sparse
116 123 index.html
117 124 webpage.sparse
@@ -129,7 +136,8 b' Verify conflicting merge pulls in the co'
129 136 [1]
130 137
131 138 $ rm *.orig
132 $ ls
139 $ ls -A
140 .hg
133 141 backend.sparse
134 142 data.py
135 143 index.html
@@ -154,7 +162,8 b' Verify resolving the merge removes the t'
154 162 (no more unresolved files)
155 163
156 164 $ hg ci -qAm "merge profiles"
157 $ ls
165 $ ls -A
166 .hg
158 167 backend.sparse
159 168 index.html
160 169 readme.txt
@@ -168,7 +177,8 b' Verify resolving the merge removes the t'
168 177 Verify stripping refreshes dirstate
169 178
170 179 $ hg strip -q -r .
171 $ ls
180 $ ls -A
181 .hg
172 182 backend.sparse
173 183 index.html
174 184 webpage.sparse
@@ -176,7 +186,8 b' Verify stripping refreshes dirstate'
176 186 Verify rebase conflicts pulls in the conflicting changes
177 187
178 188 $ hg up -q 1
179 $ ls
189 $ ls -A
190 .hg
180 191 backend.sparse
181 192 data.py
182 193 readme.txt
@@ -192,7 +203,8 b' Verify rebase conflicts pulls in the con'
192 203 unresolved conflicts (see hg resolve, then hg rebase --continue)
193 204 [1]
194 205 $ rm *.orig
195 $ ls
206 $ ls -A
207 .hg
196 208 backend.sparse
197 209 data.py
198 210 index.html
@@ -217,7 +229,8 b' Verify resolving conflict removes the te'
217 229 continue: hg rebase --continue
218 230
219 231 $ hg rebase -q --continue
220 $ ls
232 $ ls -A
233 .hg
221 234 backend.sparse
222 235 index.html
223 236 readme.txt
@@ -237,13 +250,15 b' warning message can be suppressed by set'
237 250 $ hg commit -m "delete profiles"
238 251 $ hg up -q ".^"
239 252 $ hg debugsparse --enable-profile backend.sparse
240 $ ls
253 $ ls -A
254 .hg
241 255 index.html
242 256 readme.txt
243 257 $ hg up tip | grep warning
244 258 warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it
245 259 [1]
246 $ ls
260 $ ls -A
261 .hg
247 262 data.py
248 263 index.html
249 264 readme.txt
@@ -26,7 +26,8 b' Enable sparse profile'
26 26 testonly-simplestore (reposimplestore !)
27 27
28 28 $ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse
29 $ ls
29 $ ls -A
30 .hg
30 31 a.html
31 32 b.html
32 33
@@ -22,7 +22,8 b' Verify basic --include'
22 22
23 23 $ hg up -q 0
24 24 $ hg debugsparse --include 'hide'
25 $ ls
25 $ ls -A
26 .hg
26 27 hide
27 28
28 29 Absolute paths outside the repo should just be rejected
@@ -77,7 +78,8 b' Verify commiting while sparse includes o'
77 78
78 79 $ echo z > hide
79 80 $ hg ci -Aqm 'edit hide'
80 $ ls
81 $ ls -A
82 .hg
81 83 hide
82 84 $ hg manifest
83 85 hide
@@ -86,7 +88,8 b' Verify commiting while sparse includes o'
86 88 Verify --reset brings files back
87 89
88 90 $ hg debugsparse --reset
89 $ ls
91 $ ls -A
92 .hg
90 93 hide
91 94 show
92 95 $ cat hide
@@ -106,11 +109,13 b" Verify 'hg debugsparse' default output"
106 109 Verify update only writes included files
107 110
108 111 $ hg up -q 0
109 $ ls
112 $ ls -A
113 .hg
110 114 show
111 115
112 116 $ hg up -q 1
113 $ ls
117 $ ls -A
118 .hg
114 119 show
115 120 show2
116 121
@@ -144,7 +149,8 b' Verify deleting sparseness with --force '
144 149
145 150 $ hg debugsparse --delete -f 'show*'
146 151 pending changes to 'hide'
147 $ ls
152 $ ls -A
153 .hg
148 154 hide
149 155 hide2
150 156 hide3
@@ -166,7 +172,8 b' Verify adding sparseness hides files'
166 172
167 173 $ hg debugsparse --exclude -f 'hide*'
168 174 pending changes to 'hide'
169 $ ls
175 $ ls -A
176 .hg
170 177 hide
171 178 hide3
172 179 show
@@ -177,7 +184,8 b' Verify adding sparseness hides files'
177 184 $ hg up -qC .
178 185 TODO: add an option to purge to also purge files outside the sparse config?
179 186 $ hg purge --all --config extensions.purge=
180 $ ls
187 $ ls -A
188 .hg
181 189 hide
182 190 hide3
183 191 show
@@ -216,7 +224,8 b' Verify aborting a rebase cleans up tempo'
216 224 rebase aborted
217 225 $ rm hide.orig
218 226
219 $ ls
227 $ ls -A
228 .hg
220 229 show
221 230 show2
222 231
@@ -50,7 +50,8 b' delete .hgsub and update'
50 50 $ hg st
51 51 warning: subrepo spec file '.hgsub' not found
52 52 ! .hgsub
53 $ ls subrepo
53 $ ls -A subrepo
54 .hg
54 55 a
55 56
56 57 delete .hgsubstate and update
@@ -65,7 +66,8 b' delete .hgsubstate and update'
65 66 use (c)hanged version or leave (d)eleted? c
66 67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 68 $ hg st
68 $ ls subrepo
69 $ ls -A subrepo
70 .hg
69 71 a
70 72
71 73 Enable obsolete
@@ -134,7 +136,10 b" verifying shouldn't init a new subrepo i"
134 136 1: repository $TESTTMP/repo/subrepo not found
135 137 3: repository $TESTTMP/repo/subrepo not found
136 138 4: repository $TESTTMP/repo/subrepo not found
137 $ ls
139 $ ls -A
140 .hg
141 .hgsub
142 .hgsubstate
138 143 b
139 144 $ mv b subrepo
140 145
@@ -498,7 +498,10 b' clone with subrepo disabled (update shou'
498 498 abort: subrepos not enabled
499 499 (see 'hg help config.subrepos' for details)
500 500 [255]
501 $ ls tc2
501 $ ls -A tc2
502 .hg
503 .hgsub
504 .hgsubstate
502 505 a
503 506
504 507 $ hg clone t tc3 --config subrepos.allowed=false
@@ -506,7 +509,10 b' clone with subrepo disabled (update shou'
506 509 abort: subrepos not enabled
507 510 (see 'hg help config.subrepos' for details)
508 511 [255]
509 $ ls tc3
512 $ ls -A tc3
513 .hg
514 .hgsub
515 .hgsubstate
510 516 a
511 517
512 518 And again with just the hg type disabled
@@ -516,7 +522,10 b' And again with just the hg type disabled'
516 522 abort: hg subrepos not allowed
517 523 (see 'hg help config.subrepos' for details)
518 524 [255]
519 $ ls tc4
525 $ ls -A tc4
526 .hg
527 .hgsub
528 .hgsubstate
520 529 a
521 530
522 531 $ hg clone t tc5 --config subrepos.hg:allowed=false
@@ -524,7 +533,10 b' And again with just the hg type disabled'
524 533 abort: hg subrepos not allowed
525 534 (see 'hg help config.subrepos' for details)
526 535 [255]
527 $ ls tc5
536 $ ls -A tc5
537 .hg
538 .hgsub
539 .hgsubstate
528 540 a
529 541
530 542 push
@@ -60,7 +60,8 b' Create some commits'
60 60 $ touch files
61 61 $ hg add files
62 62 $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done
63 $ ls
63 $ ls -A
64 .hg
64 65 file-a
65 66 file-ab
66 67 file-abc
@@ -12,7 +12,8 b''
12 12
13 13 'main' should be gone:
14 14
15 $ ls
15 $ ls -A
16 .hg
16 17 a
17 18
18 19 $ touch side1
@@ -59,7 +60,8 b''
59 60 date: Thu Jan 01 00:00:00 1970 +0000
60 61 summary: Added main
61 62
62 $ ls
63 $ ls -A
64 .hg
63 65 a
64 66 side1
65 67 side2
@@ -76,7 +78,8 b''
76 78 getting main
77 79 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
78 80
79 $ ls
81 $ ls -A
82 .hg
80 83 a
81 84 main
82 85
General Comments 0
You need to be logged in to leave comments. Login now