This is an archive of the discontinued Mercurial Phabricator instance.

Differential D827

fbamend: fix typo and shorten advice
ClosedPublic

Authored by ryanmce on Sep 27 2017, 9:15 AM.
Tags
None
Subscribers
mjpieters

Details

Reviewers
mjpieters
Group Reviewers
Restricted Project
Commits
rFBHGXf52232b9c2e7: fbamend: fix typo and shorten advice
Summary

Shorter and sweeter and hopefully more correct.

Diff Detail

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

Event Timeline

ryanmce created this revision.Sep 27 2017, 9:15 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 27 2017, 9:15 AM
mjpieters accepted this revision.Sep 27 2017, 9:38 AM
mjpieters added a subscriber: mjpieters.

I like.

This revision is now accepted and ready to land.Sep 27 2017, 9:38 AM
Closed by commit rFBHGXf52232b9c2e7: fbamend: fix typo and shorten advice (authored by ryanmce). · Explain WhySep 27 2017, 9:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2126

hgext3rd/fbamend/prune.py

option may be removed in a future release (with the functionality provided option may be removed in a future release (with the functionality provided
automatically). automatically).
If you specify multiple revisions in ``--succ``, you are recording a If you specify multiple revisions in ``--succ``, you are recording a
"split" and must acknowledge it by passing ``--split``. Similarly, when you "split" and must acknowledge it by passing ``--split``. Similarly, when you
prune multiple changesets with a single successor, you must pass the prune multiple changesets with a single successor, you must pass the
``--fold`` option. ``--fold`` option.
""" """
ui.warn(_( ui.warn(_("advice: 'hg hide' provides a better UI for hiding commits\n"))
'advice: `hg hide` commnand provides a better UI for hiding commits\n'))
revs = scmutil.revrange(repo, list(revs) + opts.get('rev', [])) revs = scmutil.revrange(repo, list(revs) + opts.get('rev', []))
succs = opts.get('succ', []) succs = opts.get('succ', [])
bookmarks = set(opts.get('bookmark', ())) bookmarks = set(opts.get('bookmark', ()))
metadata = _getmetadata(**opts) metadata = _getmetadata(**opts)
biject = opts.get('biject') biject = opts.get('biject')
fold = opts.get('fold') fold = opts.get('fold')
split = opts.get('split') split = opts.get('split')

tests/test-cleanobsstore.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> cleanobsstore=$TESTDIR/../hgext3rd/cleanobsstore.py > cleanobsstore=$TESTDIR/../hgext3rd/cleanobsstore.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ hg debugbuilddag +5 $ hg debugbuilddag +5
$ hg up -q tip $ hg up -q tip
$ hg prune -r . $ hg prune -r .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at 2dc09a01254d working directory now at 2dc09a01254d
1 changesets pruned 1 changesets pruned
$ hg debugobsolete $ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob) bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
$ HGUSER=baduser hg prune -r . $ HGUSER=baduser hg prune -r .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at 01241442b3c2 working directory now at 01241442b3c2
1 changesets pruned 1 changesets pruned
$ hg debugobsolete $ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob) bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
2dc09a01254db841290af0538aa52f6f52c776e3 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob) 2dc09a01254db841290af0538aa52f6f52c776e3 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob)
Run any command (for example, status). Obsstore shouldn't be cleaned because it doesn't exceed the limit Run any command (for example, status). Obsstore shouldn't be cleaned because it doesn't exceed the limit
$ hg --config cleanobsstore.badusernames=baduser st $ hg --config cleanobsstore.badusernames=baduser st
$ hg debugobsolete $ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob) bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
2dc09a01254db841290af0538aa52f6f52c776e3 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob) 2dc09a01254db841290af0538aa52f6f52c776e3 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob)
Run any command again. This time it should be cleaned because we decreased the limit Run any command again. This time it should be cleaned because we decreased the limit
$ hg --config cleanobsstore.badusernames=baduser --config cleanobsstore.obsstoresizelimit=1 st $ hg --config cleanobsstore.badusernames=baduser --config cleanobsstore.obsstoresizelimit=1 st
$ hg debugobsolete $ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob) bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
Create bad obsmarker again. Make sure it wasn't cleaned again Create bad obsmarker again. Make sure it wasn't cleaned again
$ echo 1 >> 1 $ echo 1 >> 1
$ hg add 1 $ hg add 1
$ hg ci -q -m 1 $ hg ci -q -m 1
$ HGUSER=baduser hg prune -q -r . $ HGUSER=baduser hg prune -q -r .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
$ hg debugobsolete $ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob) bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
73bce0eaaf9d039023d1b34421aceab146636d3e 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob) 73bce0eaaf9d039023d1b34421aceab146636d3e 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob)
$ hg --config cleanobsstore.badusernames=baduser --config cleanobsstore.obsstoresizelimit=1 st $ hg --config cleanobsstore.badusernames=baduser --config cleanobsstore.obsstoresizelimit=1 st
$ hg debugobsolete $ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob) bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
73bce0eaaf9d039023d1b34421aceab146636d3e 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob) 73bce0eaaf9d039023d1b34421aceab146636d3e 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob)

