[PATCH 09 of 14 evolve-ext] docs: change `evolution` references to `stabilization`

Matt Harbison mharbison72 at gmail.com
Sun Apr 28 00:28:56 EDT 2019


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1556417010 14400
#      Sat Apr 27 22:03:30 2019 -0400
# Node ID 65670dda8ace58b000da738d3e053197c436bf7a
# Parent  8edc865f6a9f625b66092015c2d1c1bf2f101887
docs: change `evolution` references to `stabilization`

Per https://www.mercurial-scm.org/wiki/CEDVocabulary.  I left the website and
bugzilla URLs with 'evolution' references alone to make deploying this easier.

diff --git a/docs/concepts.rst b/docs/concepts.rst
--- a/docs/concepts.rst
+++ b/docs/concepts.rst
@@ -8,7 +8,7 @@
 the concepts underlying it. For example, you cannot use Mercurial to
 its full potential without understanding the DAG (directed acyclic
 graph) of changesets and the meaning of parent/child relationships
-between nodes in that graph. Mercurial with changeset evolution adds
+between nodes in that graph. Mercurial with changeset stabilization adds
 some additional concepts to the graph of changesets. Understanding
 those concepts will make you an informed and empowered user of
 ``evolve``.
@@ -18,7 +18,7 @@
           better off just reading the `user guide`_. But if you
           appreciate the theoretical rigour underlying core Mercurial,
           you will be happy to know that it continues right into
