This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1616

rebase: disable `inmemory` if the rebaseset contains the working copy
ClosedPublic

Authored by phillco on Dec 8 2017, 2:25 AM.

Download Raw Diff

Details

Reviewers

dlax

Group Reviewers

hg-reviewers

Commits

rHG03bec089e105: rebase: disable `inmemory` if the rebaseset contains the working copy

Summary

As described in the comment, rebasing the working copy parent with in-memory
merge, and then updating to the new commit, isn't much faster because of the
extra overhead of uppdating. Best to leave it off in that case.

This commit makes deploying in-memory merge via an extension easier, because
you can just set inmemory=True based on some config or probability, and this
will turn off the cases where it's not desired.

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

phillco created this revision.Dec 8 2017, 2:25 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 8 2017, 2:25 AM

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

phillco added a child revision: D1617: rebase: extract _assignworkingcopy.Dec 8 2017, 2:25 AM

phillco updated this revision to Diff 4247.

phillco edited the summary of this revision. (Show Details)Dec 8 2017, 2:28 AM

dlax requested changes to this revision.Dec 8 2017, 4:44 AM

This revision now requires changes to proceed.Dec 8 2017, 4:44 AM

@dlax I see a request changes here, but I don't see any commentary as to why?

In D1616#27819, @durin42 wrote:

@dlax I see a request changes here, but I don't see any commentary as to why?

I meant to comment that the first hunks (i.e. those above the big comment block) seem unrelated and to ask for clarification.
No idea where my comment went, sorry...

@dlax you mean the parts where we pass opts instead of inmemory? This is necessary for the function to mutate opts['inmemory'].

phillco updated this revision to Diff 4276.Dec 8 2017, 6:32 PM

