This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9076

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict
ClosedPublic

Authored by martinvonz on Sep 23 2020, 1:28 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGfeffeb18d412: rebase: teach in-memory rebase to not restart with on-disk rebase on conflict

Summary

When in-memory rebase runs into conflicts, it redoes the whole rebase
operation. This patch teaches it to instead discard just the current
overlayworkingctx and redo that node on disk.

I've tested this by enabling in-memory rebase by default and checking
that there are no unexpected differences after this patch.

The next step is to make it so that hg rebase --continue can use
in-memory merge.

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.

Event Timeline

martinvonz created this revision.Sep 23 2020, 1:28 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 23 2020, 1:28 PM

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

pulkit accepted this revision.Sep 24 2020, 2:53 AM

This revision is now accepted and ready to land.Sep 24 2020, 2:53 AM

martinvonz updated this revision to Diff 22830.Sep 24 2020, 11:13 AM

I've made this not dependent on the merge.update() changes, so it can now be queued separately.

martinvonz added a child revision: D9063: merge: use merge.clean_update() when applicable.Sep 24 2020, 11:23 AM

In D9076#136240, @martinvonz wrote:

I've made this not dependent on the merge.update() changes, so it can now be queued separately.

Thank you!

martinvonz added a commit: rHGfeffeb18d412: rebase: teach in-memory rebase to not restart with on-disk rebase on conflict.Sep 25 2020, 5:19 AM

Closed by commit rHGfeffeb18d412: rebase: teach in-memory rebase to not restart with on-disk rebase on conflict (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 (48 lines)
M			tests/test-rebase-inmemory.t (17 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22813		Sep 23 2020, 1:28 PM	★	★
Diff 2	22830		Sep 24 2020, 11:13 AM	★	★
Diff 3	22849	rHGfeffeb18d412c334bbcb72e05b061cacb5ba9e71	Sep 18 2020, 6:03 PM	★	★

Status	Author	Revision
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	D9064 merge: add a back_out() function to encapsulate update()
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 22849

hgext/rebase.py

	self.obsoletenotrebased,			self.obsoletenotrebased,
	)			)
	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'):
				try:
				rebasenode(
				repo,
				rev,
				p1,
				p2,
				base,
				self.collapsef,
				wctx=self.wctx,
				)
				except error.InMemoryMergeConflictsError:
				if self.dryrun:
				raise error.ConflictResolutionRequired(b'rebase')
				if self.collapsef:
				# TODO: Make the overlayworkingctx reflected
				# in the working copy here instead of re-raising
				# so the entire rebase operation is retried.
				raise
				ui.status(
				_(
				b"hit merge conflicts; rebasing that "
				b"commit again in the working copy\n"
				)
				)
				cmdutil.bailifchanged(repo)
				self.inmemory = False
				self._assignworkingcopy()
				mergemod.update(
				repo,
				p1,
				branchmerge=False,
				force=False,
				wc=self.wctx,
				)
	rebasenode(			rebasenode(
	repo, rev, p1, p2, base, self.collapsef, wctx=self.wctx,			repo,
				rev,
				p1,
				p2,
				base,
				self.collapsef,
				wctx=self.wctx,
	)			)
	if not self.collapsef:			if not self.collapsef:
	merging = p2 != nullrev			merging = p2 != nullrev
	editform = cmdutil.mergeeditform(merging, b'rebase')			editform = cmdutil.mergeeditform(merging, b'rebase')
	editor = cmdutil.getcommiteditor(			editor = cmdutil.getcommiteditor(
	editform=editform, **pycompat.strkwargs(opts)			editform=editform, **pycompat.strkwargs(opts)
	)			)
	# We need to set parents again here just in case we're continuing			# We need to set parents again here just in case we're continuing
	# a rebase started with an old hg version (before 9c9cfecd4600),			# a rebase started with an old hg version (before 9c9cfecd4600),
	with repo.wlock(), repo.lock():			with repo.wlock(), repo.lock():
	needsabort = True			needsabort = True
	try:			try:
	overrides = {(b'rebase', b'singletransaction'): True}			overrides = {(b'rebase', b'singletransaction'): True}
	with ui.configoverride(overrides, b'rebase'):			with ui.configoverride(overrides, b'rebase'):
	_origrebase(			_origrebase(
	ui, repo, action, opts, rbsrt,			ui, repo, action, opts, rbsrt,
	)			)
	except error.InMemoryMergeConflictsError:			except error.ConflictResolutionRequired:
	ui.status(_(b'hit a merge conflict\n'))			ui.status(_(b'hit a merge conflict\n'))
	return 1			return 1
	except error.Abort:			except error.Abort:
	needsabort = False			needsabort = False
	raise			raise
	else:			else:
	if confirm:			if confirm:
	ui.status(_(b'rebase completed successfully\n'))			ui.status(_(b'rebase completed successfully\n'))

