rebase: do not update if IMM; instead, set the overlaywctx's parents
ClosedPublic

hgext/rebase.py
978–979	`wctx` has a default value of `None`, so either it shouldn't have that or there should be a check for `None` here.
982	`wctx` is redefined here.

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

phillco added inline comments.Dec 8 2017, 3:09 PM

hgext/rebase.py
978–979	Good point -- dropped.
982	This is intentional.

phillco updated this revision to Diff 4259.Dec 8 2017, 3:09 PM

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

Closed by commit rHG5c25fe7fb1e6: rebase: do not update if IMM; instead, set the overlaywctx's parents (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 (24 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3119		Oct 26 2017, 12:48 AM	★	★
Diff 2	4192		Dec 7 2017, 4:22 PM	★	★
Diff 3	4211		Dec 7 2017, 4:44 PM	★	★
Diff 4	4259		Dec 8 2017, 3:09 PM	★	★
Diff 5	4263	rHG5c25fe7fb1e63a31ed082dfcb93673fa79cf081f	Dec 7 2017, 7:07 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 3119

hgext/rebase.py

	date=self.date)			date=self.date)
	if newnode is None:			if newnode is None:
	# If it ended up being a no-op commit, then the normal			# If it ended up being a no-op commit, then the normal
	# merge state clean-up path doesn't happen, so do it			# merge state clean-up path doesn't happen, so do it
	# here. Fix issue5494			# here. Fix issue5494
	mergemod.mergestate.clean(repo)			mergemod.mergestate.clean(repo)
	else:			else:
	# Skip commit if we are collapsing			# Skip commit if we are collapsing
				if self.wctx.isinmemory():
				self.wctx.setbase(repo[p1])
				else:
	repo.setparents(repo[p1].node())			repo.setparents(repo[p1].node())
	newnode = None			newnode = None
	# Update the state			# Update the state
	if newnode is not None:			if newnode is not None:
	self.state[rev] = repo[newnode].rev()			self.state[rev] = repo[newnode].rev()
	ui.debug('rebased as %s\n' % short(newnode))			ui.debug('rebased as %s\n' % short(newnode))
	else:			else:
	if not self.collapsef:			if not self.collapsef:
	ui.warn(_('note: rebase of %d:%s created no changes '			ui.warn(_('note: rebase of %d:%s created no changes '
	updatemq(repo, self.state, self.skipped, **opts)			updatemq(repo, self.state, self.skipped, **opts)

	# restore original working directory			# restore original working directory
	# (we do this before stripping)			# (we do this before stripping)
	newwd = self.state.get(self.originalwd, self.originalwd)			newwd = self.state.get(self.originalwd, self.originalwd)
	if newwd < 0:			if newwd < 0:
	# original directory is a parent of rebase set root or ignored			# original directory is a parent of rebase set root or ignored
	newwd = self.originalwd			newwd = self.originalwd
	if newwd not in [c.rev() for c in repo[None].parents()]:			if (newwd not in [c.rev() for c in repo[None].parents()] and
				not self.inmemory):
	ui.note(_("update back to initial working directory parent\n"))			ui.note(_("update back to initial working directory parent\n"))
	hg.updaterepo(repo, newwd, False)			hg.updaterepo(repo, newwd, False)

	collapsedas = None			collapsedas = None
	if not self.keepf:			if not self.keepf:
	if self.collapsef:			if self.collapsef:
	collapsedas = newnode			collapsedas = newnode
	clearrebased(ui, repo, self.destmap, self.state, self.skipped,			clearrebased(ui, repo, self.destmap, self.state, self.skipped,

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

	def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx=None):			def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx=None):
	'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
				if wctx.isinmemory():
				wctx.setbase(repo[p1])
				dlaxUnsubmitted Not Done `wctx` has a default value of `None`, so either it shouldn't have that or there should be a check for `None` here. dlax: `wctx` has a default value of `None`, so either it shouldn't have that or there should be a…
				phillcoAuthorUnsubmitted Not Done Good point -- dropped. phillco: Good point -- dropped.
				else:
				# This is necessary to invalidate workingctx's caches.
				wctx = repo[None]
				dlaxUnsubmitted Not Done `wctx` is redefined here. dlax: `wctx` is redefined here.
				phillcoAuthorUnsubmitted Not Done This is intentional. phillco: This is intentional.
	if repo['.'].rev() != p1:			if repo['.'].rev() != p1:
	repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))			repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
	mergemod.update(repo, p1, False, True)			mergemod.update(repo, p1, False, True)
	else:			else:
	repo.ui.debug(" already in destination\n")			repo.ui.debug(" already in destination\n")
	repo.dirstate.write(repo.currenttransaction())			repo.dirstate.write(repo.currenttransaction())
	repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))			repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
	if base is not None:			if base is not None:
	repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))			repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))
	# When collapsing in-place, the parent is the common ancestor, we			# When collapsing in-place, the parent is the common ancestor, we
	# have to allow merging with it.			# have to allow merging with it.
	wctx = repo[None]
	stats = mergemod.update(repo, rev, True, True, base, collapse,			stats = mergemod.update(repo, rev, True, True, base, collapse,
	labels=['dest', 'source'])			labels=['dest', 'source'])
	if collapse:			if collapse:
	copies.duplicatecopies(repo, wctx, rev, dest)			copies.duplicatecopies(repo, wctx, rev, dest)
	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, but not			# rebasing and its first parent, but not

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: do not update if IMM; instead, set the overlaywctx's parentsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3119

hgext/rebase.py

rebase: do not update if IMM; instead, set the overlaywctx's parents
ClosedPublic

Revision Contents
Changeset List