This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8288

fix: mark -r as advanced
ClosedPublic

Authored by martinvonz on Mar 13 2020, 3:33 PM.

Details

Reviewers
mharbison72
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa6ef1e8e2f6d: fix: mark -r as advanced
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 13 2020, 3:33 PM
martinvonz updated this revision to Diff 20777.Mar 13 2020, 3:38 PM
mharbison72 accepted this revision.Mar 13 2020, 6:41 PM
martinvonz updated this revision to Diff 20781.Mar 13 2020, 7:24 PM
marmoute added a subscriber: marmoute.Mar 14 2020, 4:40 AM

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

martinvonz updated this revision to Diff 20823.Mar 18 2020, 2:34 AM
durin42 accepted this revision.Mar 18 2020, 11:56 AM
durin42 added a subscriber: durin42.
In 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.

This revision is now accepted and ready to land.Mar 18 2020, 11:56 AM
pulkit accepted this revision.Mar 19 2020, 4:15 AM
martinvonz added a commit: rHGa6ef1e8e2f6d: fix: mark -r as advanced.Mar 19 2020, 4:45 AM
Closed by commit rHGa6ef1e8e2f6d: fix: mark -r as advanced (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (2 lines)
Mtests/test-fix.t (1 line)

Diff 20835

hgext/fix.py

[], [],
_( _(
b'revisions to diff against (overrides automatic ' b'revisions to diff against (overrides automatic '
b'selection, and applies to every revision being ' b'selection, and applies to every revision being '
b'fixed)' b'fixed)'
), ),
_(b'REV'), _(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 = ( sourceopt = (
b's', b's',
b'source', b'source',
[], [],
_(b'fix the specified revisions and their descendants'), _(b'fix the specified revisions and their descendants'),
_(b'REV'), _(b'REV'),
) )
wdiropt = (b'w', b'working-dir', False, _(b'fix the working directory')) wdiropt = (b'w', b'working-dir', False, _(b'fix the working directory'))

tests/test-fix.t

(use 'hg help -e fix' to show help for the fix extension) (use 'hg help -e fix' to show help for the fix extension)
options ([+] can be repeated): options ([+] can be repeated):
--all fix all non-public non-obsolete revisions --all fix all non-public non-obsolete revisions
--base REV [+] revisions to diff against (overrides automatic selection, --base REV [+] revisions to diff against (overrides automatic selection,
and applies to every revision being fixed) and applies to every revision being fixed)
-r --rev REV [+] revisions to fix
-s --source REV [+] fix the specified revisions and their descendants -s --source REV [+] fix the specified revisions and their descendants
-w --working-dir fix the working directory -w --working-dir fix the working directory
--whole always fix every line of a file --whole always fix every line of a file
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)
$ hg help -e fix $ hg help -e fix
fix extension - rewrite file content in changesets or working copy fix extension - rewrite file content in changesets or working copy