This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1594

prune: only prompt uncommit when revs = ['.']
AbandonedPublic

Authored by quark on Dec 5 2017, 3:09 PM.
Tags
None
Subscribers
None

Details

Reviewers
mitrandir
Group Reviewers
Restricted Project
Summary

This is a follow-up of D1335.

uncommit only works for the dot revision. Therefore the advice shouldn't
be visible when stripping other revisions.

Besides, added missing i18n functions and added a test.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Dec 5 2017, 3:09 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 5 2017, 3:09 PM
quark edited the summary of this revision. (Show Details)Dec 5 2017, 3:09 PM
quark abandoned this revision.Feb 16 2020, 8:36 PM

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/prune.py (10 lines)
AMtests/test-fbamend-strip.t (30 lines)

Diff 4122

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.
""" """
if opts.get('keep', False): revs = scmutil.revrange(repo, list(revs) + opts.get('rev', []))
advice = "'hg uncommit' provides a better UI for undoing commits " \ if opts.get('keep', False) and list(revs) == [repo['.'].rev()]:
"while keeping the changes\n" advice = _("'hg uncommit' provides a better UI for undoing commits "
"while keeping the changes\n")
else: else:
advice = "'hg hide' provides a better UI for hiding commits\n" advice = _("'hg hide' provides a better UI for hiding commits\n")
ui.warn(_("advice: %s") % advice) ui.warn(_("advice: %s") % advice)
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')
options = [o for o in ('biject', 'fold', 'split') if opts.get(o)] options = [o for o in ('biject', 'fold', 'split') if opts.get(o)]

tests/test-fbamend-strip.t

  • This file was added.
$ cat >> $HGRCPATH << EOF
> [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend
> strip=
> drawdag=$RUNTESTDIR/drawdag.py
> [experimental]
> evolution=createmarkers
> EOF
$ hg init
$ hg debugdrawdag <<'EOS'
> D E
> | |
> B C
> |/
> A
> EOS
$ hg update D -q
$ hg strip D --keep
advice: 'hg uncommit' provides a better UI for undoing commits while keeping the changes
1 changesets pruned
$ hg strip C
advice: 'hg hide' provides a better UI for hiding commits
2 changesets pruned
$ hg strip B
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 426bada5c675
2 changesets pruned