This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8292

rebase: accept multiple --source arguments (BC)
ClosedPublic

Authored by martinvonz on Mar 13 2020, 8:23 PM.

Details

Reviewers
mharbison72
pulkit
Group Reviewers
hg-reviewers
Commits
rHG05654ea5137c: rebase: accept multiple --source arguments (BC)
Summary

I think it's a little surprising that hg rebase -s A -s B rebases
only B:: and ignores A. That's because the -s flag is not a
repeated flag. This patch makes it a repeated flag.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (13 lines)
Mrelnotes/next (7 lines)
Mtests/test-rebase-dest.t (2 lines)
Mtests/test-rebase-parameters.t (4 lines)

Diff 20795

hgext/rebase.py

@command( @command(
b'rebase', b'rebase',
[ [
( (
b's', b's',
b'source', b'source',
b'', [],
_(b'rebase the specified changeset and descendants'), _(b'rebase the specified changesets and their descendants'),
_(b'REV'), _(b'REV'),
), ),
( (
b'b', b'b',
b'base', b'base',
b'', b'',
_(b'rebase everything from branching point of specified changeset'), _(b'rebase everything from branching point of specified changeset'),
_(b'REV'), _(b'REV'),
b'automatically rebase orphan revisions ' b'automatically rebase orphan revisions '
b'in the specified revset (EXPERIMENTAL)' b'in the specified revset (EXPERIMENTAL)'
), ),
), ),
] ]
+ cmdutil.dryrunopts + cmdutil.dryrunopts
+ cmdutil.formatteropts + cmdutil.formatteropts
+ cmdutil.confirmopts, + cmdutil.confirmopts,
_(b'[-s REV | -b REV | [-r REV]...] [-d REV] [OPTION]...'), _(b'[[-s REV]... | -b REV | [-r REV]...] [-d REV] [OPTION]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
) )
def rebase(ui, repo, **opts): def rebase(ui, repo, **opts):
"""move changeset (and descendants) to a different branch """move changeset (and descendants) to a different branch
Rebase uses repeated merging to graft changesets from one part of Rebase uses repeated merging to graft changesets from one part of
history (the source) onto another (the destination). This can be history (the source) onto another (the destination). This can be
useful for linearizing *local* changes relative to a master useful for linearizing *local* changes relative to a master
# search default destination in this space # search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214. # used in the 'hg pull --rebase' case, see issue 5214.
destspace = opts.get(b'_destspace') destspace = opts.get(b'_destspace')
destmap = _definedestmap( destmap = _definedestmap(
ui, ui,
repo, repo,
inmemory, inmemory,
opts.get(b'dest', None), opts.get(b'dest', None),
opts.get(b'source', None), opts.get(b'source', []),
opts.get(b'base', None), opts.get(b'base', None),
opts.get(b'rev', []), opts.get(b'rev', []),
destspace=destspace, destspace=destspace,
) )
retcode = rbsrt._preparenewrebase(destmap) retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None: if retcode is not None:
return retcode return retcode
storecollapsemsg(repo, rbsrt.collapsemsg) storecollapsemsg(repo, rbsrt.collapsemsg)
dest = None dest = None
if revf: if revf:
rebaseset = scmutil.revrange(repo, revf) rebaseset = scmutil.revrange(repo, revf)
if not rebaseset: if not rebaseset:
ui.status(_(b'empty "rev" revision set - nothing to rebase\n')) ui.status(_(b'empty "rev" revision set - nothing to rebase\n'))
return None return None
elif srcf: elif srcf:
src = scmutil.revrange(repo, [srcf]) src = scmutil.revrange(repo, srcf)
if not src: if not src:
ui.status(_(b'empty "source" revision set - nothing to rebase\n')) ui.status(_(b'empty "source" revision set - nothing to rebase\n'))
return None return None
rebaseset = repo.revs(b'(%ld)::', src) or src # `+ (%ld)` to work around `wdir()::` being empty
rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src)
else: else:
base = scmutil.revrange(repo, [basef or b'.']) base = scmutil.revrange(repo, [basef or b'.'])
if not base: if not base:
ui.status( ui.status(
_(b'empty "base" revision set - ' b"can't compute rebase set\n") _(b'empty "base" revision set - ' b"can't compute rebase set\n")
) )
return None return None
if destf: if destf:

relnotes/next

== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* When `hg rebase` pauses for merge conflict resolution, the working * When `hg rebase` pauses for merge conflict resolution, the working
copy will no longer have the rebased node as a second parent. You copy will no longer have the rebased node as a second parent. You
can use the new `conflictparents()` revset for finding the other can use the new `conflictparents()` revset for finding the other
parent during a conflict. parent during a conflict.
* `hg rebase` now accepts repeated `--source` arguments. For example,
`hg rebase --source 'A + B'` is equivalent to `hg rebase --source A
--source B`. This is a backwards-incompatible change because it
will break overriding an alias `myrebase = rebase --source A` by
`hg myrebase --source B` (it will now rebase `(A + B)::` instead of
`B::`).
* `hg recover` does not verify the validity of the whole repository * `hg recover` does not verify the validity of the whole repository
anymore. You can pass `--verify` or call `hg verify` if necessary. anymore. You can pass `--verify` or call `hg verify` if necessary.
* `hg debugmergestate` output format changed. Let us know if that is * `hg debugmergestate` output format changed. Let us know if that is
causing you problems and we'll roll it back. causing you problems and we'll roll it back.
* Resolved merge conflicts are now cleared by `hg commit` even if the * Resolved merge conflicts are now cleared by `hg commit` even if the
working copy has no changes. working copy has no changes.

tests/test-rebase-dest.t

o | | 2: a6661b868de9 F o | | 2: a6661b868de9 F
/ / / /
| o 1: 058c1e1fb10a D | o 1: 058c1e1fb10a D
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A
Move to a previous parent: Move to a previous parent:
$ rebasewithdag -s E+F+G -d 'SRC^^' <<'EOS' $ rebasewithdag -s E -s F -s G -d 'SRC^^' <<'EOS'
> H > H
> | > |
> D G > D G
> |/ > |/
> C F > C F
> |/ > |/
> B E # E will be ignored, since E^^ is empty > B E # E will be ignored, since E^^ is empty
> |/ > |/

tests/test-rebase-parameters.t

$ hg rebase --rev 'wdir()' --dest 6 $ hg rebase --rev 'wdir()' --dest 6
abort: cannot rebase the working copy abort: cannot rebase the working copy
[255] [255]
$ hg rebase --source 'wdir()' --dest 6 $ hg rebase --source 'wdir()' --dest 6
abort: cannot rebase the working copy abort: cannot rebase the working copy
[255] [255]
$ hg rebase --source 1 --source 'wdir()' --dest 6
abort: cannot rebase the working copy
[255]
$ hg rebase --source '1 & !1' --dest 8 $ hg rebase --source '1 & !1' --dest 8
empty "source" revision set - nothing to rebase empty "source" revision set - nothing to rebase
[1] [1]
$ hg rebase --base '1 & !1' --dest 8 $ hg rebase --base '1 & !1' --dest 8
empty "base" revision set - can't compute rebase set empty "base" revision set - can't compute rebase set
[1] [1]