Closed by commit rHG03bec089e105: rebase: disable `inmemory` if the rebaseset contains the working copy (authored by phillco). · Explain WhyDec 8 2017, 11:34 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/rebase.py (23 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4242		Dec 8 2017, 2:25 AM	★	★
Diff 2	4247		Dec 8 2017, 2:27 AM	★	★
Diff 3	4276		Dec 8 2017, 6:32 PM	★	★
Diff 4	4285	rHG03bec089e105b2a02951b80043a5bb94a60bb2c7	Dec 8 2017, 6:27 PM	★	★

Status	Author	Revision
Closed	phillco	D1617 rebase: extract _assignworkingcopy
Closed	phillco	D1616 rebase: disable `inmemory` if the rebaseset contains the working copy
Closed	phillco	D1249 rebase: rerun a rebase on-disk if IMM merge conflicts arise
Closed	phillco	D1248 rebase: add concludememorynode(), and call it when rebasing in-memory
Closed	phillco	D1247 rebase: pass the wctx object (IMM or on-disk) to merge.update
Closed	phillco	D1246 rebase: do not update if IMM; instead, set the overlaywctx's parents
Closed	phillco	D1245 rebase: pass wctx to rebasenode()
Closed	phillco	D1244 overlayworkingctx: invalidate the manifest cache when changing parents
Closed	phillco	D1243 overlayworkingctx: add `_compact()`
Closed	phillco	D1242 overlayworkingctx: add ``tomemctx()`` and ``commit()``
Closed	phillco	D1241 overlayworkingctx: add _auditconflicts to write()
Closed	phillco	D1240 overlayworkingctx: inherit from committablectx instead of workingctx
Closed	phillco	D1239 overlayworkingctx: add a no-op ``clearunknown()``
Closed	phillco	D1238 overlayworkingctx: add _manifest, files(), added(), removed(), modified()
Closed	phillco	D1237 overlayworkingctx: add `_checkexist(path)`
Closed	phillco	D1236 overlayworkingctx: fix a bad reference to `self._path`
Closed	phillco	D1235 overlayworkingctx: track copy information in the context
Closed	phillco	D1234 rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Closed	phillco	D1233 rebase: do not bail on uncomitted changes if rebasing in-memory
Closed	phillco	D1232 rebase: add the --inmemory option flag; assign a wctx object for the rebase
Closed	phillco	D1231 overlayworkingctx: move _wrappedctx out of the constructor
Closed	phillco	D1230 overlayworkingctx: make clean() public
Closed	phillco	D1216 overlayworkingctx: remove flushall()
Closed	phillco	D1215 merge: skip subrepo state, update hooks, and updating the dirstate in IMM
Closed	phillco	D1214 merge: don't check for unknown files in IMM
Closed	phillco	D1213 merge: remove calls to flushall()
Closed	phillco	D1212 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Closed	phillco	D1211 context: switch ctx() use to changectx()
Abandoned	phillco	D1527 context: add an abstract base class for filectx

Diff 4285

hgext/rebase.py

	mergeutil.checkunresolved(ms)			mergeutil.checkunresolved(ms)

	retcode = rbsrt._prepareabortorcontinue(abortf)			retcode = rbsrt._prepareabortorcontinue(abortf)
	if retcode is not None:			if retcode is not None:
	return retcode			return retcode
	else:			else:
	destmap = _definedestmap(ui, repo, destf, srcf, basef, revf,			destmap = _definedestmap(ui, repo, destf, srcf, basef, revf,
	destspace=destspace,			destspace=destspace,
	inmemory=opts['inmemory'])			opts=opts)
				rbsrt.inmemory = opts['inmemory']
	retcode = rbsrt._preparenewrebase(destmap)			retcode = rbsrt._preparenewrebase(destmap)
	if retcode is not None:			if retcode is not None:
	return retcode			return retcode

	tr = None			tr = None
	dsguard = None			dsguard = None

	singletr = ui.configbool('rebase', 'singletransaction')			singletr = ui.configbool('rebase', 'singletransaction')
	if singletr:			if singletr:
	tr = repo.transaction('rebase')			tr = repo.transaction('rebase')
	with util.acceptintervention(tr):			with util.acceptintervention(tr):
	if singletr:			if singletr:
	dsguard = dirstateguard.dirstateguard(repo, 'rebase')			dsguard = dirstateguard.dirstateguard(repo, 'rebase')
	with util.acceptintervention(dsguard):			with util.acceptintervention(dsguard):
	rbsrt._performrebase(tr)			rbsrt._performrebase(tr)

	rbsrt._finishrebase()			rbsrt._finishrebase()

	def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None,			def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None,
	destspace=None, inmemory=False):			destspace=None, opts=None):
	"""use revisions argument to define destmap {srcrev: destrev}"""			"""use revisions argument to define destmap {srcrev: destrev}"""
	if revf is None:			if revf is None:
	revf = []			revf = []

	# destspace is here to work around issues with `hg pull --rebase` see			# destspace is here to work around issues with `hg pull --rebase` see
	# issue5214 for details			# issue5214 for details
	if srcf and basef:			if srcf and basef:
	raise error.Abort(_('cannot specify both a source and a base'))			raise error.Abort(_('cannot specify both a source and a base'))
	if revf and basef:			if revf and basef:
	raise error.Abort(_('cannot specify both a revision and a base'))			raise error.Abort(_('cannot specify both a revision and a base'))
	if revf and srcf:			if revf and srcf:
	raise error.Abort(_('cannot specify both a revision and a source'))			raise error.Abort(_('cannot specify both a revision and a source'))

	if not inmemory:			if not opts['inmemory']:
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)

	if ui.configbool('commands', 'rebase.requiredest') and not destf:			if ui.configbool('commands', 'rebase.requiredest') and not destf:
	raise error.Abort(_('you must specify a destination'),			raise error.Abort(_('you must specify a destination'),
	hint=_('use: hg rebase -d REV'))			hint=_('use: hg rebase -d REV'))

	dest = None			dest = None
	else:			else:
	ui.status(_('nothing to rebase - working '			ui.status(_('nothing to rebase - working '
	'directory parent is already an '			'directory parent is already an '
	'ancestor of destination %s\n') % dest)			'ancestor of destination %s\n') % dest)
	else: # can it happen?			else: # can it happen?
	ui.status(_('nothing to rebase from %s to %s\n') %			ui.status(_('nothing to rebase from %s to %s\n') %
	('+'.join(str(repo[r]) for r in base), dest))			('+'.join(str(repo[r]) for r in base), dest))
	return None			return None
				# If rebasing the working copy parent, force in-memory merge to be off.
				#
				# This is because the extra work of checking out the newly rebased commit
				# outweights the benefits of rebasing in-memory, and executing an extra
				# update command adds a bit of overhead, so better to just do it on disk. In
				# all other cases leave it on.
				#
				# Note that there are cases where this isn't true -- e.g., rebasing large
				# stacks that include the WCP. However, I'm not yet sure where the cutoff
				# is.
				rebasingwcp = repo['.'].rev() in rebaseset
				if opts['inmemory'] and rebasingwcp:
				opts['inmemory'] = False
				# Check these since we did not before.
				cmdutil.checkunfinished(repo)
				cmdutil.bailifchanged(repo)

	if not destf:			if not destf:
	dest = repo[_destrebase(repo, rebaseset, destspace=destspace)]			dest = repo[_destrebase(repo, rebaseset, destspace=destspace)]
	destf = str(dest)			destf = str(dest)

	allsrc = revsetlang.formatspec('%ld', rebaseset)			allsrc = revsetlang.formatspec('%ld', rebaseset)
	alias = {'ALLSRC': allsrc}			alias = {'ALLSRC': allsrc}