Show More
@@ -2,7 +2,8 b" The simple store doesn't escape paths ro" | |||
|
2 | 2 | with periods, etc. So much of this test fails with it. |
|
3 | 3 | #require no-reposimplestore |
|
4 | 4 | |
|
5 | $ hg init | |
|
5 | $ hg init repo | |
|
6 | $ cd repo | |
|
6 | 7 | |
|
7 | 8 | audit of .hg |
|
8 | 9 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo This is file a1 > a |
|
3 | 4 | $ hg add a |
|
4 | 5 | $ hg commit -m "commit #0" |
@@ -1,5 +1,5 b'' | |||
|
1 | $ hg init | |
|
2 | ||
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
3 | 3 | |
|
4 | 4 | committing changes |
|
5 | 5 | |
@@ -460,7 +460,7 b' assuming that the shell returns 127 if c' | |||
|
460 | 460 | |
|
461 | 461 | test bisecting command |
|
462 | 462 | |
|
463 | $ cat > script.py <<EOF | |
|
463 | $ cat > "$TESTTMP/script.py" <<EOF | |
|
464 | 464 | > #!$PYTHON |
|
465 | 465 | > import sys |
|
466 | 466 | > from mercurial import hg, ui as uimod |
@@ -468,7 +468,7 b' test bisecting command' | |||
|
468 | 468 | > if repo[b'.'].rev() < 6: |
|
469 | 469 | > sys.exit(1) |
|
470 | 470 | > EOF |
|
471 | $ chmod +x script.py | |
|
471 | $ chmod +x "$TESTTMP/script.py" | |
|
472 | 472 | $ hg bisect -r |
|
473 | 473 | $ hg up -qr tip |
|
474 | 474 | $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
@@ -497,7 +497,7 b' command' | |||
|
497 | 497 | |
|
498 | 498 | $ hg update null |
|
499 | 499 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
500 | $ cat > script.sh <<'EOF' | |
|
500 | $ cat > "$TESTTMP/script.sh" <<'EOF' | |
|
501 | 501 | > #!/bin/sh |
|
502 | 502 | > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
|
503 | 503 | > current="`hg log -r \"bisect(current)\" --template {node}`" |
@@ -505,7 +505,7 b' command' | |||
|
505 | 505 | > rev="`hg log -r $HG_NODE --template {rev}`" |
|
506 | 506 | > test "$rev" -ge 6 |
|
507 | 507 | > EOF |
|
508 | $ chmod +x script.sh | |
|
508 | $ chmod +x "$TESTTMP/script.sh" | |
|
509 | 509 | $ hg bisect -r |
|
510 | 510 | $ hg bisect --good tip --noupdate |
|
511 | 511 | $ hg bisect --bad 0 --noupdate |
@@ -530,7 +530,7 b" ensure that we still don't have a workin" | |||
|
530 | 530 | |
|
531 | 531 | test the same case, this time with updating |
|
532 | 532 | |
|
533 | $ cat > script.sh <<'EOF' | |
|
533 | $ cat > "$TESTTMP/script.sh" <<'EOF' | |
|
534 | 534 | > #!/bin/sh |
|
535 | 535 | > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
|
536 | 536 | > current="`hg log -r \"bisect(current)\" --template {node}`" |
@@ -538,7 +538,7 b' test the same case, this time with updat' | |||
|
538 | 538 | > rev="`hg log -r . --template {rev}`" |
|
539 | 539 | > test "$rev" -ge 6 |
|
540 | 540 | > EOF |
|
541 | $ chmod +x script.sh | |
|
541 | $ chmod +x "$TESTTMP/script.sh" | |
|
542 | 542 | $ hg bisect -r |
|
543 | 543 | $ hg up -qr tip |
|
544 | 544 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | # init |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ echo a > a |
|
5 | 6 | $ hg add a |
|
6 | 7 | $ hg commit -m'a' |
@@ -3,7 +3,8 b'' | |||
|
3 | 3 | |
|
4 | 4 | initialize repository |
|
5 | 5 | |
|
6 | $ hg init | |
|
6 | $ hg init repo | |
|
7 | $ cd repo | |
|
7 | 8 | |
|
8 | 9 | $ echo 'a' > a |
|
9 | 10 | $ hg ci -A -m "0" |
@@ -38,7 +39,7 b' rebase' | |||
|
38 | 39 | |
|
39 | 40 | $ hg rebase -s two -d one |
|
40 | 41 | rebasing 3:2ae46b1d99a7 two tip "3" |
|
41 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg | |
|
42 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg | |
|
42 | 43 | |
|
43 | 44 | $ hg log |
|
44 | 45 | changeset: 3:42e5ed2cdcf4 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo 0 > a |
|
3 | 4 | $ echo 0 > b |
|
4 | 5 | $ hg ci -A -m m |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo foo > bar |
|
3 | 4 | $ hg commit -Am default |
|
4 | 5 | adding bar |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | Setup: |
|
4 | 5 | |
@@ -36,7 +37,7 b' Amending changeset with changes in worki' | |||
|
36 | 37 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1' |
|
37 | 38 | pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149 |
|
38 | 39 | 43f1ba15f28a tip |
|
39 | saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg | |
|
40 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg | |
|
40 | 41 | $ echo 'pretxncommit.foo = ' >> $HGRCPATH |
|
41 | 42 | $ hg diff -c . |
|
42 | 43 | diff -r ad120869acf0 -r 43f1ba15f28a a |
@@ -94,7 +95,7 b' the amend, there should be no rollback.' | |||
|
94 | 95 | |
|
95 | 96 | Add new file along with modified existing file: |
|
96 | 97 | $ hg ci --amend -m 'amend base1 new file' |
|
97 | saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg | |
|
98 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg | |
|
98 | 99 | |
|
99 | 100 | Remove file that was added in amended commit: |
|
100 | 101 | (and test logfile option) |
@@ -103,7 +104,7 b' Remove file that was added in amended co' | |||
|
103 | 104 | $ hg rm b |
|
104 | 105 | $ echo 'amend base1 remove new file' > ../logfile |
|
105 | 106 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile |
|
106 | saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg | |
|
107 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg | |
|
107 | 108 | |
|
108 | 109 | $ hg cat b |
|
109 | 110 | b: no such file in rev 47343646fa3d |
@@ -123,7 +124,7 b' No changes, just a different message:' | |||
|
123 | 124 | 254 (changelog) |
|
124 | 125 | 163 (manifests) |
|
125 | 126 | 131 a |
|
126 | saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg | |
|
127 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg | |
|
127 | 128 | 1 changesets found |
|
128 | 129 | uncompressed size of bundle content: |
|
129 | 130 | 250 (changelog) |
@@ -170,10 +171,10 b' Test -u/-d:' | |||
|
170 | 171 | > EOF |
|
171 | 172 | $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0' |
|
172 | 173 | HGEDITFORM=commit.amend.normal |
|
173 | saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg | |
|
174 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg | |
|
174 | 175 | $ echo a >> a |
|
175 | 176 | $ hg ci --amend -u foo -d '1 0' |
|
176 | saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg | |
|
177 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg | |
|
177 | 178 | $ hg log -r . |
|
178 | 179 | changeset: 1:a9a13940fc03 |
|
179 | 180 | tag: tip |
@@ -267,7 +268,7 b' then, test editing custom commit message' | |||
|
267 | 268 | 249 (changelog) |
|
268 | 269 | 163 (manifests) |
|
269 | 270 | 133 a |
|
270 | saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg | |
|
271 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg | |
|
271 | 272 | 1 changesets found |
|
272 | 273 | uncompressed size of bundle content: |
|
273 | 274 | 257 (changelog) |
@@ -303,7 +304,7 b' Same, but with changes in working dir (d' | |||
|
303 | 304 | 257 (changelog) |
|
304 | 305 | 163 (manifests) |
|
305 | 306 | 133 a |
|
306 | saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg | |
|
307 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg | |
|
307 | 308 | 1 changesets found |
|
308 | 309 | uncompressed size of bundle content: |
|
309 | 310 | 257 (changelog) |
@@ -330,13 +331,13 b' Moving bookmarks, preserve active bookma' | |||
|
330 | 331 | $ hg book book1 |
|
331 | 332 | $ hg book book2 |
|
332 | 333 | $ hg ci --amend -m 'move bookmarks' |
|
333 | saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg | |
|
334 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg | |
|
334 | 335 | $ hg book |
|
335 | 336 | book1 1:8311f17e2616 |
|
336 | 337 | * book2 1:8311f17e2616 |
|
337 | 338 | $ echo a >> a |
|
338 | 339 | $ hg ci --amend -m 'move bookmarks' |
|
339 | saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg | |
|
340 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg | |
|
340 | 341 | $ hg book |
|
341 | 342 | book1 1:a3b65065808c |
|
342 | 343 | * book2 1:a3b65065808c |
@@ -370,7 +371,7 b' Moving branches:' | |||
|
370 | 371 | $ hg branch default -f |
|
371 | 372 | marked working directory as branch default |
|
372 | 373 | $ hg ci --amend -m 'back to default' |
|
373 | saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg | |
|
374 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg | |
|
374 | 375 | $ hg branches |
|
375 | 376 | default 2:9c07515f2650 |
|
376 | 377 | |
@@ -386,7 +387,7 b' Close branch:' | |||
|
386 | 387 | $ echo b >> b |
|
387 | 388 | $ hg ci -mb |
|
388 | 389 | $ hg ci --amend --close-branch -m 'closing branch foo' |
|
389 | saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg | |
|
390 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c962248fa264-54245dc7-amend.hg | |
|
390 | 391 | |
|
391 | 392 | Same thing, different code path: |
|
392 | 393 | |
@@ -395,7 +396,7 b' Same thing, different code path:' | |||
|
395 | 396 | reopening closed branch head 4 |
|
396 | 397 | $ echo b >> b |
|
397 | 398 | $ hg ci --amend --close-branch |
|
398 | saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg | |
|
399 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/027371728205-b900d9fa-amend.hg | |
|
399 | 400 | $ hg branches |
|
400 | 401 | default 2:9c07515f2650 |
|
401 | 402 | |
@@ -433,7 +434,7 b' Follow copies/renames:' | |||
|
433 | 434 | $ hg ci -m 'b -> c' |
|
434 | 435 | $ hg mv c d |
|
435 | 436 | $ hg ci --amend -m 'b -> d' |
|
436 | saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg | |
|
437 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg | |
|
437 | 438 | $ hg st --rev '.^' --copies d |
|
438 | 439 | A d |
|
439 | 440 | b |
@@ -441,7 +442,7 b' Follow copies/renames:' | |||
|
441 | 442 | $ hg ci -m 'e = d' |
|
442 | 443 | $ hg cp e f |
|
443 | 444 | $ hg ci --amend -m 'f = d' |
|
444 | saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg | |
|
445 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9198f73182d5-251d584a-amend.hg | |
|
445 | 446 | $ hg st --rev '.^' --copies f |
|
446 | 447 | A f |
|
447 | 448 | d |
@@ -452,7 +453,7 b' Follow copies/renames:' | |||
|
452 | 453 | $ hg cp a f |
|
453 | 454 | $ mv f.orig f |
|
454 | 455 | $ hg ci --amend -m replacef |
|
455 | saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg | |
|
456 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg | |
|
456 | 457 | $ hg st --change . --copies |
|
457 | 458 | $ hg log -r . --template "{file_copies}\n" |
|
458 | 459 | |
@@ -464,7 +465,7 b' Move added file (issue3410):' | |||
|
464 | 465 | adding g |
|
465 | 466 | $ hg mv g h |
|
466 | 467 | $ hg ci --amend |
|
467 | saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg | |
|
468 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg | |
|
468 | 469 | $ hg st --change . --copies h |
|
469 | 470 | A h |
|
470 | 471 | $ hg log -r . --template "{file_copies}\n" |
@@ -484,11 +485,11 b' Preserve extra dict (issue3430):' | |||
|
484 | 485 | $ echo a >> a |
|
485 | 486 | $ hg ci -ma |
|
486 | 487 | $ hg ci --amend -m "a'" |
|
487 | saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg | |
|
488 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg | |
|
488 | 489 | $ hg log -r . --template "{branch}\n" |
|
489 | 490 | a |
|
490 | 491 | $ hg ci --amend -m "a''" |
|
491 | saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg | |
|
492 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg | |
|
492 | 493 | $ hg log -r . --template "{branch}\n" |
|
493 | 494 | a |
|
494 | 495 | |
@@ -505,7 +506,7 b" first graft something so there's an addi" | |||
|
505 | 506 | $ hg graft 12 |
|
506 | 507 | grafting 12:2647734878ef "fork" (tip) |
|
507 | 508 | $ hg ci --amend -m 'graft amend' |
|
508 | saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg | |
|
509 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg | |
|
509 | 510 | $ hg log -r . --debug | grep extra |
|
510 | 511 | extra: amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60 |
|
511 | 512 | extra: branch=a |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ cat << EOF > a |
|
3 | 4 | > Small Mathematical Series. |
|
4 | 5 | > One |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo foo > a |
|
3 | 4 | $ hg add a |
|
4 | 5 | $ hg commit -m "1" |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ cat > .hg/hgrc <<EOF |
|
4 | 5 | > [extensions] |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo a > a |
|
3 | 4 | $ hg ci -Am t |
|
4 | 5 | adding a |
@@ -5,7 +5,8 b' Prepare tests:' | |||
|
5 | 5 | $ echo '[alias]' >> $HGRCPATH |
|
6 | 6 | $ echo 'ndiff = diff --nodates' >> $HGRCPATH |
|
7 | 7 | |
|
8 | $ hg init | |
|
8 | $ hg init repo | |
|
9 | $ cd repo | |
|
9 | 10 | $ printf 'hello world\ngoodbye world\n' >foo |
|
10 | 11 | $ hg ci -Amfoo -ufoo |
|
11 | 12 | adding foo |
@@ -8,7 +8,8 b'' | |||
|
8 | 8 | > EOF |
|
9 | 9 | #endif |
|
10 | 10 | |
|
11 | $ hg init | |
|
11 | $ hg init repo | |
|
12 | $ cd repo | |
|
12 | 13 | |
|
13 | 14 | $ cat > a.c <<'EOF' |
|
14 | 15 | > /* |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | Test issue2761 |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | |
|
5 | 6 | $ touch to-be-deleted |
|
6 | 7 | $ hg add |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ "$PYTHON" -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")' |
|
4 | 5 | $ hg ci -Ama -d '1 0' |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | Test temp file used with an editor has the expected suffix. |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | |
|
5 | 6 | Create an editor that writes its arguments to stdout and set it to $HGEDITOR. |
|
6 | 7 | |
@@ -9,7 +10,7 b' Create an editor that writes its argumen' | |||
|
9 | 10 | > exit 1 |
|
10 | 11 | > EOF |
|
11 | 12 | $ hg add editor.sh |
|
12 | $ HGEDITOR="sh $TESTTMP/editor.sh" | |
|
13 | $ HGEDITOR="sh $TESTTMP/repo/editor.sh" | |
|
13 | 14 | $ export HGEDITOR |
|
14 | 15 | |
|
15 | 16 | Verify that the path for a commit editor has the expected suffix. |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | Test encode/decode filters |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ cat > .hg/hgrc <<EOF |
|
5 | 6 | > [encode] |
|
6 | 7 | > not.gz = tr [:lower:] [:upper:] |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | #require execbit |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ echo a > a |
|
5 | 6 | $ hg ci -Am'not executable' |
|
6 | 7 | adding a |
@@ -3,7 +3,8 b' Issue351: mq: qrefresh can create extra ' | |||
|
3 | 3 | $ echo "[extensions]" >> $HGRCPATH |
|
4 | 4 | $ echo "mq=" >> $HGRCPATH |
|
5 | 5 | |
|
6 | $ hg init | |
|
6 | $ hg init repo | |
|
7 | $ cd repo | |
|
7 | 8 | $ hg qinit |
|
8 | 9 | |
|
9 | 10 | $ echo b > b |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | Set up history and working copy |
|
4 | 5 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo start > start |
|
3 | 4 | $ hg ci -Amstart |
|
4 | 5 | adding start |
@@ -46,7 +47,7 b' Copy:' | |||
|
46 | 47 | Cross and same-directory copies with a relative root: |
|
47 | 48 | |
|
48 | 49 | $ hg diff --git --root .. -r 1:tip |
|
49 | abort: .. not under root '$TESTTMP' | |
|
50 | abort: .. not under root '$TESTTMP/repo' | |
|
50 | 51 | [255] |
|
51 | 52 | $ hg diff --git --root doesnotexist -r 1:tip |
|
52 | 53 | $ hg diff --git --root . -r 1:tip |
@@ -121,7 +122,7 b' Cross and same-directory copies with a r' | |||
|
121 | 122 | +copy2 |
|
122 | 123 | |
|
123 | 124 | $ hg diff --git --root ../.. -r 1:tip |
|
124 | abort: ../.. not under root '$TESTTMP' | |
|
125 | abort: ../.. not under root '$TESTTMP/repo' | |
|
125 | 126 | [255] |
|
126 | 127 | $ hg diff --git --root ../doesnotexist -r 1:tip |
|
127 | 128 | $ hg diff --git --root .. -r 1:tip |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | https://bz.mercurial-scm.org/1089 |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ mkdir a |
|
5 | 6 | $ echo a > a/b |
|
6 | 7 | $ hg ci -Am m |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | https://bz.mercurial-scm.org/1175 |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ touch a |
|
5 | 6 | $ hg ci -Am0 |
|
6 | 7 | adding a |
@@ -2,7 +2,8 b'' | |||
|
2 | 2 | |
|
3 | 3 | https://bz.mercurial-scm.org/1438 |
|
4 | 4 | |
|
5 | $ hg init | |
|
5 | $ hg init repo | |
|
6 | $ cd repo | |
|
6 | 7 | |
|
7 | 8 | $ ln -s foo link |
|
8 | 9 | $ hg add link |
@@ -6,7 +6,8 b' the version in p1 is an ancestor of the ' | |||
|
6 | 6 | sure that we'll use the version from p2 in the manifest of the merge |
|
7 | 7 | revision. |
|
8 | 8 | |
|
9 | $ hg init | |
|
9 | $ hg init repo | |
|
10 | $ cd repo | |
|
10 | 11 | |
|
11 | 12 | $ echo foo > foo |
|
12 | 13 | $ hg ci -qAm 'add foo' |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | https://bz.mercurial-scm.org/612 |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ mkdir src |
|
5 | 6 | $ echo a > src/a.c |
|
6 | 7 | $ hg ci -Ama |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | https://bz.mercurial-scm.org/619 |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ echo a > a |
|
5 | 6 | $ hg ci -Ama |
|
6 | 7 | adding a |
@@ -6,7 +6,8 b' https://bz.mercurial-scm.org/672' | |||
|
6 | 6 | # |
|
7 | 7 | # rename in #1, content change in #4. |
|
8 | 8 | |
|
9 | $ hg init | |
|
9 | $ hg init repo | |
|
10 | $ cd repo | |
|
10 | 11 | |
|
11 | 12 | $ touch 1 |
|
12 | 13 | $ touch 2 |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | https://bz.mercurial-scm.org/842 |
|
2 | 2 | |
|
3 | $ hg init | |
|
3 | $ hg init repo | |
|
4 | $ cd repo | |
|
4 | 5 | $ echo foo > a |
|
5 | 6 | $ hg ci -Ama |
|
6 | 7 | adding a |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo a > a |
|
3 | 4 | $ hg ci -Am0 |
|
4 | 5 | adding a |
@@ -52,7 +53,7 b' Check that zero-size journals are correc' | |||
|
52 | 53 | |
|
53 | 54 | $ hg -R foo unbundle repo.hg |
|
54 | 55 | adding changesets |
|
55 | abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob) | |
|
56 | abort: Permission denied: '$TESTTMP/repo/foo/.hg/store/.00changelog.i-*' (glob) | |
|
56 | 57 | [255] |
|
57 | 58 | |
|
58 | 59 | $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi |
@@ -6,7 +6,8 b' enabled.' | |||
|
6 | 6 | > detailed-exit-code=no |
|
7 | 7 | > EOF |
|
8 | 8 | |
|
9 | $ hg init | |
|
9 | $ hg init repo | |
|
10 | $ cd repo | |
|
10 | 11 | $ echo a > a |
|
11 | 12 | Expect exit code 0 on success |
|
12 | 13 | $ hg ci -Aqm initial |
@@ -3,7 +3,8 b'' | |||
|
3 | 3 | > git = true |
|
4 | 4 | > EOF |
|
5 | 5 | |
|
6 | $ hg init | |
|
6 | $ hg init repo | |
|
7 | $ cd repo | |
|
7 | 8 | $ cat > foo << EOF |
|
8 | 9 | > 0 |
|
9 | 10 | > 1 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo a > a |
|
3 | 4 | $ hg commit -A -ma |
|
4 | 5 | adding a |
@@ -6,7 +6,8 b" Make sure HGMERGE doesn't interfere with" | |||
|
6 | 6 | |
|
7 | 7 | $ unset HGMERGE |
|
8 | 8 | |
|
9 | $ hg init | |
|
9 | $ hg init repo | |
|
10 | $ cd repo | |
|
10 | 11 | |
|
11 | 12 | Initial file contents: |
|
12 | 13 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ echo foo > foo |
|
4 | 5 | $ echo bar > bar |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ echo "added file1" > file1 |
|
4 | 5 | $ echo "added file2" > file2 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ echo "added file1" > file1 |
|
4 | 5 | $ echo "another line of text" >> file1 |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ echo a > a |
|
4 | 5 | $ hg ci -qAm 'add a' |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo This is file a1 > a |
|
3 | 4 | $ hg add a |
|
4 | 5 | $ hg commit -m "commit #0" |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ echo This is file a1 > a |
|
3 | 4 | $ echo This is file b1 > b |
|
4 | 5 | $ hg add a b |
@@ -1,7 +1,8 b'' | |||
|
1 | 1 | $ echo "[extensions]" >> $HGRCPATH |
|
2 | 2 | $ echo "mq=" >> $HGRCPATH |
|
3 | 3 | |
|
4 | $ hg init | |
|
4 | $ hg init repo | |
|
5 | $ cd repo | |
|
5 | 6 | $ hg qinit |
|
6 | 7 | |
|
7 | 8 | $ echo x > x |
@@ -1,7 +1,8 b'' | |||
|
1 | 1 | $ echo "[extensions]" >> $HGRCPATH |
|
2 | 2 | $ echo "mq=" >> $HGRCPATH |
|
3 | 3 | |
|
4 | $ hg init | |
|
4 | $ hg init repo | |
|
5 | $ cd repo | |
|
5 | 6 | |
|
6 | 7 | $ echo 'base' > base |
|
7 | 8 | $ hg ci -Ambase |
@@ -3,7 +3,8 b'' | |||
|
3 | 3 | $ echo "[extensions]" >> $HGRCPATH |
|
4 | 4 | $ echo "mq=" >> $HGRCPATH |
|
5 | 5 | |
|
6 | $ hg init | |
|
6 | $ hg init repo | |
|
7 | $ cd repo | |
|
7 | 8 | $ hg qinit |
|
8 | 9 | $ hg qnew base.patch |
|
9 | 10 | $ echo aaa > a |
@@ -238,11 +238,6 b' Testing path referencing other paths' | |||
|
238 | 238 | basic setup |
|
239 | 239 | ----------- |
|
240 | 240 | |
|
241 | $ ls -1 | |
|
242 | a | |
|
243 | b | |
|
244 | gpath1 | |
|
245 | suboptions | |
|
246 | 241 | $ hg init chained_path |
|
247 | 242 | $ cd chained_path |
|
248 | 243 | $ cat << EOF > .hg/hgrc |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | |
|
3 | 4 | $ echo "[merge]" >> .hg/hgrc |
|
4 | 5 | $ echo "followcopies = 1" >> .hg/hgrc |
@@ -1,4 +1,5 b'' | |||
|
1 | $ hg init | |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |
|
2 | 3 | $ mkdir d1 d1/d11 d2 |
|
3 | 4 | $ echo d1/a > d1/a |
|
4 | 5 | $ echo d1/ba > d1/ba |
@@ -613,7 +614,7 b' check illegal path components' | |||
|
613 | 614 | [10] |
|
614 | 615 | $ hg status -C |
|
615 | 616 | $ hg rename d1/d11/a1 ../foo |
|
616 | abort: ../foo not under root '$TESTTMP' | |
|
617 | abort: ../foo not under root '$TESTTMP/repo' | |
|
617 | 618 | [255] |
|
618 | 619 | $ hg status -C |
|
619 | 620 | |
@@ -636,11 +637,11 b' check illegal path components' | |||
|
636 | 637 | [10] |
|
637 | 638 | $ hg status -C |
|
638 | 639 | $ hg rename d1/d11/a1 .. |
|
639 | abort: ../a1 not under root '$TESTTMP' | |
|
640 | abort: ../a1 not under root '$TESTTMP/repo' | |
|
640 | 641 | [255] |
|
641 | 642 | $ hg --config extensions.largefiles= rename d1/d11/a1 .. |
|
642 | 643 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
643 | abort: ../a1 not under root '$TESTTMP' | |
|
644 | abort: ../a1 not under root '$TESTTMP/repo' | |
|
644 | 645 | [255] |
|
645 | 646 | $ hg status -C |
|
646 | 647 | |
@@ -659,7 +660,7 b' check illegal path components' | |||
|
659 | 660 | [10] |
|
660 | 661 | $ hg status -C |
|
661 | 662 | $ (cd d1/d11; hg rename ../../d2/b ../../../foo) |
|
662 | abort: ../../../foo not under root '$TESTTMP' | |
|
663 | abort: ../../../foo not under root '$TESTTMP/repo' | |
|
663 | 664 | [255] |
|
664 | 665 | $ hg status -C |
|
665 | 666 |
General Comments 0
You need to be logged in to leave comments.
Login now