mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
132f37fa14
Summary: It turns out the hggit tests weren't passing in Python 3, despite us having removed them from our py3-broken list. Woops. This fixes them and enables the tests. Reviewed By: sfilipco Differential Revision: D25095189 fbshipit-source-id: acffca34b0d5defa7575ede60621ca2ce0a2afe4
222 lines
6.8 KiB
Perl
222 lines
6.8 KiB
Perl
$ disable treemanifest
|
|
This test demonstrates how Hg works with remote Hg bookmarks compared with
|
|
remote branches via Hg-Git. Ideally, they would behave identically. In
|
|
practice, some differences are unavoidable, but we should try to minimize
|
|
them.
|
|
|
|
This test should not bother testing the behavior of bookmark creation,
|
|
deletion, activation, deactivation, etc. These behaviors, while important to
|
|
the end user, don't vary at all when Hg-Git is in use. Only the synchonization
|
|
of bookmarks should be considered "under test", and mutation of bookmarks
|
|
locally is only to provide a test fixture.
|
|
|
|
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ gitcount=10
|
|
$ gitcommit()
|
|
> {
|
|
> GIT_AUTHOR_DATE="2007-01-01 00:00:$gitcount +0000"
|
|
> GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
|
> git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
|
|
> gitcount=`expr $gitcount + 1`
|
|
> }
|
|
$ hgcount=10
|
|
$ hgcommit()
|
|
> {
|
|
> HGDATE="2007-01-01 00:00:$hgcount +0000"
|
|
> hg commit -u "test <test@example.org>" -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg commit error"
|
|
> hgcount=`expr $hgcount + 1`
|
|
> }
|
|
$ gitstate()
|
|
> {
|
|
> git log --format=" %h \"%s\" refs:%d" $@ | sed 's/HEAD, //'
|
|
> }
|
|
$ hgstate()
|
|
> {
|
|
> hg log --template " {node|short} \"{desc}\" bookmarks: [{bookmarks}]\n" $@
|
|
> }
|
|
$ hggitstate()
|
|
> {
|
|
> hg log --template " {node|short} {gitnode|short} \"{desc}\" bookmarks: [{bookmarks}]\n" $@
|
|
> }
|
|
|
|
Initialize remote hg and git repos with equivalent initial contents
|
|
$ hg init hgremoterepo
|
|
$ cd hgremoterepo
|
|
$ hg bookmark master
|
|
$ for f in alpha beta gamma delta; do
|
|
> echo $f > $f; hg add $f; hgcommit -m "add $f"
|
|
> done
|
|
$ hg bookmark -r 1 b1
|
|
$ hgstate
|
|
fc2664cac217 "add delta" bookmarks: [master]
|
|
d85ced7ae9d6 "add gamma" bookmarks: []
|
|
7bcd915dc873 "add beta" bookmarks: [b1]
|
|
3442585be8a6 "add alpha" bookmarks: []
|
|
$ cd ..
|
|
$ git init -q gitremoterepo
|
|
$ cd gitremoterepo
|
|
$ for f in alpha beta gamma delta; do
|
|
> echo $f > $f; git add $f; gitcommit -m "add $f"
|
|
> done
|
|
$ git branch b1 9497a4e
|
|
$ gitstate
|
|
55b133e "add delta" refs: (*master) (glob)
|
|
d338971 "add gamma" refs:
|
|
9497a4e "add beta" refs: (b1)
|
|
7eeab2e "add alpha" refs:
|
|
$ cd ..
|
|
|
|
Cloning transfers all bookmarks from remote to local
|
|
$ hg clone -q hgremoterepo purehglocalrepo
|
|
$ cd purehglocalrepo
|
|
$ hgstate
|
|
fc2664cac217 "add delta" bookmarks: [master]
|
|
d85ced7ae9d6 "add gamma" bookmarks: []
|
|
7bcd915dc873 "add beta" bookmarks: [b1]
|
|
3442585be8a6 "add alpha" bookmarks: []
|
|
$ cd ..
|
|
$ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True
|
|
$ cd hggitlocalrepo
|
|
$ hggitstate
|
|
3783f3cdb535 55b133e1d558 "add delta" bookmarks: [master]
|
|
1221213928d3 d338971a96e2 "add gamma" bookmarks: []
|
|
3bb02b6794dd 9497a4ee62e1 "add beta" bookmarks: [b1]
|
|
69982ec78c6d 7eeab2ea75ec "add alpha" bookmarks: []
|
|
|
|
TODO: Write remotenames instead of local bookmarks to fix phase handling.
|
|
$ hg phase -r master
|
|
3783f3cdb535321db1dbf622958d68d051c73218: draft
|
|
$ cd ..
|
|
|
|
No changes
|
|
$ cd purehglocalrepo
|
|
$ hg incoming -B
|
|
comparing with $TESTTMP/hgremoterepo
|
|
searching for changed bookmarks
|
|
no changed bookmarks found
|
|
[1]
|
|
$ hg outgoing
|
|
comparing with $TESTTMP/hgremoterepo
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
$ hg outgoing -B
|
|
comparing with $TESTTMP/hgremoterepo
|
|
searching for changed bookmarks
|
|
no changed bookmarks found
|
|
[1]
|
|
$ hg push
|
|
pushing to $TESTTMP/hgremoterepo
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
$ cd ..
|
|
$ cd hggitlocalrepo
|
|
$ hg incoming -B
|
|
comparing with $TESTTMP/gitremoterepo
|
|
searching for changed bookmarks
|
|
no changed bookmarks found
|
|
[1]
|
|
$ hg outgoing
|
|
comparing with $TESTTMP/gitremoterepo
|
|
no changes found
|
|
[1]
|
|
$ hg outgoing -B
|
|
comparing with $TESTTMP/gitremoterepo
|
|
searching for changed bookmarks
|
|
no changed bookmarks found
|
|
[1]
|
|
$ hg push
|
|
pushing to $TESTTMP/gitremoterepo
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
$ cd ..
|
|
|
|
Bookmarks on existing revs:
|
|
- change b1 on local repo
|
|
- introduce b2 on local repo
|
|
- introduce b3 on remote repo
|
|
Bookmarks on new revs
|
|
- introduce b4 on a new rev on the remote
|
|
$ cd hgremoterepo
|
|
$ hg bookmark -r master b3
|
|
$ hg bookmark -r master b4
|
|
$ hg update -q b4
|
|
$ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon'
|
|
$ hgstate
|
|
d979bb8e0fbb "add epsilon" bookmarks: [b4]
|
|
fc2664cac217 "add delta" bookmarks: [b3 master]
|
|
d85ced7ae9d6 "add gamma" bookmarks: []
|
|
7bcd915dc873 "add beta" bookmarks: [b1]
|
|
3442585be8a6 "add alpha" bookmarks: []
|
|
$ cd ..
|
|
$ cd purehglocalrepo
|
|
$ hg bookmark -fr 2 b1
|
|
$ hg bookmark -r 0 b2
|
|
$ hgstate
|
|
fc2664cac217 "add delta" bookmarks: [master]
|
|
d85ced7ae9d6 "add gamma" bookmarks: [b1]
|
|
7bcd915dc873 "add beta" bookmarks: []
|
|
3442585be8a6 "add alpha" bookmarks: [b2]
|
|
$ hg incoming -B
|
|
comparing with $TESTTMP/hgremoterepo
|
|
searching for changed bookmarks
|
|
b3 fc2664cac217
|
|
b4 d979bb8e0fbb
|
|
$ hg outgoing
|
|
comparing with $TESTTMP/hgremoterepo
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks
|
|
It only shows "new" bookmarks. Thus, b1 doesn't show up.
|
|
This changed in 3.4 to start showing changed and deleted bookmarks again.
|
|
$ hg outgoing -B | egrep -v -w 'b1|b3|b4'
|
|
comparing with $TESTTMP/hgremoterepo
|
|
searching for changed bookmarks
|
|
b2 3442585be8a6
|
|
$ cd ..
|
|
|
|
$ cd gitremoterepo
|
|
$ git branch b3 master
|
|
$ git checkout -b b4 master
|
|
Switched to a new branch 'b4'
|
|
$ echo epsilon > epsilon
|
|
$ git add epsilon
|
|
$ gitcommit -m 'add epsilon'
|
|
$ gitstate
|
|
fcfd2c0 "add epsilon" refs: (*b4) (glob)
|
|
55b133e "add delta" refs: (master, b3)
|
|
d338971 "add gamma" refs:
|
|
9497a4e "add beta" refs: (b1)
|
|
7eeab2e "add alpha" refs:
|
|
$ cd ..
|
|
$ cd hggitlocalrepo
|
|
$ hg bookmark -fr 2 b1
|
|
$ hg bookmark -r 0 b2
|
|
$ hgstate
|
|
3783f3cdb535 "add delta" bookmarks: [master]
|
|
1221213928d3 "add gamma" bookmarks: [b1]
|
|
3bb02b6794dd "add beta" bookmarks: []
|
|
69982ec78c6d "add alpha" bookmarks: [b2]
|
|
$ hg incoming -B
|
|
comparing with $TESTTMP/gitremoterepo
|
|
searching for changed bookmarks
|
|
b3 3783f3cdb535
|
|
b4 fcfd2c0262db
|
|
$ hg outgoing
|
|
comparing with $TESTTMP/gitremoterepo
|
|
no changes found
|
|
[1]
|
|
As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks
|
|
It only shows "new" bookmarks. Thus, b1 doesn't show up.
|
|
This changed in 3.4 to start showing changed and deleted bookmarks again.
|
|
$ hg outgoing -B | egrep -v -w 'b1|b3|b4'
|
|
comparing with $TESTTMP/gitremoterepo
|
|
searching for changed bookmarks
|
|
b2 69982ec78c6d
|
|
$ cd ..
|