This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1153

config: rename stabilization.track-operation
ClosedPublic

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

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG64f29fff1877: config: rename stabilization.track-operation
Summary

We want to get rid of stabilization.* configuration, back out to the old
configuration 'evolution.track-operation'.

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, 12:02 PM
This revision is now accepted and ready to land.Oct 18 2017, 12:02 PM
Closed by commit rHG64f29fff1877: config: rename stabilization.track-operation (authored by lothiraldan). · Explain WhyOct 18 2017, 12:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2987

tests/test-histedit-obsolete.t

o 14:6b70183d2492 (draft) g o 14:6b70183d2492 (draft) g
| |
o 13:b449568bf7fc (draft) f o 13:b449568bf7fc (draft) f
| |
o 12:40db8afa467b (public) c o 12:40db8afa467b (public) c
| |
o 0:cb9a9f314b8b (public) a o 0:cb9a9f314b8b (public) a
$ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.stabilization.track-operation=1 $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.evolution.track-operation=1
> pick b449568bf7fc 13 f > pick b449568bf7fc 13 f
> pick 7395e1ff83bd 15 h > pick 7395e1ff83bd 15 h
> pick 6b70183d2492 14 g > pick 6b70183d2492 14 g
> pick b605fb7503f2 16 i > pick b605fb7503f2 16 i
> pick 3a6c53ee7f3d 17 j > pick 3a6c53ee7f3d 17 j
> edit ee118ab9fa44 18 k > edit ee118ab9fa44 18 k
> EOF > EOF
Editing (ee118ab9fa44), you may commit or record as needed now. Editing (ee118ab9fa44), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg histedit --continue --config experimental.stabilization.track-operation=1 $ hg histedit --continue --config experimental.evolution.track-operation=1
$ hg log -G $ hg log -G
@ 23:175d6b286a22 (secret) k @ 23:175d6b286a22 (secret) k
| |
o 22:44ca09d59ae4 (secret) j o 22:44ca09d59ae4 (secret) j
| |
o 21:31747692a644 (secret) i o 21:31747692a644 (secret) i
| |
o 20:9985cd4f21fa (draft) g o 20:9985cd4f21fa (draft) g

tests/test-obsolete.t

$ hg ci --amend -m bb $ hg ci --amend -m bb
$ echo c > c $ echo c > c
$ hg ci -Am c $ hg ci -Am c
adding c adding c
$ hg ci --amend -m cc $ hg ci --amend -m cc
$ echo d > d $ echo d > d
$ hg ci -Am d $ hg ci -Am d
adding d adding d
$ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 $ hg ci --amend -m dd --config experimental.evolution.track-operation=1
$ hg debugobsolete --index --rev "3+7" $ hg debugobsolete --index --rev "3+7"
1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
$ hg debugobsolete --index --rev "3+7" -Tjson $ hg debugobsolete --index --rev "3+7" -Tjson
[ [
{ {
"date": [0.0, 0], "date": [0.0, 0],
"flag": 0, "flag": 0,

tests/test-rebase-obsolete.t

$ hg rebase -r 2 -d 1 $ hg rebase -r 2 -d 1
rebasing 2:1e9a3c00cbe9 "b" (tip) rebasing 2:1e9a3c00cbe9 "b" (tip)
$ hg log -r . # working dir is at rev 3 (successor of 2) $ hg log -r . # working dir is at rev 3 (successor of 2)
3:be1832deae9a b (no-eol) 3:be1832deae9a b (no-eol)
$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
$ hg up 2 && hg log -r . # working dir is at rev 2 again $ hg up 2 && hg log -r . # working dir is at rev 2 again
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2:1e9a3c00cbe9 b (no-eol) 2:1e9a3c00cbe9 b (no-eol)
$ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
Check that working directory and bookmark was updated to rev 3 although rev 2 Check that working directory and bookmark was updated to rev 3 although rev 2
was skipped was skipped
$ hg log -r . $ hg log -r .
3:be1832deae9a b (no-eol) 3:be1832deae9a b (no-eol)
$ hg bookmarks $ hg bookmarks
mybook 3:be1832deae9a mybook 3:be1832deae9a
$ hg debugobsolete --rev tip $ hg debugobsolete --rev tip

tests/test-strip.t

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]
> evolution=true > evolution=true
> stabilization.track-operation=1 > evolution.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
| |