This is an archive of the discontinued Mercurial Phabricator instance.

Differential D140

fbamend: add --clean flag to hg prev/next
ClosedPublic

Authored by kulshrax on Jul 18 2017, 9:25 PM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXfbbcb5c6a1fb: fbamend: add --clean flag to hg prev/next
Summary

This patch adds a --clean flag to hg prev and next that discards any pending changes, similar to hg update --clean.

Test Plan

hgarc unit && hgarc lint

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

kulshrax created this revision.Jul 18 2017, 9:25 PM
kulshrax edited the test plan for this revision. (Show Details)Jul 18 2017, 9:28 PM
kulshrax added a comment.Jul 18 2017, 9:31 PM

I'm seeing a unit test failure I don't understand in test-check-config-hg.t. Any idea what's going on?

--- /data/users/kulshrax/facebook-hg-rpms/fb-hgext/tests/test-check-config-hg.t
+++ /data/users/kulshrax/facebook-hg-rpms/fb-hgext/tests/test-check-config-hg.t.err
@@ -16,11 +16,11 @@
   > ) | sed 's|\|/|g' |
   >   $PYTHON $RUNTESTDIR/../contrib/check-config.py
       elif ui.configbool('p4fastimport', 'useworker', False):
-
   conflict on p4fastimport.useworker: ('bool', '') != ('str', '')
+  at hgext3rd/p4fastimport/util.py:49:
       if ui.configbool("experimental", "histeditng"):
-
   conflict on experimental.histeditng: ('bool', '') != ('str', '')
+  at /data/users/kulshrax/facebook-hg-rpms/hg-crew/tests/../hgext/histedit.py:1607:
   undocumented: fastlog.debug (str)
   undocumented: fastlog.enabled (bool)
   undocumented: fastmanifest.cachecutoffdays (int) [60]
quark added a subscriber: ryanmce.Jul 18 2017, 10:13 PM
quark accepted this revision.
In D140#2069, @kulshrax wrote:

I'm seeing a unit test failure I don't understand in test-check-config-hg.t. Any idea what's going on?

I think that's @ryanmce's upstream change https://www.mercurial-scm.org/repo/hg/rev/e470f12d7d05

This revision is now accepted and ready to land.Jul 18 2017, 10:13 PM
Closed by commit rFBHGXfbbcb5c6a1fb: fbamend: add --clean flag to hg prev/next (authored by kulshrax). · Explain WhyJul 19 2017, 10:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 304

hgext3rd/fbamend/movement.py

