This is an archive of the discontinued Mercurial Phabricator instance.

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 7735

	default=True,			default=True,
	)			)
	coreconfigitem('stack', 'not-merge',			coreconfigitem('stack', 'not-merge',
	default=True,			default=True,
	)			)
	coreconfigitem('stack', 'restrict-ancestors',			coreconfigitem('stack', 'restrict-ancestors',
	default=True,			default=True,
	)			)
				coreconfigitem('experimental', 'stack.same-branch',
				default=False,
				)
	coreconfigitem('subrepos', 'allowed',			coreconfigitem('subrepos', 'allowed',
	default=dynamicdefault, # to make backporting simpler			default=dynamicdefault, # to make backporting simpler
	)			)
	coreconfigitem('subrepos', 'hg:allowed',			coreconfigitem('subrepos', 'hg:allowed',
	default=dynamicdefault,			default=dynamicdefault,
	)			)
	coreconfigitem('subrepos', 'git:allowed',			coreconfigitem('subrepos', 'git:allowed',
	default=dynamicdefault,			default=dynamicdefault,

	if repo.ui.configbool("stack", "restrict-ancestors"):			if repo.ui.configbool("stack", "restrict-ancestors"):
	revspecargs.append(revsetlang.formatspec("only(%s)", rev))			revspecargs.append(revsetlang.formatspec("only(%s)", rev))
	revspec.append("%r")			revspec.append("%r")

	if repo.ui.configbool("stack", "not-merge"):			if repo.ui.configbool("stack", "not-merge"):
	revspecargs.append("not ::merge()")			revspecargs.append("not ::merge()")
	revspec.append("%r")			revspec.append("%r")

				if repo.ui.configbool("experimental", "stack.same-branch"):
				revspecargs.append(revsetlang.formatspec("branch(%s)", rev))
				revspec.append("%r")

	finalrevspec = " and ".join(revspec)			finalrevspec = " and ".join(revspec)
	revset = revsetlang.formatspec(finalrevspec, *revspecargs)			revset = revsetlang.formatspec(finalrevspec, *revspecargs)
	revisions = scmutil.revrange(repo, [revset])			revisions = scmutil.revrange(repo, [revset])
	revisions.sort()			revisions.sort()
	return revisions			return revisions

	\|			\|
	o 2 foo draft c_c			o 2 foo draft c_c
	\|			\|
	o 1 other draft c_b			o 1 other draft c_b
	\|			\|
	o 0 other draft c_a			o 0 other draft c_a


				Check that stack show draft changesets from all branches by default
				-------------------------------------------------------------------

				$ hg log -G -r "stack()"
				@ 5 foo draft c_f
				\|
				o 4 foo draft c_e
				\|
				o 3 foo draft c_d
				\|
				o 2 foo draft c_c
				\|
				o 1 other draft c_b
				\|
				o 0 other draft c_a


				But not if we restrict on the branch

				$ hg log -G -r "stack()" --config experimental.stack.same-branch=true
				@ 5 foo draft c_f
				\|
				o 4 foo draft c_e
				\|
				o 3 foo draft c_d
				\|
				o 2 foo draft c_c
				\|
				~

	Check that stack doesn't include public changesets			Check that stack doesn't include public changesets
	--------------------------------------------------			--------------------------------------------------

	$ hg up other			$ hg up other
	0 files updated, 0 files merged, 4 files removed, 0 files unresolved			0 files updated, 0 files merged, 4 files removed, 0 files unresolved
	$ hg log -G -r "stack()"			$ hg log -G -r "stack()"
	@ 1 other draft c_b			@ 1 other draft c_b
	\|			\|