Patchwork [2,of,2,STABLE] rebase: mention --rev in the help

login
register
mail settings
Submitter Pierre-Yves David
Date Jan. 31, 2013, 10:30 p.m.
Message ID <fadbec65d390af7e2db6.1359671456@yamac.lan>
Download mbox | patch
Permalink /patch/778/
State Superseded
Headers show

Comments

Pierre-Yves David - Jan. 31, 2013, 10:30 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359671125 -3600
# Branch stable
# Node ID fadbec65d390af7e2db69ecf8850787b937718ae
# Parent  cb4cb6437ca0931d03b8b4f2caeec03983b2fc98
rebase: mention --rev in the help

The --rev option is included in the command usage but not explained anywhere.
This changeset add a small mention of it in the code to prevent confusion. This
small addition reference online help that are easier to update and improves at
release time

Following Wagner Bruna advises, this is added in a plain new paragraph to not
invalidate current translation this close from the release.
Bryan O'Sullivan - Jan. 31, 2013, 11 p.m.
On Thu, Jan 31, 2013 at 2:30 PM, Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

> +    option.  It allows to specify a strict set of changesets to rebase.
> +    See online documentation for details.
>

"See online documentation" is not very helpful - where would I look?
Pierre-Yves David - Jan. 31, 2013, 11:38 p.m.
On 1 févr. 2013, at 00:00, Bryan O'Sullivan wrote:

> On Thu, Jan 31, 2013 at 2:30 PM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
> +    option.  It allows to specify a strict set of changesets to rebase.
> +    See online documentation for details.
> 
> "See online documentation" is not very helpful - where would I look? 

It's suppose mean "The RebaseExtension page on the Mercurial wiki". But odd that its actually resolve to that are low. We should probably drop this silly sentences.
Greg Ward - Feb. 1, 2013, 4:27 p.m.
On 31 January 2013, Pierre-Yves David said:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
> # Date 1359671125 -3600
> # Branch stable
> # Node ID fadbec65d390af7e2db69ecf8850787b937718ae
> # Parent  cb4cb6437ca0931d03b8b4f2caeec03983b2fc98
> rebase: mention --rev in the help
> 
> The --rev option is included in the command usage but not explained anywhere.
> This changeset add a small mention of it in the code to prevent confusion. This
> small addition reference online help that are easier to update and improves at
> release time

Grammar plus a wrong word:

  This changeset adds a small mention of it in the help to prevent confusion. This
  small addition references online help that is easier to update and improve at
  release time.
  
> Following Wagner Bruna advises, this is added in a plain new paragraph to not
> invalidate current translation this close from the release.

Grammar, punctuation, spelling:

  Following Wagner Bruna's advice, this is added in a plain new paragraph to not
  invalidate current translation this close to the release.

> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -86,10 +86,14 @@ def rebase(ui, repo, **opts):
>      ``-b`` is less precise but more convenient than ``-s``: you can
>      specify any changeset in the source branch, and rebase will select
>      the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
>      uses the parent of the working directory as the base.
>  
> +    For advanced usages, a third way is available through the ``--rev``
> +    option.  It allows to specify a strict set of changesets to rebase.
> +    See online documentation for details.

Grammar, spacing, wording:

    For advanced usage, a third way is available through the ``--rev``
    option. It allows you to specify the precise set of changesets to
    rebase. See online documentation for details.

Also I would either drop the last sentence or include a direct
hyperlink to the wiki page in question.

       Greg

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -86,10 +86,14 @@  def rebase(ui, repo, **opts):
     ``-b`` is less precise but more convenient than ``-s``: you can
     specify any changeset in the source branch, and rebase will select
     the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
     uses the parent of the working directory as the base.
 
+    For advanced usages, a third way is available through the ``--rev``
+    option.  It allows to specify a strict set of changesets to rebase.
+    See online documentation for details.
+
     By default, rebase recreates the changesets in the source branch
     as descendants of dest and then destroys the originals. Use
     ``--keep`` to preserve the original source changesets. Some
     changesets in the source branch (e.g. merges from the destination
     branch) may be dropped if they no longer contribute any change.