tests/test-fastpartialmatch-obsolete.t

> [ui] > [ui]
> ssh = python "$TESTDIR/dummyssh" > ssh = python "$TESTDIR/dummyssh"
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ mkcommit firstcommit $ mkcommit firstcommit
$ hg prune . $ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000 working directory now at 000000000000
1 changesets pruned 1 changesets pruned
$ hg debugrebuildpartialindex $ hg debugrebuildpartialindex
$ hg debugcheckpartialindex $ hg debugcheckpartialindex
$ mkcommit first $ mkcommit first
$ hg debugcheckpartialindex $ hg debugcheckpartialindex
$ hg prune -q . $ hg prune -q .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
$ hg debugcheckpartialindex $ hg debugcheckpartialindex
Try histedit Try histedit
$ mkcommit second $ mkcommit second
$ mkcommit third $ mkcommit third
$ mkcommit fourth $ mkcommit fourth
$ hg log --graph $ hg log --graph
@ changeset: 4:d5e85d22a345 @ changeset: 4:d5e85d22a345

tests/test-fbamend-hiddenoverride.t

| |
| x 1 B | x 1 B
|/ |/
@ 0 A @ 0 A
Strip/prune unpins a node Strip/prune unpins a node
$ hg prune 1 -q $ hg prune 1 -q
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
$ hg log -G -T '{rev} {desc}\n' $ hg log -G -T '{rev} {desc}\n'
o 2 C o 2 C
| |
@ 0 A @ 0 A
Bookmark pins nodes even after removed Bookmark pins nodes even after removed
$ hg bookmark -ir 1 BOOK --hidden -q $ hg bookmark -ir 1 BOOK --hidden -q

tests/test-infinitepush-backup.t

