This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1149

config: use 'experimental.evolution.create-markers'
ClosedPublic

Authored by lothiraldan on Oct 17 2017, 11:04 AM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1644623ab096: config: use 'experimental.evolution.create-markers'
Summary

Extract 'experimental.evolution' = createmarkers as
'experimental.evolution.createmarkers'.

We keep the new option in the 'experimental.evolution' namespace in order to
stay coherent with other options ('experimental.evolution.bundle-obsmarker'
and 'experimental.evolution.track-operation') ease the renaming as possibly
'evolution.createmarkers'.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Oct 17 2017, 11:04 AM
indygreg accepted this revision.Oct 18 2017, 11:59 AM
This revision is now accepted and ready to land.Oct 18 2017, 11:59 AM
Closed by commit rHG1644623ab096: config: use 'experimental.evolution.create-markers' (authored by lothiraldan). · Explain WhyOct 18 2017, 12:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2983

tests/test-amend.t

#testcases obsstore-off obsstore-on #testcases obsstore-off obsstore-on
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> amend= > amend=
> debugdrawdag=$TESTDIR/drawdag.py > debugdrawdag=$TESTDIR/drawdag.py
> [diff] > [diff]
> git=1 > git=1
> EOF > EOF
#if obsstore-on #if obsstore-on
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
#endif #endif
Basic amend Basic amend
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
[255] [255]
#if obsstore-on #if obsstore-on
With allowunstable, amend could work in the middle of a stack With allowunstable, amend could work in the middle of a stack
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental] > [experimental]
> stabilization=createmarkers, allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> EOF > EOF
$ hg amend $ hg amend
$ hg log -T '{rev} {node|short} {desc}\n' -G $ hg log -T '{rev} {node|short} {desc}\n' -G
@ 3 be169c7e8dbe B @ 3 be169c7e8dbe B
| |
| o 2 26805aba1e60 C | o 2 26805aba1e60 C
| | | |

tests/test-bisect.t

$ hg up -C . $ hg up -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Check that bisect does not break on obsolete changesets Check that bisect does not break on obsolete changesets
========================================================= =========================================================
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
tip is obsolete tip is obsolete
--------------------- ---------------------
$ hg debugobsolete `hg id --debug -i -r tip` $ hg debugobsolete `hg id --debug -i -r tip`
obsoleted 1 changesets obsoleted 1 changesets
$ hg bisect --reset $ hg bisect --reset

tests/test-bookmarks-pushpull.t

#require serve #require serve
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [ui] > [ui]
> logtemplate={rev}:{node|short} {desc|firstline} > logtemplate={rev}:{node|short} {desc|firstline}
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> stabilization=createmarkers,exchange > evolution=exchange
> evolution.createmarkers=True
> EOF > EOF
$ TESTHOOK='hooks.txnclose-bookmark.test=echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"' $ TESTHOOK='hooks.txnclose-bookmark.test=echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"'
initialize initialize
$ hg init a $ hg init a
$ cd a $ cd a

tests/test-bundle2-exchange.t

$ cp $HGRCPATH $TESTTMP/hgrc.orig $ cp $HGRCPATH $TESTTMP/hgrc.orig
$ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF $ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF
> echo pushkey: lock state after \"\$HG_NAMESPACE\" > echo pushkey: lock state after \"\$HG_NAMESPACE\"
> hg debuglock > hg debuglock
> EOF > EOF
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers,exchange > evolution=exchange
> evolution.createmarkers=True
> bundle2-output-capture=True > bundle2-output-capture=True
> [ui] > [ui]
> ssh="$PYTHON" "$TESTDIR/dummyssh" > ssh="$PYTHON" "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> [web] > [web]
> push_ssl = false > push_ssl = false
> allow_push = * > allow_push = *
> [phases] > [phases]

tests/test-bundle2-format.t

