( )⚙ D1148 config: replace experimental.stabilization by experimental.evolution

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1148

config: replace experimental.stabilization by experimental.evolution
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa0100f34e20b: config: replace experimental.stabilization by experimental.evolution
Summary

We replace 'experimental.stabilization=all' by 'experimental.evolution=true'
as we will extract individual config in their own config in later patches.

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:57 AM
This revision is now accepted and ready to land.Oct 18 2017, 11:57 AM
Closed by commit rHGa0100f34e20b: config: replace experimental.stabilization by experimental.evolution (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 2982

tests/test-drawdag.t

$ cat >> $HGRCPATH<<EOF $ cat >> $HGRCPATH<<EOF
> [extensions] > [extensions]
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> [experimental] > [experimental]
> stabilization=all > evolution=true
> EOF > EOF
$ reinit () { $ reinit () {
> rm -rf .hg && hg init > rm -rf .hg && hg init
> } > }
$ hg init $ hg init

tests/test-obsmarker-template.t

This test file test the various templates related to obsmarkers. This test file test the various templates related to obsmarkers.
Global setup Global setup
============ ============
$ . $TESTDIR/testlib/obsmarker-common.sh $ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> interactive = true > interactive = true
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> stabilization=all > evolution=true
> [templates] > [templates]
> obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
> obsfateverb = "{obsfateverb(successors)}" > obsfateverb = "{obsfateverb(successors)}"
> obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
> obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
> obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
> obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
> [alias] > [alias]

tests/test-obsolete-bundle-strip.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> # simpler log output > # simpler log output
> logtemplate = "{node|short}: {desc}\n" > logtemplate = "{node|short}: {desc}\n"
> >
> [experimental] > [experimental]
> # enable evolution > # enable evolution
> stabilization = all > evolution=true
> >
> # include obsmarkers in bundle > # include obsmarkers in bundle
> stabilization.bundle-obsmarker = yes > stabilization.bundle-obsmarker = yes
> >
> [extensions] > [extensions]
> # needed for some tests > # needed for some tests
> strip = > strip =
> [defaults] > [defaults]

tests/test-push-race.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> ssh = $PYTHON "$TESTDIR/dummyssh" > ssh = $PYTHON "$TESTDIR/dummyssh"
> # simplify output > # simplify output
> logtemplate = {node|short} {desc} ({branch}) > logtemplate = {node|short} {desc} ({branch})
> [phases] > [phases]
> publish = no > publish = no
> [experimental] > [experimental]
> stabilization = all > evolution=true
> [alias] > [alias]
> graph = log -G --rev 'sort(all(), "topo")' > graph = log -G --rev 'sort(all(), "topo")'
> EOF > EOF
We tests multiple cases: We tests multiple cases:
* strict: no race detected, * strict: no race detected,
* unrelated: race on unrelated heads are allowed. * unrelated: race on unrelated heads are allowed.

tests/test-rebase-conflicts.t

> B E > B E
> |/ > |/
> A > A
> EOS > EOS
$ hg update E -q $ hg update E -q
$ echo 3 > B $ echo 3 > B
$ hg commit --amend -m E -A B -q $ hg commit --amend -m E -A B -q
$ hg rebase -r B+D -d . --config experimental.stabilization=all $ hg rebase -r B+D -d . --config experimental.evolution=true
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
merging B merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark') warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ echo 4 > B $ echo 4 > B
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue --config experimental.stabilization=none $ hg rebase --continue --config experimental.evolution=none
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:f585351a92f8 "D" (D) rebasing 3:f585351a92f8 "D" (D)
warning: orphaned descendants detected, not stripping 112478962961 warning: orphaned descendants detected, not stripping 112478962961
saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
$ rm .hg/localtags $ rm .hg/localtags
$ hg tglog $ hg tglog
o 5:draft 'D' o 5:draft 'D'

tests/test-rebase-dest.t

> [phases] > [phases]
> publish=False > publish=False
> [alias] > [alias]
> tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)' > tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)'
> [extensions] > [extensions]
> maprevset=$TESTTMP/maprevset.py > maprevset=$TESTTMP/maprevset.py
> [experimental] > [experimental]
> rebase.multidest=true > rebase.multidest=true
> stabilization=all > evolution=true
> 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
> hg debugdrawdag > hg debugdrawdag
> hg rebase "$@" > _rebasetmp > hg rebase "$@" > _rebasetmp
> r=$? > r=$?

tests/test-rebase-obsolete.t

