Mercurial > hg
annotate tests/test-push-hook-lock.t @ 27555:ca8ada499529 stable
push: restore old behavior of default-push (issue5000)
This effectively backs out dceaef70e410 and 10917b062adf.
We can't handle "default-push" just like "default:pushurl" because it is a
stand-alone named path. Instead, I have two ideas to work around the issue:
a. two defaults: getpath(dest, default=('default-push', 'default'))
b. virtual path: getpath(dest, default=':default')
(a) is conservative approach and will have less trouble, but callers have
to specify they need "default-push" or "default". (b) generates hidden
":default" path from "default" and "default-push", and callers request
":default". This will require some tricks and won't work if there are
conflicting sub-options valid for both "pull" and "push".
I'll take (a) for default branch. This patch should NOT BE MERGED to default
except for tests because it would break handling of "pushurl" sub-option.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 26 Dec 2015 15:18:16 +0900 |
parents | 00e4c5601c74 |
children | ac9b85079122 |
rev | line source |
---|---|
12279 | 1 $ hg init 1 |
2 | |
3 $ echo '[ui]' >> 1/.hg/hgrc | |
4 $ echo 'timeout = 10' >> 1/.hg/hgrc | |
5 | |
6 $ echo foo > 1/foo | |
7 $ hg --cwd 1 ci -A -m foo | |
8 adding foo | |
9 | |
10 $ hg clone 1 2 | |
11 updating to branch default | |
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | |
14 $ hg clone 2 3 | |
15 updating to branch default | |
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 | |
23349
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
18 $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh |
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
19 > hg debuglocks |
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
20 > true |
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
21 > EOF |
12279 | 22 $ echo '[hooks]' >> 2/.hg/hgrc |
23349
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
23 $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc |
12279 | 24 $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc |
25 | |
26 $ echo bar >> 3/foo | |
27 $ hg --cwd 3 ci -m bar | |
28 | |
25126
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
29 $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False |
12279 | 30 pushing to ../2 |
31 searching for changes | |
32 adding changesets | |
33 adding manifests | |
34 adding file changes | |
35 added 1 changesets with 1 changes to 1 files | |
22559
4e0b696a1cb3
commands: add debuglocks to report/clear lock state
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
36 lock: user *, process * (*s) (glob) |
4e0b696a1cb3
commands: add debuglocks to report/clear lock state
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
37 wlock: free |
12279 | 38 |
25126
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
39 $ hg --cwd 1 --config extensions.strip= strip tip -q |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
40 $ hg --cwd 2 --config extensions.strip= strip tip -q |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
41 $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
42 pushing to ../2 |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
43 searching for changes |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
44 adding changesets |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
45 adding manifests |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
46 adding file changes |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
47 added 1 changesets with 1 changes to 1 files |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
48 lock: user *, process * (*s) (glob) |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
49 wlock: user *, process * (*s) (glob) |
00e4c5601c74
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23349
diff
changeset
|
50 |