Show More
@@ -11,7 +11,7 b'' | |||||
11 | #if obsstore-on |
|
11 | #if obsstore-on | |
12 | $ cat << EOF >> $HGRCPATH |
|
12 | $ cat << EOF >> $HGRCPATH | |
13 | > [experimental] |
|
13 | > [experimental] | |
14 |
> |
|
14 | > evolution.createmarkers=True | |
15 | > EOF |
|
15 | > EOF | |
16 | #endif |
|
16 | #endif | |
17 |
|
17 | |||
@@ -180,7 +180,8 b' With allowunstable, amend could work in ' | |||||
180 |
|
180 | |||
181 | $ cat >> $HGRCPATH <<EOF |
|
181 | $ cat >> $HGRCPATH <<EOF | |
182 | > [experimental] |
|
182 | > [experimental] | |
183 |
> |
|
183 | > evolution=allowunstable | |
|
184 | > evolution.createmarkers=True | |||
184 | > EOF |
|
185 | > EOF | |
185 |
|
186 | |||
186 | $ hg amend |
|
187 | $ hg amend |
@@ -574,7 +574,7 b' Check that bisect does not break on obso' | |||||
574 |
|
574 | |||
575 | $ cat >> $HGRCPATH << EOF |
|
575 | $ cat >> $HGRCPATH << EOF | |
576 | > [experimental] |
|
576 | > [experimental] | |
577 |
> |
|
577 | > evolution.createmarkers=True | |
578 | > EOF |
|
578 | > EOF | |
579 |
|
579 | |||
580 | tip is obsolete |
|
580 | tip is obsolete |
@@ -6,7 +6,8 b'' | |||||
6 | > [phases] |
|
6 | > [phases] | |
7 | > publish=False |
|
7 | > publish=False | |
8 | > [experimental] |
|
8 | > [experimental] | |
9 | > stabilization=createmarkers,exchange |
|
9 | > evolution=exchange | |
|
10 | > evolution.createmarkers=True | |||
10 | > EOF |
|
11 | > EOF | |
11 |
|
12 | |||
12 | $ TESTHOOK='hooks.txnclose-bookmark.test=echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"' |
|
13 | $ TESTHOOK='hooks.txnclose-bookmark.test=echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"' |
@@ -15,7 +15,8 b' enable obsolescence' | |||||
15 |
|
15 | |||
16 | $ cat >> $HGRCPATH << EOF |
|
16 | $ cat >> $HGRCPATH << EOF | |
17 | > [experimental] |
|
17 | > [experimental] | |
18 | > stabilization=createmarkers,exchange |
|
18 | > evolution=exchange | |
|
19 | > evolution.createmarkers=True | |||
19 | > bundle2-output-capture=True |
|
20 | > bundle2-output-capture=True | |
20 | > [ui] |
|
21 | > [ui] | |
21 | > ssh="$PYTHON" "$TESTDIR/dummyssh" |
|
22 | > ssh="$PYTHON" "$TESTDIR/dummyssh" |
@@ -230,7 +230,7 b' Create an extension to test bundle2 API' | |||||
230 | > [extensions] |
|
230 | > [extensions] | |
231 | > bundle2=$TESTTMP/bundle2.py |
|
231 | > bundle2=$TESTTMP/bundle2.py | |
232 | > [experimental] |
|
232 | > [experimental] | |
233 |
> |
|
233 | > evolution.createmarkers=True | |
234 | > [ui] |
|
234 | > [ui] | |
235 | > ssh=$PYTHON "$TESTDIR/dummyssh" |
|
235 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
236 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
236 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
@@ -2,7 +2,7 b' Enable obsolete markers' | |||||
2 |
|
2 | |||
3 | $ cat >> $HGRCPATH << EOF |
|
3 | $ cat >> $HGRCPATH << EOF | |
4 | > [experimental] |
|
4 | > [experimental] | |
5 |
> |
|
5 | > evolution.createmarkers=True | |
6 | > [phases] |
|
6 | > [phases] | |
7 | > publish=False |
|
7 | > publish=False | |
8 | > EOF |
|
8 | > EOF |
@@ -712,7 +712,7 b' Create repositories to test auto sharing' | |||||
712 | $ cd filteredrev0 |
|
712 | $ cd filteredrev0 | |
713 | $ cat >> .hg/hgrc << EOF |
|
713 | $ cat >> .hg/hgrc << EOF | |
714 | > [experimental] |
|
714 | > [experimental] | |
715 |
> |
|
715 | > evolution.createmarkers=True | |
716 | > EOF |
|
716 | > EOF | |
717 | $ echo initial1 > foo |
|
717 | $ echo initial1 > foo | |
718 | $ hg -q commit -A -m initial0 |
|
718 | $ hg -q commit -A -m initial0 |
@@ -3784,7 +3784,7 b' Test shortest(node) with the repo having' | |||||
3784 | $ cd hashcollision |
|
3784 | $ cd hashcollision | |
3785 | $ cat <<EOF >> .hg/hgrc |
|
3785 | $ cat <<EOF >> .hg/hgrc | |
3786 | > [experimental] |
|
3786 | > [experimental] | |
3787 |
> |
|
3787 | > evolution.createmarkers=True | |
3788 | > EOF |
|
3788 | > EOF | |
3789 | $ echo 0 > a |
|
3789 | $ echo 0 > a | |
3790 | $ hg ci -qAm 0 |
|
3790 | $ hg ci -qAm 0 |
@@ -509,7 +509,7 b' changelog and manifest would have invali' | |||||
509 |
|
509 | |||
510 | $ cat >> .hg/hgrc << EOF |
|
510 | $ cat >> .hg/hgrc << EOF | |
511 | > [experimental] |
|
511 | > [experimental] | |
512 |
> |
|
512 | > evolution.createmarkers=True | |
513 | > EOF |
|
513 | > EOF | |
514 |
|
514 | |||
515 | >>> import os |
|
515 | >>> import os |
@@ -519,7 +519,8 b' Enable obsolete' | |||||
519 |
|
519 | |||
520 | $ cat >> $HGRCPATH << EOF |
|
520 | $ cat >> $HGRCPATH << EOF | |
521 | > [experimental] |
|
521 | > [experimental] | |
522 |
> |
|
522 | > evolution=allowunstable | |
|
523 | > evolution.createmarkers=True | |||
523 | > EOF |
|
524 | > EOF | |
524 |
|
525 | |||
525 | Amend with no files changes |
|
526 | Amend with no files changes |
@@ -2297,7 +2297,7 b' Test --hidden' | |||||
2297 |
|
2297 | |||
2298 | $ cat >> $HGRCPATH << EOF |
|
2298 | $ cat >> $HGRCPATH << EOF | |
2299 | > [experimental] |
|
2299 | > [experimental] | |
2300 |
> |
|
2300 | > evolution.createmarkers=True | |
2301 | > EOF |
|
2301 | > EOF | |
2302 |
|
2302 | |||
2303 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2303 | $ hg debugobsolete `hg id --debug -i -r 8` |
@@ -496,7 +496,8 b' amend should not be blocked by the ongoi' | |||||
496 |
|
496 | |||
497 | $ cat >>$HGRCPATH <<EOF |
|
497 | $ cat >>$HGRCPATH <<EOF | |
498 | > [experimental] |
|
498 | > [experimental] | |
499 |
> |
|
499 | > evolution=allowunstable | |
|
500 | > evolution.createmarkers=True | |||
500 | > EOF |
|
501 | > EOF | |
501 | $ hg commit --amend -m 'allow this fold' |
|
502 | $ hg commit --amend -m 'allow this fold' | |
502 | $ hg histedit --continue |
|
503 | $ hg histedit --continue |
@@ -8,7 +8,8 b' Enable obsolete' | |||||
8 | > [phases] |
|
8 | > [phases] | |
9 | > publish=False |
|
9 | > publish=False | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 |
> |
|
11 | > evolution=allowunstable | |
|
12 | > evolution.createmarkers=True | |||
12 | > [extensions] |
|
13 | > [extensions] | |
13 | > histedit= |
|
14 | > histedit= | |
14 | > rebase= |
|
15 | > rebase= |
@@ -326,7 +326,7 b' process.' | |||||
326 | $ cd largefiles-repo-hg |
|
326 | $ cd largefiles-repo-hg | |
327 | $ cat >> .hg/hgrc <<EOF |
|
327 | $ cat >> .hg/hgrc <<EOF | |
328 | > [experimental] |
|
328 | > [experimental] | |
329 |
> |
|
329 | > evolution.createmarkers=True | |
330 | > EOF |
|
330 | > EOF | |
331 | $ hg debugobsolete `hg log -r tip -T "{node}"` |
|
331 | $ hg debugobsolete `hg log -r tip -T "{node}"` | |
332 | obsoleted 1 changesets |
|
332 | obsoleted 1 changesets |
@@ -1702,7 +1702,7 b' enable obsolete to test hidden feature' | |||||
1702 |
|
1702 | |||
1703 | $ cat >> $HGRCPATH << EOF |
|
1703 | $ cat >> $HGRCPATH << EOF | |
1704 | > [experimental] |
|
1704 | > [experimental] | |
1705 |
> |
|
1705 | > evolution.createmarkers=True | |
1706 | > EOF |
|
1706 | > EOF | |
1707 |
|
1707 | |||
1708 | $ hg log --template='{rev}:{node}\n' |
|
1708 | $ hg log --template='{rev}:{node}\n' | |
@@ -2284,7 +2284,7 b' Even when the file revision is missing f' | |||||
2284 | $ hg init issue4490 |
|
2284 | $ hg init issue4490 | |
2285 | $ cd issue4490 |
|
2285 | $ cd issue4490 | |
2286 | $ echo '[experimental]' >> .hg/hgrc |
|
2286 | $ echo '[experimental]' >> .hg/hgrc | |
2287 |
$ echo ' |
|
2287 | $ echo 'evolution.createmarkers=True' >> .hg/hgrc | |
2288 | $ echo a > a |
|
2288 | $ echo a > a | |
2289 | $ hg ci -Am0 |
|
2289 | $ hg ci -Am0 | |
2290 | adding a |
|
2290 | adding a |
@@ -7,7 +7,8 b' Create a repo, set the username to somet' | |||||
7 | > [extensions] |
|
7 | > [extensions] | |
8 | > amend = |
|
8 | > amend = | |
9 | > [experimental] |
|
9 | > [experimental] | |
10 |
> stabilization= |
|
10 | > stabilization=exchange | |
|
11 | > evolution.createmarkers=True | |||
11 | > EOF |
|
12 | > EOF | |
12 | $ hg init tmpa |
|
13 | $ hg init tmpa | |
13 | $ cd tmpa |
|
14 | $ cd tmpa |
@@ -3,7 +3,7 b' test-obsolete.t)' | |||||
3 |
|
3 | |||
4 | $ cat >> $HGRCPATH << EOF |
|
4 | $ cat >> $HGRCPATH << EOF | |
5 | > [experimental] |
|
5 | > [experimental] | |
6 |
> |
|
6 | > evolution.createmarkers=True | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 | Push does not corrupt remote |
|
9 | Push does not corrupt remote |
@@ -6,7 +6,7 b' Check that obsolete properly strip heads' | |||||
6 | > [ui] |
|
6 | > [ui] | |
7 | > logtemplate='{node|short} ({phase}) {desc|firstline}\n' |
|
7 | > logtemplate='{node|short} ({phase}) {desc|firstline}\n' | |
8 | > [experimental] |
|
8 | > [experimental] | |
9 |
> |
|
9 | > evolution.createmarkers=True | |
10 | > EOF |
|
10 | > EOF | |
11 | $ mkcommit() { |
|
11 | $ mkcommit() { | |
12 | > echo "$1" > "$1" |
|
12 | > echo "$1" > "$1" |
@@ -9,7 +9,7 b' Enable obsolete' | |||||
9 | > [ui] |
|
9 | > [ui] | |
10 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n |
|
10 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n | |
11 | > [experimental] |
|
11 | > [experimental] | |
12 |
> |
|
12 | > evolution.createmarkers=True | |
13 | > [extensions] |
|
13 | > [extensions] | |
14 | > drawdag=$TESTDIR/drawdag.py |
|
14 | > drawdag=$TESTDIR/drawdag.py | |
15 | > [alias] |
|
15 | > [alias] |
@@ -5,7 +5,7 b'' | |||||
5 | > mock=$TESTDIR/mockblackbox.py |
|
5 | > mock=$TESTDIR/mockblackbox.py | |
6 | > |
|
6 | > | |
7 | > [experimental] |
|
7 | > [experimental] | |
8 |
> |
|
8 | > evolution.createmarkers=True | |
9 | > EOF |
|
9 | > EOF | |
10 |
|
10 | |||
11 | Create a repo with some tags |
|
11 | Create a repo with some tags |
@@ -39,7 +39,8 b' Enabling it' | |||||
39 |
|
39 | |||
40 | $ cat >> $HGRCPATH << EOF |
|
40 | $ cat >> $HGRCPATH << EOF | |
41 | > [experimental] |
|
41 | > [experimental] | |
42 | > stabilization=createmarkers,exchange |
|
42 | > evolution=exchange | |
|
43 | > evolution.createmarkers=True | |||
43 | > EOF |
|
44 | > EOF | |
44 |
|
45 | |||
45 | Killing a single changeset without replacement |
|
46 | Killing a single changeset without replacement | |
@@ -899,15 +900,15 b' check that web.view config option:' | |||||
899 | Checking _enable=False warning if obsolete marker exists |
|
900 | Checking _enable=False warning if obsolete marker exists | |
900 |
|
901 | |||
901 | $ echo '[experimental]' >> $HGRCPATH |
|
902 | $ echo '[experimental]' >> $HGRCPATH | |
902 |
$ echo " |
|
903 | $ echo "evolution=" >> $HGRCPATH | |
903 | $ hg log -r tip |
|
904 | $ hg log -r tip | |
904 | obsolete feature not enabled but 68 markers found! |
|
|||
905 | 68:c15e9edfca13 (draft) [tip ] add celestine |
|
905 | 68:c15e9edfca13 (draft) [tip ] add celestine | |
906 |
|
906 | |||
907 | reenable for later test |
|
907 | reenable for later test | |
908 |
|
908 | |||
909 | $ echo '[experimental]' >> $HGRCPATH |
|
909 | $ echo '[experimental]' >> $HGRCPATH | |
910 |
$ echo " |
|
910 | $ echo "evolution=exchange" >> $HGRCPATH | |
|
911 | $ echo "evolution.createmarkers=True" >> $HGRCPATH | |||
911 |
|
912 | |||
912 | $ rm hg.pid access.log errors.log |
|
913 | $ rm hg.pid access.log errors.log | |
913 | #endif |
|
914 | #endif | |
@@ -1311,7 +1312,7 b' Test ability to pull changeset with loca' | |||||
1311 | $ hg ci -m '2' |
|
1312 | $ hg ci -m '2' | |
1312 |
|
1313 | |||
1313 | $ echo bar > f2 |
|
1314 | $ echo bar > f2 | |
1314 |
$ hg commit --amend --config experime |
|
1315 | $ hg commit --amend --config experimental.evolution.createmarkers=True | |
1315 | $ hg log -G |
|
1316 | $ hg log -G | |
1316 | @ 3:b0551702f918 (draft) [tip ] 2 |
|
1317 | @ 3:b0551702f918 (draft) [tip ] 2 | |
1317 | | |
|
1318 | | |
@@ -630,7 +630,7 b' test hidden changeset are not cloned as ' | |||||
630 | (enabling evolution) |
|
630 | (enabling evolution) | |
631 | $ cat >> $HGRCPATH << EOF |
|
631 | $ cat >> $HGRCPATH << EOF | |
632 | > [experimental] |
|
632 | > [experimental] | |
633 |
> |
|
633 | > evolution.createmarkers=True | |
634 | > EOF |
|
634 | > EOF | |
635 |
|
635 | |||
636 | (making a changeset hidden; H in that case) |
|
636 | (making a changeset hidden; H in that case) |
@@ -3,7 +3,8 b'' | |||||
3 | > drawdag=$TESTDIR/drawdag.py |
|
3 | > drawdag=$TESTDIR/drawdag.py | |
4 | > bruterebase=$TESTDIR/bruterebase.py |
|
4 | > bruterebase=$TESTDIR/bruterebase.py | |
5 | > [experimental] |
|
5 | > [experimental] | |
6 |
> evolution= |
|
6 | > evolution=allowunstable | |
|
7 | > evolution.createmarkers=True | |||
7 | > EOF |
|
8 | > EOF | |
8 | $ init() { |
|
9 | $ init() { | |
9 | > N=`expr ${N:-0} + 1` |
|
10 | > N=`expr ${N:-0} + 1` |
@@ -8,7 +8,8 b' Enable obsolete' | |||||
8 | > [ui] |
|
8 | > [ui] | |
9 | > logtemplate= {rev}:{node|short} {desc|firstline} |
|
9 | > logtemplate= {rev}:{node|short} {desc|firstline} | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 |
> |
|
11 | > evolution=allowunstable | |
|
12 | > evolution.createmarkers=True | |||
12 | > [phases] |
|
13 | > [phases] | |
13 | > publish=False |
|
14 | > publish=False | |
14 | > [extensions] |
|
15 | > [extensions] |
@@ -7,7 +7,8 b' destination (issue5422)' | |||||
7 | > drawdag=$TESTDIR/drawdag.py |
|
7 | > drawdag=$TESTDIR/drawdag.py | |
8 | > |
|
8 | > | |
9 | > [experimental] |
|
9 | > [experimental] | |
10 |
> |
|
10 | > evolution=allowunstable | |
|
11 | > evolution.createmarkers=True | |||
11 | > |
|
12 | > | |
12 | > [alias] |
|
13 | > [alias] | |
13 | > tglog = log -G --template "{rev}: {desc}" |
|
14 | > tglog = log -G --template "{rev}: {desc}" |
@@ -1794,7 +1794,7 b" Test short 'ff...' hash collision" | |||||
1794 | $ cd wdir-hashcollision |
|
1794 | $ cd wdir-hashcollision | |
1795 | $ cat <<EOF >> .hg/hgrc |
|
1795 | $ cat <<EOF >> .hg/hgrc | |
1796 | > [experimental] |
|
1796 | > [experimental] | |
1797 |
> |
|
1797 | > evolution.createmarkers=True | |
1798 | > EOF |
|
1798 | > EOF | |
1799 | $ echo 0 > a |
|
1799 | $ echo 0 > a | |
1800 | $ hg ci -qAm 0 |
|
1800 | $ hg ci -qAm 0 |
@@ -1626,7 +1626,7 b' Test obsstore related revsets' | |||||
1626 | $ cd repo1 |
|
1626 | $ cd repo1 | |
1627 | $ cat <<EOF >> .hg/hgrc |
|
1627 | $ cat <<EOF >> .hg/hgrc | |
1628 | > [experimental] |
|
1628 | > [experimental] | |
1629 |
> |
|
1629 | > evolution.createmarkers=True | |
1630 | > EOF |
|
1630 | > EOF | |
1631 |
|
1631 | |||
1632 | $ hg debugdrawdag <<'EOS' |
|
1632 | $ hg debugdrawdag <<'EOS' |
@@ -696,7 +696,7 b' test bug 4073 we need to enable obsolete' | |||||
696 |
|
696 | |||
697 | $ cat >> $HGRCPATH << EOF |
|
697 | $ cat >> $HGRCPATH << EOF | |
698 | > [experimental] |
|
698 | > [experimental] | |
699 |
> |
|
699 | > evolution.createmarkers=True | |
700 | > EOF |
|
700 | > EOF | |
701 | $ hg shelve |
|
701 | $ hg shelve | |
702 | shelved as default |
|
702 | shelved as default |
@@ -76,7 +76,7 b' Enable obsolete' | |||||
76 | > [phases] |
|
76 | > [phases] | |
77 | > publish=False |
|
77 | > publish=False | |
78 | > [experimental] |
|
78 | > [experimental] | |
79 |
> |
|
79 | > evolution.createmarkers=True | |
80 | > EOF |
|
80 | > EOF | |
81 |
|
81 | |||
82 | check that we can update parent repo with missing (amended) subrepo revision |
|
82 | check that we can update parent repo with missing (amended) subrepo revision |
@@ -415,7 +415,8 b' issue5539: pruned tags do not appear in ' | |||||
415 |
|
415 | |||
416 | $ cat >> $HGRCPATH << EOF |
|
416 | $ cat >> $HGRCPATH << EOF | |
417 | > [experimental] |
|
417 | > [experimental] | |
418 | > stabilization=createmarkers,exchange |
|
418 | > evolution=exchange | |
|
419 | > evolution.createmarkers=True | |||
419 | > EOF |
|
420 | > EOF | |
420 | $ hg up e4d483960b9b --quiet |
|
421 | $ hg up e4d483960b9b --quiet | |
421 | $ echo aaa >>a |
|
422 | $ echo aaa >>a |
@@ -2,7 +2,8 b' Test uncommit - set up the config' | |||||
2 |
|
2 | |||
3 | $ cat >> $HGRCPATH <<EOF |
|
3 | $ cat >> $HGRCPATH <<EOF | |
4 | > [experimental] |
|
4 | > [experimental] | |
5 |
> evolution= |
|
5 | > evolution=allowunstable | |
|
6 | > evolution.createmarkers=True | |||
6 | > [extensions] |
|
7 | > [extensions] | |
7 | > uncommit = |
|
8 | > uncommit = | |
8 | > drawdag=$TESTDIR/drawdag.py |
|
9 | > drawdag=$TESTDIR/drawdag.py |
@@ -473,7 +473,7 b' successors should be taken in account wh' | |||||
473 | > [ui] |
|
473 | > [ui] | |
474 | > logtemplate={rev}:{node|short} {desc|firstline} |
|
474 | > logtemplate={rev}:{node|short} {desc|firstline} | |
475 | > [experimental] |
|
475 | > [experimental] | |
476 |
> |
|
476 | > evolution.createmarkers=True | |
477 | > EOF |
|
477 | > EOF | |
478 |
|
478 | |||
479 | Test no-argument update to a successor of an obsoleted changeset |
|
479 | Test no-argument update to a successor of an obsoleted changeset |
General Comments 0
You need to be logged in to leave comments.
Login now