[PATCH 02 of 14 evolve-ext] docs: change `precursors` references to `predecessors`
Matt Harbison
mharbison72 at gmail.com
Sun Apr 28 00:28:49 EDT 2019
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1556407923 14400
# Sat Apr 27 19:32:03 2019 -0400
# Node ID 767ceb991c52b2002accdd72c345d6577ae15f63
# Parent 649bc44846287d4f7221e6b19f2f7849d015ea20
docs: change `precursors` references to `predecessors`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
diff --git a/docs/evolve-faq.rst b/docs/evolve-faq.rst
--- a/docs/evolve-faq.rst
+++ b/docs/evolve-faq.rst
@@ -170,7 +170,7 @@
::
[alias]
- odiff = diff --rev 'limit(precursors(.),1)' --rev .
+ odiff = diff --rev 'limit(predecessors(.),1)' --rev .
View obsolete markers
---------------------
diff --git a/docs/figures/figure-ug02.svg b/docs/figures/figure-ug02.svg
--- a/docs/figures/figure-ug02.svg
+++ b/docs/figures/figure-ug02.svg
@@ -518,7 +518,7 @@
id="tspan4805"
x="94.602974"
y="171.26965"
- style="font-size:10px;line-height:1.25;font-family:sans-serif">precursor</tspan></text>
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">predecessor</tspan></text>
<text
xml:space="preserve"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
diff --git a/docs/figures/figure-ug04.svg b/docs/figures/figure-ug04.svg
--- a/docs/figures/figure-ug04.svg
+++ b/docs/figures/figure-ug04.svg
@@ -436,7 +436,7 @@
id="tspan4805"
x="94.602959"
y="134.52141"
- style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">precursor</tspan></text>
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">predecessor</tspan></text>
<text
xml:space="preserve"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
diff --git a/docs/figures/figure-ug05.svg b/docs/figures/figure-ug05.svg
--- a/docs/figures/figure-ug05.svg
+++ b/docs/figures/figure-ug05.svg
@@ -446,7 +446,7 @@
x="145.71631"
y="120.74194"
id="tspan4866"
- style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, hidden precursors</tspan></text>
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, hidden predecessors</tspan></text>
<text
xml:space="preserve"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
diff --git a/docs/figures/figure-ug10.svg b/docs/figures/figure-ug10.svg
--- a/docs/figures/figure-ug10.svg
+++ b/docs/figures/figure-ug10.svg
@@ -793,7 +793,7 @@
x="175.91385"
y="860.83063"
id="tspan4410"
- style="font-size:10px;line-height:1;font-family:sans-serif">precursors</tspan></text>
+ style="font-size:10px;line-height:1;font-family:sans-serif">predecessors</tspan></text>
<text
xml:space="preserve"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
diff --git a/docs/obs-terms.rst b/docs/obs-terms.rst
--- a/docs/obs-terms.rst
+++ b/docs/obs-terms.rst
@@ -12,39 +12,39 @@
marker registers a relation between an old obsoleted changeset and its newer
version.
-Old changesets are called **precursors** while their new versions are called
-**successors**. A marker always registers a single *precursor* and:
+Old changesets are called **predecessors** while their new versions are called
+**successors**. A marker always registers a single *predecessor* and:
-- no *successor*: the *precursor* is just discarded.
-- one *successor*: the *precursor* has been rewritten
-- multiple *successors*: the *precursor* were splits in multiple
+- no *successor*: the *predecessor* is just discarded.
+- one *successor*: the *predecessor* has been rewritten
+- multiple *successors*: the *predecessor* were splits in multiple
changesets.
-.. The *precursors* and *successors* terms can be used on changeset directly:
+.. The *predecessors* and *successors* terms can be used on changeset directly:
-.. :precursors: of a changeset `A` are changesets used as *precursors* by
+.. :predecessors: of a changeset `A` are changesets used as *predecessors* by
.. obsolete marker using changeset `A` as *successors*
.. :successors: of a changeset `B` are changesets used as *successors* by
-.. obsolete marker using changeset `B` as *precursors*
+.. obsolete marker using changeset `B` as *predecessors*
Chaining obsolete markers is allowed to rewrite a changeset that is already a
*successor*. This is a kind of *second order version control*.
-To clarify ambiguous situations one can use **direct precursors** or
+To clarify ambiguous situations one can use **direct predecessors** or
**direct successors** to name changesets that are directly related.
The set of all *obsolete markers* forms a direct acyclic graph the same way
standard *parents*/*children* relation does. In this graph we have:
-:any precursors: are transitive precursors of a changeset: *direct precursors*
- and *precursors* of *precursors*.
+:any predecessors: are transitive predecessors of a changeset: *direct predecessors*
+ and *predecessors* of *predecessors*.
:any successors: are transitive successors of a changeset: *direct successors*
and *successors* of *successors*)
Obsolete markers may refer changesets that are not known locally.
-So, *direct precursors* of a changeset may be unknown locally.
-This is why we usually focus on the **first known precursors** of the rewritten
+So, *direct predecessors* of a changeset may be unknown locally.
+This is why we usually focus on the **first known predecessors** of the rewritten
changeset. The same apply for *successors*.
Changeset in *any successors* which are not **obsolete** are called
@@ -66,13 +66,13 @@
| | | |
| Changeset in either | Obsolete changeset is | *extinct* changeset is |
| *draft* or *secret* | *mutable* used as a | *obsolete* which has only |
-| phase. | *precursor*. | *obsolete* descendants. |
+| phase. | *predecessor*. | *obsolete* descendants. |
| | | |
| | A changeset is used as | They can safely be: |
-| | a *precursor* when at | |
+| | a *predecessor* when at | |
| | least one obsolete | - hidden in the UI, |
| | marker refers to it | - silently excluded from |
-| | as precursors. | pull and push operations |
+| | as predecessors. | pull and push operations |
| | | - mostly ignored |
| | | - garbage collected |
| | | |
@@ -130,7 +130,7 @@
| | | *divergent* is changeset |
| | | that appears when multiple |
| | | changesets are successors |
-| | | of the same precursor. |
+| | | of the same predecessor. |
| | | |
| | | *divergent* are solved |
| | | through a three ways merge |
@@ -168,8 +168,8 @@
| |
| Rewriting operation refuse to work on immutable changeset. |
| |
-| Obsolete markers that refer an immutable changeset as precursors have |
-| no effect on the precursors but may have effect on the successors. |
+| Obsolete markers that refer an immutable changeset as predecessors have |
+| no effect on the predecessors but may have effect on the successors. |
| |
| When a *mutable* changeset becomes *immutable* (changing its phase from draft|
| to public) it is just *immutable* and loose any property of it's former |
diff --git a/docs/sharing.rst b/docs/sharing.rst
--- a/docs/sharing.rst
+++ b/docs/sharing.rst
@@ -433,7 +433,7 @@
It's not enough just to update ``public``, though! Other people also
use the ``review`` repository, and right now it doesn't have Bob's
latest amendment ("v3", revision 6:540b), nor does it know that the
-precursor of that changeset ("v2", revision 5:0eb7) is obsolete. Thus,
+predecessor of that changeset ("v2", revision 5:0eb7) is obsolete. Thus,
Bob pushes to ``review`` as well::
$ hg push ../review
diff --git a/docs/tutorial/slides.md b/docs/tutorial/slides.md
--- a/docs/tutorial/slides.md
+++ b/docs/tutorial/slides.md
@@ -275,7 +275,7 @@
Notice the `x` in the log output which shows that a changeset is hidden.
-In addition to hiding the original changeset, we are also storing additional information which is recording the relation between a changeset, the **precursor** and its **successor**. It basically stores the information that the commit **X** was rewritten into the commit **Y** by the user **U** at the date **D**. This piece of information is stored in something called an **obsolescence marker**. It will be displayed like this:
+In addition to hiding the original changeset, we are also storing additional information which is recording the relation between a changeset, the **predecessor** and its **successor**. It basically stores the information that the commit **X** was rewritten into the commit **Y** by the user **U** at the date **D**. This piece of information is stored in something called an **obsolescence marker**. It will be displayed like this:
~~~graphviz-file
graphs/fix-bug-3.dot
@@ -285,7 +285,7 @@
##### Rebase
-**Successors** don't need to share anything with their **precursor**. They could have a different description message, user, date or even parents.
+**Successors** don't need to share anything with their **predecessor**. They could have a different description message, user, date or even parents.
Let's look at our earlier rebase example. The status before the rebase was:
@@ -345,7 +345,7 @@
output/under-the-hood-amend-after-obslog-patch.log
~~~
-Obslog works both ways, as it can display **precursors** and **successors** with the `--all` option:
+Obslog works both ways, as it can display **predecessors** and **successors** with the `--all` option:
```raw-file
output/under-the-hood-amend-after-obslog-no-all.log
@@ -858,7 +858,7 @@
output/edit-mid-stack-after-stack.log
```
-`hg stack` tries to simplify the view for you. We have amended **b2**, and **b3**'s parent is the precursor version of **b2**, so it is not stable any more. It is now **orphan**.
+`hg stack` tries to simplify the view for you. We have amended **b2**, and **b3**'s parent is the predecessor version of **b2**, so it is not stable any more. It is now **orphan**.
For once, let's use log to see in detail in which situation we are:
diff --git a/docs/tutorial/test-training.t b/docs/tutorial/test-training.t
--- a/docs/tutorial/test-training.t
+++ b/docs/tutorial/test-training.t
@@ -550,7 +550,7 @@
+Fix bug
- $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "precursors(typo)" --hidden
+ $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "predecessors(typo)" --hidden
@ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
@@ -1002,7 +1002,7 @@
Amend
- $ html_output $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log log -G -r "::precursors(typo)" --hidden
+ $ html_output $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log log -G -r "::predecessors(typo)" --hidden
x <span style="color:olive;">changeset: 1:5d48a444aba7</span>
| branch: typo
| user: Boris Feld <boris.feld at octobus.net>
@@ -1016,7 +1016,7 @@
summary: ROOT
-XXX Remove the command line to avoid showing precursors and hidden revset
+XXX Remove the command line to avoid showing predecessors and hidden revset
$ tail -n +2 $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log | tee $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log
x <span style="color:olive;">changeset: 1:5d48a444aba7</span>
@@ -1121,7 +1121,7 @@
Rebase
- $ html_output $TESTDIR/output/behind-the-hood-rebase-before-hash-hidden.log log -G -r "::branch(build/v2) or ::precursors('build/linuxsupport-v2')" --hidden
+ $ html_output $TESTDIR/output/behind-the-hood-rebase-before-hash-hidden.log log -G -r "::branch(build/v2) or ::predecessors('build/linuxsupport-v2')" --hidden
o <span style="color:olive;">changeset: 6:0e694460372e</span>
| branch: build/v2
| parent: 2:f3bd0ab4ee87
@@ -2593,7 +2593,7 @@
<span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
b0^ New commit on build/v2 (base)
- $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::precursors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes
+ $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::predecessors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes
Wrote */graphs/basic-stabilize-after-stack.dot (glob)
.. graphviz::
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -288,7 +288,7 @@
``prune`` (example 4 above) is the simplest history modification
command provided by ``evolve``. All it does is mark the specified
-changeset(s) obsolete, with no successor/precursor relationships
+changeset(s) obsolete, with no successor/predecessor relationships
involved. (If the working directory parent was one of the obsoleted
changesets, ``prune`` updates back to a suitable ancestor.)
More information about the Mercurial-devel
mailing list