| o 6:9c48361117de D | o 6:9c48361117de D
| | | |
o | 4:ff2c4d47b71d C o | 4:ff2c4d47b71d C
|/ |/
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase -d 6 -r "4::" $ hg rebase -d 6 -r "4::"
rebasing 4:ff2c4d47b71d "C" rebasing 4:ff2c4d47b71d "C"
note: not rebasing 7:360bbaa7d3ce "O", it has no successor note: not rebasing 7:360bbaa7d3ce "O", it has no successor
rebasing 8:8d47583e023f "P" (tip) rebasing 8:8d47583e023f "P" (tip)
If all the changeset to be rebased are obsolete and present in the destination, we If all the changeset to be rebased are obsolete and present in the destination, we
should display a friendly error message should display a friendly error message
$ hg up 9 $ hg up 9
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "non-relevant change" > nonrelevant $ echo "non-relevant change" > nonrelevant
$ hg add nonrelevant $ hg add nonrelevant
$ hg commit -m nonrelevant $ hg commit -m nonrelevant
created new head created new head
$ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase -r . -d 10 $ hg rebase -r . -d 10
note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
If a rebase is going to create divergence, it should abort If a rebase is going to create divergence, it should abort
$ hg log -G $ hg log -G
@ 10:121d9e3bc4c6 P @ 10:121d9e3bc4c6 P
$ hg commit -m "willconflict second version" $ hg commit -m "willconflict second version"
created new head created new head
$ printf "dummy" > K $ printf "dummy" > K
$ hg add K $ hg add K
$ hg commit -m "dummy change" $ hg commit -m "dummy change"
$ printf "dummy" > L $ printf "dummy" > L
$ hg add L $ hg add L
$ hg commit -m "dummy change" $ hg commit -m "dummy change"
$ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.stabilization=all $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G -r 16:: $ hg log -G -r 16::
@ 21:7bdc8a87673d dummy change @ 21:7bdc8a87673d dummy change
| |
x 20:8b31da3c4919 dummy change x 20:8b31da3c4919 dummy change
| |
o 19:b82fb57ea638 willconflict second version o 19:b82fb57ea638 willconflict second version
Z Z
$ cd .. $ cd ..
Test that bookmark is moved and working dir is updated when all changesets have Test that bookmark is moved and working dir is updated when all changesets have
equivalents in destination equivalents in destination
$ hg init rbsrepo && cd rbsrepo $ hg init rbsrepo && cd rbsrepo
$ echo "[experimental]" > .hg/hgrc $ echo "[experimental]" > .hg/hgrc
$ echo "stabilization=all" >> .hg/hgrc $ echo "evolution=true" >> .hg/hgrc
$ echo "rebaseskipobsolete=on" >> .hg/hgrc $ echo "rebaseskipobsolete=on" >> .hg/hgrc
$ echo root > root && hg ci -Am root $ echo root > root && hg ci -Am root
adding root adding root
$ echo a > a && hg ci -Am a $ echo a > a && hg ci -Am a
adding a adding a
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > b && hg ci -Am b $ echo b > b && hg ci -Am b

tests/test-rebase-scenario-global.t

> def extsetup(ui): > def extsetup(ui):
> extensions.afterloaded('rebase', wraprebase) > extensions.afterloaded('rebase', wraprebase)
> EOF > EOF
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> wraprebase=$TESTTMP/wraprebase.py > wraprebase=$TESTTMP/wraprebase.py
> [experimental] > [experimental]
> stabilization=all > evolution=true
> EOF > EOF
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> B C > B C
> |/ > |/
> A > A
> EOS > EOS
$ hg rebase -s C -d B $ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C tip) rebasing 2:dc0947a82db8 "C" (C tip)
$ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist' $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'
[1] [1]

tests/test-strip.t

b-Z -1:000000000000 b-Z -1:000000000000
Test the above using obsstore "by the way". Not directly related to strip, but Test the above using obsstore "by the way". Not directly related to strip, but
we have reusable code here we have reusable code here
$ cd $TESTTMP/scmutilcleanup.obsstore $ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> stabilization=all > evolution=true
> stabilization.track-operation=1 > stabilization.track-operation=1
> EOF > EOF
$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 12:1473d4b996d1 G2 b-F@divergent3 b-G o 12:1473d4b996d1 G2 b-F@divergent3 b-G
$ cd .. $ cd ..
Test that obsmarkers are restored even when not using generaldelta Test that obsmarkers are restored even when not using generaldelta
$ hg --config format.usegeneraldelta=no init issue5678 $ hg --config format.usegeneraldelta=no init issue5678
$ cd issue5678 $ cd issue5678
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> evolution=all > evolution=true
> EOF > EOF
$ echo a > a $ echo a > a
$ hg ci -Aqm a $ hg ci -Aqm a
$ hg ci --amend -m a2 $ hg ci --amend -m a2
$ hg debugobsolete $ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
$ hg strip . $ hg strip .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob) saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob)
$ hg unbundle -q .hg/strip-backup/* $ hg unbundle -q .hg/strip-backup/*
$ hg debugobsolete $ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
$ cd .. $ cd ..

tests/testlib/exchange-obsmarker-util.sh

[phases] [phases]
# non publishing server # non publishing server
publish=False publish=False
[experimental] [experimental]
# reduce output changes # reduce output changes
bundle2-output-capture=True bundle2-output-capture=True
# enable evolution # enable evolution
evolution=all evolution=true
[extensions] [extensions]
# we need to strip some changeset for some test cases # we need to strip some changeset for some test cases
hgext.strip= hgext.strip=
[devel] [devel]
strip-obsmarkers = no strip-obsmarkers = no