annotate tests/test-treediscovery-legacy.t @ 36705:c6901665cd5b

py3: make sure __repr__ returns a str # skip-blame because just r'' prefix Differential Revision: https://phab.mercurial-scm.org/D2652
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 04 Mar 2018 22:40:33 +0530
parents eb586ed5d8ce
children b4b7427b5786
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: 20117
diff changeset
1 #require killdaemons
15446
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 > EOF
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
9 $ cp $HGRCPATH $HGRCPATH-withcap
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
10
25117
b5c8ee72debc test-discovery-legacy: disable bundle2 for legacy test
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22046
diff changeset
11 $ CAP="getbundle known changegroupsubset bundle2"
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
12 $ . "$TESTDIR/notcapable"
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
13 $ cp $HGRCPATH $HGRCPATH-nocap
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
14 $ cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
15
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
16 Prep for test server without branchmap support
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
17
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
18 $ CAP="branchmap"
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
19 $ . "$TESTDIR/notcapable"
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
20 $ cp $HGRCPATH $HGRCPATH-nocap-branchmap
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
21 $ cp $HGRCPATH-withcap $HGRCPATH
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
22
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
23 Setup HTTP server control:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
24
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
25 $ remote=http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
26 $ export remote
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
27 $ tstart() {
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
28 > echo '[web]' > $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
29 > 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
30 > echo 'allow_push = *' >> $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
31 > cp $HGRCPATH-nocap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
32 > 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
33 > cat hg.pid >> $DAEMON_PIDS
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
34 > }
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
35 $ tstop() {
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
36 > killdaemons.py
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
37 > cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
38 > }
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
39
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
40 Both are empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
41
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
42 $ hg init empty1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
43 $ 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
44 $ tstart empty2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
45 $ hg incoming -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
46 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
47 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
48 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
49 $ hg outgoing -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
50 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
51 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
52 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
53 $ hg pull -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
54 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
55 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
56 $ hg push -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
57 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
58 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
59 [1]
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
60 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
61
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
62 Base repo:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
63
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
64 $ hg init main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
65 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
66 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 17539
diff changeset
67 $ hg log -G
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
68 o 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
69 |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
70 o 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
71 |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
72 o 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
73 |\
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
74 | o 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
75 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
76 | o 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
77 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
78 | o 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
79 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
80 | o 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
81 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
82 o | 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
83 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
84 o | 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
85 | |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
86 o | 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
87 |/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
88 o 1 0019a3b924fd: r1
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 o 0 d57206cc072a: r0
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 $ cd ..
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
93 $ tstart main
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
94
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
95 Full clone:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
96
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
97 $ hg clone main full
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
98 updating to branch default
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
99 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
100 $ cd full
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
101 $ hg incoming $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 outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
107 comparing with 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 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
111 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
112 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
113 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
114 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
115 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
116 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
117 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
118 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
119 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
120 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
121
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
122 Local is empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
123
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
124 $ cd empty1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
125 $ hg incoming $remote --rev name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
126 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
127 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
128 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
129 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
130 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
131 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
132 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
133 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
134 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
135 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
136 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
137 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
138 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
139 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
140 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
141 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
142 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
143 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
144 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
145 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
146 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
147 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
148 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
149 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
150 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
151 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
152 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
153 requesting all changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
154 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
155 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
156 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
157 added 12 changesets with 24 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 25474
diff changeset
158 new changesets d57206cc072a:a19bfa7e7328
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
159 (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
160 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
161 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
162 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
163 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
164 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
165 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
166
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
167 Local is subset:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
168
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
169 $ cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
170 $ 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
171 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
172 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
173 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
174 added 6 changesets with 12 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 25474
diff changeset
175 new changesets d57206cc072a:d8f638ac69e9
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
176 updating to branch name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
177 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
178 $ cp $HGRCPATH-nocap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
179 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
180 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
181 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
182 6 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
183 7 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
184 8 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
185 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
186 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
187 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
188 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
189 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
190 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
191 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
192 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
193 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
194 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
195 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
196 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
197 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
198 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
199 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
200 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
201 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
202 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
203 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
204 added 6 changesets with 12 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 25474
diff changeset
205 new changesets a7892891da29:a19bfa7e7328
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
206 (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
207 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
208 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
209 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
210 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
211 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
212 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
213
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
214 Remote is empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
215
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
216 $ tstop ; tstart empty2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
217 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
218 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
219 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
220 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
221 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
222 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
223 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
224 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
225 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
226 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
227 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
228 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
229 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
230 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
231 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
232 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
233 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
234 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
235 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
236 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
237 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
238 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
239 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
240 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
241 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
242 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
243 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
244 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
245 remote: adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
246 remote: adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
247 remote: adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
248 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
249 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
250 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
251 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
252 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
253 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
254 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
255
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
256 Local is superset:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
257
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
258 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
259 $ hg clone main subset2 --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
260 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
261 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
262 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
263 added 6 changesets with 12 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 25474
diff changeset
264 new changesets d57206cc072a:d8f638ac69e9
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
265 updating to branch name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
266 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
267 $ tstart subset2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
268 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
269 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
270 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
271 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
272 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
273 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
274 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
275 comparing with 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 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
278 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
279 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
280 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
281 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
282 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
283 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
284 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
285 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
286 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
287 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
288 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
289 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
290 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
291 (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
292 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
293 $ hg push $remote --new-branch
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
294 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
295 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
296 remote: adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
297 remote: adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
298 remote: adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
299 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
300 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
301 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
302 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
303 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
304 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
305 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
306
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
307 Partial pull:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
308
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
309 $ tstop ; tstart main
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
310 $ hg clone $remote partial --rev name2
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 $ hg init partial; cd partial
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
314 $ hg incoming $remote --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
315 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
316 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
317 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
318 $ hg pull $remote --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
319 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
320 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
321 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
322 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
323
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
324 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
325
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
326 Exercise pushing to server without branchmap capability
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
327
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
328 $ cp $HGRCPATH-nocap-branchmap $HGRCPATH-nocap
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
329 $ hg init rlocal
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
330 $ cd rlocal
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
331 $ echo A > A
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
332 $ hg ci -Am A
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
333 adding A
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
334 $ cd ..
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17011
diff changeset
335 $ hg clone rlocal rremote
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
336 updating to branch default
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
338 $ cd rlocal
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
339 $ echo B > B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
340 $ hg ci -Am B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
341 adding B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
342 $ cd ..
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
343 $ tstart rremote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
344
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
345 $ cd rlocal
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17011
diff changeset
346 $ hg incoming $remote
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
347 comparing with http://localhost:$HGPORT/
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
348 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
349 no changes found
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
350 [1]
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
351 $ hg outgoing $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
352 comparing with http://localhost:$HGPORT/
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
353 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
354 1 27547f69f254: B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
355 $ hg pull $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
356 pulling from http://localhost:$HGPORT/
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
357 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
358 no changes found
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
359 $ hg push $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
360 pushing to http://localhost:$HGPORT/
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
361 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
362 remote: adding changesets
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
363 remote: adding manifests
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
364 remote: adding file changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
365 remote: added 1 changesets with 1 changes to 1 files
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
366 $ hg outgoing $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
367 comparing with http://localhost:$HGPORT/
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
368 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
369 no changes found
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
370 [1]
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
371 $ cd ..
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
372
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
373 $ tstop