Commit cd344c0c authored by Anton Shestakov's avatar Anton Shestakov
Browse files

evolve: rename choosedrev to selectedrev because choosed is not a word

Aligns with revselectionprompt()'s name.
parent 44c20093fc0e
......@@ -743,9 +743,9 @@
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:
......@@ -748,8 +748,8 @@
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,11 +891,11 @@
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:
......@@ -896,10 +896,10 @@
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,12 +915,12 @@
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:
......@@ -921,10 +921,10 @@
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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment