Patchwork Small language fixes in command help

login
register
mail settings
Submitter Brendan Cully
Date April 4, 2014, 6:49 a.m.
Message ID <58dfe07b58b19a67bae4.1396594163@nimes.local>
Download mbox | patch
Permalink /patch/4224/
State Superseded
Headers show

Comments

Brendan Cully - April 4, 2014, 6:49 a.m.
# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1396593383 25200
#      Thu Apr 03 23:36:23 2014 -0700
# Branch stable
# Node ID 58dfe07b58b19a67bae41aa0e22dc005a76e7a89
# Parent  6a67606e1c3456c603707fe57e8404af5e33a1bd
Small language fixes in command help
Durham Goode - April 5, 2014, 12:28 a.m.
On 4/3/14, 11:49 PM, Brendan Cully wrote:
> # HG changeset patch
> # User Brendan Cully <brendan@kublai.com>
> # Date 1396593383 25200
> #      Thu Apr 03 23:36:23 2014 -0700
> # Branch stable
> # Node ID 58dfe07b58b19a67bae41aa0e22dc005a76e7a89
> # Parent  6a67606e1c3456c603707fe57e8404af5e33a1bd
> Small language fixes in command help
>
> diff -r 6a67606e1c34 -r 58dfe07b58b1 hgext/evolve.py
> --- a/hgext/evolve.py	Sun Mar 02 15:19:31 2014 +0100
> +++ b/hgext/evolve.py	Thu Apr 03 23:36:23 2014 -0700
> @@ -814,7 +814,7 @@
>   
I think the evolve repo follows the same commit message guidelines as 
mercurial ("topic: title blah blah")?  Also, use the evolve-ext flag for 
patches for the evolve extension, for easy sorting.

Patch

diff -r 6a67606e1c34 -r 58dfe07b58b1 hgext/evolve.py
--- a/hgext/evolve.py	Sun Mar 02 15:19:31 2014 +0100
+++ b/hgext/evolve.py	Thu Apr 03 23:36:23 2014 -0700
@@ -814,7 +814,7 @@ 
 
 
 @command('^evolve|stabilize|solve',
-    [('n', 'dry-run', False, 'do not perform actions, print what to be done'),
+    [('n', 'dry-run', False, 'do not perform actions, just print what would be done'),
     ('A', 'any', False, 'evolve any troubled changeset'),
     ('a', 'all', False, 'evolve all troubled changesets'),
     ('c', 'continue', False, 'continue an interrupted evolution'), ],
@@ -822,13 +822,13 @@ 
 def evolve(ui, repo, **opts):
     """Solve trouble in your repository
 
-    - rebase unstable changeset to make it stable again,
-    - create proper diff from bumped changeset,
-    - merge divergent changesets.
+    - rebase unstable changesets to make them stable again,
+    - create proper diffs from bumped changesets,
+    - merge divergent changesets,
     - update to a successor if the working directory parent is
       obsolete
 
-    By default, take the first trouble changeset that looks relevant.
+    By default, takes the first troubled changeset that looks relevant.
 
     (The logic is still a bit fuzzy)
 
@@ -838,7 +838,7 @@ 
 
     - For divergent, this means taking "." if applicable.
 
-    With --any, evolve picks any troubled changeset to solve.
+    With --any, evolve picks any troubled changeset to repair.
 
     The working directory is updated to the newly created revision.
     """
@@ -1365,22 +1365,22 @@ 
     _('[OPTION] [-r] REV...'))
     # -U  --noupdate option to prevent wc update and or bookmarks update ?
 def cmdprune(ui, repo, *revs, **opts):
-    """get rid of changesets by marking them obsolete
+    """hide changesets by marking them obsolete
 
     Obsolete changesets becomes invisible to all commands.
 
-    Non-pruned descendant of pruned changesets becomes "unstable". Use the
+    Unpruned descendants of pruned changesets becomes "unstable". Use the
     :hg:`evolve` to handle such situation.
 
-    When the working directory parent is pruned the repository is updated to a
-    non obsolete parents.
+    When the working directory parent is pruned, the repository is updated to a
+    non-obsolete parent.
 
-    You can use the ``--succ`` option to informs mercurial that a newer version
+    You can use the ``--succ`` option to inform mercurial that a newer version
     of the pruned changeset exists.
 
     You can use the ``--biject`` option to specify a 1-1 (bijection) between
     revisions to prune and successor changesets. This option may be removed in
-    a future release (with the functionality absored automatically).
+    a future release (with the functionality absorbed automatically).
 
     """
     revs = set(scmutil.revrange(repo, list(revs) + opts.get('rev')))
@@ -1578,10 +1578,10 @@ 
 def uncommit(ui, repo, *pats, **opts):
     """move changes from parent revision to working directory
 
-    Changes to selected files in parent revision appear again as
+    Changes to selected files in the checked out revision appear again as
     uncommitted changed in the working directory. A new revision
-    without selected changes is created, becomes the new parent and
-    obsoletes the previous one.
+    without the selected changes is created, becomes the checked out
+    revision, and obsoletes the previous one.
 
     The --include option specifies patterns to uncommit.
     The --exclude option specifies patterns to keep in the commit.
@@ -1662,7 +1662,7 @@ 
     # allow to choose the seed ?
     _('[-r] revs'))
 def touch(ui, repo, *revs, **opts):
-    """Create successors with exact same property but hash
+    """Create successors that are identical to their predecessors except for the changeset ID
 
     This is used to "resurrect" changesets
     """
@@ -1718,10 +1718,10 @@ 
 def fold(ui, repo, *revs, **opts):
     """Fold multiple revisions into a single one
 
-    Revision from your current working directory to the specified one are fold
-    as a new one replacing the other
+    The revisions from your current working directory to the given one are folded
+    into a single successor revision.
 
-    you can alternatively use --rev to explicitly specify revision to be fold
+    you can alternatively use --rev to explicitly specify revisions to be folded,
     ignoring the current working directory parent.
     """
     revs = list(revs)