This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D5693 mq: slightly simplify check for patched working copy
	Closed	martinvonz	D5692 localrepo: slightly simplify check for removed parents in _rollback()

Diff 13460

	transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn,			transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn,
	checkambigfiles=_cachedfiles)			checkambigfiles=_cachedfiles)
	if self.vfs.exists('undo.bookmarks'):			if self.vfs.exists('undo.bookmarks'):
	self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)			self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)
	if self.svfs.exists('undo.phaseroots'):			if self.svfs.exists('undo.phaseroots'):
	self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)			self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
	self.invalidate()			self.invalidate()

	parentgone = (parents[0] not in self.changelog.nodemap or			parentgone = any(p not in self.changelog.nodemap for p in parents)
	parents[1] not in self.changelog.nodemap)
	if parentgone:			if parentgone:
	# prevent dirstateguard from overwriting already restored one			# prevent dirstateguard from overwriting already restored one
	dsguard.close()			dsguard.close()

	narrowspec.restorebackup(self, 'undo.narrowspec')			narrowspec.restorebackup(self, 'undo.narrowspec')
	narrowspec.restorewcbackup(self, 'undo.narrowspec.dirstate')			narrowspec.restorewcbackup(self, 'undo.narrowspec.dirstate')
	self.dirstate.restorebackup(None, 'undo.dirstate')			self.dirstate.restorebackup(None, 'undo.dirstate')
	try:			try: