This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4243		Dec 8 2017, 2:25 AM	★	★
Diff 2	4248		Dec 8 2017, 2:27 AM	★	★
Diff 3	4277		Dec 8 2017, 6:32 PM	★	★
Diff 4	4286	rHG8dba17546016981475b7bda21b29e9267566fce7	Dec 8 2017, 3:44 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 4286

hgext/rebase.py


	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(_('reopening closed branch head %s\n') % dest)			self.ui.status(_('reopening closed branch head %s\n') % dest)

	self.prepared = True			self.prepared = True

	def _performrebase(self, tr):			def _assignworkingcopy(self):
	repo, ui = self.repo, self.ui
	# Assign a working copy object.
	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)
	else:			else:
	self.wctx = self.repo[None]			self.wctx = self.repo[None]

				def _performrebase(self, tr):
				self._assignworkingcopy()
				krbullockUnsubmitted Not Done Rather than having this method spookily set self.wctx, why not make `_assignworkingcopy` _return_ the wctx (and rename it accordingly)? krbullock: Rather than having this method spookily set self.wctx, why not make `_assignworkingcopy`…
				phillcoAuthorUnsubmitted Not Done Good point, I'll send a followup. phillco: Good point, I'll send a followup.
				repo, ui = self.repo, self.ui
	if self.keepbranchesf:			if self.keepbranchesf:
	# insert _savebranch at the start of extrafns so if			# insert _savebranch at the start of extrafns so if
	# there's a user-provided extrafn it can clobber branch if			# there's a user-provided extrafn it can clobber branch if
	# desired			# desired
	self.extrafns.insert(0, _savebranch)			self.extrafns.insert(0, _savebranch)
	if self.collapsef:			if self.collapsef:
	branches = set()			branches = set()
	for rev in self.state:			for rev in self.state:

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: extract _assignworkingcopyClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4286

hgext/rebase.py

rebase: extract _assignworkingcopy
ClosedPublic

Revision Contents
Changeset List