This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22803		Sep 23 2020, 12:36 PM	★	★
Diff 2	22810		Sep 23 2020, 1:28 PM	★	★
Diff 3	22821	rHG2dcf595f69855190624d600438121f7fee1da532	Sep 23 2020, 12:21 PM	★	★

Status	Author	Revision
Closed	martinvonz	D9064 merge: add a back_out() function to encapsulate update()
Closed	martinvonz	D9075 rebase: move check for unresolved conflicts into lower-level rebasenode()
Closed	martinvonz	D9074 rebase: add dryrun property to rebaseruntime
Closed	martinvonz	D9073 rebase: when collapsing, p1 == dest, so use the former only
Closed	martinvonz	D9070 rebase: remove redundant isinmemory argument from _origrebase()
Closed	martinvonz	D9069 largefiles: prevent in-memory merge instead of switching to on-disk
Closed	martinvonz	D9067 merge: replace calls to hg.updaterepo() by merge.update()
Closed	martinvonz	D9066 merge: add a higher-level update() for the common `hg update` use case
Closed	martinvonz	D9065 merge: make low-level update() private (API)
Closed	martinvonz	D9063 merge: use merge.clean_update() when applicable
Closed	martinvonz	D9076 rebase: teach in-memory rebase to not restart with on-disk rebase on conflict

Diff 22821

hgext/rebase.py

	user=ctx.user(),			user=ctx.user(),
	date=date,			date=date,
	)			)

	return newnode			return newnode

	def _rebasenode(self, tr, rev, allowdivergence, progressfn):			def _rebasenode(self, tr, rev, allowdivergence, progressfn):
	repo, ui, opts = self.repo, self.ui, self.opts			repo, ui, opts = self.repo, self.ui, self.opts
	dest = self.destmap[rev]
	ctx = repo[rev]			ctx = repo[rev]
	desc = _ctxdesc(ctx)			desc = _ctxdesc(ctx)
	if self.state[rev] == rev:			if self.state[rev] == rev:
	ui.status(_(b'already rebased %s\n') % desc)			ui.status(_(b'already rebased %s\n') % desc)
	elif (			elif (
	not allowdivergence			not allowdivergence
	and rev in self.obsoletewithoutsuccessorindestination			and rev in self.obsoletewithoutsuccessorindestination
	):			):
	)			)
	if self.resume and self.wctx.p1().rev() == p1:			if self.resume and self.wctx.p1().rev() == p1:
	repo.ui.debug(b'resuming interrupted rebase\n')			repo.ui.debug(b'resuming interrupted rebase\n')
	self.resume = False			self.resume = False
	else:			else:
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'rebase'):			with ui.configoverride(overrides, b'rebase'):
	stats = rebasenode(			stats = rebasenode(
	repo,			repo, rev, p1, p2, base, self.collapsef, wctx=self.wctx,
	rev,
	p1,
	p2,
	base,
	self.collapsef,
	dest,
	wctx=self.wctx,
	)			)
	if stats.unresolvedcount > 0:			if stats.unresolvedcount > 0:
	if self.inmemory:			if self.inmemory:
	raise error.InMemoryMergeConflictsError()			raise error.InMemoryMergeConflictsError()
	else:			else:
	raise error.ConflictResolutionRequired(b'rebase')			raise error.ConflictResolutionRequired(b'rebase')
	if not self.collapsef:			if not self.collapsef:
	merging = p2 != nullrev			merging = p2 != nullrev
	newnode = repo.commit(			newnode = repo.commit(
	text=commitmsg, user=user, date=date, extra=extra, editor=editor			text=commitmsg, user=user, date=date, extra=extra, editor=editor
	)			)

	repo.dirstate.setbranch(repo[newnode].branch())			repo.dirstate.setbranch(repo[newnode].branch())
	return newnode			return newnode


	def rebasenode(repo, rev, p1, p2, base, collapse, dest, wctx):			def rebasenode(repo, rev, p1, p2, base, collapse, wctx):
	"""Rebase a single revision rev on top of p1 using base as merge ancestor"""			"""Rebase a single revision rev on top of p1 using base as merge ancestor"""
	# Merge phase			# Merge phase
	# Update to destination and merge it with local			# Update to destination and merge it with local
	p1ctx = repo[p1]			p1ctx = repo[p1]
	if wctx.isinmemory():			if wctx.isinmemory():
	wctx.setbase(p1ctx)			wctx.setbase(p1ctx)
	else:			else:
	if repo[b'.'].rev() != p1:			if repo[b'.'].rev() != p1:
	force=True,			force=True,
	ancestor=base,			ancestor=base,
	mergeancestor=mergeancestor,			mergeancestor=mergeancestor,
	labels=[b'dest', b'source'],			labels=[b'dest', b'source'],
	wc=wctx,			wc=wctx,
	)			)
	wctx.setparents(p1ctx.node(), repo[p2].node())			wctx.setparents(p1ctx.node(), repo[p2].node())
	if collapse:			if collapse:
	copies.graftcopies(wctx, ctx, repo[dest])			copies.graftcopies(wctx, ctx, p1ctx)
	else:			else:
	# If we're not using --collapse, we need to			# If we're not using --collapse, we need to
	# duplicate copies between the revision we're			# duplicate copies between the revision we're
	# rebasing and its first parent.			# rebasing and its first parent.
	copies.graftcopies(wctx, ctx, ctx.p1())			copies.graftcopies(wctx, ctx, ctx.p1())
	return stats			return stats

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: when collapsing, p1 == dest, so use the former onlyClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22821

hgext/rebase.py

rebase: when collapsing, p1 == dest, so use the former only
ClosedPublic

Revision Contents
Changeset List