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

811 lines
27 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
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: add `hg backup` command Summary: Backups all new non-extinct [1] commits to bundlestore. When it is called for the first time `hg backup` will backup all draft visible commits. Next backups will save only new commits since the last backup (it is recorded in `.hg/store/infinitepushbackuptip`[2]). It's an initial implementation. Later the following features will be added: 1) It will be called automatically whenever user creates or strips commits or even creates or deletes bookmarks 2) It will also save all local bookmarks and all local heads (probably only visible). Note: calling `pushcmd` directly does not set default values for opts. That means that `--to` will be None and `_scratchbranchmatcher` will throw exception. Let's add a check to ensure that `--to` is never None. [1] I also want to backup extinct commits (i.e. obsolete invisible commits). But it will require bigger changes in discovery algorithm, so I'd leave it for later. [2] The name is a bit verbose. But I want to keep `infinitepush` part to make it easier to debug problems. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4147651 Tasks: 12479677 Signature: t1:4147651:1479229440:3eb38880c14f18e9a2fb4eaba44bedf079bca506
2016-11-16 13:13:17 +03:00
$ . "$TESTDIR/library.sh"
$ . "$TESTDIR/library-infinitepush.sh"
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 $HGRCPATH $TESTTMP/defaulthgrc
infinitepush: add `hg backup` command Summary: Backups all new non-extinct [1] commits to bundlestore. When it is called for the first time `hg backup` will backup all draft visible commits. Next backups will save only new commits since the last backup (it is recorded in `.hg/store/infinitepushbackuptip`[2]). It's an initial implementation. Later the following features will be added: 1) It will be called automatically whenever user creates or strips commits or even creates or deletes bookmarks 2) It will also save all local bookmarks and all local heads (probably only visible). Note: calling `pushcmd` directly does not set default values for opts. That means that `--to` will be None and `_scratchbranchmatcher` will throw exception. Let's add a check to ensure that `--to` is never None. [1] I also want to backup extinct commits (i.e. obsolete invisible commits). But it will require bigger changes in discovery algorithm, so I'd leave it for later. [2] The name is a bit verbose. But I want to keep `infinitepush` part to make it easier to debug problems. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4147651 Tasks: 12479677 Signature: t1:4147651:1479229440:3eb38880c14f18e9a2fb4eaba44bedf079bca506
2016-11-16 13:13:17 +03:00
$ setupcommon
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
infinitepush: add `hg backup` command Summary: Backups all new non-extinct [1] commits to bundlestore. When it is called for the first time `hg backup` will backup all draft visible commits. Next backups will save only new commits since the last backup (it is recorded in `.hg/store/infinitepushbackuptip`[2]). It's an initial implementation. Later the following features will be added: 1) It will be called automatically whenever user creates or strips commits or even creates or deletes bookmarks 2) It will also save all local bookmarks and all local heads (probably only visible). Note: calling `pushcmd` directly does not set default values for opts. That means that `--to` will be None and `_scratchbranchmatcher` will throw exception. Let's add a check to ensure that `--to` is never None. [1] I also want to backup extinct commits (i.e. obsolete invisible commits). But it will require bigger changes in discovery algorithm, so I'd leave it for later. [2] The name is a bit verbose. But I want to keep `infinitepush` part to make it easier to debug problems. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4147651 Tasks: 12479677 Signature: t1:4147651:1479229440:3eb38880c14f18e9a2fb4eaba44bedf079bca506
2016-11-16 13:13:17 +03:00
$ setupserver
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
$ 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
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +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
|
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
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
../repo/.hg/scratchbranches/filebundlestore/b9
../repo/.hg/scratchbranches/filebundlestore/b9/e1
../repo/.hg/scratchbranches/filebundlestore/b9/e1/b9e1ee5f93fb6d7c42496fc176c09839639dd9cc
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
../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
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ hg log -G -T '{desc} {phase} {bookmarks}'
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
@ newcommit public
|
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
| o scratchcommit draft 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
|/
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: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ hg log -G -T '{desc} {phase} {bookmarks}'
@ new scratch commit draft scratch/mybranch
|
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
$ scratchnodes
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
1de1d7d92f8965260391d0513fe8a8d5973d3042 bed63daed3beba97fff2e819a148cf415c217a85
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 bed63daed3beba97fff2e819a148cf415c217a85
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
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ hg log -G -T '{desc} {phase} {bookmarks}'
@ new scratch commit draft scratch/anotherbranch scratch/mybranch
|
o scratchcommit draft
|
o initialcommit public
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/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)
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ hg log -G -T '{desc} {phase} {bookmarks}'
o new scratch commit draft scratch/mybranch
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
|
| @ 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
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
Push scratch revision without bookmark with --bundle-store
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
$ hg up -q tip
$ mkcommit scratchcommitnobook
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ hg log -G -T '{desc} {phase} {bookmarks}'
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
@ scratchcommitnobook draft
|
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
o new scratch commit draft scratch/mybranch
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
|
| 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
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
1de1d7d92f8965260391d0513fe8a8d5973d3042 66fa08ff107451320512817bed42b7f467a1bec3
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3
2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3
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]
codemod: remove extpath in tests Summary: Previously, the following pattern is common in our tests: ``` $ extpath=`dirname $TESTDIR` $ cp $extpath/hgext3rd/name.py $TESTTMP # use $TESTTMP substitution in message $ cat >> $HGRCPATH<<EOF > [extensions] > name=$TESTTMP/name.py > EOF ``` Now, it gets simplified to: ``` $ cat >> $HGRCPATH<<EOF > [extensions] > name=$TESTDIR/../hgext3rd/name.py > EOF ``` This removes unnecessary `dirname` and `cp`. Also fixed a regex that does not match `bytes`: ``` - transferred 268 bytes in [\d.]+ seconds \([\d.]+ KB/sec\) (re) + transferred 268 bytes in 0.3 seconds (939 bytes/sec) ``` Test Plan: arc unit Reviewers: #mercurial, phillco Reviewed By: phillco Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5270897 Signature: t1:5270897:1497663052:bf860a0b480c751b1e4b53cebf6526193f0f6652
2017-06-17 04:31:25 +03:00
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> infinitepush=$TESTDIR/../infinitepush
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
> [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
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
1de1d7d92f8965260391d0513fe8a8d5973d3042 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397
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
Change the order of pushrebase and infinitepush
$ cp $TESTTMP/defaulthgrc $HGRCPATH
$ cat >> $HGRCPATH << EOF
> [extensions]
codemod: remove extpath in tests Summary: Previously, the following pattern is common in our tests: ``` $ extpath=`dirname $TESTDIR` $ cp $extpath/hgext3rd/name.py $TESTTMP # use $TESTTMP substitution in message $ cat >> $HGRCPATH<<EOF > [extensions] > name=$TESTTMP/name.py > EOF ``` Now, it gets simplified to: ``` $ cat >> $HGRCPATH<<EOF > [extensions] > name=$TESTDIR/../hgext3rd/name.py > EOF ``` This removes unnecessary `dirname` and `cp`. Also fixed a regex that does not match `bytes`: ``` - transferred 268 bytes in [\d.]+ seconds \([\d.]+ KB/sec\) (re) + transferred 268 bytes in 0.3 seconds (939 bytes/sec) ``` Test Plan: arc unit Reviewers: #mercurial, phillco Reviewed By: phillco Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5270897 Signature: t1:5270897:1497663052:bf860a0b480c751b1e4b53cebf6526193f0f6652
2017-06-17 04:31:25 +03:00
> infinitepush=$TESTDIR/../infinitepush
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
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
> [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
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
1de1d7d92f8965260391d0513fe8a8d5973d3042 cd0586065eaf8b483698518f5fc32531e36fd8e0
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 cd0586065eaf8b483698518f5fc32531e36fd8e0
2b5d271c7e0d25d811359a314d413ebcc75c9524 cd0586065eaf8b483698518f5fc32531e36fd8e0
6c10d49fe92751666c40263f96721b918170d3da cd0586065eaf8b483698518f5fc32531e36fd8e0
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 cd0586065eaf8b483698518f5fc32531e36fd8e0
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
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
infinitepush: create separate remotenames test Summary: Fix infinitepush tests for Mac. Let's split test in two. Now if remotenames extension is unavailable most of the tests will still run. Test Plan: Run `python run-tests.py test-infinitepush-*` Reviewers: simonfar, durham, rmcelroy, mitrandir, quark Reviewed By: quark Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4029394 Tasks: 12479677 Signature: t1:4029394:1476706777:95473f493e10d3f7f21f4679976b33d75d8821f2
2016-10-17 15:36:26 +03:00
$ hg up 6c10d49fe927
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
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'
tests: change the name of backup files Summary: Looks like the upstream has changed it on us. Reviewers: quark Reviewed By: quark Subscribers: quark Differential Revision: https://phab.mercurial-scm.org/D40
2017-07-11 19:44:53 +03:00
saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-a7adb791-amend.hg (glob)
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ hg log -G -T '{desc} {phase} {bookmarks}'
@ scratch amended commit draft scratch/mybranch
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
|
o scratchcommitwithpushrebase draft
|
o scratchcommitnobook draft
|
o new scratch commit draft
|
| o newcommit public
| |
o | scratchcommit draft
|/
o initialcommit public
$ scratchbookmarks
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
infinitepush: create separate remotenames test Summary: Fix infinitepush tests for Mac. Let's split test in two. Now if remotenames extension is unavailable most of the tests will still run. Test Plan: Run `python run-tests.py test-infinitepush-*` Reviewers: simonfar, durham, rmcelroy, mitrandir, quark Reviewed By: quark Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4029394 Tasks: 12479677 Signature: t1:4029394:1476706777:95473f493e10d3f7f21f4679976b33d75d8821f2
2016-10-17 15:36:26 +03:00
scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da
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
$ 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: fix tests Summary: 1196262099b5ff1f8529afc8055b1bc2c7e41658 upstream change cause test to fail Fix it Test Plan: arc unit Reviewers: #sourcecontrol, mitrandir Reviewed By: mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4581218 Signature: t1:4581218:1487366936:330f5982edcd03e7e8f4b4a514ea3b285713795b
2017-02-18 00:30:24 +03:00
remote: (use --non-forward-move 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
abort: push failed on remote
[255]
infinitepush: use --non-forward-move option instead of --force Summary: --force option is scary, let's use --non-forward-move instead. Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4362055 Tasks: 12479677 Signature: t1:4362055:1482426570:b57748835f5ec3b6916b9d29d67b7c3d9582a6e2
2016-12-22 20:20:49 +03:00
$ hg push -r . --to scratch/mybranch --non-forward-move
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
pushing to ssh://user@dummy/repo
searching for changes
infinitepush: create separate remotenames test Summary: Fix infinitepush tests for Mac. Let's split test in two. Now if remotenames extension is unavailable most of the tests will still run. Test Plan: Run `python run-tests.py test-infinitepush-*` Reviewers: simonfar, durham, rmcelroy, mitrandir, quark Reviewed By: quark Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4029394 Tasks: 12479677 Signature: t1:4029394:1476706777:95473f493e10d3f7f21f4679976b33d75d8821f2
2016-10-17 15:36:26 +03:00
remote: pushing 5 commits:
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
remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit
remote: 2b5d271c7e0d scratchcommitnobook
remote: d8c4f54ab678 scratchcommitwithpushrebase
infinitepush: create separate remotenames test Summary: Fix infinitepush tests for Mac. Let's split test in two. Now if remotenames extension is unavailable most of the tests will still run. Test Plan: Run `python run-tests.py test-infinitepush-*` Reviewers: simonfar, durham, rmcelroy, mitrandir, quark Reviewed By: quark Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4029394 Tasks: 12479677 Signature: t1:4029394:1476706777:95473f493e10d3f7f21f4679976b33d75d8821f2
2016-10-17 15:36:26 +03:00
remote: 8872775dd97a scratch amended commit
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
$ scratchbookmarks
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
infinitepush: create separate remotenames test Summary: Fix infinitepush tests for Mac. Let's split test in two. Now if remotenames extension is unavailable most of the tests will still run. Test Plan: Run `python run-tests.py test-infinitepush-*` Reviewers: simonfar, durham, rmcelroy, mitrandir, quark Reviewed By: quark Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4029394 Tasks: 12479677 Signature: t1:4029394:1476706777:95473f493e10d3f7f21f4679976b33d75d8821f2
2016-10-17 15:36:26 +03:00
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
infinitepush: set scratch bookmark locally during push Summary: Previously `--to` bookmark was not set locally. This diff fixes it by setting this bookmark to the head after push happened. This is correct because it's guaranteed that we'll push only one head. Test Plan: Run `test-infinitepush-bundlestore.t` Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4001168 Tasks: 12479677
2016-10-13 10:11:56 +03:00
$ 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
infinitepush fix: pass dest to the orig Test Plan: Run `test-infinitepush-*` Reviewers: durham, mitrandir, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4081739 Tasks: 12479677 Signature: t1:4081739:1477498757:7e105e400fd99e0a6dcb80165a2ed9d9c6d1a548
2016-10-26 19:29:23 +03:00
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
infinitepush: bookmarks remote-list Summary: Add an option to list remote and scratch bookmarks by pattern. Only very simple pattern is allowed: either the literal string or a prefix (like 'scratch/stash/*'). It was made intentionally to make sure that pattern requests are fast in mysql. Mysql tests will be added to the integration tests Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, andrasbelo, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074409 Tasks: 12479677 Signature: t1:4074409:1477500968:e91cd2505d61a2f1db30c7f00cdcfc949e433507
2016-10-26 20:03:35 +03:00
$ hg book --list-remote scratch/*
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
infinitepush: simplify --list-remote option Summary: Previously --list-remote wasn't user friendly. User have to always specify a pattern, and specifying * just won't work because of bash globbing. Also it wasn't possible to specify many patterns at once. This diff allows specifying many patterns, it allows to not specify patterns at all and also it allows to specify default scratch patterns to fetch if no patterns were specified. This is useful if there are many auto-generated bookmarks under the same scratch bookmark pattern. Test Plan: arc unit Reviewers: #mercurial, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4605548 Signature: t1:4605548:1487934838:066a12c28dda16fa8f90674d736d21345631ef7e
2017-02-24 16:41:53 +03:00
$ hg book --list-remote
newbook 0000000000000000000000000000000000000000
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
$ hg book --config infinitepush.defaultremotepatterns=scratch/another* --list-remote
newbook 0000000000000000000000000000000000000000
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
infinitepush: bookmarks remote-list Summary: Add an option to list remote and scratch bookmarks by pattern. Only very simple pattern is allowed: either the literal string or a prefix (like 'scratch/stash/*'). It was made intentionally to make sure that pattern requests are fast in mysql. Mysql tests will be added to the integration tests Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, andrasbelo, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074409 Tasks: 12479677 Signature: t1:4074409:1477500968:e91cd2505d61a2f1db30c7f00cdcfc949e433507
2016-10-26 20:03:35 +03:00
$ hg book --list-remote scratch/my
$ hg book --list-remote scratch/my*
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
$ hg book --list-remote scratch/my* -T json
[
{
"bookmark": "scratch/mybranch",
"node": "8872775dd97a750e1533dc1fbbca665644b32547"
}
]
$ cd ../repo
$ hg book scratch/serversidebook
$ hg book serversidebook
$ cd ../client
$ hg book --list-remote scratch/* -T json
[
{
"bookmark": "scratch/anotherbranch",
"node": "1de1d7d92f8965260391d0513fe8a8d5973d3042"
},
{
"bookmark": "scratch/mybranch",
"node": "8872775dd97a750e1533dc1fbbca665644b32547"
},
{
"bookmark": "scratch/serversidebook",
"node": "0000000000000000000000000000000000000000"
}
]
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
infinitepush: disable pushes to svn repo Summary: During infinitepush test we noticed that `hg push -r . --to SCRATCHBRANCH` fails with stack trace in www. This is expected because infinitepush doesn't work with svn servers. But it's better to print a nice error message instead of stack trace. Test Plan: Try to push to scratch bookmark from www without specifying path: stash@dev1918 ~/www (344c6bf) $ hg push -r . --to hack/durhamstash abort: infinite push does not work with svn repo (Did you forget to `hg push default`?) [Exit: 255] Got nice error instead of stack trace. Push to scratch bookmark from www with path specified works fine Reviewers: rmcelroy, mitrandir, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4103745 Tasks: 12479677 Signature: t1:4103745:1477950448:14b5ae8484f3e65cb88c83b2628f73f3a670b1a0
2016-11-01 11:50:34 +03:00
Push to svn server should fail
$ hg push svn+ssh://svn.vip.facebook.com/svnroot/tfb/trunk/www -r . --to scratch/serversidebook
abort: infinite push does not work with svn repo
(did you forget to `hg push default`?)
[255]
infinitepush: inhibit pulled revs Summary: Pulling scratch commits that were stripped before results in abort: 00changelog.i@c153241c1ea22cbce8a229dccdf7f46de827d962: filtered node! The reason is that upstream pull does checkout = str(repo.changelog.rev(checkout)) and it fails if revision is filtered. I suggest to inhibit filtered revisions that are present in the local repo. It makes sense because if user tries to pull scratch branch he or she probably expects to see them in the repo even though these revisions were stripped before. Also we can avoid doing any pull if all revisions are present in the repo. I decided not to do this because it complicates code (for example, we need to ensure that bookmarks are updated correctly) and it doesn't give any significant benefits. Test Plan: arc unit Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4103869 Tasks: 12479677
2016-11-01 13:42:26 +03:00
Scratch pull of pruned commits
$ cat >> .hg/hgrc << EOF
> [extensions]
codemod: replace evolve by fbamend Summary: Now that fbamend has most of the features we want. Replace evolve used by tests. Minor changes are made to some extensions to make test pass: - reset: drop commit reviving support (was provided by "hg touch") - smartlog: do not assume who provides "allsuccessors" revset - fbamend: return 1 on "nothing changed" - fbamend: write operation data for split and fold - fbamend: do not print incompatibility notice - fbamend: do not disable itself when rebase is not enabled - inhibit: remove `bookmark -D` option - use `prune -B` instead Test Plan: arc unit Reviewers: #mercurial, stash Reviewed By: stash Subscribers: stash, mjpieters, medson Differential Revision: https://phabricator.intern.facebook.com/D5258813 Signature: t1:5258813:1497604051:0c7334f9a6554cf31aaaaa2a4995b17d4e445847
2017-06-17 01:50:01 +03:00
> fbamend=$TESTDIR/../hgext3rd/fbamend
codemod: use vendored directaccess and inhibit extension in tests Summary: This diff makes the tests use the vendored directaccess and inhibit instead the foreign ones. Test Plan: arc unit Reviewers: #mercurial, sid0 Reviewed By: sid0 Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5142981 Signature: t1:5142981:1496173851:3a8f3a1c689711dbef517c893bf72c90ab144761
2017-05-30 22:56:40 +03:00
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
infinitepush: inhibit pulled revs Summary: Pulling scratch commits that were stripped before results in abort: 00changelog.i@c153241c1ea22cbce8a229dccdf7f46de827d962: filtered node! The reason is that upstream pull does checkout = str(repo.changelog.rev(checkout)) and it fails if revision is filtered. I suggest to inhibit filtered revisions that are present in the local repo. It makes sense because if user tries to pull scratch branch he or she probably expects to see them in the repo even though these revisions were stripped before. Also we can avoid doing any pull if all revisions are present in the repo. I decided not to do this because it complicates code (for example, we need to ensure that bookmarks are updated correctly) and it doesn't give any significant benefits. Test Plan: arc unit Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4103869 Tasks: 12479677
2016-11-01 13:42:26 +03:00
> [experimental]
> evolution=createmarkers
> EOF
$ hg prune -r scratch/mybranch
1 changesets pruned
$ hg log -r 'reverse(::scratch/mybranch)' -T '{desc}\n'
scratchcommitwithpushrebase
scratchcommitnobook
new scratch commit
scratchcommit
initialcommit
$ hg pull -B scratch/mybranch
pulling from ssh://user@dummy/repo
no changes found
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 6 files
infinitepush: inhibit pulled revs Summary: Pulling scratch commits that were stripped before results in abort: 00changelog.i@c153241c1ea22cbce8a229dccdf7f46de827d962: filtered node! The reason is that upstream pull does checkout = str(repo.changelog.rev(checkout)) and it fails if revision is filtered. I suggest to inhibit filtered revisions that are present in the local repo. It makes sense because if user tries to pull scratch branch he or she probably expects to see them in the repo even though these revisions were stripped before. Also we can avoid doing any pull if all revisions are present in the repo. I decided not to do this because it complicates code (for example, we need to ensure that bookmarks are updated correctly) and it doesn't give any significant benefits. Test Plan: arc unit Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4103869 Tasks: 12479677
2016-11-01 13:42:26 +03:00
adding remote bookmark scratch/serversidebook
adding remote bookmark serversidebook
$ hg log -r 'reverse(::scratch/mybranch)' -T '{desc}\n'
scratch amended commit
scratchcommitwithpushrebase
scratchcommitnobook
new scratch commit
scratchcommit
initialcommit
Prune it again and pull it via commit hash
$ hg log -r scratch/mybranch -T '{node}\n'
8872775dd97a750e1533dc1fbbca665644b32547
$ hg prune -r scratch/mybranch
1 changesets pruned
$ hg log -G -T '{node|short} {desc} {bookmarks}'
@ fe8283fe1190 peercommit
|
| o d8c4f54ab678 scratchcommitwithpushrebase scratch/mybranch
| |
| o 2b5d271c7e0d scratchcommitnobook
| |
| o 1de1d7d92f89 new scratch commit
| |
o | 91894e11e825 newcommit
| |
| o 20759b6926ce scratchcommit
|/
o 67145f466344 initialcommit
Have to use full hash because short hashes are not supported yet
$ hg pull -r 8872775dd97a750e1533dc1fbbca665644b32547
pulling from ssh://user@dummy/repo
no changes found
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 6 files
infinitepush: inhibit pulled revs Summary: Pulling scratch commits that were stripped before results in abort: 00changelog.i@c153241c1ea22cbce8a229dccdf7f46de827d962: filtered node! The reason is that upstream pull does checkout = str(repo.changelog.rev(checkout)) and it fails if revision is filtered. I suggest to inhibit filtered revisions that are present in the local repo. It makes sense because if user tries to pull scratch branch he or she probably expects to see them in the repo even though these revisions were stripped before. Also we can avoid doing any pull if all revisions are present in the repo. I decided not to do this because it complicates code (for example, we need to ensure that bookmarks are updated correctly) and it doesn't give any significant benefits. Test Plan: arc unit Reviewers: durham, rmcelroy, mitrandir Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4103869 Tasks: 12479677
2016-11-01 13:42:26 +03:00
$ hg log -G -T '{node|short} {desc} {bookmarks}'
@ fe8283fe1190 peercommit
|
| o 8872775dd97a scratch amended commit
| |
| o d8c4f54ab678 scratchcommitwithpushrebase scratch/mybranch
| |
| o 2b5d271c7e0d scratchcommitnobook
| |
| o 1de1d7d92f89 new scratch commit
| |
o | 91894e11e825 newcommit
| |
| o 20759b6926ce scratchcommit
|/
o 67145f466344 initialcommit
infinitepush: overwrite bundle for old revs Summary: Previously if bundle has contained nodes that are already saved in bundlestore then we wouldn't update bundleid value for these nodes. That means that we can never delete a bundle because there will always be a node that points to it. I suggest to always update bundleid value for all nodes in the bundle. Test Plan: Run `test-infinitepush-*` Reviewers: durham, mitrandir, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4130662 Tasks: 12479677 Signature: t1:4130662:1478565392:682fe39c5832d5edc84c84541f0ba6c1f2e1daf8
2016-11-08 13:27:25 +03:00
Push new scratch head. Make sure that new bundle is created but 8872775dd97a
still in the old bundle
$ hg up scratch/mybranch
4 files updated, 0 files merged, 2 files removed, 0 files unresolved
(activating bookmark scratch/mybranch)
$ mkcommit newscratchhead
created new head
$ hg push -r . --to scratch/newscratchhead --create
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: 8611afacb870 newscratchhead
$ scratchnodes
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
1de1d7d92f8965260391d0513fe8a8d5973d3042 d1b4f12087a79b2b1d342e222686a829d09d399b
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 d1b4f12087a79b2b1d342e222686a829d09d399b
2b5d271c7e0d25d811359a314d413ebcc75c9524 d1b4f12087a79b2b1d342e222686a829d09d399b
6c10d49fe92751666c40263f96721b918170d3da cd0586065eaf8b483698518f5fc32531e36fd8e0
8611afacb87078300a6d6b2f0c4b49fa506a8db9 d1b4f12087a79b2b1d342e222686a829d09d399b
8872775dd97a750e1533dc1fbbca665644b32547 ac7f12436d58e685616ffc1f619bcecce8829e25
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 d1b4f12087a79b2b1d342e222686a829d09d399b
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
Recreate the repo
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
$ cd ..
$ rm -rf repo
$ hg init repo
$ cd repo
$ setupserver
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
$ mkcommit initialcommit
$ hg phase --public .
Recreate the clients
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
$ cd ..
$ rm -rf client
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
$ rm -rf client2
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
$ 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.
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
$ cd client
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
$ mkcommit multihead1
$ hg up null
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
$ mkcommit 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
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
$ hg push -r '1:2' --bundle-store
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 2 commits:
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
remote: bc22f9a30a82 multihead1
infinitepush: support bundle with many heads Summary: During `hg backup` bundle with many heads may be pushed. Let's support it too. Many heads bundle is not allowed only when we are pushing it with `--to` because in this case we don't know the node for the bookmark. Test Plan: Run `test-infinitepush-*` Reviewers: rmcelroy, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4175280 Tasks: 12479677 Signature: t1:4175280:1479231056:fb0c47a7752319d77a6cfc83a29c57e9e2dced16
2016-11-21 11:48:09 +03:00
remote: ee4802bf6864 multihead2
$ scratchnodes
infinitepush: send cg v2 Test Plan: Run `test-infinitepush-*` Reviewers: durham, rmcelroy, mitrandir, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4299163 Tasks: 12479677 Signature: t1:4299163:1481212693:21120d98330b9a4fa0aced0523cc389eaa54551b
2016-12-15 21:02:59 +03:00
bc22f9a30a821118244deacbd732e394ed0b686c ab1bc557aa090a9e4145512c734b6e8a828393a5
ee4802bf6864326a6b3dcfff5a03abc2a0a69b8f ab1bc557aa090a9e4145512c734b6e8a828393a5
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
Create two new scratch bookmarks
$ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit scratchfirstpart
created new head
$ hg push -r . --to scratch/firstpart --create
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
$ mkcommit scratchsecondpart
created new head
$ hg push -r . --to scratch/secondpart --create
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)
(run 'hg heads' to see heads, 'hg merge' to merge)
infinitepush: do one listkeyspatterns request for all scratch bookmarks Summary: listkeyspatterns support batching. Let's use and avoid making many network calls to the hg server. I had to modify tests because scratchbookmarks are passed to the listkeyspatterns, and scratchbookmarks is dict and the order of the keys is unpredictable. Because of it bundles from the server will be sent in unpredictable order, and log output may be different. Test Plan: arc unit Reviewers: #mercurial, simonfar Reviewed By: simonfar Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4590914 Signature: t1:4590914:1487788586:dd5ba0dd41b0cd19f790755d7b3c1fc5ba4ade61
2017-02-23 15:25:02 +03:00
$ hg log -r scratch/secondpart -T '{node}'
8db3891c220e216f6da214e8254bd4371f55efca (no-eol)
$ hg log -r scratch/firstpart -T '{node}'
176993b87e39bd88d66a2cccadabe33f0b346339 (no-eol)
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
Make two commits to the scratch branch
$ mkcommit testpullbycommithash1
created new head
$ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1
$ mkcommit testpullbycommithash2
$ hg push -r . --to scratch/mybranch --create -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
infinitepush: wrap findcommonincoming if nodes are requested Summary: Previously we don't set findcommonincoming to True, and that bug was unnoticed because we send this info anyway in server-side `getbundlechunks()` function. But next diff in the stack uses a fast path server-side which won't work if fincommonincoming is not set to True. Test Plan: arc unit Reviewers: #mercurial, durham Reviewed By: durham Subscribers: durham, mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4770830 Tasks: 15389402 Signature: t1:4770830:1490719209:c251002d992e244580b7dbfeca0c30dff95734d2
2017-03-29 13:10:12 +03:00
(run 'hg update' to get a working copy)
infinitepush: support pull from many scratch bookmarks Summary: We could've avoided creating this diff if bundlerepo supported many bundles. Unfortunately it doesn't. Adding support requires changes in upstream mercurial and it can take a lot of time. This implementation wraps `listkeys` to set phases properly and `exchange._changegrouppart` to send more than one bundle at a time. It has unsolved problem with phases. For example in this situation # Publishing server creates commit A (it is marked as draft on the server). # Client pulls commit A from publishing server (in this case commit A is marked on the client but it's still draft on the server). # Another client make pull from scratch bookmark. Commit A will be draft on client because we delete publishing = True from listkeys. We assume that this case is quite rare. Test Plan: Run `test-infinitepush-*` Reviewers: mitrandir, rmcelroy, quark, durham Reviewed By: durham Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4074889 Tasks: 12479677 Signature: t1:4074889:1480446669:97e7f1d8ad23d457d7984a4cde0efb2b6e89eb2e
2016-12-06 18:41:04 +03:00
$ 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
$ mkcommit 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)
(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
$ mkcommit scratchontopofpublic
$ hg push -r . --to scratch/scratchontopofpublic --create
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
(run 'hg heads .' to see heads, 'hg merge' to merge)
infinitepush: do one listkeyspatterns request for all scratch bookmarks Summary: listkeyspatterns support batching. Let's use and avoid making many network calls to the hg server. I had to modify tests because scratchbookmarks are passed to the listkeyspatterns, and scratchbookmarks is dict and the order of the keys is unpredictable. Because of it bundles from the server will be sent in unpredictable order, and log output may be different. Test Plan: arc unit Reviewers: #mercurial, simonfar Reviewed By: simonfar Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4590914 Signature: t1:4590914:1487788586:dd5ba0dd41b0cd19f790755d7b3c1fc5ba4ade61
2017-02-23 15:25:02 +03:00
$ hg log -r scratch/scratchontopofpublic -T '{phase}'
draft (no-eol)
infinitepush: pull node during update Summary: Let's pull node during update if not found locally. This is a part of selectivepull functionality. See remotenames extensions for details about selectivepull. Test Plan: arc unit Reviewers: #sourcecontrol, durham Reviewed By: durham Subscribers: indragie, mjpieters, sergeyb Differential Revision: https://phabricator.intern.facebook.com/D4536129 Tasks: 12479658 Signature: t1:4536129:1486667537:3d1df30cb5d1db0dd7451756102ccafee20789d5
2017-02-10 11:20:54 +03:00
Strip scratchontopofpublic commit and do hg update
$ hg log -r tip -T '{node}\n'
c70aee6da07d7cdb9897375473690df3a8563339
$ hg strip -q tip
$ hg up c70aee6da07d7cdb9897375473690df3a8563339
'c70aee6da07d7cdb9897375473690df3a8563339' does not exist locally - looking for it remotely...
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
infinitepush: wrap findcommonincoming if nodes are requested Summary: Previously we don't set findcommonincoming to True, and that bug was unnoticed because we send this info anyway in server-side `getbundlechunks()` function. But next diff in the stack uses a fast path server-side which won't work if fincommonincoming is not set to True. Test Plan: arc unit Reviewers: #mercurial, durham Reviewed By: durham Subscribers: durham, mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4770830 Tasks: 15389402 Signature: t1:4770830:1490719209:c251002d992e244580b7dbfeca0c30dff95734d2
2017-03-29 13:10:12 +03:00
(run 'hg update' to get a working copy)
infinitepush: pull node during update Summary: Let's pull node during update if not found locally. This is a part of selectivepull functionality. See remotenames extensions for details about selectivepull. Test Plan: arc unit Reviewers: #sourcecontrol, durham Reviewed By: durham Subscribers: indragie, mjpieters, sergeyb Differential Revision: https://phabricator.intern.facebook.com/D4536129 Tasks: 12479658 Signature: t1:4536129:1486667537:3d1df30cb5d1db0dd7451756102ccafee20789d5
2017-02-10 11:20:54 +03:00
'c70aee6da07d7cdb9897375473690df3a8563339' found remotely
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
Trying to pull from bad path
$ hg strip -q tip
$ hg --config paths.default=badpath up c70aee6da07d7cdb9897375473690df3a8563339
'c70aee6da07d7cdb9897375473690df3a8563339' does not exist locally - looking for it remotely...
pulling from $TESTTMP/client2/badpath (glob)
pull failed: repository $TESTTMP/client2/badpath not found
abort: unknown revision 'c70aee6da07d7cdb9897375473690df3a8563339'!
[255]
infinitepush: pull bookmark during update Summary: Currently infinitepush pulls only unknown nodes. Let's also pull non-existing scratch bookmark during update. Test Plan: arc unit Reviewers: durham, rmcelroy, mjpieters Reviewed By: mjpieters Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4564626 Signature: t1:4564626:1487171677:d25db859ff35805f8ffc7741bc14abbc8d84dac3
2017-02-15 20:33:44 +03:00
Strip commit and pull it using hg update with bookmark name
$ hg strip -q d8fde0ddfc96
$ hg book -d scratch/mybranch
$ hg up scratch/mybranch
'scratch/mybranch' does not exist locally - looking for it remotely...
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
(run 'hg update' to get a working copy)
'scratch/mybranch' found remotely
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark scratch/mybranch)
infinitepush: do one listkeyspatterns request for all scratch bookmarks Summary: listkeyspatterns support batching. Let's use and avoid making many network calls to the hg server. I had to modify tests because scratchbookmarks are passed to the listkeyspatterns, and scratchbookmarks is dict and the order of the keys is unpredictable. Because of it bundles from the server will be sent in unpredictable order, and log output may be different. Test Plan: arc unit Reviewers: #mercurial, simonfar Reviewed By: simonfar Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4590914 Signature: t1:4590914:1487788586:dd5ba0dd41b0cd19f790755d7b3c1fc5ba4ade61
2017-02-23 15:25:02 +03:00
$ hg log -r scratch/mybranch -T '{node}'
d8fde0ddfc962183977f92d2bc52d303b8840f9d (no-eol)
infinitepush: add debugfillinfinitepushmetadata method Summary: Special command that fills optional metadata about infinitepush nodes. For now it's info about changed files + info about how many lines were added/removed. Since information is saved in json format it's easily extensible. It's a separate command so that we will be able to run it asynchronously: during infinitepush push separate `hg debugfillinfinitepushmetadata` process will be started. Push process won't wait for `debugfillinfinitepushmetadata` process. sqlindexapi will be implemented in the next diffs. Test Plan: arc unit Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, mjpieters, medson, azich, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5237547 Tasks: 19103180 Signature: t1:5237547:1497397211:569d1ffe3be37c8d14fb7e07e42cd085ad5686d4
2017-06-15 15:19:37 +03:00
Test debugfillinfinitepushmetadata
$ cd ../repo
$ hg debugfillinfinitepushmetadata
infinitepush: support many nodes in debugfillinfinitepushmetadata Summary: We may want to fill infinitepush metadata for many commits at once. Let's make it possible to pass many nodes to debugfillinfinitepushmetadata Depends on D5255670 Test Plan: arc unit Reviewers: #mercurial, mitrandir, quark Reviewed By: quark Subscribers: mitrandir, mjpieters, medson, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5255883 Tasks: 19103180 Signature: t1:5255883:1497629860:26332e3cc115881bca158664014ce48087d99215
2017-06-19 11:27:31 +03:00
abort: nodes are not specified
infinitepush: add debugfillinfinitepushmetadata method Summary: Special command that fills optional metadata about infinitepush nodes. For now it's info about changed files + info about how many lines were added/removed. Since information is saved in json format it's easily extensible. It's a separate command so that we will be able to run it asynchronously: during infinitepush push separate `hg debugfillinfinitepushmetadata` process will be started. Push process won't wait for `debugfillinfinitepushmetadata` process. sqlindexapi will be implemented in the next diffs. Test Plan: arc unit Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, mjpieters, medson, azich, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5237547 Tasks: 19103180 Signature: t1:5237547:1497397211:569d1ffe3be37c8d14fb7e07e42cd085ad5686d4
2017-06-15 15:19:37 +03:00
[255]
$ hg debugfillinfinitepushmetadata --node randomnode
abort: node randomnode is not found
[255]
$ hg debugfillinfinitepushmetadata --node d8fde0ddfc962183977f92d2bc52d303b8840f9d
$ cat .hg/scratchbranches/index/nodemetadatamap/d8fde0ddfc962183977f92d2bc52d303b8840f9d
infinitepush: record copies and changed status to metadata Summary: I've forgot to add it in the previous diff. We also want to know copies information and status (added, modified, removed). Test Plan: arc unit Reviewers: #mercurial, mitrandir Reviewed By: mitrandir Subscribers: mjpieters, medson, azich, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5255664 Tasks: 19103180 Signature: t1:5255664:1497542963:b552c07d261067f426d7af7a29d2f02c1917394c
2017-06-19 11:27:31 +03:00
{"changed_files": {"testpullbycommithash2": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol)
$ cd ../client
$ hg up d8fde0ddfc962183977f92d2bc52d303b8840f9d
'd8fde0ddfc962183977f92d2bc52d303b8840f9d' does not exist locally - looking for it remotely...
pulling from ssh://user@dummy/repo
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge)
'd8fde0ddfc962183977f92d2bc52d303b8840f9d' found remotely
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo file > file
$ hg add file
$ hg rm testpullbycommithash2
$ hg ci -m 'add and rm files'
$ hg log -r . -T '{node}\n'
3edfe7e9089ab9f728eb8e0d0c62a5d18cf19239
$ hg cp file cpfile
$ hg mv file mvfile
$ hg ci -m 'cpfile and mvfile'
$ hg log -r . -T '{node}\n'
c7ac39f638c6b39bcdacf868fa21b6195670f8ae
$ hg push -r . --bundle-store
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 4 commits:
remote: 33910bfe6ffe testpullbycommithash1
remote: d8fde0ddfc96 testpullbycommithash2
remote: 3edfe7e9089a add and rm files
remote: c7ac39f638c6 cpfile and mvfile
$ cd ../repo
infinitepush: support many nodes in debugfillinfinitepushmetadata Summary: We may want to fill infinitepush metadata for many commits at once. Let's make it possible to pass many nodes to debugfillinfinitepushmetadata Depends on D5255670 Test Plan: arc unit Reviewers: #mercurial, mitrandir, quark Reviewed By: quark Subscribers: mitrandir, mjpieters, medson, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5255883 Tasks: 19103180 Signature: t1:5255883:1497629860:26332e3cc115881bca158664014ce48087d99215
2017-06-19 11:27:31 +03:00
$ hg debugfillinfinitepushmetadata --node 3edfe7e9089ab9f728eb8e0d0c62a5d18cf19239 --node c7ac39f638c6b39bcdacf868fa21b6195670f8ae
infinitepush: record copies and changed status to metadata Summary: I've forgot to add it in the previous diff. We also want to know copies information and status (added, modified, removed). Test Plan: arc unit Reviewers: #mercurial, mitrandir Reviewed By: mitrandir Subscribers: mjpieters, medson, azich, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5255664 Tasks: 19103180 Signature: t1:5255664:1497542963:b552c07d261067f426d7af7a29d2f02c1917394c
2017-06-19 11:27:31 +03:00
$ cat .hg/scratchbranches/index/nodemetadatamap/3edfe7e9089ab9f728eb8e0d0c62a5d18cf19239
{"changed_files": {"file": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}, "testpullbycommithash2": {"adds": 0, "isbinary": false, "removes": 1, "status": "removed"}}} (no-eol)
$ cat .hg/scratchbranches/index/nodemetadatamap/c7ac39f638c6b39bcdacf868fa21b6195670f8ae
{"changed_files": {"cpfile": {"adds": 1, "copies": "file", "isbinary": false, "removes": 0, "status": "added"}, "file": {"adds": 0, "isbinary": false, "removes": 1, "status": "removed"}, "mvfile": {"adds": 1, "copies": "file", "isbinary": false, "removes": 0, "status": "added"}}} (no-eol)
infinitepush: add metadatafilelimit option Summary: Add an option to limit the number of file entries in the metadata field. This is to avoid huge codemods to eat up all the space. Depends on D5255883 Test Plan: arc unit Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, mjpieters, medson, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5264202 Tasks: 19103180 Signature: t1:5264202:1497630109:05d684db34578e309e0bbad314165e66d1f23ce9
2017-06-19 11:27:31 +03:00
Test infinitepush.metadatafilelimit number
$ cd ../client
$ echo file > file
$ hg add file
$ echo file1 > file1
$ hg add file1
$ echo file2 > file2
$ hg add file2
$ hg ci -m 'add many files'
$ hg log -r . -T '{node}'
09904fb20c53ff351bd3b1d47681f569a4dab7e5 (no-eol)
$ hg push -r . --bundle-store
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 5 commits:
remote: 33910bfe6ffe testpullbycommithash1
remote: d8fde0ddfc96 testpullbycommithash2
remote: 3edfe7e9089a add and rm files
remote: c7ac39f638c6 cpfile and mvfile
remote: 09904fb20c53 add many files
$ cd ../repo
$ hg debugfillinfinitepushmetadata --node 09904fb20c53ff351bd3b1d47681f569a4dab7e5 --config infinitepush.metadatafilelimit=2
$ cat .hg/scratchbranches/index/nodemetadatamap/09904fb20c53ff351bd3b1d47681f569a4dab7e5
{"changed_files": {"file": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}, "file1": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}, "changed_files_truncated": true} (no-eol)
infinitepush: run debugfillinfinitepushmetadata in the background Summary: Final part: launching debugfillinfinitepushmetadata in the background. We intentionally don't wait for it's completion in order not to slow down pushes. Test Plan: arc unit Reviewers: #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, mjpieters, medson, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5265325 Tasks: 19103180 Signature: t1:5265325:1497886939:6c306c08b240373ea43a7fc868b17ef776258cf9
2017-06-20 15:40:01 +03:00
Test infinitepush.fillmetadatabranchpattern
$ cd ../repo
$ cat >> .hg/hgrc << EOF
> [infinitepush]
> fillmetadatabranchpattern=re:scratch/fillmetadata/.*
> EOF
$ cd ../client
$ mkcommit tofillmetadata
$ hg log -r . -T '{node}\n'
d2b0410d4da084bc534b1d90df0de9eb21583496
$ hg push -r . --to scratch/fillmetadata/fill --create
pushing to ssh://user@dummy/repo
searching for changes
remote: pushing 6 commits:
remote: 33910bfe6ffe testpullbycommithash1
remote: d8fde0ddfc96 testpullbycommithash2
remote: 3edfe7e9089a add and rm files
remote: c7ac39f638c6 cpfile and mvfile
remote: 09904fb20c53 add many files
remote: d2b0410d4da0 tofillmetadata
Make sure background process finished
$ sleep 3
$ cd ../repo
$ cat .hg/scratchbranches/index/nodemetadatamap/d2b0410d4da084bc534b1d90df0de9eb21583496
{"changed_files": {"tofillmetadata": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol)
Reference in New Issue Copy Permalink