This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12416

revert: ask user to confirm before tracking new file when interactive
ClosedPublic

Authored by martinvonz on Mar 28 2022, 1:57 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3f6ef67e7a60: revert: ask user to confirm before tracking new file when interactive
Summary

If interactively reverting from a commit with hg revert -i -r, we
would unconditionally add files from that commit that are not already
tracked in the working copy. We have prompts for adding back files
removed in the working copy, but that's specific to such files and
does not apply to adding files from another revision.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 28 2022, 1:57 PM
Alphare accepted this revision.Apr 6 2022, 6:17 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
tests/test-revert-interactive.t
424

I'll amend this to hg up 0 as per our previous discussion about this particular shortcut. (I know this is very subjective so I won't bother you with a round-trip :) )

This revision is now accepted and ready to land.Apr 6 2022, 6:17 AM
martinvonz added inline comments.Apr 6 2022, 12:50 PM
tests/test-revert-interactive.t
424

Sounds good. I'm just so used to using hg co that I didn't think about it (I didn't intentionally ignore your previous request).

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (6 lines)
Mtests/test-revert-interactive.t (13 lines)

Diff 32815

mercurial/cmdutil.py

if normal: if normal:
normal(f) normal(f)
for f in actions[b'add'][0]: for f in actions[b'add'][0]:
# Don't checkout modified files, they are already created by the diff # Don't checkout modified files, they are already created by the diff
if f in newlyaddedandmodifiedfiles: if f in newlyaddedandmodifiedfiles:
continue continue
if interactive:
choice = repo.ui.promptchoice(
_(b"add new file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
)
if choice != 0:
continue
prntstatusmsg(b'add', f) prntstatusmsg(b'add', f)
checkout(f) checkout(f)
repo.dirstate.set_tracked(f) repo.dirstate.set_tracked(f)
for f in actions[b'undelete'][0]: for f in actions[b'undelete'][0]:
if interactive: if interactive:
choice = repo.ui.promptchoice( choice = repo.ui.promptchoice(
_(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f

tests/test-revert-interactive.t

A newfile A newfile
$ hg revert -i <<EOF $ hg revert -i <<EOF
> y > y
> EOF > EOF
forget added file newfile (Yn)? y forget added file newfile (Yn)? y
forgetting newfile forgetting newfile
$ hg status $ hg status
? newfile ? newfile
$ rm newfile
$ hg up 0
AlphareUnsubmitted
Not Done

I'll amend this to hg up 0 as per our previous discussion about this particular shortcut. (I know this is very subjective so I won't bother you with a round-trip :) )

Alphare: I'll amend this to `hg up 0` as per our previous discussion about this particular shortcut. (I…
martinvonzAuthorUnsubmitted
Done

Sounds good. I'm just so used to using hg co that I didn't think about it (I didn't intentionally ignore your previous request).

martinvonz: Sounds good. I'm just so used to using `hg co` that I didn't think about it (I didn't…
1 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ hg status
$ hg revert -r 2 -i <<EOF
> y
> n
> EOF
add new file folder1/g (Yn)? y
adding folder1/g
add new file folder2/h (Yn)? n
$ hg status
A folder1/g
When a line without EOL is selected during "revert -i" (issue5651) When a line without EOL is selected during "revert -i" (issue5651)
$ hg init $TESTTMP/revert-i-eol $ hg init $TESTTMP/revert-i-eol
$ cd $TESTTMP/revert-i-eol $ cd $TESTTMP/revert-i-eol
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ printf 1 >> a $ printf 1 >> a