[PATCH 4 of 4] tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Thu Nov 3 04:35:21 EDT 2016
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1478146343 -3600
# Thu Nov 03 05:12:23 2016 +0100
# Node ID 85d623d2563115919c6de6961b4f48f45199d11f
# Parent d5f07aeefda46b3cd17962565940516f69ed1f56
# EXP-Topic pushtest
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
That test file is very small and is merge with the new 'test-push.t'. No logic
is changed.
We don't register this as a copy because is actually a "ypoc" merging two file
together without replacing the destination and Mercurial cannot express that.
diff --git a/tests/test-push-hook-lock.t b/tests/test-push-hook-lock.t
deleted file mode 100644
--- a/tests/test-push-hook-lock.t
+++ /dev/null
@@ -1,50 +0,0 @@
- $ hg init 1
-
- $ echo '[ui]' >> 1/.hg/hgrc
- $ echo 'timeout = 10' >> 1/.hg/hgrc
-
- $ echo foo > 1/foo
- $ hg --cwd 1 ci -A -m foo
- adding foo
-
- $ hg clone 1 2
- updating to branch default
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
- $ hg clone 2 3
- updating to branch default
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
- $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh
- > hg debuglocks
- > true
- > EOF
- $ echo '[hooks]' >> 2/.hg/hgrc
- $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc
- $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc
-
- $ echo bar >> 3/foo
- $ hg --cwd 3 ci -m bar
-
- $ hg --cwd 3 push ../2 --config devel.legacy.exchange=bundle1
- pushing to ../2
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- lock: user *, process * (*s) (glob)
- wlock: free
-
- $ hg --cwd 1 --config extensions.strip= strip tip -q
- $ hg --cwd 2 --config extensions.strip= strip tip -q
- $ hg --cwd 3 push ../2 # bundle2+
- pushing to ../2
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- lock: user *, process * (*s) (glob)
- wlock: user *, process * (*s) (glob)
-
diff --git a/tests/test-push.t b/tests/test-push.t
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -243,3 +243,57 @@ Expected to fail:
[255]
$ cd ..
+
+Test push hook locking
+=====================
+
+ $ hg init 1
+
+ $ echo '[ui]' >> 1/.hg/hgrc
+ $ echo 'timeout = 10' >> 1/.hg/hgrc
+
+ $ echo foo > 1/foo
+ $ hg --cwd 1 ci -A -m foo
+ adding foo
+
+ $ hg clone 1 2
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg clone 2 3
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh
+ > hg debuglocks
+ > true
+ > EOF
+ $ echo '[hooks]' >> 2/.hg/hgrc
+ $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc
+ $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc
+
+ $ echo bar >> 3/foo
+ $ hg --cwd 3 ci -m bar
+
+ $ hg --cwd 3 push ../2 --config devel.legacy.exchange=bundle1
+ pushing to ../2
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ lock: user *, process * (*s) (glob)
+ wlock: free
+
+ $ hg --cwd 1 --config extensions.strip= strip tip -q
+ $ hg --cwd 2 --config extensions.strip= strip tip -q
+ $ hg --cwd 3 push ../2 # bundle2+
+ pushing to ../2
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ lock: user *, process * (*s) (glob)
+ wlock: user *, process * (*s) (glob)
+
More information about the Mercurial-devel
mailing list