$ hg clone ssh://user@dummy/repo client -q $ hg clone ssh://user@dummy/repo client -q
$ cd client $ cd client
$ setup $ setup
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
$ mkcommit commit $ mkcommit commit
$ hg prune . $ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000 working directory now at 000000000000
1 changesets pruned 1 changesets pruned
$ mkcommit newcommit $ mkcommit newcommit
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 94a60f5ad8b2 newcommit remote: 94a60f5ad8b2 newcommit
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
$ scratchbookmarks $ scratchbookmarks
infinitepush/backups/test/[0-9a-zA-Z.-]+\$TESTTMP/client/heads/94a60f5ad8b2e007240007edab982b3638a3f38d 94a60f5ad8b2e007240007edab982b3638a3f38d (re) infinitepush/backups/test/[0-9a-zA-Z.-]+\$TESTTMP/client/heads/94a60f5ad8b2e007240007edab982b3638a3f38d 94a60f5ad8b2e007240007edab982b3638a3f38d (re)
Create obsoleted commit Create obsoleted commit
$ mkcommit obsoletedcommit $ mkcommit obsoletedcommit
$ hg prune . $ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 94a60f5ad8b2 working directory now at 94a60f5ad8b2
1 changesets pruned 1 changesets pruned
Make obsoleted commit non-extinct by committing on top of it Make obsoleted commit non-extinct by committing on top of it
$ hg --hidden up 2 $ hg --hidden up 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit ontopofobsoleted $ mkcommit ontopofobsoleted
Nothing changed, make sure no backup happens Nothing changed, make sure no backup happens
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
nothing to backup nothing to backup
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
Obsolete a head, make sure backup happens Obsolete a head, make sure backup happens
$ hg prune . $ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 773a3ba2e7c2 working directory now at 773a3ba2e7c2
1 changesets pruned 1 changesets pruned
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: 667453c0787e newhead2 remote: 667453c0787e newhead2
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
Make commit and immediately obsolete it, then create a bookmark. Make commit and immediately obsolete it, then create a bookmark.
Make sure pushbackup works Make sure pushbackup works
$ mkcommit toobsolete $ mkcommit toobsolete
$ hg prune . $ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 630839011471 working directory now at 630839011471
1 changesets pruned 1 changesets pruned
$ hg book somebook $ hg book somebook
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
$ scratchbookmarks $ scratchbookmarks
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: cf2adfba1469 headone remote: cf2adfba1469 headone
remote: 6c4f4b30ae4c headtwo remote: 6c4f4b30ae4c headtwo
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
$ hg prune 6c4f4b30ae4c2dd928d551836c70c741ee836650 $ hg prune 6c4f4b30ae4c2dd928d551836c70c741ee836650
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 630839011471 working directory now at 630839011471
1 changesets pruned 1 changesets pruned
$ hg isbackedup -r 6c4f4b30ae4c2dd928d551836c70c741ee836650 $ hg isbackedup -r 6c4f4b30ae4c2dd928d551836c70c741ee836650
6c4f4b30ae4c2dd928d551836c70c741ee836650 backed up 6c4f4b30ae4c2dd928d551836c70c741ee836650 backed up
Test backupgeneration config option. If this config option value changes then Test backupgeneration config option. If this config option value changes then
new full backup should be made. new full backup should be made.

tests/test-infinitepush-bundlestore.t

$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> EOF > EOF
$ hg prune -r scratch/mybranch $ hg prune -r scratch/mybranch
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
1 changesets pruned 1 changesets pruned
$ hg log -r 'reverse(::scratch/mybranch)' -T '{desc}\n' $ hg log -r 'reverse(::scratch/mybranch)' -T '{desc}\n'
scratchcommitwithpushrebase scratchcommitwithpushrebase
scratchcommitnobook scratchcommitnobook
new scratch commit new scratch commit
scratchcommit scratchcommit
initialcommit initialcommit
$ hg pull -B scratch/mybranch $ hg pull -B scratch/mybranch
new scratch commit new scratch commit
scratchcommit scratchcommit
initialcommit initialcommit
Prune it again and pull it via commit hash Prune it again and pull it via commit hash
$ hg log -r scratch/mybranch -T '{node}\n' $ hg log -r scratch/mybranch -T '{node}\n'
8872775dd97a750e1533dc1fbbca665644b32547 8872775dd97a750e1533dc1fbbca665644b32547
$ hg prune -r scratch/mybranch $ hg prune -r scratch/mybranch
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
1 changesets pruned 1 changesets pruned
$ hg log -G -T '{node|short} {desc} {bookmarks}' $ hg log -G -T '{node|short} {desc} {bookmarks}'
@ fe8283fe1190 peercommit @ fe8283fe1190 peercommit
| |
| o d8c4f54ab678 scratchcommitwithpushrebase scratch/mybranch | o d8c4f54ab678 scratchcommitwithpushrebase scratch/mybranch
| | | |
| o 2b5d271c7e0d scratchcommitnobook | o 2b5d271c7e0d scratchcommitnobook
| | | |

tests/test-infinitepush-pullback-obsolete.t

Make a commit, than prune a commit, than create a bookmark on top of it. Make a commit, than prune a commit, than create a bookmark on top of it.
Do a backup and try to restore. Make sure it doesn't fail Do a backup and try to restore. Make sure it doesn't fail
$ hg up -q null $ hg up -q null
$ mkcommit tobepruned $ mkcommit tobepruned
created new head created new head
$ hg log -r . -T '{node}\n' $ hg log -r . -T '{node}\n'
edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff
$ hg prune . $ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000 working directory now at 000000000000
1 changesets pruned 1 changesets pruned
$ hg --hidden book -r edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff newbookonpruned $ hg --hidden book -r edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff newbookonpruned
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
nothing to backup nothing to backup
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)

