This is an archive of the discontinued Mercurial Phabricator instance.

Differential D364

bundle2hooks: remove the extension from hgext3rd as it is moved to core
ClosedPublic

Authored by pulkit on Aug 12 2017, 4:52 PM.
Tags
None
Subscribers
None

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGXb258b8f341e2: bundle2hooks: remove the extension from hgext3rd as it is moved to core
Summary

The ability to add hookargs to a bundleoperation object has been added to the
core from this extension.

Related commits are:
https://www.mercurial-scm.org/repo/hg-committed/rev/f3407d56a6e8
https://www.mercurial-scm.org/repo/hg-committed/rev/5fc4ddfbe626

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 12 2017, 4:52 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 12 2017, 4:52 PM
ryanmce accepted this revision.Aug 14 2017, 5:13 AM
This revision is now accepted and ready to land.Aug 14 2017, 5:13 AM
Closed by commit rFBHGXb258b8f341e2: bundle2hooks: remove the extension from hgext3rd as it is moved to core (authored by pulkit). · Explain WhyAug 22 2017, 11:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1178

hgext3rd/bundle2hooks.py

  • This file was deleted.
# bundle2hooks.py - fix bundle2's support for hooks prior to lock acquisition.
#
# Copyright 2012 Facebook
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
'''Hooks arguments are typically stored on the transaction object. However, we
may want to add hooks arguments without starting a transaction. This allows us
to queue hook arguments on the bundle2 operation object.
'''
from __future__ import absolute_import
from mercurial import bundle2
from mercurial import error
from mercurial.i18n import _
from hgext3rd.extutil import replaceclass
def reposetup(ui, repo):
@replaceclass(bundle2, 'bundleoperation')
class bundleoperationhooked(bundle2.bundleoperation):
def __init__(self, repo, transactiongetter, *args, **kwargs):
def gettransaction():
transaction = transactiongetter()
if self.hookargs is not None:
# the ones added to the transaction supercede those added
# to the operation.
self.hookargs.update(transaction.hookargs)
transaction.hookargs = self.hookargs
# mark the hookargs as flushed. further attempts to add to
# hookargs will result in an abort.
self.hookargs = None
return transaction
super(bundleoperationhooked, self).__init__(repo, gettransaction,
*args, **kwargs)
self.hookargs = {}
def addhookargs(self, hookargs):
if self.hookargs is None:
raise error.Abort(
_('attempted to add hooks to operation after transaction '
'started'))
self.hookargs.update(hookargs)

tests/test-pull-createmarkers-hide-later.t

> evolution= createmarkers > evolution= createmarkers
> rebaseskipobsolete=True > rebaseskipobsolete=True
> [extensions] > [extensions]
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> strip= > strip=
> rebase= > rebase=
> remotenames = > remotenames =
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py > pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
> [fbamend] > [fbamend]
> safestrip=false > safestrip=false
> [remotenames] > [remotenames]
> allownonfastforward=True > allownonfastforward=True
> EOF > EOF
$ hg init server $ hg init server

tests/test-pull-createmarkers.t

> evolution= createmarkers > evolution= createmarkers
> rebaseskipobsolete=True > rebaseskipobsolete=True
> [extensions] > [extensions]
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> strip= > strip=
> rebase= > rebase=
> remotenames = > remotenames =
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py > pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
> [remotenames] > [remotenames]
> allownonfastforward=True > allownonfastforward=True
> [fbamend] > [fbamend]
> safestrip=false > safestrip=false
> EOF > EOF
$ hg init server $ hg init server

tests/test-pushrebase-fastmanifest.t