tests/test-rebase-inmemory.t

	a			a

	$ hg rebase -s 2 -d 7 -n			$ hg rebase -s 2 -d 7 -n
	starting dry-run rebase; repository will not be changed			starting dry-run rebase; repository will not be changed
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "d"
	rebasing 4:e860deea161a "e"			rebasing 4:e860deea161a "e"
	merging e			merging e
	transaction abort!
	rollback completed
	hit a merge conflict			hit a merge conflict
	[1]			[1]
	$ hg diff			$ hg diff
	$ hg status			$ hg status
	$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"			$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
	@ 7:d2c195b28050 test			@ 7:d2c195b28050 test
	\| conflict with e			\| conflict with e
	\|			\|

	In-memory rebase that fails due to merge conflicts			In-memory rebase that fails due to merge conflicts

	$ hg rebase -s 2 -d 7			$ hg rebase -s 2 -d 7
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "d"
	rebasing 4:e860deea161a "e"			rebasing 4:e860deea161a "e"
	merging e			merging e
	transaction abort!			hit merge conflicts; rebasing that commit again in the working copy
	rollback completed
	hit merge conflicts; re-running rebase without in-memory merge
	rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"
	rebasing 4:e860deea161a "e"
	merging e			merging e
	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')			warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]
	$ hg rebase --abort			$ hg rebase --abort
	saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg			saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
	rebase aborted			rebase aborted

	Retrying without in-memory merge won't lose working copy changes			Retrying without in-memory merge won't lose working copy changes
	$ cd ..			$ cd ..
	$ hg clone repo3 repo3-dirty -q			$ hg clone repo3 repo3-dirty -q
	$ cd repo3-dirty			$ cd repo3-dirty
	$ echo dirty > a			$ echo dirty > a
	$ hg rebase -s 2 -d 7			$ hg rebase -s 2 -d 7
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "d"
	rebasing 4:e860deea161a "e"			rebasing 4:e860deea161a "e"
	merging e			merging e
				hit merge conflicts; rebasing that commit again in the working copy
	transaction abort!			transaction abort!
	rollback completed			rollback completed
	hit merge conflicts; re-running rebase without in-memory merge
	abort: uncommitted changes			abort: uncommitted changes
	[255]			[255]
	$ cat a			$ cat a
	dirty			dirty

	Retrying without in-memory merge won't lose merge state			Retrying without in-memory merge won't lose merge state
	$ cd ..			$ cd ..
	$ hg clone repo3 repo3-merge-state -q			$ hg clone repo3 repo3-merge-state -q
	-a			-a
	+b			+b
	$ hg ci -m "add b to foo"			$ hg ci -m "add b to foo"
	created new head			created new head

	$ hg rebase -r . -d 1 --config ui.merge=internal:merge3			$ hg rebase -r . -d 1 --config ui.merge=internal:merge3
	rebasing 2:fb62b706688e "add b to foo" (tip)			rebasing 2:fb62b706688e "add b to foo" (tip)
	merging foo			merging foo
	hit merge conflicts; re-running rebase without in-memory merge			hit merge conflicts; rebasing that commit again in the working copy
	rebasing 2:fb62b706688e "add b to foo" (tip)
	merging foo			merging foo
	warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')			warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]

	$ cd $TESTTMP			$ cd $TESTTMP

	Test rebasing when we're in the middle of a rebase already			Test rebasing when we're in the middle of a rebase already
	\|/ foo			\|/ foo
	\| o 1: hi from foo			\| o 1: hi from foo
	\|/ foo			\|/ foo
	o 0: r0			o 0: r0
	r0			r0
	$ hg rebase -r 2 -d 1 -t:merge3			$ hg rebase -r 2 -d 1 -t:merge3
	rebasing 2:b4d249fbf8dd "bye from foo"			rebasing 2:b4d249fbf8dd "bye from foo"
	merging foo			merging foo
	hit merge conflicts; re-running rebase without in-memory merge			hit merge conflicts; rebasing that commit again in the working copy
	rebasing 2:b4d249fbf8dd "bye from foo"
	merging foo			merging foo
	warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')			warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]
	$ hg rebase -r 3 -d 1 -t:merge3			$ hg rebase -r 3 -d 1 -t:merge3
	abort: rebase in progress			abort: rebase in progress
	(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')			(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
	[255]			[255]