annotate tests/test-schemes.t @ 22897:8fe74328f700

dirstate: merge falls through to otherparent This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Oct 2014 14:05:09 -0500
parents 7a9cbb315d84
children bf1d5c223ac0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 18910
diff changeset
1 #require serve
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
2
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
3 $ cat <<EOF >> $HGRCPATH
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
4 > [extensions]
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
5 > schemes=
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
6 >
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
7 > [schemes]
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
8 > l = http://localhost:$HGPORT/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
9 > parts = http://{1}:$HGPORT/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
10 > z = file:\$PWD/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
11 > EOF
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
12 $ hg init test
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
13 $ cd test
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
14 $ echo a > a
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
15 $ hg ci -Am initial
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
26 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
27 $ cat hg.pid >> $DAEMON_PIDS
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
28 $ hg incoming l://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
29 comparing with l://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
30 searching for changes
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
31 no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
32 [1]
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
33
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
34 check that {1} syntax works
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
35
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
44 no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
45 [1]
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
46
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
49 $ PWD=`pwd` hg incoming z://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
50 comparing with z://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
51 searching for changes
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
52 no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
55 errors
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
56
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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 ..