Setup Setup
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> ssh = python "$RUNTESTDIR/dummyssh" > ssh = python "$RUNTESTDIR/dummyssh"
> EOF > EOF
Set up server repository Set up server repository
$ hg init server $ hg init server
$ cd server $ cd server
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ echo foo > a $ echo foo > a
$ echo foo > b $ echo foo > b
$ hg commit -Am 'initial' $ hg commit -Am 'initial'
adding a adding a
adding b adding b
$ hg book master $ hg book master
$ cd .. $ cd ..
Set up client repository 1 with pushrebase enabled Set up client repository 1 with pushrebase enabled
$ hg clone -q ssh://user@dummy/server client1 $ hg clone -q ssh://user@dummy/server client1
$ cd client1 $ cd client1
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ cd .. $ cd ..
Set up client repository 2 with pushrebase enabled / fastmanifest enabled Set up client repository 2 with pushrebase enabled / fastmanifest enabled
$ hg clone -q ssh://user@dummy/server client2 $ hg clone -q ssh://user@dummy/server client2
$ cd client2 $ cd client2
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> fastmanifest=$TESTDIR/../fastmanifest > fastmanifest=$TESTDIR/../fastmanifest
> EOF > EOF
$ cd .. $ cd ..
Create the dummy commit on client 1 Create the dummy commit on client 1
$ cd client1 $ cd client1

tests/test-pushrebase-manifests.t

$ log() { $ log() {
> hg log -G -T "{desc} [{phase}:{node|short}] {bookmarks}" "$@" > hg log -G -T "{desc} [{phase}:{node|short}] {bookmarks}" "$@"
> } > }
$ config() { $ config() {
> echo "[experimental]" >> .hg/hgrc > echo "[experimental]" >> .hg/hgrc
> echo "bundle2lazylocking=True" >> .hg/hgrc > echo "bundle2lazylocking=True" >> .hg/hgrc
> echo "[extensions]" >> .hg/hgrc > echo "[extensions]" >> .hg/hgrc
> echo "bundle2hooks =" >> .hg/hgrc
> echo "pushrebase =" >> .hg/hgrc > echo "pushrebase =" >> .hg/hgrc
> } > }
$ clone() { $ clone() {
> hg clone ssh://user@dummy/server $1 -q > hg clone ssh://user@dummy/server $1 -q
> cd $1 > cd $1
> config > config
> } > }

tests/test-pushrebase-protection.t

> EOF > EOF
Setup pushrebase required repo Setup pushrebase required repo
$ hg init server $ hg init server
$ cd server $ cd server
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> [pushrebase] > [pushrebase]
> blocknonpushrebase = True > blocknonpushrebase = True
> EOF > EOF
$ echo a > a && hg commit -Aqm a $ echo a > a && hg commit -Aqm a
$ cd .. $ cd ..
$ hg clone -q server client $ hg clone -q server client
pushing to $TESTTMP/server (glob) pushing to $TESTTMP/server (glob)
searching for changes searching for changes
error: prechangegroup.blocknonpushrebase hook failed: this repository requires that you enable the pushrebase extension and push using 'hg push --to' error: prechangegroup.blocknonpushrebase hook failed: this repository requires that you enable the pushrebase extension and push using 'hg push --to'
abort: this repository requires that you enable the pushrebase extension and push using 'hg push --to' abort: this repository requires that you enable the pushrebase extension and push using 'hg push --to'
[255] [255]
Pushrebase pushes should be allowed Pushrebase pushes should be allowed
$ hg push --config "extensions.bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py" --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master $ hg push --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
pushing to $TESTTMP/server (glob) pushing to $TESTTMP/server (glob)
searching for changes searching for changes
pushing 1 changeset: pushing 1 changeset:
1846eede8b68 b 1846eede8b68 b
exporting bookmark master exporting bookmark master
Bookmark pushes should not be affected by the block Bookmark pushes should not be affected by the block

tests/test-pushrebase-remotenames.t

