This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	quark	D645 rebase: remove unnecessary '.unfiltered()' calls
Closed	quark	D644 rebase: remove complex unhiding code
Closed	quark	D643 rebase: use unfiltered repo when loading state
Closed	quark	D640 rebase: do not crash rebasing merge with a parent having hidden successor

Diff 1717

	\|/ C will be rebased to C'			\|/ C will be rebased to C'
	B C D's new destination will be C' instead of B			B C D's new destination will be C' instead of B
	\|/ E's new destination will be C' instead of B			\|/ E's new destination will be C' instead of B
	A			A

	The new parents of a merge is slightly more complicated. See the comment			The new parents of a merge is slightly more complicated. See the comment
	block below.			block below.
	"""			"""
	cl = repo.changelog			# use unfiltered changelog since successorrevs may return filtered nodes
				cl = repo.unfiltered().changelog
	def isancestor(a, b):			def isancestor(a, b):
	# take revision numbers instead of nodes			# take revision numbers instead of nodes
	if a == b:			if a == b:
	return True			return True
	elif a > b:			elif a > b:
	return False			return False
	return cl.isancestor(cl.node(a), cl.node(b))			return cl.isancestor(cl.node(a), cl.node(b))

	\| o C			\| o C
	\| \|			\| \|
	o \| D2			o \| D2
	\| \|			\| \|
	\| x B			\| x B
	\|/			\|/
	o A			o A

				Rebasing a merge with one of its parent having a hidden successor

				$ hg init $TESTTMP/merge-p1-hidden-successor
				$ cd $TESTTMP/merge-p1-hidden-successor

				$ hg debugdrawdag <<'EOS'
				> E
				> \|
				> B3 B2 # amend: B1 -> B2 -> B3
				> \|/ # B2 is hidden
				> \| D
				> \| \|\
				> \| B1 C
				> \|/
				> A
				> EOS

				$ eval `hg tags -T '{tag}={node}\n'`
				$ rm .hg/localtags

				$ hg rebase -r $D -d $E
				rebasing 5:9e62094e4d94 "D"

				$ hg log -G
				o 7:a699d059adcf D
				\|\
				\| o 6:ecc93090a95c E
				\| \|
				\| o 4:0dc878468a23 B3
				\| \|
				o \| 1:96cc3511f894 C
				/
				o 0:426bada5c675 A