moveopts = [ moveopts = [
('B', 'move-bookmark', False, _('move active bookmark')), ('B', 'move-bookmark', False, _('move active bookmark')),
('', 'merge', False, _('merge uncommitted changes')), ('', 'merge', False, _('merge uncommitted changes')),
] ]
@command( @command(
'^previous', '^previous',
[('', 'newest', False, [('', 'clean', False,
_('discard uncommitted changes (no backup)')),
('', 'newest', False,
_('always pick the newest parent when a changeset has multiple parents')), _('always pick the newest parent when a changeset has multiple parents')),
('', 'bottom', False, ('', 'bottom', False,
_('update to the lowest non-public ancestor of the current changeset')), _('update to the lowest non-public ancestor of the current changeset')),
('', 'bookmark', False, ('', 'bookmark', False,
_('update to the first ancestor with a bookmark')), _('update to the first ancestor with a bookmark')),
('', 'no-activate-bookmark', False, ('', 'no-activate-bookmark', False,
_('do not activate the bookmark on the destination changeset')), _('do not activate the bookmark on the destination changeset')),
] + moveopts, _('[OPTIONS]... [STEPS]')) ] + moveopts, _('[OPTIONS]... [STEPS]'))
def previous(ui, repo, *args, **opts): def previous(ui, repo, *args, **opts):
"""update to parent changeset""" """update to parent changeset"""
_moverelative(ui, repo, args, opts, reverse=True) _moverelative(ui, repo, args, opts, reverse=True)
@command( @command(
'^next', '^next',
[('', 'newest', False, [('', 'clean', False,
_('discard uncommitted changes (no backup)')),
('', 'newest', False,
_('always pick the newest child when a changeset has multiple children')), _('always pick the newest child when a changeset has multiple children')),
('', 'rebase', False, _('rebase each changeset if necessary')), ('', 'rebase', False, _('rebase each changeset if necessary')),
('', 'top', False, _('update to the head of the current stack')), ('', 'top', False, _('update to the head of the current stack')),
('', 'bookmark', False, ('', 'bookmark', False,
_('update to the first changeset with a bookmark')), _('update to the first changeset with a bookmark')),
('', 'no-activate-bookmark', False, ('', 'no-activate-bookmark', False,
_('do not activate the bookmark on the destination changeset')), _('do not activate the bookmark on the destination changeset')),
('', 'towards', "", _('move linearly towards the specified head')), ('', 'towards', "", _('move linearly towards the specified head')),
raise error.Abort(_("cannot use both number and --bottom")) raise error.Abort(_("cannot use both number and --bottom"))
if opts.get('bookmark', False): if opts.get('bookmark', False):
if opts.get('top', False): if opts.get('top', False):
raise error.Abort(_("cannot use both --top and --bookmark")) raise error.Abort(_("cannot use both --top and --bookmark"))
if opts.get('bottom', False): if opts.get('bottom', False):
raise error.Abort(_("cannot use both --bottom and --bookmark")) raise error.Abort(_("cannot use both --bottom and --bookmark"))
if opts.get('towards', False) and opts.get('top', False): if opts.get('towards', False) and opts.get('top', False):
raise error.Abort(_("cannot use both --top and --towards")) raise error.Abort(_("cannot use both --top and --towards"))
if opts.get('merge', False) and opts.get('rebase', False):
raise error.Abort(_("cannot use both --merge and --rebase"))
# Check if there is an outstanding operation or uncommited changes. # Check if there is an outstanding operation or uncommited changes.
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
if not opts.get('merge', False): if not opts.get('clean', False) and not opts.get('merge', False):
try: try:
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
except error.Abort as e: except error.Abort as e:
e.hint = _("use --merge to merge uncommitted changes") e.hint = _("use --clean to discard uncommitted changes "
"or --merge to bring them along")
raise raise
elif opts.get('rebase', False):
raise error.Abort(_("cannot use both --merge and --rebase")) # If we have both --clean and --rebase, we need to discard any outstanding
# changes now before we attempt to perform any rebases.
if opts.get('clean') and opts.get('rebase'):
commands.update(ui, repo, rev=repo['.'].rev(), clean=True)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
# Record the active bookmark, if any. # Record the active bookmark, if any.
bookmark = repo._activebookmark bookmark = repo._activebookmark
noactivate = opts.get('no_activate_bookmark', False) noactivate = opts.get('no_activate_bookmark', False)
movebookmark = opts.get('move_bookmark', False) movebookmark = opts.get('move_bookmark', False)
with repo.transaction('moverelative') as tr: with repo.transaction('moverelative') as tr:
# Find the desired changeset. May potentially perform rebase. # Find the desired changeset. May potentially perform rebase.
try: try:
target = _findtarget(ui, repo, n, opts, reverse) target = _findtarget(ui, repo, n, opts, reverse)
except error.InterventionRequired: except error.InterventionRequired:
# Rebase failed. Need to manually close transaction to allow # Rebase failed. Need to manually close transaction to allow
# `hg rebase --continue` to work correctly. # `hg rebase --continue` to work correctly.
tr.close() tr.close()
raise raise
# Move the active bookmark if neccesary. Needs to happen before # Move the active bookmark if neccesary. Needs to happen before
# we update to avoid getting a 'leaving bookmark X' message. # we update to avoid getting a 'leaving bookmark X' message.
if movebookmark and bookmark is not None: if movebookmark and bookmark is not None:
_setbookmark(repo, tr, bookmark, target) _setbookmark(repo, tr, bookmark, target)
# Update to the target changeset. # Update to the target changeset.
commands.update(ui, repo, rev=target) commands.update(ui, repo, rev=target,
clean=opts.get('clean', False))
# Print out the changeset we landed on. # Print out the changeset we landed on.
_showchangesets(ui, repo, revs=[target]) _showchangesets(ui, repo, revs=[target])
# Activate the bookmark on the new changeset. # Activate the bookmark on the new changeset.
if not noactivate and not movebookmark: if not noactivate and not movebookmark:
_activate(ui, repo, target) _activate(ui, repo, target)

tests/test-fbamend-next.t

Check help text for new options and removal of unsupported options. Check help text for new options and removal of unsupported options.
$ hg next --help $ hg next --help
hg next [OPTIONS]... [STEPS] hg next [OPTIONS]... [STEPS]
update to child changeset update to child changeset
options: options:
--clean discard uncommitted changes (no backup)
--newest always pick the newest child when a changeset has --newest always pick the newest child when a changeset has
multiple children multiple children
--rebase rebase each changeset if necessary --rebase rebase each changeset if necessary
--top update to the head of the current stack --top update to the head of the current stack
--bookmark update to the first changeset with a bookmark --bookmark update to the first changeset with a bookmark
--no-activate-bookmark do not activate the bookmark on the destination --no-activate-bookmark do not activate the bookmark on the destination
changeset changeset
--towards VALUE move linearly towards the specified head --towards VALUE move linearly towards the specified head
(leaving bookmark bottom) (leaving bookmark bottom)
[2dc09a] (bookmark) r3 [2dc09a] (bookmark) r3
(activating bookmark bookmark) (activating bookmark bookmark)
$ hg next 2 --no-activate-bookmark $ hg next 2 --no-activate-bookmark
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bookmark) (leaving bookmark bookmark)
[c8d03c] (top) r5 [c8d03c] (top) r5
Test dirty working copy and --clean.
$ hg up bottom
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark bottom)
$ touch test
$ hg add test
$ hg st
A test
$ hg next
abort: uncommitted changes
(use --clean to discard uncommitted changes or --merge to bring them along)
[255]
$ hg next --clean
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bottom)
[66f7d4] r1
$ hg st
? test
$ rm test
Test dirty working copy and --merge. Test dirty working copy and --merge.
$ hg up bottom $ hg up bottom
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark bottom) (activating bookmark bottom)
$ touch test $ touch test
$ hg add test $ hg add test
$ hg st $ hg st
A test A test
$ hg next $ hg next
abort: uncommitted changes abort: uncommitted changes
(use --merge to merge uncommitted changes) (use --clean to discard uncommitted changes or --merge to bring them along)
[255] [255]
$ hg next --merge $ hg next --merge
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bottom) (leaving bookmark bottom)
[66f7d4] r1 [66f7d4] r1
$ hg st $ hg st
A test A test
$ hg forget test $ hg forget test
[255] [255]
$ hg log -r . $ hg log -r .
changeset: 0:1ea73414a91b changeset: 0:1ea73414a91b
bookmark: bottom bookmark: bottom
user: debugbuilddag user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: r0 summary: r0
$ hg next --top --newest $ hg next --top --newest
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bottom) (leaving bookmark bottom)
[10f4a7] (other) test [10f4a7] (other) test
(activating bookmark other) (activating bookmark other)
Test --towards flag. Test --towards flag.
$ hg up bottom $ hg up bottom

