Patchwork [1,of,5] histedit: add description about basic histedit function to command help

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Aug. 26, 2013, 7:41 a.m.
Message ID <16d2e0f938a3ff0c0d0c.1377502908@feefifofum>
Download mbox | patch
Permalink /patch/2259/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Aug. 26, 2013, 7:41 a.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1377501081 -32400
#      Mon Aug 26 16:11:21 2013 +0900
# Node ID 16d2e0f938a3ff0c0d0c4c449979652b2e4e633c
# Parent  d4a0055af149cdea20b3136b66cae8a24b2e2a98
histedit: add description about basic histedit function to command help

Before this patch, there is no explicit description that histedit
edits changesets between specified ancestor and the parent of the
working directory: users may notice it by error message "REV is not an
ancestor of working directory".

This patch adds description about basic histedit function to command
help of it.

This patch uses term "ancestor" instead of "parent", because it seems
to be more suitable, and almost all (error) messages already use it.

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -451,9 +451,12 @@ 
      ('f', 'force', False,
       _('force outgoing even for unrelated repositories')),
      ('r', 'rev', [], _('first revision to be edited'))],
-     _("[PARENT]"))
+     _("ANCESTOR"))
 def histedit(ui, repo, *freeargs, **opts):
     """interactively edit changeset history
+
+    This command edits changesets between ANCESTOR and the parent of
+    the working directory.
     """
     # TODO only abort if we try and histedit mq patches, not just
     # blanket if mq patches are applied somewhere
@@ -493,7 +496,7 @@ 
             revs.extend(freeargs)
             if len(revs) != 1:
                 raise util.Abort(
-                    _('histedit requires exactly one parent revision'))
+                    _('histedit requires exactly one ancestor revision'))
 
 
     if goal == 'continue':