Mercurial > hg > hg-git
changeset 871:93689e8f27ac
tests: stop filtering out bookmark output
The bookmark output has been stable since well before the oldest Mercurial we
support, 2.8.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 12 Mar 2015 10:29:58 -0700 |
parents | 6547d63aee4e |
children | c1c2af8aecb3 |
files | tests/test-clone.t tests/test-encoding.t tests/test-file-removal.t tests/test-git-clone.t tests/test-git-submodules.t tests/test-git-tags.t tests/test-git-workflow.t tests/test-hg-author.t tests/test-hg-branch.t tests/test-hg-tags-invalid.t tests/test-hg-tags.t tests/test-incoming.t tests/test-outgoing.t tests/test-pull-after-strip.t tests/test-push.t |
diffstat | 15 files changed, 85 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -22,8 +22,9 @@ $ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating' importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo-a log --graph | egrep -v ': *(beta|master)' + $ hg -R hgrepo-a log --graph @ changeset: 0:ff7a2f2d8d70 + bookmark: master tag: alpha tag: default/master tag: tip @@ -35,8 +36,9 @@ $ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating' importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo-b log --graph | egrep -v ': *(beta|master)' + $ hg -R hgrepo-b log --graph @ changeset: 1:7fe02317c63d + | bookmark: beta | tag: default/beta | tag: tip | user: test <test@example.org> @@ -44,6 +46,7 @@ | summary: add beta | o changeset: 0:ff7a2f2d8d70 + bookmark: master tag: alpha tag: default/master user: test <test@example.org>
--- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -31,8 +31,9 @@ 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ HGENCODING=utf-8 hg log --graph --debug | grep -v ': *master' | grep -v 'phase:' | grep -v ': *author=' | grep -v ': *message=' + $ HGENCODING=utf-8 hg log --graph --debug | grep -v 'phase:' | grep -v ': *author=' | grep -v ': *message=' @ changeset: 3:b8a0ac52f339ccd6d5729508bac4aee6e8b489d8 + | bookmark: master | tag: default/master | tag: tip | parent: 2:8bc4d64940260d4a1e70b54c099d3a76c83ff41e
--- a/tests/test-file-removal.t +++ b/tests/test-file-removal.t @@ -102,8 +102,9 @@ importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg log --graph | grep -v ': *master' + $ hg log --graph @ changeset: 8:0995b8a0a943 + | bookmark: master | tag: default/master | tag: tip | user: test <test@example.org> @@ -230,7 +231,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgreporenames - $ hg log --graph | grep -v ': master' + $ hg log --graph @ changeset: 8:0995b8a0a943 | bookmark: master | tag: default/master
--- a/tests/test-git-clone.t +++ b/tests/test-git-clone.t @@ -16,8 +16,9 @@ $ hg clone gitrepo hgrepo | grep -v '^updating' importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo log --graph | grep -v ': *master' + $ hg -R hgrepo log --graph @ changeset: 1:7fe02317c63d + | bookmark: master | tag: default/master | tag: tip | user: test <test@example.org>
--- a/tests/test-git-submodules.t +++ b/tests/test-git-submodules.t @@ -191,8 +191,9 @@ importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg log --graph | grep -v ': *master' + $ hg log --graph @ changeset: 9:9c3929c04f22 + | bookmark: master | tag: default/master | tag: tip | user: test <test@example.org> @@ -354,8 +355,9 @@ importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgreporenames - $ hg log --graph | grep -v ': *master' + $ hg log --graph @ changeset: 9:9c3929c04f22 + | bookmark: master | tag: default/master | tag: tip | user: test <test@example.org>
--- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -21,8 +21,9 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg log --graph | grep -v ': *master' + $ hg log --graph @ changeset: 1:5403d6137622 + | bookmark: master | tag: beta | tag: default/master | tag: tip
--- a/tests/test-git-workflow.t +++ b/tests/test-git-workflow.t @@ -46,8 +46,9 @@ get things back to hg $ hg gimport importing git objects into hg - $ hg log --graph --debug | grep -v ': *master' | grep -v phase: + $ hg log --graph --debug | grep -v phase: o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 + | bookmark: master | tag: tip | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 | parent: -1:0000000000000000000000000000000000000000
--- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -97,8 +97,9 @@ added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master - $ hg log --graph | egrep -v ': *(not-master|master)' + $ hg log --graph @ changeset: 8:c5d1976ab12c + | bookmark: master | tag: default/master | tag: tip | user: test >test@example.com> @@ -141,6 +142,7 @@ | summary: add beta | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: default/not-master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000 @@ -151,8 +153,9 @@ $ hg clone gitrepo hgrepo2 | grep -v '^updating' importing git objects into hg 8 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo2 log --graph | egrep -v ': *(not-master|master)' + $ hg -R hgrepo2 log --graph @ changeset: 8:1fbf3aa91221 + | bookmark: master | tag: default/master | tag: tip | user: test ?test@example.com <test ?test@example.com> @@ -195,6 +198,7 @@ | summary: add beta | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: default/not-master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000
--- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -37,9 +37,10 @@ added 1 commits with 1 trees and 0 blobs updating reference refs/heads/master - $ hg log --graph | egrep -v ': *(not-master|master)' + $ hg log --graph @ changeset: 2:400db38f4f64 | branch: gamma + | bookmark: master | tag: default/master | tag: tip | user: test @@ -52,6 +53,7 @@ | summary: rename alpha to beta | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: default/not-master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000 @@ -62,9 +64,10 @@ $ hg clone gitrepo hgrepo2 | grep -v '^updating' importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo2 log --graph | egrep -v ': *(not-master|master)' + $ hg -R hgrepo2 log --graph o changeset: 2:400db38f4f64 | branch: gamma + | bookmark: master | tag: default/master | tag: tip | user: test @@ -77,6 +80,7 @@ | summary: rename alpha to beta | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: default/not-master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000
--- a/tests/test-hg-tags-invalid.t +++ b/tests/test-hg-tags-invalid.t @@ -31,8 +31,9 @@ adding reference refs/tags/alph#a adding reference refs/tags/gamm_a - $ hg log --graph | egrep -v ': *(not-master|master)' + $ hg log --graph @ changeset: 3:0950ab44ea23 + | bookmark: master | tag: default/master | tag: tip | user: test @@ -52,6 +53,7 @@ | summary: Added tag alph#a for changeset ff7a2f2d8d70 | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: alph#a tag: default/not-master user: test <test@example.org> @@ -70,8 +72,9 @@ $ hg clone gitrepo hgrepo2 | grep -v '^updating' importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo2 log --graph | egrep -v ': *(not-master|master)' + $ hg -R hgrepo2 log --graph @ changeset: 3:0950ab44ea23 + | bookmark: master | tag: default/master | tag: tip | user: test @@ -92,6 +95,7 @@ | summary: Added tag alph#a for changeset ff7a2f2d8d70 | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: alph#a tag: default/not-master user: test <test@example.org>
--- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -27,8 +27,9 @@ updating reference refs/heads/master adding reference refs/tags/alpha - $ hg log --graph | egrep -v ': *(not-master|master)' + $ hg log --graph @ changeset: 1:e8b150f84560 + | bookmark: master | tag: default/master | tag: tip | user: test @@ -36,6 +37,7 @@ | summary: Added tag alpha for changeset ff7a2f2d8d70 | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: alpha tag: default/not-master user: test <test@example.org> @@ -53,8 +55,9 @@ $ hg clone gitrepo hgrepo2 | grep -v '^updating' importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo2 log --graph | egrep -v ': *(not-master|master)' + $ hg -R hgrepo2 log --graph @ changeset: 1:e8b150f84560 + | bookmark: master | tag: default/master | tag: tip | user: test @@ -62,6 +65,7 @@ | summary: Added tag alpha for changeset ff7a2f2d8d70 | o changeset: 0:ff7a2f2d8d70 + bookmark: not-master tag: alpha tag: default/not-master user: test <test@example.org>
--- a/tests/test-incoming.t +++ b/tests/test-incoming.t @@ -10,9 +10,10 @@ $ cd .. $ hg init hgrepo-empty - $ hg -R hgrepo-empty incoming gitrepo | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg -R hgrepo-empty incoming gitrepo | grep -v 'no changes found' comparing with gitrepo changeset: 0:7eeab2ea75ec + bookmark: master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000 summary: add alpha @@ -22,7 +23,7 @@ importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo incoming | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg -R hgrepo incoming | grep -v 'no changes found' comparing with $TESTTMP/gitrepo $ cd gitrepo @@ -31,9 +32,10 @@ $ fn_git_commit -m 'add beta' $ cd .. - $ hg -R hgrepo incoming | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg -R hgrepo incoming | grep -v 'no changes found' comparing with $TESTTMP/gitrepo changeset: 1:9497a4ee62e1 + bookmark: master user: test <test@example.org> date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta @@ -52,9 +54,10 @@ $ git add d/gamma $ fn_git_commit -m'add d/gamma line 2' $ cd ../hgrepo - $ hg incoming -p | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg incoming -p | grep -v 'no changes found' comparing with $TESTTMP/gitrepo changeset: 1:9497a4ee62e1 + bookmark: master user: test <test@example.org> date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta @@ -79,6 +82,7 @@ +gamma changeset: 3:5202f48c20c9 + bookmark: b1 user: test <test@example.org> date: Mon Jan 01 00:00:13 2007 +0000 summary: add d/gamma line 2 @@ -92,14 +96,15 @@ incoming -r - $ hg incoming -r master | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg incoming -r master | grep -v 'no changes found' comparing with $TESTTMP/gitrepo changeset: 1:9497a4ee62e1 + bookmark: master user: test <test@example.org> date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta - $ hg incoming -r b1 | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg incoming -r b1 | grep -v 'no changes found' comparing with $TESTTMP/gitrepo changeset: 1:9865e289be73 tag: t1 @@ -108,11 +113,12 @@ summary: add d/gamma changeset: 2:5202f48c20c9 + bookmark: b1 user: test <test@example.org> date: Mon Jan 01 00:00:13 2007 +0000 summary: add d/gamma line 2 - $ hg incoming -r t1 | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg incoming -r t1 | grep -v 'no changes found' comparing with $TESTTMP/gitrepo changeset: 1:9865e289be73 tag: t1 @@ -127,5 +133,5 @@ pulling from $TESTTMP/gitrepo importing git objects into hg (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg incoming | grep -v 'no changes found' | grep -v 'bookmark:' + $ hg incoming | grep -v 'no changes found' comparing with $TESTTMP/gitrepo
--- a/tests/test-outgoing.t +++ b/tests/test-outgoing.t @@ -30,39 +30,39 @@ $ hg book -r 1 beta - $ hg outgoing | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' + $ hg outgoing | grep -v 'searching for changes' comparing with */gitrepo (glob) changeset: 1:47580592d3d6 - tag: beta + bookmark: beta user: test date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta changeset: 2:953796e1cfd8 - tag: master + bookmark: master tag: tip user: test date: Mon Jan 01 00:00:12 2007 +0000 summary: add gamma - $ hg outgoing -r beta | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' + $ hg outgoing -r beta | grep -v 'searching for changes' comparing with */gitrepo (glob) changeset: 1:47580592d3d6 - tag: beta + bookmark: beta user: test date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta - $ hg outgoing -r master | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' + $ hg outgoing -r master | grep -v 'searching for changes' comparing with */gitrepo (glob) changeset: 1:47580592d3d6 - tag: beta + bookmark: beta user: test date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta changeset: 2:953796e1cfd8 - tag: master + bookmark: master tag: tip user: test date: Mon Jan 01 00:00:12 2007 +0000 @@ -98,38 +98,38 @@ pulling from */gitrepo (glob) importing git objects into hg (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg outgoing | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' + $ hg outgoing | grep -v 'searching for changes' comparing with */gitrepo (glob) changeset: 1:47580592d3d6 - tag: beta + bookmark: beta user: test date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta changeset: 2:953796e1cfd8 - tag: master + bookmark: master user: test date: Mon Jan 01 00:00:12 2007 +0000 summary: add gamma - $ hg outgoing -r beta | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' + $ hg outgoing -r beta | grep -v 'searching for changes' comparing with */gitrepo (glob) changeset: 1:47580592d3d6 - tag: beta + bookmark: beta user: test date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta - $ hg outgoing -r master | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' + $ hg outgoing -r master | grep -v 'searching for changes' comparing with */gitrepo (glob) changeset: 1:47580592d3d6 - tag: beta + bookmark: beta user: test date: Mon Jan 01 00:00:11 2007 +0000 summary: add beta changeset: 2:953796e1cfd8 - tag: master + bookmark: master user: test date: Mon Jan 01 00:00:12 2007 +0000 summary: add gamma
--- a/tests/test-pull-after-strip.t +++ b/tests/test-pull-after-strip.t @@ -22,8 +22,9 @@ $ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating' importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo-a log --graph | egrep -v ': *(beta|master)' + $ hg -R hgrepo-a log --graph @ changeset: 0:ff7a2f2d8d70 + bookmark: master tag: alpha tag: default/master tag: tip @@ -35,8 +36,9 @@ $ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating' importing git objects into hg 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo-b log --graph | egrep -v ': *(beta|master)' + $ hg -R hgrepo-b log --graph @ changeset: 1:7fe02317c63d + | bookmark: beta | tag: default/beta | tag: tip | user: test <test@example.org> @@ -44,6 +46,7 @@ | summary: add beta | o changeset: 0:ff7a2f2d8d70 + bookmark: master tag: alpha tag: default/master user: test <test@example.org> @@ -72,8 +75,9 @@ pulling from $TESTTMP/gitrepo importing git objects into hg (run 'hg update' to get a working copy) - $ hg log --graph | egrep -v 'bookmark: *(alpha|beta|master)' + $ hg log --graph o changeset: 2:cc1e605d90db + | bookmark: beta | tag: default/beta | tag: tip | user: test <test@example.org> @@ -86,6 +90,7 @@ | summary: add beta | @ changeset: 0:ff7a2f2d8d70 + bookmark: master tag: alpha tag: default/master user: test <test@example.org>
--- a/tests/test-push.t +++ b/tests/test-push.t @@ -76,13 +76,14 @@ which should not implicitly also push the not-master ref. $ hg book not-master -r default/not-master --force master and default/master should be diferent - $ hg log -r master | grep -v ': *master' + $ hg log -r master changeset: 2:953796e1cfd8 + bookmark: master user: test date: Mon Jan 01 00:00:12 2007 +0000 summary: add gamma - $ hg log -r default/master | grep -v 'master@default' + $ hg log -r default/master changeset: 3:25eed24f5e8f tag: default/master tag: tip