This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6012		Feb 23 2018, 5:36 AM	★	★
Diff 2	6214		Feb 28 2018, 6:59 PM	★	★
Diff 3	7127	rHG2987726085c641f12a4fcef5594d516967c1a6e3	Jan 19 2018, 11:09 AM	★	★

Status	Author	Revision
Closed	lothiraldan	D3137 histedit: simplify desthistedit
Closed	lothiraldan	D3136 stack: follow-up on the stack revset
Abandoned	lothiraldan	D2403 stack: remove destutil.stackbase
Abandoned	lothiraldan	D2402 stack: introduce an option to limit the selection on the current branch
Abandoned	lothiraldan	D2401 stack: introduce an option to disable the restriction on ancestor
Abandoned	lothiraldan	D2400 stack: begin to make the stack revset configurable
Closed	lothiraldan	D2399 stack: return a sorted smartrev by default
Closed	lothiraldan	D2398 histedit: use the new stack definition for histedit
Closed	lothiraldan	D2397 show: use the new stack definition for show stack
Closed	lothiraldan	D2396 stack: import Evolve stack test file
Closed	lothiraldan	D2395 stack: add a new module for stack-related commands

Diff 6214

hgext/histedit.py

	command = registrar.command(cmdtable)			command = registrar.command(cmdtable)

	configtable = {}			configtable = {}
	configitem = registrar.configitem(configtable)			configitem = registrar.configitem(configtable)
	configitem('experimental', 'histedit.autoverb',			configitem('experimental', 'histedit.autoverb',
	default=False,			default=False,
	)			)
	configitem('histedit', 'defaultrev',			configitem('histedit', 'defaultrev',
	default=configitem.dynamicdefault,			default=None,
	)			)
	configitem('histedit', 'dropmissing',			configitem('histedit', 'dropmissing',
	default=False,			default=False,
	)			)
	configitem('histedit', 'linelen',			configitem('histedit', 'linelen',
	default=80,			default=80,
	)			)
	configitem('histedit', 'singletransaction',			configitem('histedit', 'singletransaction',

mercurial/destutil.py

	if repo._activebookmark:			if repo._activebookmark:
	node = _destmergebook(repo, action=action, sourceset=sourceset,			node = _destmergebook(repo, action=action, sourceset=sourceset,
	destspace=destspace)			destspace=destspace)
	else:			else:
	node = _destmergebranch(repo, action=action, sourceset=sourceset,			node = _destmergebranch(repo, action=action, sourceset=sourceset,
	onheadcheck=onheadcheck, destspace=destspace)			onheadcheck=onheadcheck, destspace=destspace)
	return repo[node].rev()			return repo[node].rev()

	histeditdefaultrevset = 'reverse(only(.) and not public() and not ::merge())'

	def desthistedit(ui, repo):			def desthistedit(ui, repo):
	"""Default base revision to edit for `hg histedit`."""			"""Default base revision to edit for `hg histedit`."""
	default = ui.config('histedit', 'defaultrev', histeditdefaultrevset)			default = ui.config('histedit', 'defaultrev')
	if default:
				if default is None:
				revs = stack.getstack(repo)
				elif default:
				indygregUnsubmitted Not Done This means we can mark the default value for this option as `None`. indygreg: This means we can mark the default value for this option as `None`.
	revs = scmutil.revrange(repo, [default])			revs = scmutil.revrange(repo, [default])

	if revs:			if revs:
	# The revset supplied by the user may not be in ascending order nor			# The revset supplied by the user may not be in ascending order nor
	# take the first revision. So do this manually.			# take the first revision. So do this manually.
	revs.sort()			revs.sort()
	return revs.first()			return revs.first()
				yujaUnsubmitted Not Done Can be `return revs.min()`? yuja: Can be `return revs.min()`?
				lothiraldanAuthorUnsubmitted Not Done It seems so and it's much simpler to read. I have sent a follow-up: https://phab.mercurial-scm.org/D3137 lothiraldan: It seems so and it's much simpler to read. I have sent a follow-up: https://phab.mercurial-scm.

	return None			return None

	def stackbase(ui, repo):			def stackbase(ui, repo):
	revs = stack.getstack(repo)			revs = stack.getstack(repo)
	return revs.last() if revs else None			return revs.last() if revs else None

	def _statusotherbook(ui, repo):			def _statusotherbook(ui, repo):

This is an archive of the discontinued Mercurial Phabricator instance.

histedit: use the new stack definition for histeditClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 6214

hgext/histedit.py

mercurial/destutil.py

histedit: use the new stack definition for histedit
ClosedPublic

Revision Contents
Changeset List