> ui.write(b' advisory: %i\n' % len(p.advisoryparams)) > ui.write(b' advisory: %i\n' % len(p.advisoryparams))
> ui.write(b' payload: %i bytes\n' % len(p.read())) > ui.write(b' payload: %i bytes\n' % len(p.read()))
> ui.write(b'parts count: %i\n' % count) > ui.write(b'parts count: %i\n' % count)
> EOF > EOF
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> bundle2=$TESTTMP/bundle2.py > bundle2=$TESTTMP/bundle2.py
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> [ui] > [ui]
> ssh=$PYTHON "$TESTDIR/dummyssh" > ssh=$PYTHON "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> [web] > [web]
> push_ssl = false > push_ssl = false
> allow_push = * > allow_push = *
> [phases] > [phases]
> publish=False > publish=False

tests/test-cache-abuse.t

Enable obsolete markers Enable obsolete markers
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> [phases] > [phases]
> publish=False > publish=False
> EOF > EOF
Build a repo with some cacheable bits: Build a repo with some cacheable bits:
$ hg init a $ hg init a
$ cd a $ cd a

tests/test-clone.t

$ echo second > foo $ echo second > foo
$ hg commit -m second $ hg commit -m second
$ cd .. $ cd ..
$ hg init filteredrev0 $ hg init filteredrev0
$ cd filteredrev0 $ cd filteredrev0
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
$ echo initial1 > foo $ echo initial1 > foo
$ hg -q commit -A -m initial0 $ hg -q commit -A -m initial0
$ hg -q up -r null $ hg -q up -r null
$ echo initial2 > foo $ echo initial2 > foo
$ hg -q commit -A -m initial1 $ hg -q commit -A -m initial1
$ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8 $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
obsoleted 1 changesets obsoleted 1 changesets

tests/test-command-template.t

$ cd .. $ cd ..
Test shortest(node) with the repo having short hash collision: Test shortest(node) with the repo having short hash collision:
$ hg init hashcollision $ hg init hashcollision
$ cd hashcollision $ cd hashcollision
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [experimental] > [experimental]
> stabilization = createmarkers > evolution.createmarkers=True
> EOF > EOF
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ for i in 17 129 248 242 480 580 617 1057 2857 4025; do $ for i in 17 129 248 242 480 580 617 1057 2857 4025; do
> hg up -q 0 > hg up -q 0
> echo $i > a > echo $i > a
> hg ci -qm $i > hg ci -qm $i
> done > done

tests/test-commandserver.t

checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
1 files, 2 changesets, 2 total revisions 1 files, 2 changesets, 2 total revisions
$ hg revert --no-backup -aq $ hg revert --no-backup -aq
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
>>> import os >>> import os
>>> from hgclient import check, readchannel, runcommand >>> from hgclient import check, readchannel, runcommand
>>> @check >>> @check
... def obsolete(server): ... def obsolete(server):
... readchannel(server) ... readchannel(server)
... ...

tests/test-commit-amend.t

Test amend with obsolete Test amend with obsolete
--------------------------- ---------------------------
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers,allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> EOF > EOF
Amend with no files changes Amend with no files changes
$ hg id -n $ hg id -n
13 13
$ hg ci --amend -m 'babar' $ hg ci --amend -m 'babar'
$ hg id -n $ hg id -n

tests/test-glog.t

(string 'b')))) (string 'b'))))
$ cd .. $ cd ..
Test --hidden Test --hidden
(enable obsolete) (enable obsolete)
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
$ hg debugobsolete `hg id --debug -i -r 8` $ hg debugobsolete `hg id --debug -i -r 8`
obsoleted 1 changesets obsoleted 1 changesets
$ testlog $ testlog
[] []
[] []
$ testlog --hidden $ testlog --hidden

tests/test-histedit-arguments.t