tests/test-smartlog-obsolete.t

$ hg log -T "{rev} {node|short} {amendsuccessors % '(amend as {short(amendsuccessor)}) '}\n" -G -r 'all()' $ hg log -T "{rev} {node|short} {amendsuccessors % '(amend as {short(amendsuccessor)}) '}\n" -G -r 'all()'
o 2 1ef61e92c901 o 2 1ef61e92c901
| |
| @ 1 66f7d451a68b (amend as 1ef61e92c901) | @ 1 66f7d451a68b (amend as 1ef61e92c901)
|/ |/
o 0 1ea73414a91b o 0 1ea73414a91b
$ hg prune 2 -q $ hg prune 2 -q
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
$ hg log -T "{rev} {node|short} {amendsuccessors % '(amend as {short(amendsuccessor)}) '}\n" -G -r 'all()' $ hg log -T "{rev} {node|short} {amendsuccessors % '(amend as {short(amendsuccessor)}) '}\n" -G -r 'all()'
x 1 66f7d451a68b x 1 66f7d451a68b
| |
@ 0 1ea73414a91b @ 0 1ea73414a91b

tests/test-tweakdefaults-bookmarks.t

$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ touch a $ touch a
$ hg commit -A a -m a $ hg commit -A a -m a
$ echo 1 >> a $ echo 1 >> a
$ hg commit a -m a1 $ hg commit a -m a1
$ hg prune da7a5140a611 -q $ hg prune da7a5140a611 -q
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
$ hg bookmark b -r da7a5140a611 -q $ hg bookmark b -r da7a5140a611 -q
Same test but with remotenames enabled Same test but with remotenames enabled
$ . $TESTDIR/require-ext.sh remotenames $ . $TESTDIR/require-ext.sh remotenames
$ hg bookmark b2 -r da7a5140a611 -q --config extensions.remotenames= $ hg bookmark b2 -r da7a5140a611 -q --config extensions.remotenames=

tests/test-tweakdefaults.t

$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> EOF > EOF
$ hg rebase -r 1 -d 3 --hidden $ hg rebase -r 1 -d 3 --hidden
rebasing 1:09d39afb522a "a" rebasing 1:09d39afb522a "a"
Test that we allow pure prune rebases Test that we allow pure prune rebases
$ hg strip 4 $ hg strip 4
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 1e4be0697311 working directory now at 1e4be0697311
1 changesets pruned 1 changesets pruned
$ hg rebase -r 4 -d 3 --hidden $ hg rebase -r 4 -d 3 --hidden
rebasing 4:31aefaa21905 "d" rebasing 4:31aefaa21905 "d"
Test diff --per-file-stat Test diff --per-file-stat
$ echo a >> a $ echo a >> a
|/ |/
o 2 o 2
| |
o 1 master o 1 master
| |
o 0 o 0
$ hg bookmark -D feature1 $ hg bookmark -D feature1
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
bookmark 'feature1' deleted bookmark 'feature1' deleted
2 changesets pruned 2 changesets pruned
$ hg log -G -T '{rev} {bookmarks}' -r 'all()' --hidden $ hg log -G -T '{rev} {bookmarks}' -r 'all()' --hidden
o 6 feature2 o 6 feature2
| |
| x 5 | x 5
| | | |
o | 4 o | 4

tests/test-undo.t

Check local undo with facebook style strip Check local undo with facebook style strip
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> strip = > strip =
> fbamend = $TESTDIR/../hgext3rd/fbamend/ > fbamend = $TESTDIR/../hgext3rd/fbamend/
> EOF > EOF
$ hg strip 3ee6 $ hg strip 3ee6
advice: `hg hide` commnand provides a better UI for hiding commits advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 75f63379f12b working directory now at 75f63379f12b
1 changesets pruned 1 changesets pruned
$ hg undo -b 3532 $ hg undo -b 3532
undone to *, before strip 3ee6 (glob) undone to *, before strip 3ee6 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol) 3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol)
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF