annotate tests/test-treediscovery-legacy.t @ 49328:aaa7df6992ea

bundlespec: test that parameter overwrite the local config This is currently working, but havint it explicitly tested seems useful.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 25 May 2022 03:18:47 +0200
parents 9261f6c1d39b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
1 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
2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
3 $ cat >> $HGRCPATH <<EOF
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
4 > [ui]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
5 > 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
6 > EOF
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
7 $ cp $HGRCPATH $HGRCPATH-withcap
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
8
25117
b5c8ee72debc test-discovery-legacy: disable bundle2 for legacy test
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22046
diff changeset
9 $ CAP="getbundle known changegroupsubset bundle2"
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
10 $ . "$TESTDIR/notcapable"
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
11 $ cp $HGRCPATH $HGRCPATH-nocap
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
12 $ cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
13
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
14 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
15
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
16 $ CAP="branchmap"
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
17 $ . "$TESTDIR/notcapable"
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
18 $ 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
19 $ 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
20
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
21 Setup HTTP server control:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
22
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
23 $ remote=http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
24 $ export remote
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
25 $ tstart() {
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
26 > echo '[web]' > $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
27 > 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
28 > echo 'allow_push = *' >> $1/.hg/hgrc
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
29 > cp $HGRCPATH-nocap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
30 > 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
31 > cat hg.pid >> $DAEMON_PIDS
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
32 > }
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
33 $ tstop() {
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
34 > killdaemons.py
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
35 > cp $HGRCPATH-withcap $HGRCPATH
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
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
38 Both are empty:
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 $ hg init empty1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
41 $ 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
42 $ tstart empty2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
43 $ hg incoming -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
44 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
45 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
46 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
47 $ hg outgoing -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
48 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
49 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
50 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
51 $ hg pull -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
52 pulling from 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
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
54 $ hg push -R empty1 $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
55 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
56 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
57 [1]
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
58 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
59
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
60 Base repo:
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 $ hg init main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
63 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
64 $ 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
65 $ hg log -G
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
66 o 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
67 |
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
68 o 10 8b6bad1512e1: r10 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 9 025829e08038: r9 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 8 d8f638ac69e9: r8 name2
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 7 b6b4d315a2ac: r7 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 6 6c6f5d5f3c11: r6 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 5 70314b29987d: r5 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 | 4 e71dbbc70e03: r4 name1
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 | 3 2c8d5d5ec612: r3 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 | 2 a7892891da29: r2 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 1 0019a3b924fd: r1
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 0 d57206cc072a: r0
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 $ cd ..
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
91 $ tstart main
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
92
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
93 Full clone:
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 $ hg clone main full
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
96 updating to branch default
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
97 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
98 $ cd full
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
99 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
100 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
101 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
102 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
103 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
104 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
105 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
106 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
107 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
108 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
109 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
110 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
111 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
112 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
113 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
114 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
115 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
116 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
117 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
118 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
119
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
120 Local is empty:
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 $ cd empty1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
123 $ hg incoming $remote --rev name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
124 comparing with http://localhost:$HGPORT/
45906
95c4cca641f6 errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents: 38250
diff changeset
125 abort: cannot look up remote changes; remote repository does not support the 'changegroupsubset' capability
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
126 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
127 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
128 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
129 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
130 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
131 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
132 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
133 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
134 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
135 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
136 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
137 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
138 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
139 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
140 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
141 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
142 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
143 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
144 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
145 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
146 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
147 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
148 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
149 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
150 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
151 requesting all changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
152 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
153 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
154 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
155 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
156 new changesets d57206cc072a:a19bfa7e7328
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
157 (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
158 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
159 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
160 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
161 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
162 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
163 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
164
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
165 Local is subset:
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 $ cp $HGRCPATH-withcap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
168 $ 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
169 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
170 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
171 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
172 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
173 new changesets d57206cc072a:d8f638ac69e9
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
174 updating to branch name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
175 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
176 $ cp $HGRCPATH-nocap $HGRCPATH
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
177 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
178 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
179 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
180 6 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
181 7 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
182 8 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
183 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
184 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
185 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
186 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
187 comparing with 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
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
190 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
191 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
192 pushing to 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 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
195 [1]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
196 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
197 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
198 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
199 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
200 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
201 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
202 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
203 new changesets a7892891da29:a19bfa7e7328
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
204 (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
205 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
206 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
207 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
208 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
209 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
210 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
211
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
212 Remote is empty:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
213
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
214 $ tstop ; tstart empty2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
215 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
216 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
217 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
218 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
219 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
220 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
221 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
222 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
223 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
224 0 d57206cc072a: r0
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
225 1 0019a3b924fd: r1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
226 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
227 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
228 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
229 5 70314b29987d: r5 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
230 6 6c6f5d5f3c11: r6 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
231 7 b6b4d315a2ac: r7 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
232 8 d8f638ac69e9: r8 name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
233 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
234 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
235 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
236 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
237 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
238 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
239 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
240 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
241 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
242 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
243 remote: adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
244 remote: adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
245 remote: adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
246 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
247 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
248 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
249 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
250 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
251 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
252 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
253
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
254 Local is superset:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
255
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
256 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
257 $ hg clone main subset2 --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
258 adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
259 adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
260 adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
261 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
262 new changesets d57206cc072a:d8f638ac69e9
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
263 updating to branch name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
264 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
265 $ tstart subset2
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
266 $ cd main
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
267 $ hg incoming $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
268 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
269 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
270 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
271 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
272 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
273 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
274 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
275 2 a7892891da29: r2 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
276 3 2c8d5d5ec612: r3 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
277 4 e71dbbc70e03: r4 name1
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
278 9 025829e08038: r9 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
279 10 8b6bad1512e1: r10 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
280 11 a19bfa7e7328: r11 both
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
281 $ hg pull $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
282 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
283 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
284 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
285 $ hg push $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
286 pushing to http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
287 searching for changes
45908
122f0b59f5f0 errors: remove trailing "!" in messages about creating new heads on push
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
288 abort: push creates new remote branches: both, name1
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
289 (use 'hg push --new-branch' to create new remote branches)
46119
9261f6c1d39b errors: raise StateError when push fails because it creates new heads
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
290 [20]
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
291 $ hg push $remote --new-branch
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
292 pushing to 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 remote: adding changesets
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
295 remote: adding manifests
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
296 remote: adding file changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
297 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
298 $ hg outgoing $remote
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
299 comparing with http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
300 searching for changes
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
301 no changes found
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
302 [1]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
303 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
304
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
305 Partial pull:
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
306
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
307 $ tstop ; tstart main
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
308 $ hg clone $remote partial --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
309 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
310 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
311 $ hg init partial; cd partial
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
312 $ hg incoming $remote --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
313 comparing with http://localhost:$HGPORT/
45906
95c4cca641f6 errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents: 38250
diff changeset
314 abort: cannot look up remote changes; remote repository does not support the 'changegroupsubset' capability
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
315 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
316 $ hg pull $remote --rev name2
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
317 pulling from http://localhost:$HGPORT/
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
318 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
319 [255]
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
320 $ cd ..
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
321
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14411
diff changeset
322 $ tstop
14411
0c35514734e7 tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
323
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
324 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
325
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
326 $ 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
327 $ hg init rlocal
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
328 $ cd rlocal
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
329 $ echo A > A
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
330 $ 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
331 adding A
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
332 $ cd ..
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17011
diff changeset
333 $ 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
334 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
335 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
336 $ cd rlocal
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
337 $ echo B > B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
338 $ 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
339 adding B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
340 $ cd ..
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
341 $ tstart rremote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
342
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
343 $ cd rlocal
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17011
diff changeset
344 $ 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
345 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
346 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
347 no changes found
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
348 [1]
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
349 $ hg outgoing $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
350 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
351 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
352 1 27547f69f254: B
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
353 $ hg pull $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
354 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
355 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
356 no changes found
38250
d0abd7949ea3 phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents: 38249
diff changeset
357 1 local changesets published
17011
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
358 $ hg push $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
359 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
360 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
361 remote: adding changesets
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
362 remote: adding manifests
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
363 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
364 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
365 $ hg outgoing $remote
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
366 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
367 searching for changes
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
368 no changes found
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
369 [1]
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
370 $ cd ..
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
371
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com>
parents: 16107
diff changeset
372 $ tstop