(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[255] [255]
With markers enabled, histedit does not get confused, and With markers enabled, histedit does not get confused, and
amend should not be blocked by the ongoing histedit. amend should not be blocked by the ongoing histedit.
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [experimental] > [experimental]
> stabilization=createmarkers,allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> EOF > EOF
$ hg commit --amend -m 'allow this fold' $ hg commit --amend -m 'allow this fold'
$ hg histedit --continue $ hg histedit --continue
$ cd .. $ cd ..
Test autoverb feature Test autoverb feature

tests/test-histedit-obsolete.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> stabilization=createmarkers,allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> [extensions] > [extensions]
> histedit= > histedit=
> rebase= > rebase=
> EOF > EOF
Test that histedit learns about obsolescence not stored in histedit state Test that histedit learns about obsolescence not stored in histedit state
$ hg init boo $ hg init boo
$ cd boo $ cd boo

tests/test-lfconvert.t

o 0:d4892ec57ce2 add large, normal1 o 0:d4892ec57ce2 add large, normal1
Verify will fail (for now) if the usercache is purged before converting, since Verify will fail (for now) if the usercache is purged before converting, since
largefiles are not cached in the converted repo's local store by the conversion largefiles are not cached in the converted repo's local store by the conversion
process. process.
$ cd largefiles-repo-hg $ cd largefiles-repo-hg
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
$ hg debugobsolete `hg log -r tip -T "{node}"` $ hg debugobsolete `hg log -r tip -T "{node}"`
obsoleted 1 changesets obsoleted 1 changesets
$ cd .. $ cd ..
$ hg -R largefiles-repo-hg verify --large --lfa $ hg -R largefiles-repo-hg verify --large --lfa
checking changesets checking changesets
checking manifests checking manifests

tests/test-log.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
enable obsolete to test hidden feature enable obsolete to test hidden feature
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
$ hg log --template='{rev}:{node}\n' $ hg log --template='{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f 1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
obsoleted 1 changesets obsoleted 1 changesets
$ hg up null -q $ hg up null -q
$ cd .. $ cd ..
Even when the file revision is missing from some head: Even when the file revision is missing from some head:
$ hg init issue4490 $ hg init issue4490
$ cd issue4490 $ cd issue4490
$ echo '[experimental]' >> .hg/hgrc $ echo '[experimental]' >> .hg/hgrc
$ echo 'stabilization=createmarkers' >> .hg/hgrc $ echo 'evolution.createmarkers=True' >> .hg/hgrc
$ echo a > a $ echo a > a
$ hg ci -Am0 $ hg ci -Am0
adding a adding a
$ echo b > b $ echo b > b
$ hg ci -Am1 $ hg ci -Am1
adding b adding b
$ echo B > b $ echo B > b
$ hg ci --amend -m 1 $ hg ci --amend -m 1

tests/test-obsolete-bounds-checking.t

Create a repo, set the username to something more than 255 bytes, then run hg amend on it. Create a repo, set the username to something more than 255 bytes, then run hg amend on it.
$ unset HGUSER $ unset HGUSER
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> username = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <very.long.name@example.com> > username = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <very.long.name@example.com>
> [extensions] > [extensions]
> amend = > amend =
> [experimental] > [experimental]
> stabilization=createmarkers,exchange > stabilization=exchange
> evolution.createmarkers=True
> EOF > EOF
$ hg init tmpa $ hg init tmpa
$ cd tmpa $ cd tmpa
$ echo a > a $ echo a > a
$ hg add $ hg add
adding a adding a
$ hg commit -m "Initial commit" $ hg commit -m "Initial commit"
$ echo a >> a $ echo a >> a
$ hg amend 2>&1 | egrep -v '^(\*\*| )' $ hg amend 2>&1 | egrep -v '^(\*\*| )'
transaction abort! transaction abort!
rollback completed rollback completed
Traceback (most recent call last): Traceback (most recent call last):
*ProgrammingError: obsstore metadata value cannot be longer than 255 bytes (value "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <very.long.name@example.com>" for key "user" is 285 bytes) (glob) *ProgrammingError: obsstore metadata value cannot be longer than 255 bytes (value "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <very.long.name@example.com>" for key "user" is 285 bytes) (glob)

tests/test-obsolete-changeset-exchange.t

Test changesets filtering during exchanges (some tests are still in Test changesets filtering during exchanges (some tests are still in
test-obsolete.t) test-obsolete.t)
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
Push does not corrupt remote Push does not corrupt remote
---------------------------- ----------------------------
Create a DAG where a changeset reuses a revision from a file first used in an Create a DAG where a changeset reuses a revision from a file first used in an
extinct changeset. extinct changeset.

tests/test-obsolete-checkheads.t

Check that obsolete properly strip heads Check that obsolete properly strip heads
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [phases] > [phases]
> # public changeset are not obsolete > # public changeset are not obsolete
> publish=false > publish=false
> [ui] > [ui]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n' > logtemplate='{node|short} ({phase}) {desc|firstline}\n'
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
$ mkcommit() { $ mkcommit() {
> echo "$1" > "$1" > echo "$1" > "$1"
> hg add "$1" > hg add "$1"
> hg ci -m "add $1" > hg ci -m "add $1"
> } > }
$ getid() { $ getid() {
> hg id --debug -ir "desc('$1')" > hg id --debug -ir "desc('$1')"

tests/test-obsolete-divergent.t

Test file dedicated to testing the divergent troubles from obsolete changeset. Test file dedicated to testing the divergent troubles from obsolete changeset.
This is the most complex troubles from far so we isolate it in a dedicated This is the most complex troubles from far so we isolate it in a dedicated
file. file.
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> [extensions] > [extensions]
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> [alias] > [alias]
> debugobsolete = debugobsolete -d '0 0' > debugobsolete = debugobsolete -d '0 0'
> [phases] > [phases]
> publish=False > publish=False
> EOF > EOF

tests/test-obsolete-tag-cache.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> blackbox= > blackbox=
> rebase= > rebase=
> mock=$TESTDIR/mockblackbox.py > mock=$TESTDIR/mockblackbox.py
> >
> [experimental] > [experimental]
> stabilization = createmarkers > evolution.createmarkers=True
> EOF > EOF
Create a repo with some tags Create a repo with some tags
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo initial > foo $ echo initial > foo
$ hg -q commit -A -m initial $ hg -q commit -A -m initial

tests/test-obsolete.t

$ hg debugobsolete -d '0 0' `getid kill_me` -u babar $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
abort: creating obsolete markers is not enabled on this repo abort: creating obsolete markers is not enabled on this repo
[255] [255]
Enabling it Enabling it
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers,exchange > evolution=exchange
> evolution.createmarkers=True
> EOF > EOF
Killing a single changeset without replacement Killing a single changeset without replacement
$ hg debugobsolete 0 $ hg debugobsolete 0
abort: changeset references must be full hexadecimal node identifiers abort: changeset references must be full hexadecimal node identifiers
[255] [255]
$ hg debugobsolete '00' $ hg debugobsolete '00'
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
200 Script output follows 200 Script output follows
$ killdaemons.py hg.pid $ killdaemons.py hg.pid
Checking _enable=False warning if obsolete marker exists Checking _enable=False warning if obsolete marker exists
$ echo '[experimental]' >> $HGRCPATH $ echo '[experimental]' >> $HGRCPATH
$ echo "stabilization=" >> $HGRCPATH $ echo "evolution=" >> $HGRCPATH
$ hg log -r tip $ hg log -r tip
obsolete feature not enabled but 68 markers found!
68:c15e9edfca13 (draft) [tip ] add celestine 68:c15e9edfca13 (draft) [tip ] add celestine
reenable for later test reenable for later test
$ echo '[experimental]' >> $HGRCPATH $ echo '[experimental]' >> $HGRCPATH
$ echo "stabilization=createmarkers,exchange" >> $HGRCPATH $ echo "evolution=exchange" >> $HGRCPATH
$ echo "evolution.createmarkers=True" >> $HGRCPATH
$ rm hg.pid access.log errors.log $ rm hg.pid access.log errors.log
#endif #endif
Several troubles on the same changeset (create an unstable and bumped changeset) Several troubles on the same changeset (create an unstable and bumped changeset)
$ hg debugobsolete `getid obsolete_e` $ hg debugobsolete `getid obsolete_e`
obsoleted 1 changesets obsoleted 1 changesets
$ echo foo > f1 $ echo foo > f1
$ hg add f1 $ hg add f1
$ hg ci -m '1' $ hg ci -m '1'
$ echo foo > f2 $ echo foo > f2
$ hg add f2 $ hg add f2
$ hg ci -m '2' $ hg ci -m '2'
$ echo bar > f2 $ echo bar > f2
$ hg commit --amend --config experimetnal.stabilization=createmarkers $ hg commit --amend --config experimental.evolution.createmarkers=True
$ hg log -G $ hg log -G
@ 3:b0551702f918 (draft) [tip ] 2 @ 3:b0551702f918 (draft) [tip ] 2
| |
o 1:e016b03fd86f (draft) [ ] 1 o 1:e016b03fd86f (draft) [ ] 1
| |
o 0:a78f55e5508c (draft) [ ] 0 o 0:a78f55e5508c (draft) [ ] 0
$ hg log -G --hidden $ hg log -G --hidden

tests/test-phases.t

test hidden changeset are not cloned as public (issue3935) test hidden changeset are not cloned as public (issue3935)
$ cd initialrepo $ cd initialrepo
(enabling evolution) (enabling evolution)
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
(making a changeset hidden; H in that case) (making a changeset hidden; H in that case)
$ hg debugobsolete `hg id --debug -r 5` $ hg debugobsolete `hg id --debug -r 5`
obsoleted 1 changesets obsoleted 1 changesets
$ cd .. $ cd ..
$ hg clone initialrepo clonewithobs $ hg clone initialrepo clonewithobs

tests/test-rebase-brute-force.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> bruterebase=$TESTDIR/bruterebase.py > bruterebase=$TESTDIR/bruterebase.py
> [experimental] > [experimental]
> evolution=createmarkers,allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> EOF > EOF
$ init() { $ init() {
> N=`expr ${N:-0} + 1` > N=`expr ${N:-0} + 1`
> cd $TESTTMP && hg init repo$N && cd repo$N > cd $TESTTMP && hg init repo$N && cd repo$N
> hg debugdrawdag > hg debugdrawdag
> } > }
Source looks like "N" Source looks like "N"

tests/test-rebase-obsolete.t

========================== ==========================
Test rebase with obsolete Test rebase with obsolete
========================== ==========================
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}
> [experimental] > [experimental]
> stabilization=createmarkers,allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> [phases] > [phases]
> publish=False > publish=False
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> EOF > EOF
Setup rebase canonical repo Setup rebase canonical repo

tests/test-rebase-partial.t

Tests rebasing with part of the rebase set already in the Tests rebasing with part of the rebase set already in the
destination (issue5422) destination (issue5422)
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> >
> [experimental] > [experimental]
> stabilization=createmarkers,allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: {desc}" > tglog = log -G --template "{rev}: {desc}"
> EOF > EOF
$ rebasewithdag() { $ rebasewithdag() {
> N=`$PYTHON -c "print($N+1)"` > N=`$PYTHON -c "print($N+1)"`
> hg init repo$N && cd repo$N > hg init repo$N && cd repo$N

tests/test-revset.t

Test short 'ff...' hash collision Test short 'ff...' hash collision
(BUG: '0:wdir()' is still needed to populate wdir revision) (BUG: '0:wdir()' is still needed to populate wdir revision)
$ hg init wdir-hashcollision $ hg init wdir-hashcollision
$ cd wdir-hashcollision $ cd wdir-hashcollision
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [experimental] > [experimental]
> stabilization = createmarkers > evolution.createmarkers=True
> EOF > EOF
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ for i in 2463 2961 6726 78127; do $ for i in 2463 2961 6726 78127; do
> hg up -q 0 > hg up -q 0
> echo $i > a > echo $i > a
> hg ci -qm $i > hg ci -qm $i
> done > done

tests/test-revset2.t

$ cd .. $ cd ..
Test obsstore related revsets Test obsstore related revsets
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [experimental] > [experimental]
> stabilization = createmarkers > evolution.createmarkers=True
> EOF > EOF
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F G > F G
> |/ # split: B -> E, F > |/ # split: B -> E, F
> B C D E # amend: B -> C -> D > B C D E # amend: B -> C -> D
> \|/ | # amend: F -> G > \|/ | # amend: F -> G
> A A Z # amend: A -> Z > A A Z # amend: A -> Z

tests/test-shelve.t

rebasing 3:013284d9655e "changes to: b" (tip) rebasing 3:013284d9655e "changes to: b" (tip)
$ hg status $ hg status
A d A d
test bug 4073 we need to enable obsolete markers for it test bug 4073 we need to enable obsolete markers for it
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `hg --debug id -i -r 1` $ hg debugobsolete `hg --debug id -i -r 1`
obsoleted 1 changesets obsoleted 1 changesets
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'

tests/test-subrepo-missing.t

Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
check that we can update parent repo with missing (amended) subrepo revision check that we can update parent repo with missing (amended) subrepo revision
$ hg up --repository subrepo -r tip $ hg up --repository subrepo -r tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg ci -m "updated subrepo to tip" $ hg ci -m "updated subrepo to tip"
created new head created new head

tests/test-tag.t

$ hg tag -R empty -r 00000000000 -f nulltag $ hg tag -R empty -r 00000000000 -f nulltag
abort: cannot tag null revision abort: cannot tag null revision
[255] [255]
issue5539: pruned tags do not appear in .hgtags issue5539: pruned tags do not appear in .hgtags
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> stabilization=createmarkers,exchange > evolution=exchange
> evolution.createmarkers=True
> EOF > EOF
$ hg up e4d483960b9b --quiet $ hg up e4d483960b9b --quiet
$ echo aaa >>a $ echo aaa >>a
$ hg ci -maaa $ hg ci -maaa
$ hg log -r . -T "{node}\n" $ hg log -r . -T "{node}\n"
743b3afd5aa69f130c246806e48ad2e699f490d2 743b3afd5aa69f130c246806e48ad2e699f490d2
$ hg tag issue5539 $ hg tag issue5539
hook: tag changes detected hook: tag changes detected

tests/test-uncommit.t

Test uncommit - set up the config Test uncommit - set up the config
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental] > [experimental]
> evolution=createmarkers, allowunstable > evolution=allowunstable
> evolution.createmarkers=True
> [extensions] > [extensions]
> uncommit = > uncommit =
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> EOF > EOF
Build up a repo Build up a repo
$ hg init repo $ hg init repo

tests/test-update-branches.t

--------------------------------------------------------------------- ---------------------------------------------------------------------
successors should be taken in account when checking head destination successors should be taken in account when checking head destination
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [ui] > [ui]
> logtemplate={rev}:{node|short} {desc|firstline} > logtemplate={rev}:{node|short} {desc|firstline}
> [experimental] > [experimental]
> stabilization=createmarkers > evolution.createmarkers=True
> EOF > EOF
Test no-argument update to a successor of an obsoleted changeset Test no-argument update to a successor of an obsoleted changeset
$ hg log -G $ hg log -G
o 5:ff252e8273df 5 o 5:ff252e8273df 5
| |
o 4:d047485b3896 4 o 4:d047485b3896 4