This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10247

rebase: calculate obsolescense-related info earlier
ClosedPublic

Authored by martinvonz on Mar 22 2021, 1:36 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGd95edcbe5c99: rebase: calculate obsolescense-related info earlier

Summary

My goal is to use rewriteutil.precheck() in the rebase code. Since
rebase does its own handling of divergent commits (it skips them
instead of erroring out), we need to have divergence-causing commits
filtered out early. This patch helps prepare for that.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

martinvonz created this revision.Mar 22 2021, 1:36 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 22 2021, 1:36 PM

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

martinvonz added a child revision: D10248: rebase: clarify names of variables and function related to obsolete revisions.Mar 22 2021, 1:36 PM

martinvonz updated this revision to Diff 26560.Mar 24 2021, 2:24 AM

martinvonz added a commit: rHGd95edcbe5c99: rebase: calculate obsolescense-related info earlier.Mar 25 2021, 5:30 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGd95edcbe5c99: rebase: calculate obsolescense-related info earlier (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 (8 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26530		Mar 22 2021, 1:36 PM	★	★
Diff 2	26560		Mar 24 2021, 2:24 AM	★	★
Diff 3	26589	rHGd95edcbe5c99e8f489022f7627f27304c06c90b3	Feb 12 2021, 7:05 PM	★	★

Commit	Parents	Author	Summary	Date
fe830138ad80	2cf35d1e78df	Martin von Zweigbergk		Feb 12 2021, 7:05 PM

Status	Author	Revision
Closed	martinvonz	D10259 rebase: don't call rewriteutil.precheck() with to-be-skipped commits
Closed	martinvonz	D10258 reabase: call rewriteutil.precheck() a bit later
Closed	martinvonz	D10257 rebase: set `prepared = True` at very end of `_preparenewrebase()`
Closed	martinvonz	D10249 rebase: filter out descendants of divergence-causing commits earlier
Closed	martinvonz	D10248 rebase: clarify names of variables and function related to obsolete revisions
Closed	martinvonz	D10247 rebase: calculate obsolescense-related info earlier
Closed	martinvonz	D10246 rebase: let _handleskippingobsolete(self) read directly from self
Closed	martinvonz	D10256 tests: test divergence created during interrupted rebase
Closed	martinvonz	D10255 tests: split up test-rebase-obsolete.t in four pieces

Diff 26560

hgext/rebase.py

	_checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)			_checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)

	def _prepareabortorcontinue(			def _prepareabortorcontinue(
	self, isabort, backup=True, suppwarns=False, dryrun=False, confirm=False			self, isabort, backup=True, suppwarns=False, dryrun=False, confirm=False
	):			):
	self.resume = True			self.resume = True
	try:			try:
	self.restorestatus()			self.restorestatus()
				# Calculate self.obsoletenotrebased
				self._handleskippingobsolete()
	self.collapsemsg = restorecollapsemsg(self.repo, isabort)			self.collapsemsg = restorecollapsemsg(self.repo, isabort)
	except error.RepoLookupError:			except error.RepoLookupError:
	if isabort:			if isabort:
	clearstatus(self.repo)			clearstatus(self.repo)
	clearcollapsemsg(self.repo)			clearcollapsemsg(self.repo)
	self.repo.ui.warn(			self.repo.ui.warn(
	_(			_(
	b'rebase aborted (no revision is removed,'			b'rebase aborted (no revision is removed,'

	for destrev in sorted(set(destmap.values())):			for destrev in sorted(set(destmap.values())):
	dest = self.repo[destrev]			dest = self.repo[destrev]
	if dest.closesbranch() and not self.keepbranchesf:			if dest.closesbranch() and not self.keepbranchesf:
	self.ui.status(_(b'reopening closed branch head %s\n') % dest)			self.ui.status(_(b'reopening closed branch head %s\n') % dest)

	self.prepared = True			self.prepared = True

				# Calculate self.obsoletenotrebased
				self._handleskippingobsolete()

	def _assignworkingcopy(self):			def _assignworkingcopy(self):
	if self.inmemory:			if self.inmemory:
	from mercurial.context import overlayworkingctx			from mercurial.context import overlayworkingctx

	self.wctx = overlayworkingctx(self.repo)			self.wctx = overlayworkingctx(self.repo)
	self.repo.ui.debug(b"rebasing in memory\n")			self.repo.ui.debug(b"rebasing in memory\n")
	else:			else:
	self.wctx = self.repo[None]			self.wctx = self.repo[None]
	branches = set()			branches = set()
	for rev in self.state:			for rev in self.state:
	branches.add(repo[rev].branch())			branches.add(repo[rev].branch())
	if len(branches) > 1:			if len(branches) > 1:
	raise error.InputError(			raise error.InputError(
	_(b'cannot collapse multiple named branches')			_(b'cannot collapse multiple named branches')
	)			)

	# Calculate self.obsoletenotrebased
	self._handleskippingobsolete()

	# Keep track of the active bookmarks in order to reset them later			# Keep track of the active bookmarks in order to reset them later
	self.activebookmark = self.activebookmark or repo._activebookmark			self.activebookmark = self.activebookmark or repo._activebookmark
	if self.activebookmark:			if self.activebookmark:
	bookmarks.deactivate(repo)			bookmarks.deactivate(repo)

	# Store the state before we begin so users can run 'hg rebase --abort'			# Store the state before we begin so users can run 'hg rebase --abort'
	# if we fail before the transaction closes.			# if we fail before the transaction closes.
	self.storestatus()			self.storestatus()