hgext3rd/evolve/__init__.py
changeset 3547 78abffad8626
parent 3546 d197e6f0d0e3
child 3548 79d995cb8152
--- a/hgext3rd/evolve/__init__.py	Fri Mar 16 11:31:13 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Fri Mar 16 11:46:47 2018 +0530
@@ -1109,11 +1109,17 @@
             c = children[0]
             result = _updatetonext(ui, repo, c, displayer, opts)
         elif children:
-            ui.warn(_("ambiguous next changeset:\n"))
-            for c in children:
-                displayer.show(c)
-            ui.warn(_('explicitly update to one of them\n'))
-            result = 1
+            cheader = _("ambiguous next changeset, choose one to update:")
+            crevs = [c.rev() for c in children]
+            choosedrev = utility.revselectionprompt(ui, repo, crevs, cheader)
+            if choosedrev is None:
+                ui.warn(_("ambiguous next changeset:\n"))
+                for c in children:
+                    displayer.show(c)
+                ui.warn(_("explicitly update to one of them\n"))
+                result = 1
+            else:
+                result = _updatetonext(ui, repo, repo[choosedrev], displayer, opts)
         else:
             aspchildren = evolvecmd._aspiringchildren(repo, [repo['.'].rev()])
             if topic: