This is an archive of the discontinued Mercurial Phabricator instance.

Differential D133

obsolete: update tests with new debugobsolete message
ClosedPublic

Authored by ryanmce on Jul 18 2017, 10:46 AM.
Tags
None
Subscribers
None

Details

Reviewers
mitrandir
Group Reviewers
Restricted Project
Commits
rFBHGXb3b8f6399056: obsolete: update tests with new debugobsolete message
Summary

Upstream change b11e8c67fb0f9f692d680fbe0f3793e9bdeb29b7 made
the debugobsolete command print out the number of changes it obsoleted.

Test Plan

run the tests

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.Jul 18 2017, 10:46 AM
mitrandir accepted this revision.Jul 18 2017, 10:48 AM
This revision is now accepted and ready to land.Jul 18 2017, 10:48 AM
Closed by commit rFBHGXb3b8f6399056: obsolete: update tests with new debugobsolete message (authored by ryanmce). · Explain WhyJul 18 2017, 1:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 270

tests/test-hiddenerror.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> hiddenerror=$TESTDIR/../hgext3rd/hiddenerror.py > hiddenerror=$TESTDIR/../hgext3rd/hiddenerror.py
> [experimental] > [experimental]
> evolution=all > evolution=all
> EOF > EOF
Create hidden changeset. Create hidden changeset.
$ hg init repo && cd repo $ hg init repo && cd repo
$ hg debugbuilddag +1 $ hg debugbuilddag +1
$ hg debugobsolete 1ea73414a91b0920940797d8fc6a11e447f8ea1e $ hg debugobsolete 1ea73414a91b0920940797d8fc6a11e447f8ea1e
obsoleted 1 changesets
Test default error message. Test default error message.
$ hg log -r 0 $ hg log -r 0
abort: hidden changeset 1ea73414a91b! abort: hidden changeset 1ea73414a91b!
[255] [255]
Test custom error message without hash. Test custom error message without hash.
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF

tests/test-inhibit.t

$ hg up null -q $ hg up null -q
$ hg log -T '{desc}' --hidden $ hg log -T '{desc}' --hidden
B2B1A (no-eol) B2B1A (no-eol)
$ B1=`HGPLAIN=1 hg log -r B1 -T '{node}' --hidden` $ B1=`HGPLAIN=1 hg log -r B1 -T '{node}' --hidden`
$ B2=`HGPLAIN=1 hg log -r B2 -T '{node}' --hidden` $ B2=`HGPLAIN=1 hg log -r B2 -T '{node}' --hidden`
$ hg debugobsolete $B2 $B1 -d '1 0' $ hg debugobsolete $B2 $B1 -d '1 0'
obsoleted 1 changesets
$ hg log -G -T '{desc}' --hidden $ hg log -G -T '{desc}' --hidden
x B2 x B2
| |
| o B1 | o B1
|/ |/
o A o A
$ hg debugobsolete $B1 $B2 -d '2 0' $ hg debugobsolete $B1 $B2 -d '2 0'

tests/test-obsshelve.t

$ hg status $ hg status
A d A d
Test bug 4073 we need to enable obsolete markers for it Test bug 4073 we need to enable obsolete markers for it
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `hg --debug id -i -r 1` $ hg debugobsolete `hg --debug id -i -r 1`
obsoleted 1 changesets
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
Unshelve should leave unknown files alone (issue4113) Unshelve should leave unknown files alone (issue4113)
$ echo e > e $ echo e > e
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved

tests/test-pull-createmarkers-hide-later.t

$ hg pull $ hg pull
pulling from ssh://user@dummy/server pulling from ssh://user@dummy/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 2 files (+1 heads) added 2 changesets with 0 changes to 2 files (+1 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
obsoleted 3 changesets
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' -r 'all()' $ hg log -G -T '{rev} "{desc}" {remotebookmarks}' -r 'all()'
o 7 "add c o 7 "add c
| |
| Differential Revision: https://phabricator.fb.com/D124 | Differential Revision: https://phabricator.fb.com/D124
| Reviewed By: someone" default/master | Reviewed By: someone" default/master
o 6 "add b o 6 "add b
| |
| Differential Revision: https://phabricator.fb.com/D123 | Differential Revision: https://phabricator.fb.com/D123
$ hg pull $ hg pull
pulling from ssh://user@dummy/server pulling from ssh://user@dummy/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads) added 1 changesets with 0 changes to 1 files (+1 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
obsoleted 2 changesets
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' -r 'all()' $ hg log -G -T '{rev} "{desc}" {remotebookmarks}' -r 'all()'
o 9 "add d o 9 "add d
| |
| Differential Revision: https://phabricator.fb.com/D131 | Differential Revision: https://phabricator.fb.com/D131
| Reviewed By: someone" default/master | Reviewed By: someone" default/master
@ 7 "add c @ 7 "add c
| |
| Differential Revision: https://phabricator.fb.com/D124 | Differential Revision: https://phabricator.fb.com/D124

tests/test-pull-createmarkers.t

$ hg pull $ hg pull
pulling from ssh://user@dummy/server pulling from ssh://user@dummy/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 0 changes to 3 files added 3 changesets with 0 changes to 3 files
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
obsoleted 3 changesets
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' $ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
o 8 "add e o 8 "add e
| |
| Differential Revision: https://phabricator.fb.com/D131" default/master | Differential Revision: https://phabricator.fb.com/D131" default/master
o 7 "add d o 7 "add d
| |
| Differential Revision: https://phabricator.intern.facebook.com/D124" | Differential Revision: https://phabricator.intern.facebook.com/D124"
o 6 "add c o 6 "add c

tests/test-sqldirstate-shelve.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> EOF > EOF
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `hg --debug id -i -r 1` $ hg debugobsolete `hg --debug id -i -r 1`
obsoleted 1 changesets
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
unshelve should leave unknown files alone (issue4113) unshelve should leave unknown files alone (issue4113)
$ echo e > e $ echo e > e
$ hg shelve $ hg shelve
shelved as default shelved as default