Mercurial > hg
comparison tests/test-import-git.t @ 39405:cb70501d8b71
revert: fix the inconsistency of status msgs in --interactive mode
Before this patch we were priting every action msg before actually
performing that action and that was resulting in inconsistencies;
like in --interactive session if user decided to not revert any
changes in a file foo, still there will be a msg on console saying
"reverting foo".
To fix this, I have made some changes to print status msg just
before the action it is going to perform, no matter if --interactive
or not.
Changes made in test-revert-interactive.t reflect the changed behavior.
There are also some changes in test-revert.t because of change in the
order of messages.
Differential Revision: https://phab.mercurial-scm.org/D4380
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 31 Aug 2018 23:28:09 +0530 |
parents | 0a10f142299d |
children | 8c13f7b0ace6 |
comparison
equal
deleted
inserted
replaced
39404:90afd61ef8a2 | 39405:cb70501d8b71 |
---|---|
613 R a | 613 R a |
614 | 614 |
615 Prefix with strip, renames, creates etc | 615 Prefix with strip, renames, creates etc |
616 | 616 |
617 $ hg revert -aC | 617 $ hg revert -aC |
618 forgetting b | |
618 undeleting a | 619 undeleting a |
619 forgetting b | |
620 $ rm b | 620 $ rm b |
621 $ mkdir -p dir/dir2 | 621 $ mkdir -p dir/dir2 |
622 $ echo b > dir/dir2/b | 622 $ echo b > dir/dir2/b |
623 $ echo c > dir/dir2/c | 623 $ echo c > dir/dir2/c |
624 $ echo d > dir/d | 624 $ echo d > dir/d |
713 | 713 |
714 Renames, similarity and git diff | 714 Renames, similarity and git diff |
715 | 715 |
716 $ hg revert -aC | 716 $ hg revert -aC |
717 forgetting dir/a | 717 forgetting dir/a |
718 forgetting dir/dir2/b2 | |
719 reverting dir/dir2/c | |
718 undeleting dir/d | 720 undeleting dir/d |
719 undeleting dir/dir2/b | 721 undeleting dir/dir2/b |
720 forgetting dir/dir2/b2 | |
721 reverting dir/dir2/c | |
722 $ rm dir/a dir/dir2/b2 | 722 $ rm dir/a dir/dir2/b2 |
723 $ hg import --similarity 90 --no-commit - <<EOF | 723 $ hg import --similarity 90 --no-commit - <<EOF |
724 > diff --git a/a b/b | 724 > diff --git a/a b/b |
725 > rename from a | 725 > rename from a |
726 > rename to b | 726 > rename to b |