This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	indygreg	D2702 commands: use constants for merge things
Closed	indygreg	D2701 merge: use constants for actions
Closed	indygreg	D2700 merge: use constants for merge record state
Closed	indygreg	D2699 merge: use constants for merge driver state
Closed	indygreg	D2698 merge: use constants for merge state record types
Closed	indygreg	D2694 merge: deprecate accessing update results by index
Closed	indygreg	D2693 histedit: always define update results
Closed	indygreg	D2692 merge: return an attrs class from update() and applyupdates()
Closed	indygreg	D2691 commands: don't check for merge.update() truthiness

Diff 6653

hgext/histedit.py

	"""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, labeled=True)
	hg.update(repo, self.state.parentctxnode, quietempty=True)			hg.update(repo, self.state.parentctxnode, quietempty=True)
	stats = applychanges(repo.ui, repo, rulectx, {})			stats = applychanges(repo.ui, repo, rulectx, {})
	repo.dirstate.setbranch(rulectx.branch())			repo.dirstate.setbranch(rulectx.branch())
	if stats and stats[3] > 0:			if stats and stats[3] > 0:
				martinvonzUnsubmitted Done remove the "stats and" now? martinvonz: remove the "stats and" now?
				indygregAuthorUnsubmitted Not Done This is done in the next commit :) indygreg: This is done in the next commit :)
	buf = repo.ui.popbuffer()			buf = repo.ui.popbuffer()
	repo.ui.write(buf)			repo.ui.write(buf)
	raise error.InterventionRequired(			raise error.InterventionRequired(
	_('Fix up the change (%s %s)') %			_('Fix up the change (%s %s)') %
	(self.verb, node.short(self.node)),			(self.verb, node.short(self.node)),
	hint=_('hg histedit --continue to resume'))			hint=_('hg histedit --continue to resume'))
	else:			else:
	repo.ui.popbuffer()			repo.ui.popbuffer()

	def applychanges(ui, repo, ctx, opts):			def applychanges(ui, repo, ctx, opts):
	"""Merge changeset from ctx (only) in the current working directory"""			"""Merge changeset from ctx (only) in the current working directory"""
	wcpar = repo.dirstate.parents()[0]			wcpar = repo.dirstate.parents()[0]
	if ctx.p1().node() == wcpar:			if ctx.p1().node() == wcpar:
	# edits are "in place" we do not need to make any merge,			# edits are "in place" we do not need to make any merge,
	# just applies changes on parent for editing			# just applies changes on parent for editing
	cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)			cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
	stats = None			stats = mergemod.updateresult(0, 0, 0, 0)
	else:			else:
	try:			try:
	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),			repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
	'histedit')			'histedit')
	stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit'])			stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit'])
	finally:			finally:
	repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')			repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6653		Mar 5 2018, 1:17 AM	★	★
Diff 2	7273	rHG0351fb0153baadd6bbbb6627988e539c353b30e0	Mar 5 2018, 12:28 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

histedit: always define update resultsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 6653

hgext/histedit.py

histedit: always define update results
ClosedPublic

Revision Contents
Changeset List