mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
b17df254d7
Summary: Mercurial Infinitepush normally records received bundles into the `forwardfillerqueue`, which is later tailed by the commit cloud `forwardfiller` in order be replayed onto Mononoke. Now I am adding a reverse filler, which means that we will have two such queues and sync in two directions. Therefore, in order to avoid infinite loops we need to distinguish cross-backend bundle replay from genuine pushes. I propose to use `crossbackendsync` bundle2 param to indicate that no recording is needed. Reviewed By: krallin Differential Revision: D21255446 fbshipit-source-id: 70f6efe1331bd3c7fd3aca61d486d350d93086dc
91 lines
2.9 KiB
Perl
91 lines
2.9 KiB
Perl
#require py2
|
|
#chg-compatible
|
|
|
|
#if no-windows no-osx
|
|
$ disable treemanifest
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -d "0 0" -m "$1"
|
|
> }
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
|
|
Configure the server
|
|
$ hg init server
|
|
$ cd server
|
|
$ setupsqlserverhgrc repo123
|
|
$ setupdb
|
|
$ cd ..
|
|
|
|
Without forwardfill, it should not insert into the queue
|
|
$ hg clone -q ssh://user@dummy/server client1
|
|
$ cd client1
|
|
$ setupsqlclienthgrc
|
|
$ mkcommit commit1
|
|
$ hg push -r . --to scratch/book --create
|
|
pushing to ssh://user@dummy/server
|
|
searching for changes
|
|
remote: pushing 1 commit:
|
|
remote: cb9a30b04b9d commit1
|
|
$ cd ..
|
|
|
|
Enable forwardfill on the server
|
|
$ cd server
|
|
$ enableforwardfill
|
|
$ cd ..
|
|
|
|
With forwardfill, it should insert into the queue
|
|
$ hg clone -q ssh://user@dummy/server client2
|
|
$ cd client2
|
|
$ setupsqlclienthgrc
|
|
$ mkcommit commit2
|
|
$ hg push -r . --to scratch/book2 --create
|
|
pushing to ssh://user@dummy/server
|
|
searching for changes
|
|
remote: pushing 1 commit:
|
|
remote: 6fdf683f5af9 commit2
|
|
$ cd ..
|
|
|
|
Proper metadata should have been recorded
|
|
$ querysqlindex "SELECT * FROM nodestobundle;"
|
|
node bundle reponame
|
|
6fdf683f5af9a2be091b81ef475f335e2624fb0d 8347a06785e3bdd572ebeb7df3aac1356acb4ce5 repo123
|
|
cb9a30b04b9df854f40d21fdac525408f3bd6c78 944fe1c133f63c7711aa15db2dd9216084dacc36 repo123
|
|
$ querysqlindex "SELECT id, reponame, bundle FROM forwardfillerqueue;"
|
|
id reponame bundle
|
|
1 repo123 8347a06785e3bdd572ebeb7df3aac1356acb4ce5
|
|
|
|
Check that crossbackendsync bundle param prevents us from recording into forwardfillerqueue
|
|
-- set up param-adding extension to test crossbackendsync
|
|
$ cat >> "$TESTTMP/param_adder.py" <<EOF
|
|
> from __future__ import absolute_import
|
|
> from edenscm.mercurial import exchange, extensions
|
|
> from edenscm.hgext.infinitepush import bundleparts, constants
|
|
>
|
|
> def extsetup(ui):
|
|
> orig = exchange.b2partsgenmapping[constants.scratchbranchparttype]
|
|
> def wrapped(pushop, bundler):
|
|
> bundler.addparam("crossbackendsync", value="True")
|
|
> return orig(pushop, bundler)
|
|
> exchange.b2partsgenmapping[constants.scratchbranchparttype] = wrapped
|
|
> EOF
|
|
|
|
-- try pushing to Mercurial backend with this new extension
|
|
$ cd "$TESTTMP/client2"
|
|
$ mkcommit commit3
|
|
$ hg push -r . --to scratch/book3 --create \
|
|
> --debug --config devel.bundle2.debug=on \
|
|
> --config extensions.param_adder="$TESTTMP/param_adder.py" \
|
|
> 2>&1 | egrep '(commit3|crossbackendsync)'
|
|
bundle2-output: bundle parameter: crossbackendsync=True infinitepush=True
|
|
remote: 8e0c8ddac9fb commit3
|
|
|
|
-- note that this new push has *not* been recorded in the forwardfillerqueue
|
|
because of the crossbackendsync param
|
|
$ querysqlindex "SELECT id, reponame, bundle FROM forwardfillerqueue;"
|
|
id reponame bundle
|
|
1 repo123 8347a06785e3bdd572ebeb7df3aac1356acb4ce5
|
|
|
|
#endif
|