> EOF > EOF
Set up server repository Set up server repository
$ hg init server $ hg init server
$ cd server $ cd server
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> remotenames = ! > remotenames = !
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ echo foo > a $ echo foo > a
$ echo foo > b $ echo foo > b
$ hg commit -Am 'initial' $ hg commit -Am 'initial'
$ cd server $ cd server
$ hg up -q master $ hg up -q master
$ echo x >> a && hg commit -m "master's commit" $ echo x >> a && hg commit -m "master's commit"
$ cd ../client $ cd ../client
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> remotenames = > remotenames =
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> [remotenames] > [remotenames]
> allownonfastforward=True > allownonfastforward=True
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ echo x >> b && hg commit -m "client's commit" $ echo x >> b && hg commit -m "client's commit"
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' $ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
abort: updating bookmark bm failed! abort: updating bookmark bm failed!
[255] [255]
Test force pushes Test force pushes
$ hg init forcepushserver $ hg init forcepushserver
$ cd forcepushserver $ cd forcepushserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> remotenames = ! > remotenames = !
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ echo a > a && hg commit -Aqm a $ echo a > a && hg commit -Aqm a
$ hg book master $ hg book master
$ cd .. $ cd ..
$ hg clone -q --config 'extensions.remotenames=' ssh://user@dummy/forcepushserver forcepushclient $ hg clone -q --config 'extensions.remotenames=' ssh://user@dummy/forcepushserver forcepushclient
$ cd forcepushserver $ cd forcepushserver
$ echo a >> a && hg commit -Aqm aa $ echo a >> a && hg commit -Aqm aa
$ cd ../forcepushclient $ cd ../forcepushclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> remotenames = > remotenames =
> [remotenames] > [remotenames]
> allownonfastforward=True > allownonfastforward=True
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ hg up master $ hg up master
$ cd .. $ cd ..
Test 'hg push' with a tracking bookmark Test 'hg push' with a tracking bookmark
$ hg init trackingserver $ hg init trackingserver
$ cd trackingserver $ cd trackingserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> remotenames = ! > remotenames = !
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ echo a > a && hg commit -Aqm a $ echo a > a && hg commit -Aqm a
$ hg book master $ hg book master
$ cd .. $ cd ..
$ hg clone --config 'extensions.remotenames=' -q ssh://user@dummy/trackingserver trackingclient $ hg clone --config 'extensions.remotenames=' -q ssh://user@dummy/trackingserver trackingclient
$ cd trackingclient $ cd trackingclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> remotenames = > remotenames =
> [remotenames] > [remotenames]
> allownonfastforward=True > allownonfastforward=True
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ hg book feature -t default/master $ hg book feature -t default/master
$ cd .. $ cd ..
Test push --to to a repo without pushrebase on (i.e. the default remotenames behavior) Test push --to to a repo without pushrebase on (i.e. the default remotenames behavior)
$ hg init oldserver $ hg init oldserver
$ cd oldserver $ cd oldserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> remotenames = > remotenames =
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ echo a > a && hg commit -Aqm a $ echo a > a && hg commit -Aqm a
$ hg book serverfeature $ hg book serverfeature
$ cd .. $ cd ..
$ hg clone --config 'extensions.remotenames=' -q ssh://user@dummy/oldserver newclient $ hg clone --config 'extensions.remotenames=' -q ssh://user@dummy/oldserver newclient
$ cd newclient $ cd newclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> remotenames = > remotenames =
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ hg book clientfeature -t default/serverfeature $ hg book clientfeature -t default/serverfeature
$ echo b > b && hg commit -Aqm b $ echo b > b && hg commit -Aqm b
$ hg push --to serverfeature $ hg push --to serverfeature
Test push --to with remotenames but without pushrebase to a remote repository Test push --to with remotenames but without pushrebase to a remote repository
that requires pushrebase. that requires pushrebase.
$ cd .. $ cd ..
$ hg init pushrebaseserver $ hg init pushrebaseserver
$ cd pushrebaseserver $ cd pushrebaseserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> remotenames = > remotenames =
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> [pushrebase] > [pushrebase]
> blocknonpushrebase = True > blocknonpushrebase = True
> EOF > EOF
$ echo a > a && hg commit -Aqm a $ echo a > a && hg commit -Aqm a
$ hg book serverfeature $ hg book serverfeature
$ cd .. $ cd ..
$ hg clone --config 'extensions.remotenames=' -q ssh://user@dummy/pushrebaseserver remotenamesonlyclient $ hg clone --config 'extensions.remotenames=' -q ssh://user@dummy/pushrebaseserver remotenamesonlyclient
$ cd remotenamesonlyclient $ cd remotenamesonlyclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=! > pushrebase=!
> remotenames = > remotenames =
> [experimental] > [experimental]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ hg book clientfeature -t default/serverfeature $ hg book clientfeature -t default/serverfeature
$ echo b > b && hg commit -Aqm b $ echo b > b && hg commit -Aqm b
$ hg push --to serverfeature $ hg push --to serverfeature

