tests: disable infinitepush tests for simple store

Infinitepush relies heavily on bundles and bundlerepo. As such,
it won't be easy to make compatible with alternate storage
backends at this time.

Let's disable the tests when running with our simple store.

Differential Revision: https://phab.mercurial-scm.org/D3062

tests/test-infinitepush-bundlestore.t

@@ -1,363 +1,364
+#require no-reposimplestore
 
 Create an ondisk bundlestore in .hg/scratchbranches
   $ . "$TESTDIR/library-infinitepush.sh"
   $ cp $HGRCPATH $TESTTMP/defaulthgrc
   $ setupcommon
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    hg ci -m "$1"
   > }
   $ hg init repo
   $ cd repo
 
 Check that we can send a scratch on the server and it does not show there in
 the history but is stored on disk
   $ setupserver
   $ cd ..
   $ hg clone ssh://user@dummy/repo client -q
   $ cd client
   $ mkcommit initialcommit
   $ hg push -r .
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ mkcommit scratchcommit
   $ hg push -r . -B scratch/mybranch
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 1 commit:
   remote:     20759b6926ce  scratchcommit
   $ hg log -G
   @  changeset:   1:20759b6926ce
   |  bookmark:    scratch/mybranch
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     scratchcommit
   |
   o  changeset:   0:67145f466344
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initialcommit
   
   $ hg log -G -R ../repo
   o  changeset:   0:67145f466344
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initialcommit
   
   $ find ../repo/.hg/scratchbranches | sort
   ../repo/.hg/scratchbranches
   ../repo/.hg/scratchbranches/filebundlestore
   ../repo/.hg/scratchbranches/filebundlestore/b9
   ../repo/.hg/scratchbranches/filebundlestore/b9/e1
   ../repo/.hg/scratchbranches/filebundlestore/b9/e1/b9e1ee5f93fb6d7c42496fc176c09839639dd9cc
   ../repo/.hg/scratchbranches/index
   ../repo/.hg/scratchbranches/index/bookmarkmap
   ../repo/.hg/scratchbranches/index/bookmarkmap/scratch
   ../repo/.hg/scratchbranches/index/bookmarkmap/scratch/mybranch
   ../repo/.hg/scratchbranches/index/nodemap
   ../repo/.hg/scratchbranches/index/nodemap/20759b6926ce827d5a8c73eb1fa9726d6f7defb2
 
 From another client we can get the scratchbranch if we ask for it explicitely
 
   $ cd ..
   $ hg clone ssh://user@dummy/repo client2 -q
   $ cd client2
   $ hg pull -B scratch/mybranch --traceback
   pulling from ssh://user@dummy/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 20759b6926ce
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  changeset:   1:20759b6926ce
   |  bookmark:    scratch/mybranch
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     scratchcommit
   |
   @  changeset:   0:67145f466344
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initialcommit
   
   $ cd ..
 
 Push to non-scratch bookmark
 
   $ cd client
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit newcommit
   created new head
   $ hg push -r .
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  newcommit public
   |
   | o  scratchcommit draft scratch/mybranch
   |/
   o  initialcommit public
   
 
 Push to scratch branch
   $ cd ../client2
   $ hg up -q scratch/mybranch
   $ mkcommit 'new scratch commit'
   $ hg push -r . -B scratch/mybranch
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 2 commits:
   remote:     20759b6926ce  scratchcommit
   remote:     1de1d7d92f89  new scratch commit
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  new scratch commit draft scratch/mybranch
   |
   o  scratchcommit draft
   |
   o  initialcommit public
   
   $ scratchnodes
   1de1d7d92f8965260391d0513fe8a8d5973d3042 bed63daed3beba97fff2e819a148cf415c217a85
   20759b6926ce827d5a8c73eb1fa9726d6f7defb2 bed63daed3beba97fff2e819a148cf415c217a85
 
   $ scratchbookmarks
   scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
 
 Push scratch bookmark with no new revs
   $ hg push -r . -B scratch/anotherbranch
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 2 commits:
   remote:     20759b6926ce  scratchcommit
   remote:     1de1d7d92f89  new scratch commit
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  new scratch commit draft scratch/anotherbranch scratch/mybranch
   |
   o  scratchcommit draft
   |
   o  initialcommit public
   
   $ scratchbookmarks
   scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
   scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
 
 Pull scratch and non-scratch bookmark at the same time
 
   $ hg -R ../repo book newbook
   $ cd ../client
   $ hg pull -B newbook -B scratch/mybranch --traceback
   pulling from ssh://user@dummy/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 2 files
   adding remote bookmark newbook
   new changesets 1de1d7d92f89
   (run 'hg update' to get a working copy)
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   o  new scratch commit draft scratch/mybranch
   |
   | @  newcommit public
   | |
   o |  scratchcommit draft
   |/
   o  initialcommit public
   
 
 Push scratch revision without bookmark with --bundle-store
 
   $ hg up -q tip
   $ mkcommit scratchcommitnobook
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  scratchcommitnobook draft
   |
   o  new scratch commit draft scratch/mybranch
   |
   | o  newcommit public
   | |
   o |  scratchcommit draft
   |/
   o  initialcommit public
   
   $ hg push -r . --bundle-store
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 3 commits:
   remote:     20759b6926ce  scratchcommit
   remote:     1de1d7d92f89  new scratch commit
   remote:     2b5d271c7e0d  scratchcommitnobook
   $ hg -R ../repo log -G -T '{desc} {phase}'
   o  newcommit public
   |
   o  initialcommit public
   
 
   $ scratchnodes
   1de1d7d92f8965260391d0513fe8a8d5973d3042 66fa08ff107451320512817bed42b7f467a1bec3
   20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3
   2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3
 
 Test with pushrebase
   $ mkcommit scratchcommitwithpushrebase
   $ hg push -r . -B scratch/mybranch
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 4 commits:
   remote:     20759b6926ce  scratchcommit
   remote:     1de1d7d92f89  new scratch commit
   remote:     2b5d271c7e0d  scratchcommitnobook
   remote:     d8c4f54ab678  scratchcommitwithpushrebase
   $ hg -R ../repo log -G -T '{desc} {phase}'
   o  newcommit public
   |
   o  initialcommit public
   
   $ scratchnodes
   1de1d7d92f8965260391d0513fe8a8d5973d3042 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
   20759b6926ce827d5a8c73eb1fa9726d6f7defb2 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
   2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
   d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
 
 Change the order of pushrebase and infinitepush
   $ mkcommit scratchcommitwithpushrebase2
   $ hg push -r . -B scratch/mybranch
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 5 commits:
   remote:     20759b6926ce  scratchcommit
   remote:     1de1d7d92f89  new scratch commit
   remote:     2b5d271c7e0d  scratchcommitnobook
   remote:     d8c4f54ab678  scratchcommitwithpushrebase
   remote:     6c10d49fe927  scratchcommitwithpushrebase2
   $ hg -R ../repo log -G -T '{desc} {phase}'
   o  newcommit public
   |
   o  initialcommit public
   
   $ scratchnodes
   1de1d7d92f8965260391d0513fe8a8d5973d3042 cd0586065eaf8b483698518f5fc32531e36fd8e0
   20759b6926ce827d5a8c73eb1fa9726d6f7defb2 cd0586065eaf8b483698518f5fc32531e36fd8e0
   2b5d271c7e0d25d811359a314d413ebcc75c9524 cd0586065eaf8b483698518f5fc32531e36fd8e0
   6c10d49fe92751666c40263f96721b918170d3da cd0586065eaf8b483698518f5fc32531e36fd8e0
   d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 cd0586065eaf8b483698518f5fc32531e36fd8e0
 
 Non-fastforward scratch bookmark push
 
   $ hg log -GT "{rev}:{node} {desc}\n"
   @  6:6c10d49fe92751666c40263f96721b918170d3da scratchcommitwithpushrebase2
   |
   o  5:d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 scratchcommitwithpushrebase
   |
   o  4:2b5d271c7e0d25d811359a314d413ebcc75c9524 scratchcommitnobook
   |
   o  3:1de1d7d92f8965260391d0513fe8a8d5973d3042 new scratch commit
   |
   | o  2:91894e11e8255bf41aa5434b7b98e8b2aa2786eb newcommit
   | |
   o |  1:20759b6926ce827d5a8c73eb1fa9726d6f7defb2 scratchcommit
   |/
   o  0:67145f4663446a9580364f70034fea6e21293b6f initialcommit
   
   $ hg up 6c10d49fe927
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 > amend
   $ hg add amend
   $ hg ci --amend -m 'scratch amended commit'
   saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-c99ffec5-amend.hg (glob)
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  scratch amended commit draft scratch/mybranch
   |
   o  scratchcommitwithpushrebase draft
   |
   o  scratchcommitnobook draft
   |
   o  new scratch commit draft
   |
   | o  newcommit public
   | |
   o |  scratchcommit draft
   |/
   o  initialcommit public
   
 
   $ scratchbookmarks
   scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
   scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da
   $ hg push -r . -B scratch/mybranch
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 5 commits:
   remote:     20759b6926ce  scratchcommit
   remote:     1de1d7d92f89  new scratch commit
   remote:     2b5d271c7e0d  scratchcommitnobook
   remote:     d8c4f54ab678  scratchcommitwithpushrebase
   remote:     8872775dd97a  scratch amended commit
   $ scratchbookmarks
   scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
   scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  scratch amended commit draft scratch/mybranch
   |
   o  scratchcommitwithpushrebase draft
   |
   o  scratchcommitnobook draft
   |
   o  new scratch commit draft
   |
   | o  newcommit public
   | |
   o |  scratchcommit draft
   |/
   o  initialcommit public
   
 Check that push path is not ignored. Add new path to the hgrc
   $ cat >> .hg/hgrc << EOF
   > [paths]
   > peer=ssh://user@dummy/client2
   > EOF
 
 Checkout last non-scrath commit
   $ hg up 91894e11e8255
   1 files updated, 0 files merged, 6 files removed, 0 files unresolved
   $ mkcommit peercommit
 Use --force because this push creates new head
   $ hg push peer -r . -f
   pushing to ssh://user@dummy/client2
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files (+1 heads)
   $ hg -R ../repo log -G -T '{desc} {phase} {bookmarks}'
   o  newcommit public
   |
   o  initialcommit public
   
   $ hg -R ../client2 log -G -T '{desc} {phase} {bookmarks}'
   o  peercommit public
   |
   o  newcommit public
   |
   | @  new scratch commit draft scratch/anotherbranch scratch/mybranch
   | |
   | o  scratchcommit draft
   |/
   o  initialcommit public
   

