rebase: do not bail on uncomitted changes if rebasing in-memory
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3106		Oct 26 2017, 12:48 AM	★	★
Diff 2	4043		Dec 1 2017, 3:09 AM	★	★
Diff 3	4179		Dec 7 2017, 4:22 PM	★	★
Diff 4	4198		Dec 7 2017, 4:44 PM	★	★
Diff 5	4221	rHGaa660c1203a9e10b679fa6deee2e0e943e97cc95	Dec 7 2017, 4:20 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 4043

hgext/rebase.py

	ms = mergemod.mergestate.read(repo)			ms = mergemod.mergestate.read(repo)
	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'])
	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):			destspace=None, inmemory=False):
	"""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:
	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

	if revf:			if revf:

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: do not bail on uncomitted changes if rebasing in-memoryClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4043

hgext/rebase.py

rebase: do not bail on uncomitted changes if rebasing in-memory
ClosedPublic

Revision Contents
Changeset List