--- a/hgext3rd/evolve/__init__.py Thu Apr 04 12:24:28 2019 +0200
+++ b/hgext3rd/evolve/__init__.py Fri Apr 05 16:31:45 2019 +0200
@@ -220,24 +220,22 @@
via an extension).
Instability
-==========
+===========
-(note: the vocabulary is in the process of being updated)
-
-Rewriting changesets might introduce instability (currently 'trouble').
+Rewriting changesets might introduce instability.
There are two main kinds of instability: orphaning and diverging.
-Orphans are changesets left behind when their ancestors are rewritten, (currently: 'unstable').
+Orphans are changesets left behind when their ancestors are rewritten.
Divergence has two variants:
* Content-divergence occurs when independent rewrites of the same changesets
- lead to different results. (currently: 'divergent')
+ lead to different results.
* Phase-divergence occurs when the old (obsolete) version of a changeset
- becomes public. (currently: 'bumped')
+ becomes public.
-If it possible to prevent local creation of orphans by using the following config::
+It is possible to prevent local creation of orphans by using the following config::
[experimental]
evolution=createmarkers,allnewcommands,exchange
--- a/tests/test-evolve-list.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-evolve-list.t Fri Apr 05 16:31:45 2019 +0200
@@ -5,7 +5,7 @@
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
-Test the instability listing
+Test listing orphan changesets
$ hg init r2
$ cd r2
$ echo a > a && hg ci -Am a
@@ -27,7 +27,7 @@
$ cd ..
-Test the bumpedness listing
+Test listing phase-divergent changesets
$ hg init r3
$ cd r3
$ echo a > a && hg ci -Am a
@@ -41,7 +41,7 @@
$ cd ..
-Test the divergence listing
+Test listing content-divergent changesets
$ hg init r1
$ cd r1
$ echo a > a && hg ci -Am a
--- a/tests/test-evolve-public-content-divergent.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-evolve-public-content-divergent.t Fri Apr 05 16:31:45 2019 +0200
@@ -360,7 +360,7 @@
@@ -0,0 +1,1 @@
+a
-Check that we don't have any troubled cset now:
+Check that we don't have any unstable cset now:
$ hg evolve -l
$ cd ..
--- a/tests/test-evolve.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-evolve.t Fri Apr 05 16:31:45 2019 +0200
@@ -81,23 +81,22 @@
explicitly assert support for the obsolescence feature (this can currently
only be done via an extension).
- Instability ==========
+ Instability
+ ===========
- (note: the vocabulary is in the process of being updated)
-
- Rewriting changesets might introduce instability (currently 'trouble').
+ Rewriting changesets might introduce instability.
There are two main kinds of instability: orphaning and diverging.
- Orphans are changesets left behind when their ancestors are rewritten,
- (currently: 'unstable'). Divergence has two variants:
+ Orphans are changesets left behind when their ancestors are rewritten.
+ Divergence has two variants:
* Content-divergence occurs when independent rewrites of the same
- changesets lead to different results. (currently: 'divergent')
+ changesets lead to different results.
* Phase-divergence occurs when the old (obsolete) version of a changeset
- becomes public. (currently: 'bumped')
+ becomes public.
- If it possible to prevent local creation of orphans by using the following
+ It is possible to prevent local creation of orphans by using the following
config:
[experimental]
@@ -390,12 +389,12 @@
4 feature-A: a nifty feature - test
0 : base - test
-phase change turning obsolete changeset public issue a bumped warning
+phase change turning obsolete changeset public issues a phase divergence warning
$ hg phase --hidden --public 99833d22b0c6
1 new phase-divergent changesets
-all solving bumped troubled
+all solving phase-divergent
$ glog
@ 6:47d52a103155@default(draft) another feature that rox
@@ -428,7 +427,7 @@
@@ -3,1 +3,1 @@
-Zwei
+deux
- $ hg log -r 'phasedivergent()' # no more bumped
+ $ hg log -r 'phasedivergent()' # no more phase-divergent
test evolve --all
$ sed -i'' -e s/deux/to/ main-file-1
@@ -999,8 +998,8 @@
o 0:07c1c36d9ef0@default(draft) a0
-Possibility to select what trouble to solve first, asking for bumped before
-divergent
+Possibility to select what instability to solve first, asking for
+phase-divergent before content-divergent
$ hg up -r "desc('a1__')"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg revert -r d952e93add6f --all
@@ -1039,8 +1038,8 @@
o 0 : a0 - test
-Now we have a bumped and an unstable changeset, we solve the bumped first
-normally the unstable changeset would be solve first
+Now we have a phase-divergent and an orphan changeset, we solve the
+phase-divergent first. Normally the orphan changeset would be solved first
$ hg log -G
@ 11 : add new file bumped - test
@@ -1078,7 +1077,7 @@
o 0:07c1c36d9ef0@default(public) a0
-Check that we can resolve troubles in a revset with more than one commit
+Check that we can resolve instabilities in a revset with more than one commit
$ hg up b88539ad24d7 -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit gg
@@ -1535,7 +1534,7 @@
adding a
adding b
adding c
-Lets create a merge commit so that we can create orhpan merge later:
+Let's create a merge commit so that we can create orphan merge later:
$ hg up 1 -q
$ echo feature > f
$ hg ci -Am "added feature f"
@@ -1582,7 +1581,7 @@
To check `lastsolved` contain right value after completion of orphan-merge
-resolution there should be one more trouble to be evolved; lets create one:
+resolution there should be one more instability to be evolved; lets create one:
$ hg up 1 -q
$ echo d > d
$ hg ci -Am "added d"
--- a/tests/test-obsolete.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-obsolete.t Fri Apr 05 16:31:45 2019 +0200
@@ -236,7 +236,7 @@
abort: push includes orphan changeset: 95de7fc6918d!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
- $ hg push ../other-new -f # use f because there is unstability
+ $ hg push ../other-new -f # use f because there is an orphan
pushing to ../other-new
searching for changes
adding changesets
@@ -431,7 +431,7 @@
1 new phase-divergent changesets
83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
# at core level the warning is not issued
-# this is now a big issue now that we have bumped warning
+# this is now a big issue now that we have phase divergence warning
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -574,7 +574,7 @@
obsoleted 1 changesets
$ cd ..
-check bumped detection
+check phase divergence detection
(make an obsolete changeset public)
$ cd local
--- a/tests/test-push-checkheads-unpushed-D5.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t Fri Apr 05 16:31:45 2019 +0200
@@ -24,7 +24,7 @@
..
.. * push the new branch only -> push denied
.. * push the existing branch only -> push allowed
-.. /!\ This push create unstability/orphaning on the other hand and we should
+.. /!\ This push create instability/orphaning on the other hand and we should
.. probably detect/warn agains that.
..
.. graph-summary:
--- a/tests/test-sharing.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-sharing.t Fri Apr 05 16:31:45 2019 +0200
@@ -423,8 +423,8 @@
~
$ cd ..
-Setup for "cowboy mode" shared mutable history (to illustrate divergent
-and bumped changesets).
+Setup for "cowboy mode" shared mutable history (to illustrate content- and
+phase-divergent changesets).
$ rm -rf review alice bob
$ hg clone public alice
updating to branch default
--- a/tests/test-stack-branch.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-stack-branch.t Fri Apr 05 16:31:45 2019 +0200
@@ -105,7 +105,7 @@
phases: 4 draft
Case with some of the branch unstable
-------------------------------------
+-------------------------------------
$ echo bbb > ddd
$ hg commit --amend
@@ -217,7 +217,7 @@
s1: c_c
s0^ c_b (base)
-Case with multiple heads on the topic with unstability involved
+Case with multiple heads on the topic with instability involved
---------------------------------------------------------------
We amend the message to make sure the display base pick the right changeset
--- a/tests/test-topic-stack-data.t Thu Apr 04 12:24:28 2019 +0200
+++ b/tests/test-topic-stack-data.t Fri Apr 05 16:31:45 2019 +0200
@@ -61,7 +61,7 @@
(see 'hg help topics' for more information)
$ mkcommit baz_b
-A simple topic with unstability
+A simple topic with instability
$ hg up 'desc(base_d)'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved