Mercurial > evolve

changeset 5879:cd344c0c89f0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename choosedrev to selectedrev because choosed is not a word Aligns with revselectionprompt()'s name.
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 21 Apr 2021 19:41:41 +0800
parents 44c20093fc0e
children 1ed3e1f2d2c3
files hgext3rd/evolve/__init__.py
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Thu Apr 22 20:51:46 2021 +0800
+++ b/hgext3rd/evolve/__init__.py	Wed Apr 21 19:41:41 2021 +0800
@@ -743,13 +743,13 @@
     else:
         header = _(b"multiple parents, choose one to update:")
         prevs = [p.rev() for p in parents]
-        choosedrev = utility.revselectionprompt(repo.ui, repo, prevs, header)
-        if choosedrev is None:
+        selectedrev = utility.revselectionprompt(repo.ui, repo, prevs, header)
+        if selectedrev is None:
             for p in parents:
                 display(p)
             repo.ui.warn(_(b'multiple parents, explicitly update to one\n'))
         else:
-            target = repo[choosedrev]
+            target = repo[selectedrev]
     return target, bookmark
 
 @eh.command(
@@ -891,15 +891,15 @@
         elif children:
             cheader = _(b"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:
+            selectedrev = utility.revselectionprompt(ui, repo, crevs, cheader)
+            if selectedrev is None:
                 ui.warn(_(b"ambiguous next changeset:\n"))
                 for c in children:
                     display(c)
                 ui.warn(_(b"explicitly update to one of them\n"))
                 return 1
             else:
-                return _updatetonext(ui, repo, repo[choosedrev], display, opts)
+                return _updatetonext(ui, repo, repo[selectedrev], display, opts)
         else:
             if not opts['evolve'] or not aspchildren:
                 if filtered:
@@ -915,16 +915,16 @@
             elif len(aspchildren) > 1:
                 cheader = _(b"ambiguous next (unstable) changeset, choose one to"
                             b" evolve and update:")
-                choosedrev = utility.revselectionprompt(ui, repo,
-                                                        aspchildren, cheader)
-                if choosedrev is None:
+                selectedrev = utility.revselectionprompt(ui, repo,
+                                                         aspchildren, cheader)
+                if selectedrev is None:
                     ui.warn(_(b"ambiguous next (unstable) changeset:\n"))
                     for c in aspchildren:
                         display(repo[c])
                     ui.warn(_(b"(run 'hg evolve --rev REV' on one of them)\n"))
                     return 1
                 else:
-                    return _nextevolve(ui, repo, repo[choosedrev], opts)
+                    return _nextevolve(ui, repo, repo[selectedrev], opts)
             else:
                 return _nextevolve(ui, repo, aspchildren[0], opts)
     finally: