This is an archive of the discontinued Mercurial Phabricator instance.

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

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

Download Raw Diff

Details

Reviewers

mharbison72
pulkit

Group Reviewers

hg-reviewers

Commits

rHGf63598aa1c4b: rebase: accept multiple --base arguments (BC)

Summary

Same reasoning as for the previous patch. Rebase has worked well with
--base 'A + B' since 51e7c83e05ee (rebase: calculate ancestors for
--base separately (issue5420), 2016-11-28).

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

martinvonz created this revision.Mar 13 2020, 8:23 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 13 2020, 8:23 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz retitled this revision from rebase: accept multiple --base arguments to rebase: accept multiple --base arguments (BC).Mar 13 2020, 8:24 PM

mharbison72 added a subscriber: mharbison72.Mar 13 2020, 9:45 PM

mharbison72 added inline comments.

hgext/rebase.py
874	Maybe these need to be updated to `REV...` like some other commands that take multiple revs. (I looked to `graft` for reference.) I forgot to mention this on the previous patch.

martinvonz updated this revision to Diff 20792.Mar 13 2020, 10:38 PM

I've updated the synopsis (also added another patch in the series for adding -r to the synopsis).

mharbison72 accepted this revision.Mar 13 2020, 11:43 PM

pulkit accepted this revision.Mar 14 2020, 5:04 AM

This revision is now accepted and ready to land.Mar 14 2020, 5:04 AM

martinvonz added a commit: rHGf63598aa1c4b: rebase: accept multiple --base arguments (BC).Mar 14 2020, 5:32 AM

Closed by commit rHGf63598aa1c4b: rebase: accept multiple --base arguments (BC) (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/rebase.py (8 lines)
M			relnotes/next (12 lines)
M			tests/test-rebase-dest.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	20784		Mar 13 2020, 8:23 PM	★	★
Diff 2	20792		Mar 13 2020, 10:37 PM	★	★
Diff 3	20796	rHGf63598aa1c4b17f437c9a9491d06f927b0d97892	Mar 13 2020, 7:57 PM	★	★

Commit	Parents	Author	Summary	Date
c8e21693ff7b	f59878cb304a	Martin von Zweigbergk		Mar 13 2020, 7:57 PM

Status	Author	Revision
Closed	martinvonz	D8293 rebase: accept multiple --base arguments (BC)
Closed	martinvonz	D8292 rebase: accept multiple --source arguments (BC)
Closed	martinvonz	D8295 rebase: mention -r argument in synopsis
Closed	martinvonz	D8291 rebase: remove unused defaults argument values from _definedestmap()

Diff 20792

hgext/rebase.py

	b'source',			b'source',
	[],			[],
	_(b'rebase the specified changesets and their descendants'),			_(b'rebase the specified changesets and their descendants'),
	_(b'REV'),			_(b'REV'),
	),			),
	(			(
	b'b',			b'b',
	b'base',			b'base',
	b'',			[],
	_(b'rebase everything from branching point of specified changeset'),			_(b'rebase everything from branching point of specified changeset'),
	_(b'REV'),			_(b'REV'),
	),			),
	(b'r', b'rev', [], _(b'rebase these revisions'), _(b'REV')),			(b'r', b'rev', [], _(b'rebase these revisions'), _(b'REV')),
	(			(
	b'd',			b'd',
	b'dest',			b'dest',
	b'',			b'',
	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]...'),
				mharbison72Unsubmitted Done Maybe these need to be updated to `REV...` like some other commands that take multiple revs. (I looked to `graft` for reference.) I forgot to mention this on the previous patch. mharbison72: Maybe these need to be updated to `REV...` like some other commands that take multiple revs.
	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
	# 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', []),			opts.get(b'source', []),
	opts.get(b'base', None),			opts.get(b'base', []),
	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)

	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
	# `+ (%ld)` to work around `wdir()::` being empty			# `+ (%ld)` to work around `wdir()::` being empty
	rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src)			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:
	# --base does not support multiple destinations			# --base does not support multiple destinations
	dest = scmutil.revsingle(repo, destf)			dest = scmutil.revsingle(repo, 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` now accepts repeated `--source` and `--base`
	`hg rebase --source 'A + B'` is equivalent to `hg rebase --source A			arguments. For example, `hg rebase --source 'A + B'` is equivalent
	--source B`. This is a backwards-incompatible change because it			to `hg rebase --source A --source B`. This is a
	will break overriding an alias `myrebase = rebase --source A` by			backwards-incompatible change because it will break overriding an
	`hg myrebase --source B` (it will now rebase `(A + B)::` instead of			alias `myrebase = rebase --source A` by `hg myrebase --source B`
	`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

tests/test-rebase-dest.t

	> \| \|			> \| \|
	> A D			> A D
	> EOS			> EOS
	abort: --collapse does not work with multiple destinations			abort: --collapse does not work with multiple destinations
	[255]			[255]

	Multiple destinations cannot be used with --base:			Multiple destinations cannot be used with --base:

	$ rebasewithdag -b B+E -d 'SRC^^' --collapse <<'EOS'			$ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS'
	> B E			> B E
	> \| \|			> \| \|
	> A D			> A D
	> EOS			> EOS
	abort: unknown revision 'SRC'!			abort: unknown revision 'SRC'!
	[255]			[255]

	Rebase to null should work:			Rebase to null should work: