Commit 126215f9 authored by Taapas Agrawal's avatar Taapas Agrawal

revert: add prompt before undeleting a file in -i (issue6008)

This adds a prompt that asks whether or not a removed file is to be undeleted
in `hg revert -i`.

Differential Revision: https://phab.mercurial-scm.org/D5803
parent bad59bbd9bec
......@@ -3194,9 +3194,19 @@ def _performrevert(repo, parents, ctx, names, actions, interactive=False,
if node == parent and p2 == nullid:
normal = repo.dirstate.normal
for f in actions['undelete'][0]:
prntstatusmsg('undelete', f)
checkout(f)
normal(f)
if interactive:
choice = repo.ui.promptchoice(
_("add back removed file %s (Yn)?$$ &Yes $$ &No") % f)
if choice == 0:
prntstatusmsg('undelete', f)
checkout(f)
normal(f)
else:
excluded_files.append(f)
else:
prntstatusmsg('undelete', f)
checkout(f)
normal(f)
copied = copies.pathcopies(repo[parent], ctx)
......
......@@ -424,3 +424,24 @@ When specified pattern does not exist, we should exit early (issue5789).
b: no such file in rev b40d1912accf
$ cd ..
Prompt before undeleting file(issue6008)
$ hg init repo
$ cd repo
$ echo a > a
$ hg ci -qAm a
$ hg rm a
$ hg revert -i<<EOF
> y
> EOF
add back removed file a (Yn)? y
undeleting a
$ ls
a
$ hg rm a
$ hg revert -i<<EOF
> n
> EOF
add back removed file a (Yn)? n
$ ls
$ cd ..
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