annotate tests/test-treediscovery-legacy.t @ 16541:bb3334806ace stable

tests: quote dummyssh in a way that works on windows too Don't depend on $environmentvariableexpansion and 'quote' handling in system()
author Mads Kiilerich <mads@kiilerich.com>
date Sat, 28 Apr 2012 02:00:04 +0200
parents a3dcc59054ca
children 25f7d40fe735
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 14831
diff changeset
1 $ "$TESTDIR/hghave" serve || exit 80
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 14831
diff changeset
2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
3 Tests discovery against servers without getbundle support:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
4
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
5 $ cat >> $HGRCPATH <<EOF
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
6 > [ui]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
7 > logtemplate="{rev} {node|short}: {desc} {branches}\n"
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
8 > [extensions]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
9 > graphlog=
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
10 > EOF
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
11 $ cp $HGRCPATH $HGRCPATH-withcap
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
12
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
13 $ CAP="getbundle known changegroupsubset"
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
14 $ . "$TESTDIR/notcapable"
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
15 $ cp $HGRCPATH $HGRCPATH-nocap
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
16 $ cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
17
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
18 Setup HTTP server control:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
19
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
20 $ remote=http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
21 $ export remote
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
22 $ tstart() {
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
23 > echo '[web]' > $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
24 > echo 'push_ssl = false' >> $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
25 > echo 'allow_push = *' >> $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
26 > cp $HGRCPATH-nocap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
27 > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
28 > cat hg.pid >> $DAEMON_PIDS
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
29 > }
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
30 $ tstop() {
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
31 > "$TESTDIR/killdaemons.py"
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
32 > cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
33 > }
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
34
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
35 Both are empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
36
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
37 $ hg init empty1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
38 $ hg init empty2
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
39 $ tstart empty2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
40 $ hg incoming -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
41 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
42 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
43 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
44 $ hg outgoing -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
45 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
46 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
47 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
48 $ hg pull -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
49 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
50 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
51 $ hg push -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
52 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
53 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
54 [1]
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
55 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
56
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
57 Base repo:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
58
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
59 $ hg init main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
60 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
61 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
62 $ hg glog
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
63 o 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
64 |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
65 o 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
66 |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
67 o 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
68 |\
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
69 | o 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
70 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
71 | o 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
72 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
73 | o 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
74 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
75 | o 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
76 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
77 o | 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
78 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
79 o | 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
80 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
81 o | 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
82 |/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
83 o 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
84 |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
85 o 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
86
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
87 $ cd ..
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
88 $ tstart main
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
89
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
90 Full clone:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
91
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
92 $ hg clone main full
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
93 updating to branch default
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
94 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
95 $ cd full
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
96 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
97 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
98 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
99 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
100 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
101 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
102 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
103 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
104 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
105 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
106 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
107 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
108 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
109 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
110 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
111 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
112 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
113 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
114 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
115 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
116
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
117 Local is empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
118
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
119 $ cd empty1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
120 $ hg incoming $remote --rev name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
121 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
122 abort: cannot look up remote changes; remote repository does not support the 'changegroupsubset' capability!
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
123 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
124 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
125 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
126 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
127 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
128 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
129 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
130 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
131 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
132 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
133 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
134 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
135 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
136 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
137 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
138 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
139 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
140 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
141 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
142 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
143 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
144 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
145 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
146 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
147 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
148 requesting all changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
149 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
150 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
151 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
152 added 12 changesets with 24 changes to 2 files
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
153 (run 'hg update' to get a working copy)
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
154 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
155 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
156 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
157 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
158 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
159 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
160
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
161 Local is subset:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
162
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
163 $ cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
164 $ hg clone main subset --rev name2 ; cd subset
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
165 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
166 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
167 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
168 added 6 changesets with 12 changes to 2 files
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
169 updating to branch name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
170 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
171 $ cp $HGRCPATH-nocap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
172 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
173 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
174 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
175 6 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
176 7 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
177 8 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
178 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
179 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
180 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
181 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
182 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
183 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
184 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
185 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
186 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
187 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
188 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
189 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
190 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
191 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
192 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
193 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
194 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
195 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
196 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
197 added 6 changesets with 12 changes to 2 files
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
198 (run 'hg update' to get a working copy)
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
199 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
200 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
201 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
202 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
203 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
204 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
205
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
206 Remote is empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
207
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
208 $ tstop ; tstart empty2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
209 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
210 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
211 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
212 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
213 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
214 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
215 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
216 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
217 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
218 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
219 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
220 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
221 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
222 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
223 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
224 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
225 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
226 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
227 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
228 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
229 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
230 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
231 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
232 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
233 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
234 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
235 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
236 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
237 remote: adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
238 remote: adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
239 remote: adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
240 remote: added 12 changesets with 24 changes to 2 files
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
241 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
242 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
243 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
244 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
245 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
246 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
247
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
248 Local is superset:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
249
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
250 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
251 $ hg clone main subset2 --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
252 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
253 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
254 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
255 added 6 changesets with 12 changes to 2 files
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
256 updating to branch name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
257 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
258 $ tstart subset2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
259 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
260 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
261 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
262 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
263 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
264 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
265 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
266 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
267 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
268 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
269 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
270 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
271 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
272 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
273 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
274 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
275 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
276 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
277 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
278 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
279 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
280 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
281 abort: push creates new remote branches: both, name1!
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
282 (use 'hg push --new-branch' to create new remote branches)
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
283 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
284 $ hg push $remote --new-branch
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
285 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
286 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
287 remote: adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
288 remote: adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
289 remote: adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
290 remote: added 6 changesets with 12 changes to 2 files
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
291 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
292 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
293 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
294 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
295 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
296 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
297
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
298 Partial pull:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
299
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
300 $ tstop ; tstart main
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
301 $ hg clone $remote partial --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
302 abort: partial pull cannot be done because other repository doesn't support changegroupsubset.
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
303 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
304 $ hg init partial; cd partial
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
305 $ hg incoming $remote --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
306 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
307 abort: cannot look up remote changes; remote repository does not support the 'changegroupsubset' capability!
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
308 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
309 $ hg pull $remote --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
310 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
311 abort: partial pull cannot be done because other repository doesn't support changegroupsubset.
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
312 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
313 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
314
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
315 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
316