tests/test-pushrebase.t

adding b adding b
Set up client repository Set up client repository
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/server client -q $ hg clone ssh://user@dummy/server client -q
$ cd client $ cd client
$ echo "[extensions]" >> .hg/hgrc $ echo "[extensions]" >> .hg/hgrc
$ echo "bundle2hooks =" >> .hg/hgrc
$ echo "pushrebase =" >> .hg/hgrc $ echo "pushrebase =" >> .hg/hgrc
Without server extension Without server extension
$ cd ../server $ cd ../server
$ echo 'bar' > a $ echo 'bar' > a
$ commit 'a => bar' $ commit 'a => bar'
searching for changes searching for changes
abort: no server support for 'b2x:rebase' abort: no server support for 'b2x:rebase'
[255] [255]
Stack of non-conflicting commits should be accepted Stack of non-conflicting commits should be accepted
$ cd ../server $ cd ../server
$ echo "[extensions]" >> .hg/hgrc $ echo "[extensions]" >> .hg/hgrc
$ echo "bundle2hooks =" >> .hg/hgrc
$ echo "pushrebase =" >> .hg/hgrc $ echo "pushrebase =" >> .hg/hgrc
$ log $ log
@ a => bar [draft:add0c792bfce] @ a => bar [draft:add0c792bfce]
| |
o initial [draft:2bb9d20e471c] o initial [draft:2bb9d20e471c]
$ cd ../client $ cd ../client
> EOF > EOF
$ chmod a+x $TESTTMP/prerebase.sh $ chmod a+x $TESTTMP/prerebase.sh
$ hg init prepushrebaseserver $ hg init prepushrebaseserver
$ cd prepushrebaseserver $ cd prepushrebaseserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [hooks] > [hooks]
> prepushrebase = $TESTTMP/prerebase.sh > prepushrebase = $TESTTMP/prerebase.sh
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> [experimental] > [experimental]
> bundle2lazylocking = True > bundle2lazylocking = True
> EOF > EOF
$ touch a && hg add a && hg commit -qm a $ touch a && hg add a && hg commit -qm a
$ hg book master $ hg book master
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/prepushrebaseserver prepushrebaseclient $ hg clone ssh://user@dummy/prepushrebaseserver prepushrebaseclient
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd prepushrebaseclient $ cd prepushrebaseclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ touch b && hg add b && hg commit -qm b $ touch b && hg add b && hg commit -qm b
$ hg push --to master $ hg push --to master
pushing to ssh://user@dummy/prepushrebaseserver pushing to ssh://user@dummy/prepushrebaseserver
searching for changes searching for changes
remote: changeset: 1:0e067c57feba remote: changeset: 1:0e067c57feba
remote: tag: tip remote: tag: tip
> prechangegroup = python "$RUNTESTDIR/printenv.py" prechangegroup > prechangegroup = python "$RUNTESTDIR/printenv.py" prechangegroup
> preoutgoing = python "$RUNTESTDIR/printenv.py" preoutgoing > preoutgoing = python "$RUNTESTDIR/printenv.py" preoutgoing
> pretxnchangegroup = python "$RUNTESTDIR/printenv.py" pretxnchangegroup > pretxnchangegroup = python "$RUNTESTDIR/printenv.py" pretxnchangegroup
> txnclose = python "$RUNTESTDIR/printenv.py" txnclose > txnclose = python "$RUNTESTDIR/printenv.py" txnclose
> pretxnclose = python "$RUNTESTDIR/printenv.py" pretxnclose > pretxnclose = python "$RUNTESTDIR/printenv.py" pretxnclose
> prepushrebase = python "$RUNTESTDIR/printenv.py" prepushrebase > prepushrebase = python "$RUNTESTDIR/printenv.py" prepushrebase
> prepushkey = python "$RUNTESTDIR/printenv.py" prepushkey > prepushkey = python "$RUNTESTDIR/printenv.py" prepushkey
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ touch file && hg ci -Aqm initial $ touch file && hg ci -Aqm initial
pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob) pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob)
txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob) txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob)
$ hg bookmark master $ hg bookmark master
pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob)
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob)
$ cd ../ $ cd ../
$ hg clone hookserver hookclient $ hg clone hookserver hookclient
preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=clone preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
outgoing hook: HG_HOOKNAME=outgoing HG_HOOKTYPE=outgoing HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone outgoing hook: HG_HOOKNAME=outgoing HG_HOOKTYPE=outgoing HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hookclient $ cd hookclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ hg update master $ hg update master
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark master) (activating bookmark master)
$ echo >> file && hg ci -Aqm first $ echo >> file && hg ci -Aqm first
$ echo >> file && hg ci -Aqm second $ echo >> file && hg ci -Aqm second
$ echo >> file && hg ci -Aqm last $ echo >> file && hg ci -Aqm last
$ cd ../ $ cd ../
Test date rewriting Test date rewriting
$ hg init rewritedate $ hg init rewritedate
$ cd rewritedate $ cd rewritedate
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> [pushrebase] > [pushrebase]
> rewritedates = True > rewritedates = True
> EOF > EOF
$ touch a && hg commit -Aqm a $ touch a && hg commit -Aqm a
$ touch b && hg commit -Aqm b $ touch b && hg commit -Aqm b
$ hg book master $ hg book master
$ cd .. $ cd ..
$ hg clone rewritedate rewritedateclient $ hg clone rewritedate rewritedateclient
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rewritedateclient $ cd rewritedateclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ touch c && hg commit -Aqm c $ touch c && hg commit -Aqm c
$ cat > $TESTTMP/daterewrite.py <<EOF $ cat > $TESTTMP/daterewrite.py <<EOF
> import sys, time > import sys, time
$ cd .. $ cd ..
Test pushrebase on merge commit where master is on the p2 side Test pushrebase on merge commit where master is on the p2 side
$ hg init p2mergeserver $ hg init p2mergeserver
$ cd p2mergeserver $ cd p2mergeserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ echo a >> a && hg commit -Aqm 'add a' $ echo a >> a && hg commit -Aqm 'add a'
$ hg bookmark master $ hg bookmark master
$ cd .. $ cd ..
$ hg clone -q p2mergeserver p2mergeclient $ hg clone -q p2mergeserver p2mergeclient
$ cd p2mergeclient $ cd p2mergeclient
c c
$ cd .. $ cd ..
Test force pushes Test force pushes
$ hg init forcepushserver $ hg init forcepushserver
$ cd forcepushserver $ cd forcepushserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ echo a > a && hg commit -Aqm a $ echo a > a && hg commit -Aqm a
$ cd .. $ cd ..
$ hg clone forcepushserver forcepushclient $ hg clone forcepushserver forcepushclient
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd forcepushserver $ cd forcepushserver
$ echo a >> a && hg commit -Aqm aa $ echo a >> a && hg commit -Aqm aa
$ cd ../forcepushclient $ cd ../forcepushclient
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> a && hg commit -Aqm b $ echo b >> a && hg commit -Aqm b
$ hg book master $ hg book master
$ hg push -f --to master -B master $ hg push -f --to master -B master
pushing to $TESTTMP/forcepushserver (glob) pushing to $TESTTMP/forcepushserver (glob)
and osx) and osx)
$ ls ../server/.hg/hg-bundle-* || true $ ls ../server/.hg/hg-bundle-* || true
ls: *../server/.hg/hg-bundle-*: No such file or directory (glob) ls: *../server/.hg/hg-bundle-*: No such file or directory (glob)
Server with obsstore disabled can still send obsmarkers useful to client, and Server with obsstore disabled can still send obsmarkers useful to client, and
phase is updated correctly with the marker information. phase is updated correctly with the marker information.
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> [experimental] > [experimental]
> evolution = > evolution =
> EOF > EOF
$ cd .. $ cd ..
$ hg init server1 $ hg init server1
$ cd server1 $ cd server1
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF

