[PATCH 2 of 6 topic-experiment] docs: some fixes to the help text
Pulkit Goyal
7895pulkit at gmail.com
Wed Jun 28 17:08:24 EDT 2017
# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1498586338 -19800
# Tue Jun 27 23:28:58 2017 +0530
# Node ID dd6f7f7e8236eef7672b5ea1f22e6c34345217df
# Parent da41510ef1475dfceae2cc1e2c615248837e52b5
# EXP-Topic resolvetopic
docs: some fixes to the help text
diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -20,7 +20,7 @@
this extensions contains significant additions recommended to any user of
changeset evolution.
-With the extensions various evolution events will display warning (new unstable
+With the extension various evolution events will display warning (new unstable
changesets, obsolete working copy parent, improved error when accessing hidden
revision, etc).
@@ -77,8 +77,8 @@
# (recommended 'yes' for server (default))
obshashrange.warm-cache = no
-It is recommended to enable the blackbox extension. It gather useful data about
-the experiment. It is shipped with Mercurial so no extra install are needed.
+It is recommended to enable the blackbox extension. It gathers useful data about
+the experiment. It is shipped with Mercurial so no extra install is needed.
[extensions]
blackbox =
@@ -110,7 +110,7 @@
# deactivate the registration of effect flags in obs markers
evolution.effect-flags = false
-The effect flags are shown in the obglog command output without particular
+The effect flags are shown in the obslog command output without particular
configuration if you want to inspect them.
Templates
@@ -121,14 +121,14 @@
- precursors, for each obsolete changeset show the closest visible
precursors.
- - successors, for each obsolete changeset show the closets visible
+ - successors, for each obsolete changeset show the closests visible
successors. It is useful when your working directory is obsolete to see
- what are its successors. This informations can also be retrieved with the
+ what are its successors. This information can also be retrieved with the
obslog command and the --all option.
- obsfate, for each obsolete changeset display a line summarizing what
changed between the changeset and its successors. Dependending on the
verbosity level (-q and -v) it display the changeset successors, the users
- that created the obsmarkers and the date range of theses changes.
+ that created the obsmarkers and the date range of these changes.
The template itself is not complex, the data are basically a list of
successortset. Each successorset is a dict with these fields:
diff --git a/hgext3rd/evolve/obshistory.py b/hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py
+++ b/hgext3rd/evolve/obshistory.py
@@ -54,8 +54,8 @@
the obsolescence operation (rewritten or pruned) in addition of the user and
date of the operation.
- The output is a graph by default but can deactivated with the option '--no-
- graph'.
+ The output is a graph by default but can deactivated with the option
+ '--no-graph'.
'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
and '+' represents a fork where the changeset from the lines below is a
More information about the Mercurial-devel
mailing list