Patchwork D8288: fix: mark -r as advanced

login
register
mail settings
Submitter phabricator
Date March 13, 2020, 7:33 p.m.
Message ID <differential-rev-PHID-DREV-aqczdo3x6fr5bc7cq6aw-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45770/
State Superseded
Headers show

Comments

phabricator - March 13, 2020, 7:33 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  See the previous patch for reasoning. I planned to even mark it
  deprecated, but someone (timeless?) on the #mercurial IRC channel said
  they sometimes wanted to use `-r` with its existing semantics.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8288

AFFECTED FILES
  hgext/fix.py
  tests/test-fix.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - March 14, 2020, 8:40 a.m.
marmoute added a comment.


  For the record, I always use `hg fix` with `--rev`.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8288/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8288

To: martinvonz, #hg-reviewers, mharbison72
Cc: marmoute, mercurial-devel
phabricator - March 18, 2020, 3:56 p.m.
This revision is now accepted and ready to land.
durin42 added a comment.
durin42 accepted this revision.


  In D8288#123836 <https://phab.mercurial-scm.org/D8288#123836>, @marmoute wrote:
  
  > For the record, I always use `hg fix` with `--rev`.
  
  So do I, but I also acknowledge that I've got some idiosyncratic habits and use of `-r` is definitely correlated with users that get confused and blow a foot partway off.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8288/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8288

To: martinvonz, #hg-reviewers, mharbison72, durin42
Cc: durin42, marmoute, mercurial-devel

Patch

diff --git a/tests/test-fix.t b/tests/test-fix.t
--- a/tests/test-fix.t
+++ b/tests/test-fix.t
@@ -107,7 +107,6 @@ 
       --all            fix all non-public non-obsolete revisions
       --base REV [+]   revisions to diff against (overrides automatic selection,
                        and applies to every revision being fixed)
-   -r --rev REV [+]    revisions to fix
    -s --source REV [+] fix descendants of these revisions
    -w --working-dir    fix the working directory
       --whole          always fix every line of a file
diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -213,7 +213,7 @@ 
     ),
     _(b'REV'),
 )
-revopt = (b'r', b'rev', [], _(b'revisions to fix'), _(b'REV'))
+revopt = (b'r', b'rev', [], _(b'revisions to fix (ADVANCED)'), _(b'REV'))
 sourceopt = (
     b's',
     b'source',