Mercurial > hg
annotate tests/test-schemes.t @ 24353:3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
Before this patch, "@99" suffixed bookmark may be updated unexpectedly
by the bookmark value on the remote side at "hg pull", if all of "@1"
to "@99" suffixed bookmarks exist in the local repository, because
variable "n" still refers "@99" suffixed bookmark after the loop to
examine "@num" suffixes, even though it already exists in the local
repository.
This patch prevents divergent bookmark from being updated
unexpectedly, and shows warning message in such situation.
This patch uses original python script "seq.py" instead of "seq"
command to create sequence numbers in the test, because "seq" command
may not be available: it isn't defined in recent POSIX specification
(POSIX.1-2001 2013 Edition or XPG7)
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 17 Mar 2015 18:20:24 +0900 |
parents | 7a9cbb315d84 |
children | bf1d5c223ac0 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18910
diff
changeset
|
1 #require serve |
9964 | 2 |
12486 | 3 $ cat <<EOF >> $HGRCPATH |
4 > [extensions] | |
5 > schemes= | |
6 > | |
7 > [schemes] | |
8 > l = http://localhost:$HGPORT/ | |
9 > parts = http://{1}:$HGPORT/ | |
10 > z = file:\$PWD/ | |
11 > EOF | |
12 $ hg init test | |
13 $ cd test | |
14 $ echo a > a | |
15 $ hg ci -Am initial | |
16 adding a | |
18910
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
17 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
18 invalid scheme |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
19 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
20 $ hg log -R z:z |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
21 abort: no '://' in scheme url 'z:z' |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
22 [255] |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
23 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
24 http scheme |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
25 |
12486 | 26 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
27 $ cat hg.pid >> $DAEMON_PIDS | |
28 $ hg incoming l:// | |
29 comparing with l:// | |
30 searching for changes | |
31 no changes found | |
32 [1] | |
9964 | 33 |
12486 | 34 check that {1} syntax works |
9964 | 35 |
12486 | 36 $ hg incoming --debug parts://localhost |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12486
diff
changeset
|
37 using http://localhost:$HGPORT/ |
13603
395a84f78736
httprepo: use caps instead of between for compat check
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12643
diff
changeset
|
38 sending capabilities command |
13815
d066d8d652c8
url: add trailing slashes to URLs with hostnames that don't have one
Brodie Rao <brodie@bitheap.org>
parents:
13742
diff
changeset
|
39 comparing with parts://localhost/ |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13815
diff
changeset
|
40 query 1; heads |
14624
f03c82d1f50a
setdiscovery: batch heads and known(ownheads)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14164
diff
changeset
|
41 sending batch command |
12486 | 42 searching for changes |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13815
diff
changeset
|
43 all remote heads known locally |
12486 | 44 no changes found |
45 [1] | |
9964 | 46 |
12486 | 47 check that paths are expanded |
10070
9d1195b2f00d
schemes: url parts are counted from 1
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9964
diff
changeset
|
48 |
12486 | 49 $ PWD=`pwd` hg incoming z:// |
50 comparing with z:// | |
51 searching for changes | |
52 no changes found | |
53 [1] | |
11154
17031fea4e95
expand paths to local repository or bundle in appropriate classes
Alexander Solovyov <piranha@piranha.org.ua>
parents:
10070
diff
changeset
|
54 |
12486 | 55 errors |
56 | |
57 $ cat errors.log | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
58 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
59 $ cd .. |