-          changeset evolution.
+          changeset stabilization.
 
 .. note:: This document is incomplete! (The formatting of the math
           isn't quite right yet, and the diagrams are missing for
@@ -41,8 +41,8 @@
 
 First, every changeset in a Mercurial repository (since 2.3) has a
 *phase*. Phases are independent of ``evolve`` and they affect
-Mercurial usage with or without changeset evolution. However, they
-were implemented in order to support evolution, and are a critical
+Mercurial usage with or without changeset stabilization. However, they
+were implemented in order to support stabilization, and are a critical
 foundation of ``evolve``.
 
 Phases are strictly ordered:
@@ -64,7 +64,7 @@
 -------------------
 
 *Obsolescence* is they key concept at the heart of changeset
-evolution. Everything else in this document depends on understanding
+stabilization. Everything else in this document depends on understanding
 obsolescence. So: what does it mean for a changeset to be obsolete?
 
 In implementation terms, there is an *obsolescence marker* associated
@@ -86,7 +86,7 @@
 obsolescence graph is second-order version control. Where the
 traditional parent/child DAG tracks changes to your source code, the
 obsolescence graph tracks changes to your changesets. It tracks the
-evolution of your changesets.
+stabilization of your changesets.
 
 (If you prefer a calculus metaphor to set theory, it might help to
 think of the traditional parent/child DAG as the first derivative of
diff --git a/docs/from-mq.rst b/docs/from-mq.rst
--- a/docs/from-mq.rst
+++ b/docs/from-mq.rst
@@ -68,7 +68,7 @@
 hg qref
 ```````
 
-A new command from evolution will allow you to rewrite the changeset you are
+A new command from stabilization will allow you to rewrite the changeset you are
 currently on. Just call:
 
   $ hg amend
@@ -118,7 +118,7 @@
 "orphan". You need to rewrite them on top of the new version of their
 ancestor.
 
-The evolution extension adds a command to rewrite "orphan"
+The stabilization extension adds a command to rewrite "orphan"
 changesets:::
 
   $ hg evolve
@@ -138,7 +138,7 @@
 hg qrm
 ``````
 
-evolution introduce a new command to mark a changeset as "not wanted anymore".::
+stabilization introduce a new command to mark a changeset as "not wanted anymore".::
 
   $ hg prune <revset>
 
diff --git a/docs/index.rst b/docs/index.rst
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,11 +1,11 @@
 .. Copyright © 2014 Greg Ward <greg at gerg.ca>
 
-==================================
-Changeset Evolution with Mercurial
-==================================
+======================================
+Changeset Stabilization with Mercurial
+======================================
 
 `evolve`_ is a Mercurial extension for faster and safer mutable history. It
-implements the `changeset evolution`_ concept for `Mercurial`_.
+implements the `changeset stabilization`_ concept for `Mercurial`_.
 
 * It offers a safe and simple way to refine changesets locally and propagate
   those changes to other repositories.
@@ -57,10 +57,10 @@
    commands
    known-doc-issues
 
-.. _`changeset evolution`:
+.. _`changeset stabilization`:
 
-What is Changeset Evolution?
-----------------------------
+What is Changeset Stabilization?
+--------------------------------
 
 With core Mercurial, changesets are permanent and immutable. You can
 commit new changesets to modify your source code, but you cannot
@@ -95,7 +95,7 @@
   * Fix a mistake immediately: “Oops! I just committed a changeset
     with a syntax error—I'll fix that and amend the changeset so no
     one sees my mistake.” (While this is possible using default
-    features of core Mercurial, changeset evolution makes it safer.)
+    features of core Mercurial, changeset stabilization makes it safer.)
 
   * Fix a mistake a little bit later: “Oops! I broke the tests three
     commits back, but only noticed it now—I'll just update back to the
@@ -126,7 +126,7 @@
 Why the `evolve` extension?
 ---------------------------
 
-Mercurial core already has some support for `changeset evolution`_ so why have a
+Mercurial core already has some support for `changeset stabilization`_ so why have a
 dedicated extension?
 
 The long-term plan for ``evolve`` is to add it to core Mercurial. However,
@@ -141,7 +141,7 @@
 Development status
 ------------------
 
-While well underway, the full implementation of the `changeset evolution`_
+While well underway, the full implementation of the `changeset stabilization`_
 concept is still a work in progress. Core Mercurial already supports many of the
 associated features, but for now they are still disabled by default. The current
 implementation has been usable for multiple years already, and some parts of it
@@ -150,14 +150,14 @@
 
 However, there are still some areas were the current implementation has gaps.
 This means some use cases or performance issues are not handled as well as they
-currently are without evolution. Mercurial has been around for a long time and
-is strongly committed to backward compatibility. Therefore turning evolution on
+currently are without stabilization. Mercurial has been around for a long time and
+is strongly committed to backward compatibility. Therefore turning stabilization on
 by default today could regress the experience of some of our current users. The
 features will only be enabled by default at the point where users who do not use
-or care about the new features added by evolution won't be negatively impacted
+or care about the new features added by stabilization won't be negatively impacted
 by the new default.
 
-You can find the `evolution roadmap in the wiki`_.
+You can find the `stabilization roadmap in the wiki`_.
 
 .. # .. _`this query`: https://bz.mercurial-scm.org/buglist.cgi?component=evolution&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEED_EXAMPLE
 
@@ -175,4 +175,4 @@
 .. _`sharing mutable history`: sharing.html
 .. _`concepts`: concepts.html
 .. _`MQ migration guide`: from-mq.html
-.. _`evolution roadmap in the wiki`: https://www.mercurial-scm.org/wiki/CEDRoadMap
+.. _`stabilization roadmap in the wiki`: https://www.mercurial-scm.org/wiki/CEDRoadMap
diff --git a/docs/known-doc-issues.rst b/docs/known-doc-issues.rst
--- a/docs/known-doc-issues.rst
+++ b/docs/known-doc-issues.rst
@@ -7,7 +7,7 @@
 Features not covered by tutorials
 =================================
 
-Some of the *newer* features of evolution might not be reflected in the
+Some of the *newer* features of stabilization might not be reflected in the
 documentation yet. You can directly check the inline documentation of the
 extension itself for fresher details using `hg help -e evolve`.
 
diff --git a/docs/tutorial/draft.md b/docs/tutorial/draft.md
--- a/docs/tutorial/draft.md
+++ b/docs/tutorial/draft.md
@@ -1,6 +1,6 @@
 ---
 author: Boris Feld <boris.feld at octobus.net>
-title: Changeset evolution
+title: Changeset stabilization
 date: June 23, 2017
 ---
 
@@ -16,7 +16,7 @@
 
 Basic (local amend + local rebase)
 
-Stabilization -> Evolution
+Stabilization -> Stabilization
 
 Feature
 
@@ -435,7 +435,7 @@
 
 ## Obs markers
 
-Obs markers stores the relation between a changeset and its evolutions.
+Obs markers stores the relation between a changeset and its stabilizations.
 
 XXX: Speak about META
 
@@ -1147,11 +1147,11 @@
 
 Remember our obs-markers?
 
-They are great for evolution, but how do you know what changed between two evolutions?
+They are great for stabilization, but how do you know what changed between two stabilizations?
 
 ## Effect-flag
 
-Effect-flag are storing what changed between evolutions. You can view them with `obslog`, who else?
+Effect-flag are storing what changed between stabilizations. You can view them with `obslog`, who else?
 
 ## Effect-flag
 
diff --git a/docs/tutorial/slides.md b/docs/tutorial/slides.md
--- a/docs/tutorial/slides.md
+++ b/docs/tutorial/slides.md
@@ -1,5 +1,5 @@
 ---
-title: Changeset Evolution training
+title: Changeset Stabilization training
 author: |
   <span style="text-transform: none;"><small>Boris Feld<br/><a href="https://octobus.net">octobus.net</a></small></span>
 ---
@@ -8,7 +8,7 @@
 
 ## Welcome
 
-Hello everyone, and welcome to this Changeset Evolution training. During this session, you will learn how to safely rewrite history with Mercurial and Evolve, and how to collaborate together with your colleagues while rewriting the history at the same time.
+Hello everyone, and welcome to this Changeset Stabilization training. During this session, you will learn how to safely rewrite history with Mercurial and Evolve, and how to collaborate together with your colleagues while rewriting the history at the same time.
 
 This training is designed to last approximately ¾ hours.
 
@@ -73,7 +73,7 @@
 
 # The Basics
 
-<!-- #### What is Changeset Evolution?
+<!-- #### What is Changeset Stabilization?
 
 With core Mercurial, changesets are permanent and history rewriting has been discouraged for a long time. You can
 commit new changesets to modify your source code, but you cannot
@@ -85,7 +85,7 @@
 modifying history have been *unsafe* and expensive, in that changesets were
 destroyed (“stripped”) rather than simply hidden and still easy to recover.
 
-Changeset Evolution makes things better by changing the behaviour of most existing
+Changeset Stabilization makes things better by changing the behaviour of most existing
 history modification commands so they use a safer mechanism (*changeset
 obsolescence*, covered below) rather than the older, less safe *strip*
 operation.
@@ -112,7 +112,7 @@
   * Fix a mistake immediately: “Oops! I just committed a changeset
     with a syntax error—I'll fix that and amend the changeset so no
     one sees my mistake.” (While this is possible using default
-    features of core Mercurial, Changeset Evolution makes it safer.)
+    features of core Mercurial, Changeset Stabilization makes it safer.)
 
   * Fix a mistake a little bit later: “Oops! I broke the tests three
     commits back, but only noticed it now—I'll just update back to the
@@ -321,9 +321,9 @@
 graphs/rebase-after-hidden.dot
 ~~~
 
-### Evolution History
-
-Mercurial is designed to track the history of files. Evolution goes beyond, and tracks the history of the history of files. It basically tracks the different versions of your commits.
+### Stabilization History
+
+Mercurial is designed to track the history of files. Stabilization goes beyond, and tracks the history of the history of files. It basically tracks the different versions of your commits.
 
 As it is a new dimension of history, the classical Mercurial commands are not always the best to visualize this new history.
 
@@ -379,7 +379,7 @@
 
 While these two obsolescence logs look very similar —because they show a similar change—, the two changesets log histories looked quite different.
 
-Using the `hg log` command to understand the Evolution history is hard because it is designed for displaying the files history, not the Evolution history. The `hg obslog` has been specially designed for this use-case and is more suited for this use-case.
+Using the `hg log` command to understand the Stabilization history is hard because it is designed for displaying the files history, not the Stabilization history. The `hg obslog` has been specially designed for this use-case and is more suited for this use-case.
 
 #### TortoiseHG
 
@@ -421,7 +421,7 @@
 
 ## More rewriting commands
 
-The `hg amend` and `hg rebase` commands are the foundations for changeset evolution in Mercurial. You could do everything with these, but, luckily for us, the evolve extension provides human-friendly commands for common needs. We are going to see them now:
+The `hg amend` and `hg rebase` commands are the foundations for changeset stabilization in Mercurial. You could do everything with these, but, luckily for us, the evolve extension provides human-friendly commands for common needs. We are going to see them now:
 
 ### Amend
 
@@ -1237,7 +1237,7 @@
 
 <img src="https://media.giphy.com/media/F3MoHzSjjJ16w/giphy.gif">
 
-#### Track evolution
+#### Track stabilization
 
 ~~~graphviz-file
 graphs/fix-bug-3.dot
@@ -1261,7 +1261,7 @@
 
 #### Obsmarker
 
-Stores relation between evolutions
+Stores relation between stabilizations
 
 
 <div class='graph' style='display: flex ;align-items: stretch ;flex-flow: row wrap ; align-items: center;'>
@@ -2027,7 +2027,7 @@
 
 ## Instability
 
-#### Evolution
+#### stabilization
 
 * Unlock powerful unique features
 
@@ -2045,7 +2045,7 @@
 
 * **Orphans:** ancestors were rewritten
 
-* **Divergence:** branching in evolutions
+* **Divergence:** branching in stabilizations
 
     - Content-divergence: independent rewrites
 
@@ -2061,7 +2061,7 @@
 * Some rough edges
 * Feedback → priority
 
-#### Use Evolution Today
+#### Use stabilization Today
 
 install `hg-evolve`
 


More information about the Mercurial-devel mailing list