tests/test-pushvars-remotenames.t

$ . $TESTDIR/require-ext.sh remotenames $ . $TESTDIR/require-ext.sh remotenames
Setup Setup
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ cat > $TESTTMP/pretxnchangegroup.sh << EOF $ cat > $TESTTMP/pretxnchangegroup.sh << EOF
> #!/bin/bash > #!/bin/bash
> env | grep -E "^HG_USERVAR" > env | grep -E "^HG_USERVAR"
> exit 0 > exit 0
> EOF > EOF
$ chmod +x $TESTTMP/pretxnchangegroup.sh $ chmod +x $TESTTMP/pretxnchangegroup.sh
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushvars=$TESTDIR/../hgext3rd/pushvars.py > pushvars=$TESTDIR/../hgext3rd/pushvars.py
> remotenames= > remotenames=
> [hooks] > [hooks]
> pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh > pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
> EOF > EOF
$ hg init server $ hg init server
$ cd server $ cd server

tests/test-pushvars.t

Setup Setup
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ cat > $TESTTMP/pretxnchangegroup.sh << EOF $ cat > $TESTTMP/pretxnchangegroup.sh << EOF
> #!/bin/bash > #!/bin/bash
> env | grep -E "^HG_USERVAR_DEBUG" > env | grep -E "^HG_USERVAR_DEBUG"
> env | grep -E "^HG_USERVAR_BYPASS_REVIEW" > env | grep -E "^HG_USERVAR_BYPASS_REVIEW"
> exit 0 > exit 0
> EOF > EOF
$ chmod +x $TESTTMP/pretxnchangegroup.sh $ chmod +x $TESTTMP/pretxnchangegroup.sh
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushvars=$TESTDIR/../hgext3rd/pushvars.py > pushvars=$TESTDIR/../hgext3rd/pushvars.py
> [hooks] > [hooks]
> pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh > pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
> [experimental] > [experimental]
> bundle2-exp = true > bundle2-exp = true
> EOF > EOF
$ hg init repo $ hg init repo

tests/test-treemanifest-pushrebase.t

> done > done
> wait > wait
> } > }
> EOF > EOF
$ . "$TESTTMP/helper.sh" $ . "$TESTTMP/helper.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> [experimental] > [experimental]
> bundle2lazylocking=True > bundle2lazylocking=True
> [remotefilelog] > [remotefilelog]
> reponame=master > reponame=master
> EOF > EOF
Test that multiple fighting pushes result in the correct flat and tree manifests Test that multiple fighting pushes result in the correct flat and tree manifests

tests/test-treemanifest-server.t

$ . "$TESTDIR/library.sh" $ . "$TESTDIR/library.sh"
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ hginit master $ hginit master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> treemanifest=$TESTDIR/../treemanifest > treemanifest=$TESTDIR/../treemanifest
> [treemanifest] > [treemanifest]
> server=True > server=True
> [remotefilelog] > [remotefilelog]
> server=True > server=True
> EOF > EOF