hgext3rd/evolve/__init__.py
changeset 4161 3c28f8a3a5a5
parent 4160 44133463372f
child 4184 b9e0cc531b2b
--- a/hgext3rd/evolve/__init__.py	Fri Oct 12 14:33:03 2018 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri Oct 12 14:40:03 2018 +0200
@@ -1076,9 +1076,14 @@
                     exc.hint = _('do you want --merge?')
                     raise
 
-        displayer = compat.changesetdisplayer(ui, repo,
-                                              {'template': shorttemplate})
         topic = not opts.get("no_topic", False)
+        hastopic = bool(_getcurrenttopic(repo))
+
+        template = shorttemplate
+        if topic and hastopic:
+            template = utility.stacktemplate
+
+        displayer = compat.changesetdisplayer(ui, repo, {'template': template})
 
         target, bookmark = _findprevtarget(repo, displayer,
                                            opts.get('move_bookmark'), topic)