This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6013		Feb 23 2018, 5:36 AM	★	★
Diff 2	6215		Feb 28 2018, 6:59 PM	★	★
Diff 3	7128	rHG68fcc5503ec55bda2d6be2887f8fc3f61000c666	Jan 19 2018, 11:29 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 7128

mercurial/destutil.py

	# 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()

	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.first() if revs else None

	def _statusotherbook(ui, repo):			def _statusotherbook(ui, repo):
	bmheads = bookmarks.headsforactive(repo)			bmheads = bookmarks.headsforactive(repo)
	curhead = repo[repo._activebookmark].node()			curhead = repo[repo._activebookmark].node()
	if repo.revs('%n and parents()', curhead):			if repo.revs('%n and parents()', curhead):
	# we are on the active bookmark			# we are on the active bookmark
	bmheads = [b for b in bmheads if curhead != b]			bmheads = [b for b in bmheads if curhead != b]
	if bmheads:			if bmheads:

mercurial/stack.py

	# stack.py - Mercurial functions for stack definition			# stack.py - Mercurial functions for stack definition
	#			#
	# Copyright Matt Mackall <mpm@selenic.com> and other			# Copyright Matt Mackall <mpm@selenic.com> and other
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	from . import (			from . import (
	revsetlang,			revsetlang,
	scmutil,			scmutil,
	)			)

	def getstack(repo, rev=None):			def getstack(repo, rev=None):
	"""return a smartrev of the stack containing either rev if it is not None			"""return a sorted smartrev of the stack containing either rev if it is
	or the current working directory parent.			not None or the current working directory parent.

	The stack will always contain all drafts changesets which are ancestors to			The stack will always contain all drafts changesets which are ancestors to
	the revision and are not merges.			the revision and are not merges.
	"""			"""
	if rev is None:			if rev is None:
	rev = '.'			rev = '.'

	revspec = 'reverse(only(%s) and not public() and not ::merge())'			revspec = 'reverse(only(%s) and not public() and not ::merge())'
				yujaUnsubmitted Done `reverse()` can be removed as well? yuja: `reverse()` can be removed as well?
				lothiraldanAuthorUnsubmitted Not Done reverse is removed in the next commit https://phab.mercurial-scm.org/D2400 lothiraldan: reverse is removed in the next commit https://phab.mercurial-scm.org/D2400
	revset = revsetlang.formatspec(revspec, rev)			revset = revsetlang.formatspec(revspec, rev)
	return scmutil.revrange(repo, [revset])			revisions = scmutil.revrange(repo, [revset])
				revisions.sort()
				return revisions

tests/test-stack.t

	~			~
	o 8 foo draft c_f			o 8 foo draft c_f
	\|			\|
	o 7 foo draft c_e			o 7 foo draft c_e
	\|			\|
	~			~
	Check the stack order			Check the stack order
	$ hg log -r "first(stack())"			$ hg log -r "first(stack())"
	10 foo draft c_h			9 foo draft c_g
	$ hg log -r "first(stack(10))"			$ hg log -r "first(stack(10))"
	10 foo draft c_h			9 foo draft c_g
	$ hg log -r "first(stack(8))"			$ hg log -r "first(stack(8))"
	8 foo draft c_f			7 foo draft c_e
	$ hg log -r "first(stack(head()))"			$ hg log -r "first(stack(head()))"
	8 foo draft c_f			7 foo draft c_e

	Case with multiple heads with unstability involved			Case with multiple heads with unstability involved
	--------------------------------------------------			--------------------------------------------------

	We amend the message to make sure the display base pick the right changeset			We amend the message to make sure the display base pick the right changeset

	$ hg up 'desc(c_d)'			$ hg up 'desc(c_d)'
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved

This is an archive of the discontinued Mercurial Phabricator instance.

stack: return a sorted smartrev by defaultClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 7128

mercurial/destutil.py

mercurial/stack.py

tests/test-stack.t

stack: return a sorted smartrev by default
ClosedPublic

Revision Contents
Changeset List