diff --git a/hgext3rd/fbamend/prune.py b/hgext3rd/fbamend/prune.py --- a/hgext3rd/fbamend/prune.py +++ b/hgext3rd/fbamend/prune.py @@ -121,6 +121,8 @@ prune multiple changesets with a single successor, you must pass the ``--fold`` option. """ + ui.warn(_( + 'advice: `hg hide` commnand provides a better UI for hiding commits\n')) revs = scmutil.revrange(repo, list(revs) + opts.get('rev', [])) succs = opts.get('succ', []) bookmarks = set(opts.get('bookmark', ())) diff --git a/tests/test-cleanobsstore.t b/tests/test-cleanobsstore.t --- a/tests/test-cleanobsstore.t +++ b/tests/test-cleanobsstore.t @@ -12,12 +12,14 @@ $ hg debugbuilddag +5 $ hg up -q tip $ hg prune -r . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 2dc09a01254d 1 changesets pruned $ hg debugobsolete bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'user': 'test'} (glob) $ HGUSER=baduser hg prune -r . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 01241442b3c2 1 changesets pruned @@ -41,6 +43,7 @@ $ hg add 1 $ hg ci -q -m 1 $ HGUSER=baduser hg prune -q -r . + advice: `hg hide` commnand provides a better UI for hiding commits $ hg debugobsolete bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'user': 'test'} (glob) 73bce0eaaf9d039023d1b34421aceab146636d3e 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'user': 'baduser'} (glob) diff --git a/tests/test-fastpartialmatch-obsolete.t b/tests/test-fastpartialmatch-obsolete.t --- a/tests/test-fastpartialmatch-obsolete.t +++ b/tests/test-fastpartialmatch-obsolete.t @@ -21,6 +21,7 @@ $ cd repo $ mkcommit firstcommit $ hg prune . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 000000000000 1 changesets pruned @@ -29,6 +30,7 @@ $ mkcommit first $ hg debugcheckpartialindex $ hg prune -q . + advice: `hg hide` commnand provides a better UI for hiding commits $ hg debugcheckpartialindex Try histedit diff --git a/tests/test-fbamend-hiddenoverride.t b/tests/test-fbamend-hiddenoverride.t --- a/tests/test-fbamend-hiddenoverride.t +++ b/tests/test-fbamend-hiddenoverride.t @@ -44,6 +44,7 @@ Strip/prune unpins a node $ hg prune 1 -q + advice: `hg hide` commnand provides a better UI for hiding commits $ hg log -G -T '{rev} {desc}\n' o 2 C | diff --git a/tests/test-infinitepush-backup.t b/tests/test-infinitepush-backup.t --- a/tests/test-infinitepush-backup.t +++ b/tests/test-infinitepush-backup.t @@ -26,6 +26,7 @@ finished in \d+\.(\d+)? seconds (re) $ mkcommit commit $ hg prune . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 000000000000 1 changesets pruned @@ -82,6 +83,7 @@ Create obsoleted commit $ mkcommit obsoletedcommit $ hg prune . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 94a60f5ad8b2 1 changesets pruned @@ -186,6 +188,7 @@ Obsolete a head, make sure backup happens $ hg prune . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 773a3ba2e7c2 1 changesets pruned @@ -360,6 +363,7 @@ Make sure pushbackup works $ mkcommit toobsolete $ hg prune . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 630839011471 1 changesets pruned @@ -438,6 +442,7 @@ remote: 6c4f4b30ae4c headtwo finished in \d+\.(\d+)? seconds (re) $ hg prune 6c4f4b30ae4c2dd928d551836c70c741ee836650 + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 630839011471 1 changesets pruned diff --git a/tests/test-infinitepush-bundlestore.t b/tests/test-infinitepush-bundlestore.t --- a/tests/test-infinitepush-bundlestore.t +++ b/tests/test-infinitepush-bundlestore.t @@ -423,6 +423,7 @@ > evolution=createmarkers > EOF $ hg prune -r scratch/mybranch + advice: `hg hide` commnand provides a better UI for hiding commits 1 changesets pruned $ hg log -r 'reverse(::scratch/mybranch)' -T '{desc}\n' scratchcommitwithpushrebase @@ -451,6 +452,7 @@ $ hg log -r scratch/mybranch -T '{node}\n' 8872775dd97a750e1533dc1fbbca665644b32547 $ hg prune -r scratch/mybranch + advice: `hg hide` commnand provides a better UI for hiding commits 1 changesets pruned $ hg log -G -T '{node|short} {desc} {bookmarks}' @ fe8283fe1190 peercommit diff --git a/tests/test-infinitepush-pullback-obsolete.t b/tests/test-infinitepush-pullback-obsolete.t --- a/tests/test-infinitepush-pullback-obsolete.t +++ b/tests/test-infinitepush-pullback-obsolete.t @@ -40,6 +40,7 @@ $ hg log -r . -T '{node}\n' edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff $ hg prune . + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 000000000000 1 changesets pruned diff --git a/tests/test-smartlog-obsolete.t b/tests/test-smartlog-obsolete.t --- a/tests/test-smartlog-obsolete.t +++ b/tests/test-smartlog-obsolete.t @@ -189,6 +189,7 @@ o 0 1ea73414a91b $ hg prune 2 -q + advice: `hg hide` commnand provides a better UI for hiding commits $ hg log -T "{rev} {node|short} {amendsuccessors % '(amend as {short(amendsuccessor)}) '}\n" -G -r 'all()' x 1 66f7d451a68b | diff --git a/tests/test-tweakdefaults-bookmarks.t b/tests/test-tweakdefaults-bookmarks.t --- a/tests/test-tweakdefaults-bookmarks.t +++ b/tests/test-tweakdefaults-bookmarks.t @@ -17,6 +17,7 @@ $ echo 1 >> a $ hg commit a -m a1 $ hg prune da7a5140a611 -q + advice: `hg hide` commnand provides a better UI for hiding commits $ hg bookmark b -r da7a5140a611 -q Same test but with remotenames enabled diff --git a/tests/test-tweakdefaults.t b/tests/test-tweakdefaults.t --- a/tests/test-tweakdefaults.t +++ b/tests/test-tweakdefaults.t @@ -563,6 +563,7 @@ Test that we allow pure prune rebases $ hg strip 4 + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 1e4be0697311 1 changesets pruned @@ -711,6 +712,7 @@ o 0 $ hg bookmark -D feature1 + advice: `hg hide` commnand provides a better UI for hiding commits bookmark 'feature1' deleted 2 changesets pruned $ hg log -G -T '{rev} {bookmarks}' -r 'all()' --hidden diff --git a/tests/test-undo.t b/tests/test-undo.t --- a/tests/test-undo.t +++ b/tests/test-undo.t @@ -689,6 +689,7 @@ > fbamend = $TESTDIR/../hgext3rd/fbamend/ > EOF $ hg strip 3ee6 + advice: `hg hide` commnand provides a better UI for hiding commits 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 75f63379f12b 1 changesets pruned