This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1335

tweakdefaults: provide advice about`hg uncommit`
ClosedPublic

Authored by sergeyn on Nov 8 2017, 3:54 AM.
Tags
None
Subscribers
quark

Details

Reviewers
mitrandir
Group Reviewers
Restricted Project
Commits
rFBHGX9b5a2305541e: tweakdefaults: provide advice about`hg uncommit`
Summary

Advice using hg uncommit when a command to prune (like hg strip) but keeping the changes (with --keep option)

Test Plan

Run hg strip -k\--keep a "'hg uncommit' provides a better UI for undoing commits while keeping the changes" should show up.
Run hg strip w/o --keep option, "'hg hide' provides a better UI for hiding commits" should be shown

Diff Detail

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

Event Timeline

sergeyn created this revision.Nov 8 2017, 3:54 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 8 2017, 3:54 AM
mitrandir accepted this revision.Nov 8 2017, 10:28 AM
This revision is now accepted and ready to land.Nov 8 2017, 10:28 AM
Closed by commit rFBHGX9b5a2305541e: tweakdefaults: provide advice about`hg uncommit` (authored by sergeyn). · Explain WhyNov 8 2017, 6:28 PM
This revision was automatically updated to reflect the committed changes.
quark added a subscriber: quark.EditedDec 5 2017, 2:56 PM

I think we should only show this message when stripping . but not other revisions.

Besides, this probably wants a real test.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/prune.py (8 lines)

Diff 3353

hgext3rd/fbamend/prune.py

option may be removed in a future release (with the functionality provided option may be removed in a future release (with the functionality provided
automatically). automatically).
If you specify multiple revisions in ``--succ``, you are recording a If you specify multiple revisions in ``--succ``, you are recording a
"split" and must acknowledge it by passing ``--split``. Similarly, when you "split" and must acknowledge it by passing ``--split``. Similarly, when you
prune multiple changesets with a single successor, you must pass the prune multiple changesets with a single successor, you must pass the
``--fold`` option. ``--fold`` option.
""" """
ui.warn(_("advice: 'hg hide' provides a better UI for hiding commits\n")) if opts.get('keep', False):
advice = "'hg uncommit' provides a better UI for undoing commits " \
"while keeping the changes\n"
else:
advice = "'hg hide' provides a better UI for hiding commits\n"
ui.warn(_("advice: %s") % advice)
revs = scmutil.revrange(repo, list(revs) + opts.get('rev', [])) revs = scmutil.revrange(repo, list(revs) + opts.get('rev', []))
succs = opts.get('succ', []) succs = opts.get('succ', [])
bookmarks = set(opts.get('bookmark', ())) bookmarks = set(opts.get('bookmark', ()))
metadata = _getmetadata(**opts) metadata = _getmetadata(**opts)
biject = opts.get('biject') biject = opts.get('biject')
fold = opts.get('fold') fold = opts.get('fold')
split = opts.get('split') split = opts.get('split')