changeset 4634:0b231ea2124b

branching: merge with stable

--- a/debian/rules	Fri Apr 26 01:20:08 2019 +0530
+++ b/debian/rules	Fri May 03 01:23:12 2019 +0200
@@ -6,7 +6,8 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	$(MAKE) -C docs
+	# Workaround for Sphinx in Debian Buster defaulting to Python 3
+	SPHINXBUILD=/usr/share/sphinx/scripts/python2/sphinx-build $(MAKE) -C docs
 
 hgsrc_defined:
 	# Use "! -z" instead of "-n", because "-n" without arguments is true

--- a/docs/makefile	Fri Apr 26 01:20:08 2019 +0530
+++ b/docs/makefile	Fri May 03 01:23:12 2019 +0200
@@ -1,6 +1,7 @@
+SPHINXBUILD ?= sphinx-build
 
 all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
-	sphinx-build . ../html/
+	$(SPHINXBUILD) . ../html/
 
 tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
 	python test2rst.py tutorials/
@@ -10,5 +11,3 @@
 
 static/logo-evolve.ico: static/logo-evolve.svg
 	convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico
-
-

--- a/hgext3rd/evolve/legacy.py	Fri Apr 26 01:20:08 2019 +0530
+++ b/hgext3rd/evolve/legacy.py	Fri May 03 01:23:12 2019 +0200
@@ -15,12 +15,6 @@
 
 from mercurial import error
 
-try:
-    from mercurial import obsolete
-    obsolete._enabled
-except ImportError:
-    raise error.Abort('Obsolete extension requires Mercurial 2.3 (or later)')
-
 import sys
 import json
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-topic-multiple.t	Fri May 03 01:23:12 2019 +0200
@@ -0,0 +1,69 @@
+Testing topics on cases when we have multiple topics based on top
+of other.
+  $ . "$TESTDIR/testlib/topic_setup.sh"
+
+Setup
+
+  $ cat << EOF >> $HGRCPATH
+  > [experimental]
+  > evolution = all
+  > [ui]
+  > interactive = True
+  > logtemplate = {rev} - \{{get(namespaces, "topics")}} {node|short} {desc} ({phase})\n
+  > [extensions]
+  > show =
+  > EOF
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
+
+Test to make sure `hg evolve` don't solve troubles out of current stack:
+------------------------------------------------------------------------
+
+  $ hg init repo1
+  $ cd repo1
+  $ for ch in a b c; do
+  > echo $ch > $ch
+  > hg ci -Am "added "$ch --topic foo
+  > done;
+  adding a
+  active topic 'foo' grew its first changeset
+  (see 'hg help topics' for more information)
+  adding b
+  adding c
+
+  $ echo d > d
+  $ hg ci -Am "added d" --topic bar
+  adding d
+  active topic 'bar' grew its first changeset
+  (see 'hg help topics' for more information)
+
+  $ hg up -r "desc('added c')"
+  > echo cc >> c
+  switching to topic foo
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg amend
+  1 new orphan changesets
+
+  $ hg log -G
+  @  4 - {foo} 0cc68cbf943a added c (draft)
+  |
+  | *  3 - {bar} 94b12ff0f44a added d (draft)
+  | |
+  | x  2 - {foo} 9c315cf1e7de added c (draft)
+  |/
+  o  1 - {foo} ead01932caf0 added b (draft)
+  |
+  o  0 - {foo} 853c9ec0849e added a (draft)
+  
+
+  $ hg stack
+  ### topic: foo
+  ### target: default (branch)
+  s3@ added c (current)
+  s2: added b
+  s1: added a
+
+As expected, evolve should deny to evolve here as there is no troubled csets in current stack:
+  $ hg evolve --all
+  nothing to evolve on current working copy parent
+  (1 other orphan in the repository, do you want --any or --rev)
+  [2]