next: populate stacktemplate to the missed _nextevolve function
authorSushil khanchi <sushilkhanchi97@gmail.com>
Tue, 25 Dec 2018 10:10:12 +0530
changeset 4342 914b9e55f76e
parent 4341 d1aab9d82f5b
child 4343 11b726506204
next: populate stacktemplate to the missed _nextevolve function
hgext3rd/evolve/__init__.py
tests/test-topic-tutorial.t
--- a/hgext3rd/evolve/__init__.py	Mon Jan 14 09:14:38 2019 -0800
+++ b/hgext3rd/evolve/__init__.py	Tue Dec 25 10:10:12 2018 +0530
@@ -1074,6 +1074,7 @@
             filtered = set(ctx for ctx in children if ctx.topic() != topic)
             children = [ctx for ctx in children if ctx not in filtered]
             template = utility.stacktemplate
+            opts['stacktemplate'] = True
         displayer = compat.changesetdisplayer(ui, repo, {'template': template})
 
         # check if we need to evolve while updating to the next child revision
@@ -1161,7 +1162,8 @@
                                              'bookmarkchanges': []})
     result = evolvecmd._solveone(ui, repo, repo[aspchildren],
                                  evolvestate, opts.get('dry_run'), False,
-                                 lambda: None, category='orphan')
+                                 lambda: None, category='orphan',
+                                 stacktmplt=opts.get('stacktemplate', False))
     # making sure a next commit is formed
     if result[0] and result[1]:
         ui.status(_('working directory now at %s\n')
--- a/tests/test-topic-tutorial.t	Mon Jan 14 09:14:38 2019 -0800
+++ b/tests/test-topic-tutorial.t	Tue Dec 25 10:10:12 2018 +0530
@@ -1368,8 +1368,8 @@
 to do that rebase by hand.:
 
   $ hg next --evolve
-  move:[14] Adding saw
-  atop:[18] Adding hammer to the shopping list
+  move:[s2] Adding saw
+  atop:[s1] Adding hammer to the shopping list
   working directory now at d5c51ee5762a
 
   $ hg stack
@@ -1383,8 +1383,8 @@
 One more to go:
 
   $ hg next --evolve
-  move:[15] Adding drill
-  atop:[19] Adding saw
+  move:[s3] Adding drill
+  atop:[s2] Adding saw
   working directory now at bae3758e46bf
 
   $ hg stack