Patchwork [STABLE] doc: change 'revision or range' to 'revision or revset'

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date Oct. 24, 2014, 5:50 p.m.
Message ID <c2617cb5444e89e358af.1414173042@Iris>
Download mbox | patch
Permalink /patch/6460/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - Oct. 24, 2014, 5:50 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1414173000 14400
#      Fri Oct 24 13:50:00 2014 -0400
# Branch stable
# Node ID c2617cb5444e89e358af78f328510c778822b34a
# Parent  eb763217152ab2b472416bcc57722451c317f282
doc: change 'revision or range' to 'revision or revset'

The phrase "revision or range" comes from a pre-revset era. Since the
documentation for ranges now is under the revset docs, and as a
helpful hint nudging users towards revsets, I think it's better to say
"revision or revset"
Pierre-Yves David - Oct. 26, 2014, 12:11 p.m.
On 10/24/2014 07:50 PM, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1414173000 14400
> #      Fri Oct 24 13:50:00 2014 -0400
> # Branch stable
> # Node ID c2617cb5444e89e358af78f328510c778822b34a
> # Parent  eb763217152ab2b472416bcc57722451c317f282
> doc: change 'revision or range' to 'revision or revset'
>
> The phrase "revision or range" comes from a pre-revset era. Since the
> documentation for ranges now is under the revset docs, and as a
> helpful hint nudging users towards revsets, I think it's better to say
> "revision or revset"

THe change looks good but I'm concerned for the amount of critical 
translation it is going to invalidate. Would probably be better after 
the freeze. CCing Matt for arbitration.
Wagner Bruna - Oct. 27, 2014, 3:24 p.m.
Em 26-10-2014 10:11, Pierre-Yves David escreveu:
> On 10/24/2014 07:50 PM, Jordi Gutiérrez Hermoso wrote:
>> # HG changeset patch
>> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
>> # Date 1414173000 14400
>> #      Fri Oct 24 13:50:00 2014 -0400
>> # Branch stable
>> # Node ID c2617cb5444e89e358af78f328510c778822b34a
>> # Parent  eb763217152ab2b472416bcc57722451c317f282
>> doc: change 'revision or range' to 'revision or revset'
>>
>> The phrase "revision or range" comes from a pre-revset era.
>> Since the documentation for ranges now is under the revset
>> docs, and as a helpful hint nudging users towards revsets,
>> I think it's better to say "revision or revset"
> 
> THe change looks good but I'm concerned for the amount
> of critical translation it is going to invalidate. Would
> probably be better after the freeze. CCing Matt for
> arbitration.

FWIW, excluding pt_BR (which I could fix right now), this invalidates both
messages for da, de, it, ja and ru, and one for ro and sv.

Best regards,
Wagner
Matt Mackall - Oct. 27, 2014, 8:27 p.m.
On Fri, 2014-10-24 at 13:50 -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1414173000 14400
> #      Fri Oct 24 13:50:00 2014 -0400
> # Branch stable
> # Node ID c2617cb5444e89e358af78f328510c778822b34a
> # Parent  eb763217152ab2b472416bcc57722451c317f282
> doc: change 'revision or range' to 'revision or revset'

This is queued for stable, thanks.

Patch

diff --git a/contrib/zsh_completion b/contrib/zsh_completion
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -709,7 +709,7 @@  typeset -A _hg_cmd_globals
   '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \
   '(--copies -C)'{-C,--copies}'[show copied files]' \
   '(--keyword -k)'{-k+,--keyword}'[search for a keyword]:' \
-  '*'{-r,--rev}'[show the specified revision or range]:revision:_hg_revrange' \
+  '*'{-r,--rev}'[show the specified revision or revset]:revision:_hg_revrange' \
   '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
   '(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_labels' \
   '(--graph -G)'{-G+,--graph}'[show the revision DAG]' \
diff --git a/hgext/churn.py b/hgext/churn.py
--- a/hgext/churn.py
+++ b/hgext/churn.py
@@ -92,7 +92,7 @@  def countrate(ui, repo, amap, *pats, **o
 
 @command('churn',
     [('r', 'rev', [],
-     _('count rate for the specified revision or range'), _('REV')),
+     _('count rate for the specified revision or revset'), _('REV')),
     ('d', 'date', '',
      _('count rate for revisions matching date spec'), _('DATE')),
     ('t', 'template', '{author|email}',
diff --git a/hgext/graphlog.py b/hgext/graphlog.py
--- a/hgext/graphlog.py
+++ b/hgext/graphlog.py
@@ -31,7 +31,7 @@  testedwith = 'internal'
     ('C', 'copies', None, _('show copied files')),
     ('k', 'keyword', [],
      _('do case-insensitive search for a given text'), _('TEXT')),
-    ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
+    ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
     ('', 'removed', None, _('include revisions where files were removed')),
     ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
     ('u', 'user', [], _('revisions committed by user'), _('USER')),
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4322,7 +4322,7 @@  def locate(ui, repo, *pats, **opts):
     ('C', 'copies', None, _('show copied files')),
     ('k', 'keyword', [],
      _('do case-insensitive search for a given text'), _('TEXT')),
-    ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
+    ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
     ('', 'removed', None, _('include revisions where files were removed')),
     ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
     ('u', 'user', [], _('revisions committed by user'), _('USER')),