mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
140 lines
3.4 KiB
Perl
140 lines
3.4 KiB
Perl
Verify that pending changesets are seen by pretxn* hooks but not by other
|
|
processes that access the destination repo while the hooks are running.
|
|
|
|
The hooks (python and external) both reject changesets after some think time,
|
|
during which another process runs pull. Each hook creates a file ('notify') to
|
|
indicate to the controlling process that it is running; the process removes the
|
|
file to indicate the hook can terminate.
|
|
|
|
init env vars
|
|
|
|
$ d=`pwd`
|
|
$ maxwait=20
|
|
|
|
utility to run the test - start a push in the background and run pull
|
|
|
|
$ dotest() {
|
|
> rm -f notify
|
|
> printf 'push '; hg -R child-push tip --template '{node}\n'
|
|
> hg -R child-push -q push > push.out 2>&1 &
|
|
>
|
|
> # wait for hook to create the notify file
|
|
> i=$maxwait
|
|
> while [ ! -f notify -a $i != 0 ]; do
|
|
> sleep 1
|
|
> i=`expr $i - 1`
|
|
> done
|
|
>
|
|
> # run pull
|
|
> hg -R child-pull -q pull
|
|
> rc=$?
|
|
>
|
|
> # tell hook to finish; notify should exist.
|
|
> rm notify
|
|
> wait
|
|
>
|
|
> cat push.out
|
|
> printf 'pull '; hg -R child-pull tip --template '{node}\n'
|
|
> return $rc
|
|
> }
|
|
|
|
python hook
|
|
|
|
$ cat <<EOF > reject.py
|
|
> import os, time
|
|
> from edenscm.mercurial import ui, localrepo
|
|
> def rejecthook(ui, repo, hooktype, node, **opts):
|
|
> ui.write('hook %s\\n' % repo['tip'].hex())
|
|
> # create the notify file so caller knows we're running
|
|
> fpath = os.path.join('$d', 'notify')
|
|
> f = open(fpath, 'w')
|
|
> f.close()
|
|
> # wait for ack - caller should delete the notify file
|
|
> i = $maxwait
|
|
> while os.path.exists(fpath) and i > 0:
|
|
> time.sleep(1)
|
|
> i -= 1
|
|
> return True # reject the changesets
|
|
> EOF
|
|
|
|
external hook
|
|
|
|
$ cat <<EOF > reject.sh
|
|
> printf 'hook '; hg tip --template '{node}\\n'
|
|
> # create the notify file so caller knows we're running
|
|
> fpath=$d/notify
|
|
> touch \$fpath
|
|
> # wait for ack - caller should delete the notify file
|
|
> i=$maxwait
|
|
> while [ -f \$fpath -a \$i != 0 ]; do
|
|
> sleep 1
|
|
> i=\`expr \$i - 1\`
|
|
> done
|
|
> exit 1 # reject the changesets
|
|
> EOF
|
|
|
|
create repos
|
|
|
|
$ hg init parent
|
|
$ hg clone -q parent child-push
|
|
$ hg clone -q parent child-pull
|
|
$ echo a > child-push/a
|
|
$ hg -R child-push add child-push/a
|
|
$ hg -R child-push commit -m a -d '1000000 0'
|
|
|
|
test python hook
|
|
|
|
$ cat <<EOF > parent/.hg/hgrc
|
|
> [extensions]
|
|
> reject = $d/reject.py
|
|
> [hooks]
|
|
> pretxnchangegroup = python:reject.rejecthook
|
|
> EOF
|
|
|
|
$ dotest
|
|
push 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
|
|
hook 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
|
|
transaction abort!
|
|
rollback completed
|
|
abort: pretxnchangegroup hook failed
|
|
pull 0000000000000000000000000000000000000000
|
|
|
|
test external hook
|
|
|
|
$ cat <<EOF > parent/.hg/hgrc
|
|
> [hooks]
|
|
> pretxnchangegroup = sh $d/reject.sh
|
|
> EOF
|
|
|
|
$ dotest
|
|
push 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
|
|
hook 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
|
|
transaction abort!
|
|
rollback completed
|
|
abort: pretxnchangegroup hook exited with status 1
|
|
pull 0000000000000000000000000000000000000000
|
|
|
|
Test that pending on transaction without changegroup see the normal changegroup(
|
|
(issue4609)
|
|
|
|
$ cat <<EOF > parent/.hg/hgrc
|
|
> [hooks]
|
|
> pretxnchangegroup=
|
|
> pretxnclose = hg tip -T "tip: {node|short}\n"
|
|
> [phases]
|
|
> publishing=False
|
|
> EOF
|
|
|
|
setup
|
|
|
|
$ cd parent
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m a
|
|
tip: cb9a9f314b8b
|
|
|
|
actual test
|
|
|
|
$ hg phase --public .
|
|
tip: cb9a9f314b8b
|