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 13439

	if localrepo.hasunfilteredcache(self, r'mq'):			if localrepo.hasunfilteredcache(self, r'mq'):
	# recreate mq in case queue path was changed			# recreate mq in case queue path was changed
	delattr(self.unfiltered(), r'mq')			delattr(self.unfiltered(), r'mq')

	def abortifwdirpatched(self, errmsg, force=False):			def abortifwdirpatched(self, errmsg, force=False):
	if self.mq.applied and self.mq.checkapplied and not force:			if self.mq.applied and self.mq.checkapplied and not force:
	parents = self.dirstate.parents()			parents = self.dirstate.parents()
	patches = [s.node for s in self.mq.applied]			patches = [s.node for s in self.mq.applied]
	if parents[0] in patches or parents[1] in patches:			if any(p in patches for p in parents):
	raise error.Abort(errmsg)			raise error.Abort(errmsg)

	def commit(self, text="", user=None, date=None, match=None,			def commit(self, text="", user=None, date=None, match=None,
	force=False, editor=False, extra=None):			force=False, editor=False, extra=None):
	if extra is None:			if extra is None:
	extra = {}			extra = {}
	self.abortifwdirpatched(			self.abortifwdirpatched(
	_('cannot commit over an applied mq patch'),			_('cannot commit over an applied mq patch'),