This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D10886 narrowbundle: use new context manager for silencing the ui
Closed	martinvonz	D10885 debugbackupbundle: use new context manager for silencing the ui
Closed	martinvonz	D10884 ui: add a context manager for silencing the ui (pushbuffer+popbuffer)
Closed	martinvonz	D10883 shelve: don't swallow errors that happen when reverting the working copy
Closed	martinvonz	D10882 histedit: don't swallow errors that happen when updating the working copy
Closed	martinvonz	D10881 histedit: don't record labels for output that we will discard
Closed	martinvonz	D10864 dog-raft: work with str-keyed opts throughout
Closed	martinvonz	D10863 cmdutil: make resolvecommitoptions() work on str-keyed opts
Closed	martinvonz	D10862 cmdutil: make amend() take str-keyed opts
Closed	martinvonz	D10861 commit: keep opts dict str-keyed a bit longer
Closed	martinvonz	D10860 dog-raft: keep opts dict str-keyed a bit longer
Closed	martinvonz	D10859 cmdutil: make checknotesize() work on str-keyed opts
Closed	martinvonz	D10880 amend: work mostly with str-type **opts for simplicity

Diff 28607

	self.continuedirty()			self.continuedirty()
	return self.continueclean()			return self.continueclean()

	def applychange(self):			def applychange(self):
	"""Applies the changes from this action's rulectx onto the current			"""Applies the changes from this action's rulectx onto the current
	parentctx, but does not commit them."""			parentctx, but does not commit them."""
	repo = self.repo			repo = self.repo
	rulectx = repo[self.node]			rulectx = repo[self.node]
	repo.ui.pushbuffer(error=True, labeled=True)			repo.ui.pushbuffer(error=True)
	hg.update(repo, self.state.parentctxnode, quietempty=True)			hg.update(repo, self.state.parentctxnode, quietempty=True)
	repo.ui.popbuffer()			repo.ui.popbuffer()
	stats = applychanges(repo.ui, repo, rulectx, {})			stats = applychanges(repo.ui, repo, rulectx, {})
	repo.dirstate.setbranch(rulectx.branch())			repo.dirstate.setbranch(rulectx.branch())
	if stats.unresolvedcount:			if stats.unresolvedcount:
	raise error.InterventionRequired(			raise error.InterventionRequired(
	_(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),			_(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
	hint=_(b'hg histedit --continue to resume'),			hint=_(b'hg histedit --continue to resume'),