facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity
1b98921c48
sapling/tests/test-infinitepush-bundlestore.t

352 lines
10 KiB
Perl
Raw Normal View History

test-infinitepush: check mysql module before running tests Summary: `mysql` is required for the test. Otherwise it would error out: ``` $ hg init repo + abort: No module named mysql! + [255] $ cd repo ``` Test Plan: Remove mysql python package and run the test, make sure it's skipped. Reviewers: stash, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D3925440
2016-09-26 21:40:29 +03:00
$ . $TESTDIR/require-ext.sh mysql
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
Create an ondisk bundlestore in .hg/scratchbranches
infinitepush: temp remotenames fix Summary: Hack to fix interaction with remotenames. Remotenames push '--to' bookmark to the server but we don't want to push scratch bookmark to the server. Let's delete '--to' and '--create' and also set allow_anon to True (because if --to is not set remotenames will think that we are pushing anonymoush head). Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, mitrandir, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3937202 Tasks: 12479677 Signature: t1:3937202:1475170335:fa4d39e1e17bea67b62b99dfc4cd2ffa4e5d6bea
2016-10-02 15:13:06 +03:00
$ . $TESTDIR/require-ext.sh remotenames
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
$ extpath=`dirname $TESTDIR`
infinitepush: move integration test to the rool level directory Differential Revision: https://phabricator.intern.facebook.com/D3791446
2016-08-31 11:44:59 +03:00
$ cp -r $extpath/infinitepush $TESTTMP # use $TESTTMP substitution in message
infinitepush: fix interaction with pushrebase Summary: infinitepush bundle2 part should be run before pushrebase bundle2 part. This is a bit tricky since both pushrebase and infinitepush change the `extensions._order` and both of them try to load before bundle2 `changeset` part. I suggest to load before 'changeset' or pushrebase part whichever is earlier. Then we have two situations: 1) pushrebase comes first. It sets it's part before 'changeset' part, then infinitepush sets it's part before pushrebase part. 2) infinitepush comes first. It sets part before 'changeset' and pushrebase part, then pushrebase sets it's part before 'changeset' part. Since infinitepush part comes before 'changeset' part it still be before pushrebase part. This solution is not robust but it should be fine for now. The proper solution requires changes upstream that will introduce dependencies between bundle2 parts. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3930697 Tasks: 12479677 Signature: t1:3930697:1475079064:1b5851df4d2067ec21ec01e7510ddf83ff1684ad
2016-10-02 12:54:03 +03:00
$ cp $extpath/hgext3rd/pushrebase.py $TESTTMP # use $TESTTMP substitution in message
$ cp $HGRCPATH $TESTTMP/defaulthgrc
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
$ cat >> $HGRCPATH << EOF
> [extensions]
> infinitepush=$TESTTMP/infinitepush
> [infinitepush]
> branchpattern=re:scratch/.+
> [ui]
> ssh = python "$TESTDIR/dummyssh"
> EOF
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "$1"
> }
infinitepush: add bundle-store option to push Summary: --bundle-store option makes push go to bundle store even if bookmark is not specified or bookmark doesn't match scratch branch pattern. The main reason for the `--bundle-store` is to be able to push not a scratch bookmark, but a scratch commit, for example, `hg push -r . --bundle-store`. It will be useful when we will save all the local commits in the bundlestore. To do this: 1) Wrap `discovery.checkheads()` to allow push to scratch branch even if new head is created. 2) Make scratchbranchpat params advisory because now bookmark may not be specified. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: mitrandir, rmcelroy, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3862665 Tasks: 12479677 Signature: t1:3862665:1475077612:7e02a5bdc1da28161e45029b1e3a38fe8223a305
2016-09-28 23:17:25 +03:00
$ scratchnodes() {
> for node in `find ../repo/.hg/scratchbranches/index/nodemap/* | sort`; do
> echo ${node##*/}
> done
> }
infinitepush: fix push of scratch bookmark on existing commit Summary: It's possible to push new scratch bookmark which points to existing scratch commit. Previously it has failed with a stack trace. Unfortunately it still doesn't allow to push scratch bookmark that points to non-scratch commit. It requires more complex changes so it will be fixed later if necessary. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3936728 Tasks: 12479677 Signature: t1:3936728:1475078059:ac4588e086b0344070a90f806b6f518c6e187c3b
2016-10-02 13:05:50 +03:00
$ scratchbookmarks() {
> for bookmark in `find ../repo/.hg/scratchbranches/index/bookmarkmap/* -type f | sort`; do
infinitepush: output bookmark hash in tests Summary: Simple test improvement: output scratch bookmark name together with scratch bookmark hash Test Plan: Run test-infinitepush-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3994805 Tasks: 12479677 Signature: t1:3994805:1476112139:a02c78dd8a117f99251e71827224bb368532052b
2016-10-10 18:37:04 +03:00
> echo "${bookmark##*/bookmarkmap/} `cat $bookmark`"
infinitepush: fix push of scratch bookmark on existing commit Summary: It's possible to push new scratch bookmark which points to existing scratch commit. Previously it has failed with a stack trace. Unfortunately it still doesn't allow to push scratch bookmark that points to non-scratch commit. It requires more complex changes so it will be fixed later if necessary. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3936728 Tasks: 12479677 Signature: t1:3936728:1475078059:ac4588e086b0344070a90f806b6f518c6e187c3b
2016-10-02 13:05:50 +03:00
> done
> }
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
$ 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
$ cat >> .hg/hgrc << EOF
> [infinitepush]
> server=yes
infinitepush: remove defaults Summary: I think it's better throw if misconfigured then silently proceed Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, mitrandir, quark, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3967202 Tasks: 12479677 Signature: t1:3967202:1475581664:9d7b3e21fce48a49eda35bde473915cb64dfdfa0
2016-10-04 14:52:31 +03:00
> indextype=disk
> storetype=disk
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
> EOF
$ cd ..
$ hg clone ssh://user@dummy/repo client -q
$ cd client
$ mkcommit initialcommit
$ hg push -r . --create
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 . --to scratch/mybranch --create
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 1 commit:
remote: 20759b6926ce scratchcommit
infinitepush: lint fixes Summary: {P56601586} Test Plan: `cd fb-hgext/tests && python ../../hg-crew/tests/run-tests.py test-check-code-hg.t` Reviewers: rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D3777586 Signature: t1:3777586:1472223173:56da05516a766422f16a5b61046cb8bd95bd67a4
2016-08-26 18:01:30 +03:00
$ hg log -G
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
@ changeset: 1:20759b6926ce
| 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/cf
../repo/.hg/scratchbranches/filebundlestore/cf/b7
../repo/.hg/scratchbranches/filebundlestore/cf/b7/cfb730091ebd5e252fca88aab63316b11a8512b0
../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
infinitepush: lint fixes Summary: {P56601586} Test Plan: `cd fb-hgext/tests && python ../../hg-crew/tests/run-tests.py test-check-code-hg.t` Reviewers: rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D3777586 Signature: t1:3777586:1472223173:56da05516a766422f16a5b61046cb8bd95bd67a4
2016-08-26 18:01:30 +03:00
$ cd client2
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
$ 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
(run 'hg update' to get a working copy)
$ hg log -G
o changeset: 1:20759b6926ce
infinitepush: record scratch bookmark changes after the pull Summary: scratchbookmarks are not automatically pulled (because they are not showed in listkeys). Let's record them after the actual pull. It introduces a race condition. But this race condition is unlikely and shouldn't be harmful. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: mjpieters, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3835414 Tasks: 12479677 Signature: t1:3835414:1473703998:554c890be50f732f34b2793160ee1abb26561e39
2016-09-13 12:34:55 +03:00
| bookmark: scratch/mybranch
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
| 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
infinitepush: allow pulling one scratch and many non-scratch boomarks at the same time Summary: There is no point in disallowing it. The next step is to allow to fetch arbitrary many scratch bookmarks with one command. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D3835502 Tasks: 12479677
2016-09-13 12:34:55 +03:00
$ hg push -r .
infinitepush: sample implementation Summary: Copy of hackbranch hackathon project with a few changes. The goal is to allow saving commits under certain bookmarks in the separate store. These bookmarks are called 'scratch' bookmarks and are defined in config file (for example, 're:scratch/.+'). Scratch commits are sent in a separate bundle2 part during push. During pull new bundle repo is created and requests are served using this bundle repo. There are a few changes from hackathon project implementation. # It requires no changes in mercurial core. It was done by wrapping `findcommonincoming()` function and changing `lookup()` wireproto method (see below). # Instead of introducing `listkeypattern()` wireproto method, `lookup()` method and `pull()` command were wrapped. I did it because I thought that it will make code easier. It probably haven't made it easier, it's almost the same. I can change it back to `listkeypattern` if it's necessary. The bad thing about current implementation is that scratch bookmarks are not downloaded. But in the previous implementation also haven't downloaded bookmark if remotenames is enabled. There are a couple of problems: 1) As I mentioned before, scratch bookmarks are not downloaded 2) It's impossible to pull both scratch and non-scratch bookmark Test Plan: python ../../../hg-crew/tests/run-tests.py test-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3750999 Tasks: 12479677 Signature: t1:3750999:1472052396:5d7828566863f0aa437cdc34439ec0759503c6c9
2016-08-26 16:09:01 +03:00
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}'
@ newcommit public
|
| o scratchcommit draft
|/
o initialcommit public
infinitepush: lint fixes Summary: Remove generic exception. Remove trailing whitespace. Remove unused import #accept2ship Test Plan: Run `test-check-code-hg.t` and `test-infinitepush-bundlestore.t` Reviewers: #sourcecontrol, ttung, jeroenv Reviewed By: jeroenv Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3876225 Signature: t1:3876225:1474015261:adff2496c4e36f19e3315856f1a0102eb7e9dc7e
2016-09-16 11:45:33 +03:00
infinitepush: allow pulling one scratch and many non-scratch boomarks at the same time Summary: There is no point in disallowing it. The next step is to allow to fetch arbitrary many scratch bookmarks with one command. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D3835502 Tasks: 12479677
2016-09-13 12:34:55 +03:00
Push to scratch branch
$ cd ../client2
$ hg up -q scratch/mybranch
$ mkcommit 'new scratch commit'
$ hg push -r . --to scratch/mybranch
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 2 commits:
remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit
infinitepush: add bundle-store option to push Summary: --bundle-store option makes push go to bundle store even if bookmark is not specified or bookmark doesn't match scratch branch pattern. The main reason for the `--bundle-store` is to be able to push not a scratch bookmark, but a scratch commit, for example, `hg push -r . --bundle-store`. It will be useful when we will save all the local commits in the bundlestore. To do this: 1) Wrap `discovery.checkheads()` to allow push to scratch branch even if new head is created. 2) Make scratchbranchpat params advisory because now bookmark may not be specified. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: mitrandir, rmcelroy, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3862665 Tasks: 12479677 Signature: t1:3862665:1475077612:7e02a5bdc1da28161e45029b1e3a38fe8223a305
2016-09-28 23:17:25 +03:00
$ scratchnodes
1de1d7d92f8965260391d0513fe8a8d5973d3042
20759b6926ce827d5a8c73eb1fa9726d6f7defb2
infinitepush: allow pulling one scratch and many non-scratch boomarks at the same time Summary: There is no point in disallowing it. The next step is to allow to fetch arbitrary many scratch bookmarks with one command. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D3835502 Tasks: 12479677
2016-09-13 12:34:55 +03:00
infinitepush: fix push of scratch bookmark on existing commit Summary: It's possible to push new scratch bookmark which points to existing scratch commit. Previously it has failed with a stack trace. Unfortunately it still doesn't allow to push scratch bookmark that points to non-scratch commit. It requires more complex changes so it will be fixed later if necessary. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3936728 Tasks: 12479677 Signature: t1:3936728:1475078059:ac4588e086b0344070a90f806b6f518c6e187c3b
2016-10-02 13:05:50 +03:00
$ scratchbookmarks
infinitepush: output bookmark hash in tests Summary: Simple test improvement: output scratch bookmark name together with scratch bookmark hash Test Plan: Run test-infinitepush-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3994805 Tasks: 12479677 Signature: t1:3994805:1476112139:a02c78dd8a117f99251e71827224bb368532052b
2016-10-10 18:37:04 +03:00
scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
infinitepush: fix push of scratch bookmark on existing commit Summary: It's possible to push new scratch bookmark which points to existing scratch commit. Previously it has failed with a stack trace. Unfortunately it still doesn't allow to push scratch bookmark that points to non-scratch commit. It requires more complex changes so it will be fixed later if necessary. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3936728 Tasks: 12479677 Signature: t1:3936728:1475078059:ac4588e086b0344070a90f806b6f518c6e187c3b
2016-10-02 13:05:50 +03:00
Push scratch bookmark with no new revs
$ hg push -r . --to scratch/anotherbranch --create
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 2 commits:
remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit
$ scratchbookmarks
infinitepush: output bookmark hash in tests Summary: Simple test improvement: output scratch bookmark name together with scratch bookmark hash Test Plan: Run test-infinitepush-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3994805 Tasks: 12479677 Signature: t1:3994805:1476112139:a02c78dd8a117f99251e71827224bb368532052b
2016-10-10 18:37:04 +03:00
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
infinitepush: fix push of scratch bookmark on existing commit Summary: It's possible to push new scratch bookmark which points to existing scratch commit. Previously it has failed with a stack trace. Unfortunately it still doesn't allow to push scratch bookmark that points to non-scratch commit. It requires more complex changes so it will be fixed later if necessary. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3936728 Tasks: 12479677 Signature: t1:3936728:1475078059:ac4588e086b0344070a90f806b6f518c6e187c3b
2016-10-02 13:05:50 +03:00
infinitepush: allow pulling one scratch and many non-scratch boomarks at the same time Summary: There is no point in disallowing it. The next step is to allow to fetch arbitrary many scratch bookmarks with one command. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D3835502 Tasks: 12479677
2016-09-13 12:34:55 +03:00
Pull scratch and non-scratch bookmark at the same time
infinitepush: record scratch bookmark changes after the pull Summary: scratchbookmarks are not automatically pulled (because they are not showed in listkeys). Let's record them after the actual pull. It introduces a race condition. But this race condition is unlikely and shouldn't be harmful. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: mjpieters, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3835414 Tasks: 12479677 Signature: t1:3835414:1473703998:554c890be50f732f34b2793160ee1abb26561e39
2016-09-13 12:34:55 +03:00
infinitepush: allow pulling one scratch and many non-scratch boomarks at the same time Summary: There is no point in disallowing it. The next step is to allow to fetch arbitrary many scratch bookmarks with one command. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D3835502 Tasks: 12479677
2016-09-13 12:34:55 +03:00
$ 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
(run 'hg update' to get a working copy)
$ hg log -G -T '{desc} {phase}'
o new scratch commit draft
|
| @ newcommit public
| |
o | scratchcommit draft
|/
o initialcommit public
infinitepush: add bundle-store option to push Summary: --bundle-store option makes push go to bundle store even if bookmark is not specified or bookmark doesn't match scratch branch pattern. The main reason for the `--bundle-store` is to be able to push not a scratch bookmark, but a scratch commit, for example, `hg push -r . --bundle-store`. It will be useful when we will save all the local commits in the bundlestore. To do this: 1) Wrap `discovery.checkheads()` to allow push to scratch branch even if new head is created. 2) Make scratchbranchpat params advisory because now bookmark may not be specified. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: mitrandir, rmcelroy, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3862665 Tasks: 12479677 Signature: t1:3862665:1475077612:7e02a5bdc1da28161e45029b1e3a38fe8223a305
2016-09-28 23:17:25 +03:00
Push scratch revision without bookmark with --force-scratch
$ hg up -q tip
$ mkcommit scratchcommitnobook
$ hg log -G -T '{desc} {phase}'
@ scratchcommitnobook draft
|
o new scratch commit draft
|
| 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
20759b6926ce827d5a8c73eb1fa9726d6f7defb2
2b5d271c7e0d25d811359a314d413ebcc75c9524
infinitepush: fix interaction with pushrebase Summary: infinitepush bundle2 part should be run before pushrebase bundle2 part. This is a bit tricky since both pushrebase and infinitepush change the `extensions._order` and both of them try to load before bundle2 `changeset` part. I suggest to load before 'changeset' or pushrebase part whichever is earlier. Then we have two situations: 1) pushrebase comes first. It sets it's part before 'changeset' part, then infinitepush sets it's part before pushrebase part. 2) infinitepush comes first. It sets part before 'changeset' and pushrebase part, then pushrebase sets it's part before 'changeset' part. Since infinitepush part comes before 'changeset' part it still be before pushrebase part. This solution is not robust but it should be fine for now. The proper solution requires changes upstream that will introduce dependencies between bundle2 parts. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3930697 Tasks: 12479677 Signature: t1:3930697:1475079064:1b5851df4d2067ec21ec01e7510ddf83ff1684ad
2016-10-02 12:54:03 +03:00
Test with pushrebase
$ cp $TESTTMP/defaulthgrc $HGRCPATH
$ cat >> $HGRCPATH << EOF
> [extensions]
> pushrebase=$TESTTMP/pushrebase.py
> infinitepush=$TESTTMP/infinitepush
> [infinitepush]
> branchpattern=re:scratch/.+
> [ui]
> ssh = python "$TESTDIR/dummyssh"
> EOF
$ mkcommit scratchcommitwithpushrebase
$ hg push -r . --to 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
20759b6926ce827d5a8c73eb1fa9726d6f7defb2
2b5d271c7e0d25d811359a314d413ebcc75c9524
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7
Change the order of pushrebase and infinitepush
$ cp $TESTTMP/defaulthgrc $HGRCPATH
$ cat >> $HGRCPATH << EOF
> [extensions]
> infinitepush=$TESTTMP/infinitepush
> pushrebase=$TESTTMP/pushrebase.py
> [infinitepush]
> branchpattern=re:scratch/.+
> [ui]
> ssh = python "$TESTDIR/dummyssh"
> EOF
$ mkcommit scratchcommitwithpushrebase2
$ hg push -r . --to 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
20759b6926ce827d5a8c73eb1fa9726d6f7defb2
2b5d271c7e0d25d811359a314d413ebcc75c9524
6c10d49fe92751666c40263f96721b918170d3da
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7
infinitepush: temp remotenames fix Summary: Hack to fix interaction with remotenames. Remotenames push '--to' bookmark to the server but we don't want to push scratch bookmark to the server. Let's delete '--to' and '--create' and also set allow_anon to True (because if --to is not set remotenames will think that we are pushing anonymoush head). Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, mitrandir, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3937202 Tasks: 12479677 Signature: t1:3937202:1475170335:fa4d39e1e17bea67b62b99dfc4cd2ffa4e5d6bea
2016-10-02 15:13:06 +03:00
$ mkcommit scratchcommitwithremotenames
$ hg push --config extensions.remotenames= -r . --to scratch/mybranch
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 6 commits:
remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit
remote: 2b5d271c7e0d scratchcommitnobook
remote: d8c4f54ab678 scratchcommitwithpushrebase
remote: 6c10d49fe927 scratchcommitwithpushrebase2
remote: 9558d6761412 scratchcommitwithremotenames
infinitepush: add option to force non-fast-forward push Summary: Non-fast-forward pushes were disallowed. But having a mutable shared history for scratch branches is a very nice feature. Let's use --force option to force non-fast forward push. Test Plan: Run test-infinitepush-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3994813 Tasks: 12479677
2016-10-10 13:48:21 +03:00
Non-fastforward scratch bookmark push
$ hg up 9558d6761412
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/9558d6761412-64a1e69b-amend-backup.hg (glob)
$ hg log -G -T '{desc} {phase}'
@ scratch amended commit draft
|
o scratchcommitwithpushrebase2 draft
|
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 9558d6761412a5513b30c67ef930af0d86e70e1d
$ hg push -r . --to scratch/mybranch
pushing to ssh://user@dummy/repo
searching for changes
infinitepush: better error message Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001218 Tasks: 12479677 Signature: t1:4001218:1476227692:c60b3def4e82911a40fe577bc44cf7d24cba9438
2016-10-12 12:57:53 +03:00
remote: non-forward push
infinitepush: add option to force non-fast-forward push Summary: Non-fast-forward pushes were disallowed. But having a mutable shared history for scratch branches is a very nice feature. Let's use --force option to force non-fast forward push. Test Plan: Run test-infinitepush-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3994813 Tasks: 12479677
2016-10-10 13:48:21 +03:00
abort: push failed on remote
infinitepush: better error message Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001218 Tasks: 12479677 Signature: t1:4001218:1476227692:c60b3def4e82911a40fe577bc44cf7d24cba9438
2016-10-12 12:57:53 +03:00
(use --force to override)
infinitepush: add option to force non-fast-forward push Summary: Non-fast-forward pushes were disallowed. But having a mutable shared history for scratch branches is a very nice feature. Let's use --force option to force non-fast forward push. Test Plan: Run test-infinitepush-bundlestore.t Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D3994813 Tasks: 12479677
2016-10-10 13:48:21 +03:00
[255]
$ hg push -r . --to scratch/mybranch --force
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 6 commits:
remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit
remote: 2b5d271c7e0d scratchcommitnobook
remote: d8c4f54ab678 scratchcommitwithpushrebase
remote: 6c10d49fe927 scratchcommitwithpushrebase2
remote: 5da7ed61b032 scratch amended commit
$ scratchbookmarks
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
scratch/mybranch 5da7ed61b032f9701238753f48ffd5873fce5970
Reference in New Issue Copy Permalink