rebase: rerun a rebase on-disk if IMM merge conflicts arise
ClosedPublic

hgext/rebase.py
667	Why would that be nice? Do you foresee any problem? It just makes the code harder to follow, IMHO. Besides, now the `rebase()` no longer has a docstring, meaning that help is broken.

durin42 accepted this revision.Dec 8 2017, 2:30 PM

durin42 added inline comments.

hgext/rebase.py
667	It's just a style thing. I find avoiding recursion to generally be clearer. @phillco dlax is right, the docstring needs fixed here (I'm surprised tests passed...)

phillco added inline comments.Dec 8 2017, 2:56 PM

hgext/rebase.py
667	huh, weird. not sure how they did.

phillco updated this revision to Diff 4261.Dec 8 2017, 3:15 PM

I've moved the comment back to rebase() to fix the help issue. I'm mostly neutral on using recursion or using this approach, though I think having to pass a flag to prevent infinite recursion would be messy.

durin42 accepted this revision.Dec 8 2017, 3:19 PM

Closed by commit rHGd901a88891fe: rebase: rerun a rebase on-disk if IMM merge conflicts arise (authored by phillco). · Explain WhyDec 8 2017, 3:28 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3122		Oct 26 2017, 12:48 AM	★	★
Diff 2	4195		Dec 7 2017, 4:22 PM	★	★
Diff 3	4214		Dec 7 2017, 4:45 PM	★	★
Diff 4	4238		Dec 8 2017, 1:38 AM	★	★
Diff 5	4240		Dec 8 2017, 1:54 AM	★	★
Diff 6	4246		Dec 8 2017, 2:27 AM	★	★
Diff 7	4261		Dec 8 2017, 3:15 PM	★	★
Diff 8	4266	rHGd901a88891fecb606df36ed36c5fee123311eee0	Dec 8 2017, 3:14 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 4261

hgext/rebase.py

	If you don't specify a destination changeset (``-d/--dest``), rebase			If you don't specify a destination changeset (``-d/--dest``), rebase
	will use the same logic as :hg:`merge` to pick a destination. if			will use the same logic as :hg:`merge` to pick a destination. if
	the current branch contains exactly one other head, the other head			the current branch contains exactly one other head, the other head
	is merged with by default. Otherwise, an explicit revision with			is merged with by default. Otherwise, an explicit revision with
	which to merge with must be provided. (destination changeset is not			which to merge with must be provided. (destination changeset is not
	modified by rebasing, but new changesets are added as its			modified by rebasing, but new changesets are added as its
	descendants.)			descendants.)

	Here are the ways to select changesets:			Here are the ways to select changesets:
				dlaxUnsubmitted Not Done Do we need to make another function? Can't we call rebase again with options modified? dlax: Do we need to make another function? Can't we call rebase again with options modified?
				durin42Unsubmitted Not Done Avoiding the recursion seems like a nice thing to me. I prefer what Phil has to just doing recursion... durin42: Avoiding the recursion seems like a nice thing to me. I prefer what Phil has to just doing…
				dlaxUnsubmitted Not Done Why would that be nice? Do you foresee any problem? It just makes the code harder to follow, IMHO. Besides, now the `rebase()` no longer has a docstring, meaning that help is broken. dlax: Why would that be nice? Do you foresee any problem? It just makes the code harder to follow…
				durin42Unsubmitted Not Done It's just a style thing. I find avoiding recursion to generally be clearer. @phillco dlax is right, the docstring needs fixed here (I'm surprised tests passed...) durin42: It's just a style thing. I find avoiding recursion to generally be clearer. @phillco dlax is…
				phillcoAuthorUnsubmitted Not Done huh, weird. not sure how they did. phillco: huh, weird. not sure how they did.

	1. Explicitly select them using ``--rev``.			1. Explicitly select them using ``--rev``.

	2. Use ``--source`` to select a root changeset and include all of its			2. Use ``--source`` to select a root changeset and include all of its
	descendants.			descendants.

	3. Use ``--base`` to select a changeset; rebase will find ancestors			3. Use ``--base`` to select a changeset; rebase will find ancestors
	and their descendants which are not also ancestors of the destination.			and their descendants which are not also ancestors of the destination.
	singletransaction = True			singletransaction = True

	Return Values:			Return Values:

	Returns 0 on success, 1 if nothing to rebase or there are			Returns 0 on success, 1 if nothing to rebase or there are
	unresolved conflicts.			unresolved conflicts.

	"""			"""
				if opts.get('continue') or opts.get('abort'):
				# in-memory rebase is not compatible with resuming rebases.
				opts['inmemory'] = False

				if opts.get('inmemory', False):
				try:
				# in-memory merge doesn't support conflicts, so if we hit any, abort
				# and re-run as an on-disk merge.
				return _origrebase(ui, repo, **opts)
				except error.InMemoryMergeConflictsError:
				ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
				' merge\n'))
				_origrebase(ui, repo, **{'abort': True})
				opts['inmemory'] = False
				return _origrebase(ui, repo, **opts)
				else:
				return _origrebase(ui, repo, **opts)

				def _origrebase(ui, repo, **opts):
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	if 'inmemory' not in opts:			if 'inmemory' not in opts:
	opts['inmemory'] = False			opts['inmemory'] = False
	rbsrt = rebaseruntime(repo, ui, opts)			rbsrt = rebaseruntime(repo, ui, opts)

	with repo.wlock(), repo.lock():			with repo.wlock(), repo.lock():
	# Validate input and define rebasing points			# Validate input and define rebasing points
	destf = opts.get('dest', None)			destf = opts.get('dest', None)

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: rerun a rebase on-disk if IMM merge conflicts ariseClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4261

hgext/rebase.py

rebase: rerun a rebase on-disk if IMM merge conflicts arise
ClosedPublic

Revision Contents
Changeset List