tests/test-fbamend-nextrebase.t

| o 3 r3 | o 3 r3
| | | |
| x 2 r2 | x 2 r2
| | | |
| x 1 r1 | x 1 r1
|/ |/
o 0 r0 o 0 r0
Test --clean flag.
$ touch foo
$ hg add foo
$ hg status
A foo
$ hg next --rebase
abort: uncommitted changes
(use --clean to discard uncommitted changes or --merge to bring them along)
[255]
$ hg next --rebase --clean
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
rebasing 3:137d867d71d5 "r3"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[7d603c] r3
$ hg status
? foo
$ showgraph
@ 6 r3
|
o 5 r2
|
o 4 amended
|
o 0 r0
Rebasing multiple changesets at once. Rebasing multiple changesets at once.
$ reset $ reset
$ hg debugbuilddag -n +5 $ hg debugbuilddag -n +5
$ hg up 1 $ hg up 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg amend -m "amended" $ hg amend -m "amended"
warning: the changeset's children were left behind warning: the changeset's children were left behind

tests/test-fbamend-previous.t

Check help text for new options and removal of unsupported options. Check help text for new options and removal of unsupported options.
$ hg previous --help $ hg previous --help
hg previous [OPTIONS]... [STEPS] hg previous [OPTIONS]... [STEPS]
update to parent changeset update to parent changeset
options: options:
--clean discard uncommitted changes (no backup)
--newest always pick the newest parent when a changeset has --newest always pick the newest parent when a changeset has
multiple parents multiple parents
--bottom update to the lowest non-public ancestor of the --bottom update to the lowest non-public ancestor of the
current changeset current changeset
--bookmark update to the first ancestor with a bookmark --bookmark update to the first ancestor with a bookmark
--no-activate-bookmark do not activate the bookmark on the destination --no-activate-bookmark do not activate the bookmark on the destination
changeset changeset
-B --move-bookmark move active bookmark -B --move-bookmark move active bookmark
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark top) (activating bookmark top)
$ touch test $ touch test
$ hg add test $ hg add test
$ hg st $ hg st
A test A test
$ hg previous $ hg previous
abort: uncommitted changes abort: uncommitted changes
(use --merge to merge uncommitted changes) (use --clean to discard uncommitted changes or --merge to bring them along)
[255] [255]
$ hg previous --merge $ hg previous --merge
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark top) (leaving bookmark top)
[bebd16] r4 [bebd16] r4
$ hg st $ hg st
A test A test
Test dirty working copy and --clean.
$ hg previous
abort: uncommitted changes
(use --clean to discard uncommitted changes or --merge to bring them along)
[255]
$ hg previous --clean
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
[2dc09a] r3
$ hg st
? test