tests/test-infinitepush-ci.t

@@ -1,382 +1,384
+#require no-reposimplestore
+
 Testing the case when there is no infinitepush extension present on the client
 side and the server routes each push to bundlestore. This case is very much
 similar to CI use case.
 
 Setup
 -----
 
   $ . "$TESTDIR/library-infinitepush.sh"
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n{phase}"
   > EOF
   $ cp $HGRCPATH $TESTTMP/defaulthgrc
   $ hg init repo
   $ cd repo
   $ setupserver
   $ echo "pushtobundlestore = True" >> .hg/hgrc
   $ echo "[extensions]" >> .hg/hgrc
   $ echo "infinitepush=" >> .hg/hgrc
   $ echo initialcommit > initialcommit
   $ hg ci -Aqm "initialcommit"
   $ hg phase --public .
 
   $ cd ..
   $ hg clone repo client -q
   $ hg clone repo client2 -q
   $ cd client
 
 Pushing a new commit from the client to the server
 -----------------------------------------------------
 
   $ echo foobar > a
   $ hg ci -Aqm "added a"
   $ hg glog
   @  1:6cb0989601f1 added a
   |  draft
   o  0:67145f466344 initialcommit
      public
 
   $ hg push
   pushing to $TESTTMP/repo
   searching for changes
   storing changesets on the bundlestore
   pushing 1 commit:
       6cb0989601f1  added a
 
   $ scratchnodes
   6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
 
 Understanding how data is stored on the bundlestore in server
 -------------------------------------------------------------
 
 There are two things, filebundlestore and index
   $ ls ../repo/.hg/scratchbranches
   filebundlestore
   index
 
 filebundlestore stores the bundles
   $ ls ../repo/.hg/scratchbranches/filebundlestore/a4/c2/
   a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
 
 index/nodemap stores a map of node id and file in which bundle is stored in filebundlestore
   $ ls ../repo/.hg/scratchbranches/index/
   nodemap
   $ ls ../repo/.hg/scratchbranches/index/nodemap/
   6cb0989601f1fb5805238edfb16f3606713d9a0b
 
   $ cd ../repo
 
 Checking that the commit was not applied to revlog on the server
 ------------------------------------------------------------------
 
   $ hg glog
   @  0:67145f466344 initialcommit
      public
 
 Applying the changeset from the bundlestore
 --------------------------------------------
 
   $ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 6cb0989601f1
   (run 'hg update' to get a working copy)
 
   $ hg glog
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public
 
 Pushing more changesets from the local repo
 --------------------------------------------
 
   $ cd ../client
   $ echo b > b
   $ hg ci -Aqm "added b"
   $ echo c > c
   $ hg ci -Aqm "added c"
   $ hg glog
   @  3:bf8a6e3011b3 added c
   |  draft
   o  2:eaba929e866c added b
   |  draft
   o  1:6cb0989601f1 added a
   |  public
   o  0:67145f466344 initialcommit
      public
 
   $ hg push
   pushing to $TESTTMP/repo
   searching for changes
   storing changesets on the bundlestore
   pushing 2 commits:
       eaba929e866c  added b
       bf8a6e3011b3  added c
 
 Checking that changesets are not applied on the server
 ------------------------------------------------------
 
   $ hg glog -R ../repo
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public
 
 Both of the new changesets are stored in a single bundle-file
   $ scratchnodes
   6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   bf8a6e3011b345146bbbedbcb1ebd4837571492a ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f
   eaba929e866c59bc9a6aada5a9dd2f6990db83c0 ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f
 
 Pushing more changesets to the server
 -------------------------------------
 
   $ echo d > d
   $ hg ci -Aqm "added d"
   $ echo e > e
   $ hg ci -Aqm "added e"
 
 XXX: we should have pushed only the parts which are not in bundlestore
   $ hg push
   pushing to $TESTTMP/repo
   searching for changes
   storing changesets on the bundlestore
   pushing 4 commits:
       eaba929e866c  added b
       bf8a6e3011b3  added c
       1bb96358eda2  added d
       b4e4bce66051  added e
 
 Sneak peek into the bundlestore at the server
   $ scratchnodes
   1bb96358eda285b536c6d1c66846a7cdb2336cea 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
   6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   b4e4bce660512ad3e71189e14588a70ac8e31fef 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
   bf8a6e3011b345146bbbedbcb1ebd4837571492a 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
   eaba929e866c59bc9a6aada5a9dd2f6990db83c0 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
 
 Checking if `hg pull` pulls something or `hg incoming` shows something
 -----------------------------------------------------------------------
 
   $ hg incoming
   comparing with $TESTTMP/repo
   searching for changes
   no changes found
   [1]
 
   $ hg pull
   pulling from $TESTTMP/repo
   searching for changes
   no changes found
 
 Pulling from second client to test `hg pull -r <rev>`
 ------------------------------------------------------
 
 Pulling the revision which is applied
 
   $ cd ../client2
   $ hg pull -r 6cb0989601f1
   pulling from $TESTTMP/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 6cb0989601f1
   (run 'hg update' to get a working copy)
   $ hg glog
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public
 
 Pulling the revision which is in bundlestore
 XXX: we should support pulling revisions from bundlestore without client side
 wrapping
 
   $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef
   pulling from $TESTTMP/repo
   abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef'!
   [255]
   $ hg glog
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public
 
   $ cd ../client
 
 Checking storage of phase information with the bundle on bundlestore
 ---------------------------------------------------------------------
 
 creating a draft commit
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
   > EOF
   $ echo f > f
   $ hg ci -Aqm "added f"
   $ hg glog -r '.^::'
   @  6:9b42578d4447 added f
   |  draft
   o  5:b4e4bce66051 added e
   |  public
   ~
 
   $ hg push
   pushing to $TESTTMP/repo
   searching for changes
   storing changesets on the bundlestore
   pushing 5 commits:
       eaba929e866c  added b
       bf8a6e3011b3  added c
       1bb96358eda2  added d
       b4e4bce66051  added e
       9b42578d4447  added f
 
 XXX: the phase of 9b42578d4447 should not be changed here
   $ hg glog -r .
   @  6:9b42578d4447 added f
   |  public
   ~
 
 applying the bundle on the server to check preservation of phase-information
 
   $ cd ../repo
   $ scratchnodes
   1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927
 
   $ hg unbundle .hg/scratchbranches/filebundlestore/0a/6e/0a6e70ecd5b98d22382f69b93909f557ac6a9927
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files
   new changesets eaba929e866c:9b42578d4447
   (run 'hg update' to get a working copy)
 
   $ hg glog
   o  6:9b42578d4447 added f
   |  draft
   o  5:b4e4bce66051 added e
   |  public
   o  4:1bb96358eda2 added d
   |  public
   o  3:bf8a6e3011b3 added c
   |  public
   o  2:eaba929e866c added b
   |  public
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public
 
 Checking storage of obsmarkers in the bundlestore
 --------------------------------------------------
 
 enabling obsmarkers and rebase extension
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution = all
   > [extensions]
   > rebase =
   > EOF
 
   $ cd ../client
 
   $ hg phase -r . --draft --force
   $ hg rebase -r 6 -d 3
   rebasing 6:9b42578d4447 "added f" (tip)
 
   $ hg glog
   @  7:99949238d9ac added f
   |  draft
   | o  5:b4e4bce66051 added e
   | |  public
   | o  4:1bb96358eda2 added d
   |/   public
   o  3:bf8a6e3011b3 added c
   |  public
   o  2:eaba929e866c added b
   |  public
   o  1:6cb0989601f1 added a
   |  public
   o  0:67145f466344 initialcommit
      public
 
   $ hg push -f
   pushing to $TESTTMP/repo
   searching for changes
   storing changesets on the bundlestore
   pushing 1 commit:
       99949238d9ac  added f
 
 XXX: the phase should not have changed here
   $ hg glog -r .
   @  7:99949238d9ac added f
   |  public
   ~
 
 Unbundling on server to see obsmarkers being applied
 
   $ cd ../repo
 
   $ scratchnodes
   1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   99949238d9ac7f2424a33a46dface6f866afd059 090a24fe63f31d3b4bee714447f835c8c362ff57
   9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927
   eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927
 
   $ hg glog
   o  6:9b42578d4447 added f
   |  draft
   o  5:b4e4bce66051 added e
   |  public
   o  4:1bb96358eda2 added d
   |  public
   o  3:bf8a6e3011b3 added c
   |  public
   o  2:eaba929e866c added b
   |  public
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public
 
   $ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   1 new obsolescence markers
   obsoleted 1 changesets
   new changesets 99949238d9ac
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog
   o  7:99949238d9ac added f
   |  draft
   | o  5:b4e4bce66051 added e
   | |  public
   | o  4:1bb96358eda2 added d
   |/   public
   o  3:bf8a6e3011b3 added c
   |  public
   o  2:eaba929e866c added b
   |  public
   o  1:6cb0989601f1 added a
   |  public
   @  0:67145f466344 initialcommit
      public

tests/test-infinitepush.t

@@ -1,167 +1,169
+#require no-reposimplestore
+
 Testing infinipush extension and the confi options provided by it
 
 Setup
 
   $ . "$TESTDIR/library-infinitepush.sh"
   $ cp $HGRCPATH $TESTTMP/defaulthgrc
   $ setupcommon
   $ hg init repo
   $ cd repo
   $ setupserver
   $ echo initialcommit > initialcommit
   $ hg ci -Aqm "initialcommit"
   $ hg phase --public .
 
   $ cd ..
   $ hg clone ssh://user@dummy/repo client -q
 
 Create two heads. Push first head alone, then two heads together. Make sure that
 multihead push works.
   $ cd client
   $ echo multihead1 > multihead1
   $ hg add multihead1
   $ hg ci -m "multihead1"
   $ hg up null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo multihead2 > multihead2
   $ hg ci -Am "multihead2"
   adding multihead2
   created new head
   $ hg push -r . --bundle-store
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 1 commit:
   remote:     ee4802bf6864  multihead2
   $ hg push -r '1:2' --bundle-store
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 2 commits:
   remote:     bc22f9a30a82  multihead1
   remote:     ee4802bf6864  multihead2
   $ scratchnodes
   bc22f9a30a821118244deacbd732e394ed0b686c ab1bc557aa090a9e4145512c734b6e8a828393a5
   ee4802bf6864326a6b3dcfff5a03abc2a0a69b8f ab1bc557aa090a9e4145512c734b6e8a828393a5
 
 Create two new scratch bookmarks
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo scratchfirstpart > scratchfirstpart
   $ hg ci -Am "scratchfirstpart"
   adding scratchfirstpart
   created new head
   $ hg push -r . -B scratch/firstpart
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 1 commit:
   remote:     176993b87e39  scratchfirstpart
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo scratchsecondpart > scratchsecondpart
   $ hg ci -Am "scratchsecondpart"
   adding scratchsecondpart
   created new head
   $ hg push -r . -B scratch/secondpart
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 1 commit:
   remote:     8db3891c220e  scratchsecondpart
 
 Pull two bookmarks from the second client
   $ cd ..
   $ hg clone ssh://user@dummy/repo client2 -q
   $ cd client2
   $ hg pull -B scratch/firstpart -B scratch/secondpart
   pulling from ssh://user@dummy/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets * (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg log -r scratch/secondpart -T '{node}'
   8db3891c220e216f6da214e8254bd4371f55efca (no-eol)
   $ hg log -r scratch/firstpart -T '{node}'
   176993b87e39bd88d66a2cccadabe33f0b346339 (no-eol)
 Make two commits to the scratch branch
 
   $ echo testpullbycommithash1 > testpullbycommithash1
   $ hg ci -Am "testpullbycommithash1"
   adding testpullbycommithash1
   created new head
   $ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1
   $ echo testpullbycommithash2 > testpullbycommithash2
   $ hg ci -Aqm "testpullbycommithash2"
   $ hg push -r . -B scratch/mybranch -q
 
 Create third client and pull by commit hash.
 Make sure testpullbycommithash2 has not fetched
   $ cd ..
   $ hg clone ssh://user@dummy/repo client3 -q
   $ cd client3
   $ hg pull -r `cat ../testpullbycommithash1`
   pulling from ssh://user@dummy/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 33910bfe6ffe
   (run 'hg update' to get a working copy)
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   o  testpullbycommithash1 draft
   |
   @  initialcommit public
   
 Make public commit in the repo and pull it.
 Make sure phase on the client is public.
   $ cd ../repo
   $ echo publiccommit > publiccommit
   $ hg ci -Aqm "publiccommit"
   $ hg phase --public .
   $ cd ../client3
   $ hg pull
   pulling from ssh://user@dummy/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets a79b6597f322
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg log -G -T '{desc} {phase} {bookmarks} {node|short}'
   o  publiccommit public  a79b6597f322
   |
   | o  testpullbycommithash1 draft  33910bfe6ffe
   |/
   @  initialcommit public  67145f466344
   
   $ hg up a79b6597f322
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo scratchontopofpublic > scratchontopofpublic
   $ hg ci -Aqm "scratchontopofpublic"
   $ hg push -r . -B scratch/scratchontopofpublic
   pushing to ssh://user@dummy/repo
   searching for changes
   remote: pushing 1 commit:
   remote:     c70aee6da07d  scratchontopofpublic
   $ cd ../client2
   $ hg pull -B scratch/scratchontopofpublic
   pulling from ssh://user@dummy/repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets a79b6597f322:c70aee6da07d
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ hg log -r scratch/scratchontopofpublic -T '{phase}'
   draft (no-eol)