Show More
@@ -1,167 +1,167 b'' | |||||
1 | $ cat >> $HGRCPATH << EOF |
|
1 | $ cat >> $HGRCPATH << EOF | |
2 | > [web] |
|
2 | > [web] | |
3 | > push_ssl = false |
|
3 | > push_ssl = false | |
4 | > allow_push = * |
|
4 | > allow_push = * | |
5 | > EOF |
|
5 | > EOF | |
6 |
|
6 | |||
7 | $ hg init server |
|
7 | $ hg init server | |
8 | $ cd server |
|
8 | $ cd server | |
9 | $ touch a |
|
9 | $ touch a | |
10 | $ hg -q commit -A -m initial |
|
10 | $ hg -q commit -A -m initial | |
11 | $ cd .. |
|
11 | $ cd .. | |
12 |
|
12 | |||
13 | $ hg -R server serve -p $HGPORT -d --pid-file hg.pid |
|
13 | $ hg -R server serve -p $HGPORT -d --pid-file hg.pid | |
14 | $ cat hg.pid >> $DAEMON_PIDS |
|
14 | $ cat hg.pid >> $DAEMON_PIDS | |
15 |
|
15 | |||
16 | compression formats are advertised in compression capability |
|
16 | compression formats are advertised in compression capability | |
17 |
|
17 | |||
18 | #if zstd |
|
18 | #if zstd | |
19 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression |
|
19 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression | |
20 | compression=zstd,zlib |
|
20 | compression=zstd,zlib | |
21 | #else |
|
21 | #else | |
22 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression |
|
22 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression | |
23 |
compression= |
|
23 | compression=zlib | |
24 | #endif |
|
24 | #endif | |
25 |
|
25 | |||
26 | $ killdaemons.py |
|
26 | $ killdaemons.py | |
27 |
|
27 | |||
28 | server.compressionengines can replace engines list wholesale |
|
28 | server.compressionengines can replace engines list wholesale | |
29 |
|
29 | |||
30 | $ hg --config server.compressionengines=none -R server serve -p $HGPORT -d --pid-file hg.pid |
|
30 | $ hg --config server.compressionengines=none -R server serve -p $HGPORT -d --pid-file hg.pid | |
31 | $ cat hg.pid > $DAEMON_PIDS |
|
31 | $ cat hg.pid > $DAEMON_PIDS | |
32 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression |
|
32 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression | |
33 | compression=none |
|
33 | compression=none | |
34 |
|
34 | |||
35 | $ killdaemons.py |
|
35 | $ killdaemons.py | |
36 |
|
36 | |||
37 | Order of engines can also change |
|
37 | Order of engines can also change | |
38 |
|
38 | |||
39 | $ hg --config server.compressionengines=none,zlib -R server serve -p $HGPORT -d --pid-file hg.pid |
|
39 | $ hg --config server.compressionengines=none,zlib -R server serve -p $HGPORT -d --pid-file hg.pid | |
40 | $ cat hg.pid > $DAEMON_PIDS |
|
40 | $ cat hg.pid > $DAEMON_PIDS | |
41 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression |
|
41 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression | |
42 | compression=none,zlib |
|
42 | compression=none,zlib | |
43 |
|
43 | |||
44 | $ killdaemons.py |
|
44 | $ killdaemons.py | |
45 |
|
45 | |||
46 | Start a default server again |
|
46 | Start a default server again | |
47 |
|
47 | |||
48 | $ hg -R server serve -p $HGPORT -d --pid-file hg.pid |
|
48 | $ hg -R server serve -p $HGPORT -d --pid-file hg.pid | |
49 | $ cat hg.pid > $DAEMON_PIDS |
|
49 | $ cat hg.pid > $DAEMON_PIDS | |
50 |
|
50 | |||
51 | Server should send application/mercurial-0.1 to clients if no Accept is used |
|
51 | Server should send application/mercurial-0.1 to clients if no Accept is used | |
52 |
|
52 | |||
53 | $ get-with-headers.py --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - |
|
53 | $ get-with-headers.py --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - | |
54 | 200 Script output follows |
|
54 | 200 Script output follows | |
55 | content-type: application/mercurial-0.1 |
|
55 | content-type: application/mercurial-0.1 | |
56 | date: * (glob) |
|
56 | date: * (glob) | |
57 | server: * (glob) |
|
57 | server: * (glob) | |
58 | transfer-encoding: chunked |
|
58 | transfer-encoding: chunked | |
59 |
|
59 | |||
60 | Server should send application/mercurial-0.1 when client says it wants it |
|
60 | Server should send application/mercurial-0.1 when client says it wants it | |
61 |
|
61 | |||
62 | $ get-with-headers.py --hgproto '0.1' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - |
|
62 | $ get-with-headers.py --hgproto '0.1' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - | |
63 | 200 Script output follows |
|
63 | 200 Script output follows | |
64 | content-type: application/mercurial-0.1 |
|
64 | content-type: application/mercurial-0.1 | |
65 | date: * (glob) |
|
65 | date: * (glob) | |
66 | server: * (glob) |
|
66 | server: * (glob) | |
67 | transfer-encoding: chunked |
|
67 | transfer-encoding: chunked | |
68 |
|
68 | |||
69 | Server should send application/mercurial-0.2 when client says it wants it |
|
69 | Server should send application/mercurial-0.2 when client says it wants it | |
70 |
|
70 | |||
71 | $ get-with-headers.py --hgproto '0.2' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - |
|
71 | $ get-with-headers.py --hgproto '0.2' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - | |
72 | 200 Script output follows |
|
72 | 200 Script output follows | |
73 | content-type: application/mercurial-0.2 |
|
73 | content-type: application/mercurial-0.2 | |
74 | date: * (glob) |
|
74 | date: * (glob) | |
75 | server: * (glob) |
|
75 | server: * (glob) | |
76 | transfer-encoding: chunked |
|
76 | transfer-encoding: chunked | |
77 |
|
77 | |||
78 | $ get-with-headers.py --hgproto '0.1 0.2' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - |
|
78 | $ get-with-headers.py --hgproto '0.1 0.2' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - | |
79 | 200 Script output follows |
|
79 | 200 Script output follows | |
80 | content-type: application/mercurial-0.2 |
|
80 | content-type: application/mercurial-0.2 | |
81 | date: * (glob) |
|
81 | date: * (glob) | |
82 | server: * (glob) |
|
82 | server: * (glob) | |
83 | transfer-encoding: chunked |
|
83 | transfer-encoding: chunked | |
84 |
|
84 | |||
85 | Requesting a compression format that server doesn't support results will fall back to 0.1 |
|
85 | Requesting a compression format that server doesn't support results will fall back to 0.1 | |
86 |
|
86 | |||
87 | $ get-with-headers.py --hgproto '0.2 comp=aa' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - |
|
87 | $ get-with-headers.py --hgproto '0.2 comp=aa' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - | |
88 | 200 Script output follows |
|
88 | 200 Script output follows | |
89 | content-type: application/mercurial-0.1 |
|
89 | content-type: application/mercurial-0.1 | |
90 | date: * (glob) |
|
90 | date: * (glob) | |
91 | server: * (glob) |
|
91 | server: * (glob) | |
92 | transfer-encoding: chunked |
|
92 | transfer-encoding: chunked | |
93 |
|
93 | |||
94 | #if zstd |
|
94 | #if zstd | |
95 | zstd is used if available |
|
95 | zstd is used if available | |
96 |
|
96 | |||
97 | $ get-with-headers.py --hgproto '0.2 comp=zstd' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp |
|
97 | $ get-with-headers.py --hgproto '0.2 comp=zstd' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp | |
98 | $ f --size --hexdump --bytes 36 --sha1 resp |
|
98 | $ f --size --hexdump --bytes 36 --sha1 resp | |
99 | resp: size=248, sha1=4d8d8f87fb82bd542ce52881fdc94f850748 |
|
99 | resp: size=248, sha1=4d8d8f87fb82bd542ce52881fdc94f850748 | |
100 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| |
|
100 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| | |
101 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 73 74 64 |t follows...zstd| |
|
101 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 73 74 64 |t follows...zstd| | |
102 | 0020: 28 b5 2f fd |(./.| |
|
102 | 0020: 28 b5 2f fd |(./.| | |
103 |
|
103 | |||
104 | #endif |
|
104 | #endif | |
105 |
|
105 | |||
106 | application/mercurial-0.2 is not yet used on non-streaming responses |
|
106 | application/mercurial-0.2 is not yet used on non-streaming responses | |
107 |
|
107 | |||
108 | $ get-with-headers.py --hgproto '0.2' 127.0.0.1:$HGPORT '?cmd=heads' - |
|
108 | $ get-with-headers.py --hgproto '0.2' 127.0.0.1:$HGPORT '?cmd=heads' - | |
109 | 200 Script output follows |
|
109 | 200 Script output follows | |
110 | content-length: 41 |
|
110 | content-length: 41 | |
111 | content-type: application/mercurial-0.1 |
|
111 | content-type: application/mercurial-0.1 | |
112 | date: * (glob) |
|
112 | date: * (glob) | |
113 | server: * (glob) |
|
113 | server: * (glob) | |
114 |
|
114 | |||
115 | e93700bd72895c5addab234c56d4024b487a362f |
|
115 | e93700bd72895c5addab234c56d4024b487a362f | |
116 |
|
116 | |||
117 | Now test protocol preference usage |
|
117 | Now test protocol preference usage | |
118 |
|
118 | |||
119 | $ killdaemons.py |
|
119 | $ killdaemons.py | |
120 | $ hg --config server.compressionengines=none,zlib -R server serve -p $HGPORT -d --pid-file hg.pid |
|
120 | $ hg --config server.compressionengines=none,zlib -R server serve -p $HGPORT -d --pid-file hg.pid | |
121 | $ cat hg.pid > $DAEMON_PIDS |
|
121 | $ cat hg.pid > $DAEMON_PIDS | |
122 |
|
122 | |||
123 | No Accept will send 0.1+zlib, even though "none" is preferred b/c "none" isn't supported on 0.1 |
|
123 | No Accept will send 0.1+zlib, even though "none" is preferred b/c "none" isn't supported on 0.1 | |
124 |
|
124 | |||
125 | $ get-with-headers.py --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' Content-Type |
|
125 | $ get-with-headers.py --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' Content-Type | |
126 | 200 Script output follows |
|
126 | 200 Script output follows | |
127 | content-type: application/mercurial-0.1 |
|
127 | content-type: application/mercurial-0.1 | |
128 |
|
128 | |||
129 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp |
|
129 | $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp | |
130 | $ f --size --hexdump --bytes 28 --sha1 resp |
|
130 | $ f --size --hexdump --bytes 28 --sha1 resp | |
131 | resp: size=227, sha1=35a4c074da74f32f5440da3cbf04 |
|
131 | resp: size=227, sha1=35a4c074da74f32f5440da3cbf04 | |
132 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| |
|
132 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| | |
133 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 78 |t follows..x| |
|
133 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 78 |t follows..x| | |
134 |
|
134 | |||
135 | Explicit 0.1 will send zlib because "none" isn't supported on 0.1 |
|
135 | Explicit 0.1 will send zlib because "none" isn't supported on 0.1 | |
136 |
|
136 | |||
137 | $ get-with-headers.py --hgproto '0.1' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp |
|
137 | $ get-with-headers.py --hgproto '0.1' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp | |
138 | $ f --size --hexdump --bytes 28 --sha1 resp |
|
138 | $ f --size --hexdump --bytes 28 --sha1 resp | |
139 | resp: size=227, sha1=35a4c074da74f32f5440da3cbf04 |
|
139 | resp: size=227, sha1=35a4c074da74f32f5440da3cbf04 | |
140 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| |
|
140 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| | |
141 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 78 |t follows..x| |
|
141 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 78 |t follows..x| | |
142 |
|
142 | |||
143 | 0.2 with no compression will get "none" because that is server's preference |
|
143 | 0.2 with no compression will get "none" because that is server's preference | |
144 | (spec says ZL and UN are implicitly supported) |
|
144 | (spec says ZL and UN are implicitly supported) | |
145 |
|
145 | |||
146 | $ get-with-headers.py --hgproto '0.2' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp |
|
146 | $ get-with-headers.py --hgproto '0.2' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp | |
147 | $ f --size --hexdump --bytes 32 --sha1 resp |
|
147 | $ f --size --hexdump --bytes 32 --sha1 resp | |
148 | resp: size=432, sha1=ac931b412ec185a02e0e5bcff98dac83 |
|
148 | resp: size=432, sha1=ac931b412ec185a02e0e5bcff98dac83 | |
149 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| |
|
149 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| | |
150 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 6e 6f 6e 65 |t follows...none| |
|
150 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 6e 6f 6e 65 |t follows...none| | |
151 |
|
151 | |||
152 | Client receives server preference even if local order doesn't match |
|
152 | Client receives server preference even if local order doesn't match | |
153 |
|
153 | |||
154 | $ get-with-headers.py --hgproto '0.2 comp=zlib,none' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp |
|
154 | $ get-with-headers.py --hgproto '0.2 comp=zlib,none' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp | |
155 | $ f --size --hexdump --bytes 32 --sha1 resp |
|
155 | $ f --size --hexdump --bytes 32 --sha1 resp | |
156 | resp: size=432, sha1=ac931b412ec185a02e0e5bcff98dac83 |
|
156 | resp: size=432, sha1=ac931b412ec185a02e0e5bcff98dac83 | |
157 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| |
|
157 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| | |
158 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 6e 6f 6e 65 |t follows...none| |
|
158 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 6e 6f 6e 65 |t follows...none| | |
159 |
|
159 | |||
160 | Client receives only supported format even if not server preferred format |
|
160 | Client receives only supported format even if not server preferred format | |
161 |
|
161 | |||
162 | $ get-with-headers.py --hgproto '0.2 comp=zlib' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp |
|
162 | $ get-with-headers.py --hgproto '0.2 comp=zlib' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp | |
163 | $ f --size --hexdump --bytes 33 --sha1 resp |
|
163 | $ f --size --hexdump --bytes 33 --sha1 resp | |
164 | resp: size=232, sha1=a1c727f0c9693ca15742a75c30419bc36 |
|
164 | resp: size=232, sha1=a1c727f0c9693ca15742a75c30419bc36 | |
165 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| |
|
165 | 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| | |
166 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 6c 69 62 |t follows...zlib| |
|
166 | 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 6c 69 62 |t follows...zlib| | |
167 | 0020: 78 |x| |
|
167 | 0020: 78 |x| |
@@ -1,536 +1,570 b'' | |||||
1 | #require killdaemons |
|
1 | #require killdaemons | |
2 |
|
2 | |||
3 | Tests discovery against servers without getbundle support: |
|
3 | Tests discovery against servers without getbundle support: | |
4 |
|
4 | |||
5 | $ CAP="getbundle bundle2" |
|
5 | $ CAP="getbundle bundle2" | |
6 | $ . "$TESTDIR/notcapable" |
|
6 | $ . "$TESTDIR/notcapable" | |
7 | $ cat >> $HGRCPATH <<EOF |
|
7 | $ cat >> $HGRCPATH <<EOF | |
8 | > [ui] |
|
8 | > [ui] | |
9 | > logtemplate="{rev} {node|short}: {desc} {branches}\n" |
|
9 | > logtemplate="{rev} {node|short}: {desc} {branches}\n" | |
10 | > EOF |
|
10 | > EOF | |
11 |
|
11 | |||
12 | Setup HTTP server control: |
|
12 | Setup HTTP server control: | |
13 |
|
13 | |||
14 | $ remote=http://localhost:$HGPORT/ |
|
14 | $ remote=http://localhost:$HGPORT/ | |
15 | $ export remote |
|
15 | $ export remote | |
16 | $ tstart() { |
|
16 | $ tstart() { | |
17 | > echo '[web]' > $1/.hg/hgrc |
|
17 | > echo '[web]' > $1/.hg/hgrc | |
18 | > echo 'push_ssl = false' >> $1/.hg/hgrc |
|
18 | > echo 'push_ssl = false' >> $1/.hg/hgrc | |
19 | > echo 'allow_push = *' >> $1/.hg/hgrc |
|
19 | > echo 'allow_push = *' >> $1/.hg/hgrc | |
20 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
20 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
21 | > cat hg.pid >> $DAEMON_PIDS |
|
21 | > cat hg.pid >> $DAEMON_PIDS | |
22 | > } |
|
22 | > } | |
23 | $ tstop() { |
|
23 | $ tstop() { | |
24 | > killdaemons.py |
|
24 | > killdaemons.py | |
25 | > [ "$1" ] && cut -d' ' -f6- access.log && cat errors.log |
|
25 | > [ "$1" ] && cut -d' ' -f6- access.log && cat errors.log | |
26 | > rm access.log errors.log |
|
26 | > rm access.log errors.log | |
27 | > } |
|
27 | > } | |
28 |
|
28 | |||
29 | Both are empty: |
|
29 | Both are empty: | |
30 |
|
30 | |||
31 | $ hg init empty1 |
|
31 | $ hg init empty1 | |
32 | $ hg init empty2 |
|
32 | $ hg init empty2 | |
33 | $ tstart empty2 |
|
33 | $ tstart empty2 | |
34 | $ hg incoming -R empty1 $remote |
|
34 | $ hg incoming -R empty1 $remote | |
35 | comparing with http://localhost:$HGPORT/ |
|
35 | comparing with http://localhost:$HGPORT/ | |
36 | no changes found |
|
36 | no changes found | |
37 | [1] |
|
37 | [1] | |
38 | $ hg outgoing -R empty1 $remote |
|
38 | $ hg outgoing -R empty1 $remote | |
39 | comparing with http://localhost:$HGPORT/ |
|
39 | comparing with http://localhost:$HGPORT/ | |
40 | no changes found |
|
40 | no changes found | |
41 | [1] |
|
41 | [1] | |
42 | $ hg pull -R empty1 $remote |
|
42 | $ hg pull -R empty1 $remote | |
43 | pulling from http://localhost:$HGPORT/ |
|
43 | pulling from http://localhost:$HGPORT/ | |
44 | no changes found |
|
44 | no changes found | |
45 | $ hg push -R empty1 $remote |
|
45 | $ hg push -R empty1 $remote | |
46 | pushing to http://localhost:$HGPORT/ |
|
46 | pushing to http://localhost:$HGPORT/ | |
47 | no changes found |
|
47 | no changes found | |
48 | [1] |
|
48 | [1] | |
49 | $ tstop |
|
49 | $ tstop | |
50 |
|
50 | |||
51 | Base repo: |
|
51 | Base repo: | |
52 |
|
52 | |||
53 | $ hg init main |
|
53 | $ hg init main | |
54 | $ cd main |
|
54 | $ cd main | |
55 | $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' |
|
55 | $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' | |
56 | $ hg log -G |
|
56 | $ hg log -G | |
57 | o 11 a19bfa7e7328: r11 both |
|
57 | o 11 a19bfa7e7328: r11 both | |
58 | | |
|
58 | | | |
59 | o 10 8b6bad1512e1: r10 both |
|
59 | o 10 8b6bad1512e1: r10 both | |
60 | | |
|
60 | | | |
61 | o 9 025829e08038: r9 both |
|
61 | o 9 025829e08038: r9 both | |
62 | |\ |
|
62 | |\ | |
63 | | o 8 d8f638ac69e9: r8 name2 |
|
63 | | o 8 d8f638ac69e9: r8 name2 | |
64 | | | |
|
64 | | | | |
65 | | o 7 b6b4d315a2ac: r7 name2 |
|
65 | | o 7 b6b4d315a2ac: r7 name2 | |
66 | | | |
|
66 | | | | |
67 | | o 6 6c6f5d5f3c11: r6 name2 |
|
67 | | o 6 6c6f5d5f3c11: r6 name2 | |
68 | | | |
|
68 | | | | |
69 | | o 5 70314b29987d: r5 name2 |
|
69 | | o 5 70314b29987d: r5 name2 | |
70 | | | |
|
70 | | | | |
71 | o | 4 e71dbbc70e03: r4 name1 |
|
71 | o | 4 e71dbbc70e03: r4 name1 | |
72 | | | |
|
72 | | | | |
73 | o | 3 2c8d5d5ec612: r3 name1 |
|
73 | o | 3 2c8d5d5ec612: r3 name1 | |
74 | | | |
|
74 | | | | |
75 | o | 2 a7892891da29: r2 name1 |
|
75 | o | 2 a7892891da29: r2 name1 | |
76 | |/ |
|
76 | |/ | |
77 | o 1 0019a3b924fd: r1 |
|
77 | o 1 0019a3b924fd: r1 | |
78 | | |
|
78 | | | |
79 | o 0 d57206cc072a: r0 |
|
79 | o 0 d57206cc072a: r0 | |
80 |
|
80 | |||
81 | $ cd .. |
|
81 | $ cd .. | |
82 | $ tstart main |
|
82 | $ tstart main | |
83 |
|
83 | |||
84 | Full clone: |
|
84 | Full clone: | |
85 |
|
85 | |||
86 | $ hg clone main full |
|
86 | $ hg clone main full | |
87 | updating to branch default |
|
87 | updating to branch default | |
88 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
88 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
89 | $ cd full |
|
89 | $ cd full | |
90 | $ hg incoming $remote |
|
90 | $ hg incoming $remote | |
91 | comparing with http://localhost:$HGPORT/ |
|
91 | comparing with http://localhost:$HGPORT/ | |
92 | searching for changes |
|
92 | searching for changes | |
93 | no changes found |
|
93 | no changes found | |
94 | [1] |
|
94 | [1] | |
95 | $ hg outgoing $remote |
|
95 | $ hg outgoing $remote | |
96 | comparing with http://localhost:$HGPORT/ |
|
96 | comparing with http://localhost:$HGPORT/ | |
97 | searching for changes |
|
97 | searching for changes | |
98 | no changes found |
|
98 | no changes found | |
99 | [1] |
|
99 | [1] | |
100 | $ hg pull $remote |
|
100 | $ hg pull $remote | |
101 | pulling from http://localhost:$HGPORT/ |
|
101 | pulling from http://localhost:$HGPORT/ | |
102 | searching for changes |
|
102 | searching for changes | |
103 | no changes found |
|
103 | no changes found | |
104 | $ hg push $remote |
|
104 | $ hg push $remote | |
105 | pushing to http://localhost:$HGPORT/ |
|
105 | pushing to http://localhost:$HGPORT/ | |
106 | searching for changes |
|
106 | searching for changes | |
107 | no changes found |
|
107 | no changes found | |
108 | [1] |
|
108 | [1] | |
109 | $ cd .. |
|
109 | $ cd .. | |
110 |
|
110 | |||
111 | Local is empty: |
|
111 | Local is empty: | |
112 |
|
112 | |||
113 | $ cd empty1 |
|
113 | $ cd empty1 | |
114 | $ hg incoming $remote |
|
114 | $ hg incoming $remote | |
115 | comparing with http://localhost:$HGPORT/ |
|
115 | comparing with http://localhost:$HGPORT/ | |
116 | 0 d57206cc072a: r0 |
|
116 | 0 d57206cc072a: r0 | |
117 | 1 0019a3b924fd: r1 |
|
117 | 1 0019a3b924fd: r1 | |
118 | 2 a7892891da29: r2 name1 |
|
118 | 2 a7892891da29: r2 name1 | |
119 | 3 2c8d5d5ec612: r3 name1 |
|
119 | 3 2c8d5d5ec612: r3 name1 | |
120 | 4 e71dbbc70e03: r4 name1 |
|
120 | 4 e71dbbc70e03: r4 name1 | |
121 | 5 70314b29987d: r5 name2 |
|
121 | 5 70314b29987d: r5 name2 | |
122 | 6 6c6f5d5f3c11: r6 name2 |
|
122 | 6 6c6f5d5f3c11: r6 name2 | |
123 | 7 b6b4d315a2ac: r7 name2 |
|
123 | 7 b6b4d315a2ac: r7 name2 | |
124 | 8 d8f638ac69e9: r8 name2 |
|
124 | 8 d8f638ac69e9: r8 name2 | |
125 | 9 025829e08038: r9 both |
|
125 | 9 025829e08038: r9 both | |
126 | 10 8b6bad1512e1: r10 both |
|
126 | 10 8b6bad1512e1: r10 both | |
127 | 11 a19bfa7e7328: r11 both |
|
127 | 11 a19bfa7e7328: r11 both | |
128 | $ hg outgoing $remote |
|
128 | $ hg outgoing $remote | |
129 | comparing with http://localhost:$HGPORT/ |
|
129 | comparing with http://localhost:$HGPORT/ | |
130 | no changes found |
|
130 | no changes found | |
131 | [1] |
|
131 | [1] | |
132 | $ hg push $remote |
|
132 | $ hg push $remote | |
133 | pushing to http://localhost:$HGPORT/ |
|
133 | pushing to http://localhost:$HGPORT/ | |
134 | no changes found |
|
134 | no changes found | |
135 | [1] |
|
135 | [1] | |
136 | $ hg pull $remote |
|
136 | $ hg pull $remote | |
137 | pulling from http://localhost:$HGPORT/ |
|
137 | pulling from http://localhost:$HGPORT/ | |
138 | requesting all changes |
|
138 | requesting all changes | |
139 | adding changesets |
|
139 | adding changesets | |
140 | adding manifests |
|
140 | adding manifests | |
141 | adding file changes |
|
141 | adding file changes | |
142 | added 12 changesets with 24 changes to 2 files |
|
142 | added 12 changesets with 24 changes to 2 files | |
143 | (run 'hg update' to get a working copy) |
|
143 | (run 'hg update' to get a working copy) | |
144 | $ hg incoming $remote |
|
144 | $ hg incoming $remote | |
145 | comparing with http://localhost:$HGPORT/ |
|
145 | comparing with http://localhost:$HGPORT/ | |
146 | searching for changes |
|
146 | searching for changes | |
147 | no changes found |
|
147 | no changes found | |
148 | [1] |
|
148 | [1] | |
149 | $ cd .. |
|
149 | $ cd .. | |
150 |
|
150 | |||
151 | Local is subset: |
|
151 | Local is subset: | |
152 |
|
152 | |||
153 | $ hg clone main subset --rev name2 ; cd subset |
|
153 | $ hg clone main subset --rev name2 ; cd subset | |
154 | adding changesets |
|
154 | adding changesets | |
155 | adding manifests |
|
155 | adding manifests | |
156 | adding file changes |
|
156 | adding file changes | |
157 | added 6 changesets with 12 changes to 2 files |
|
157 | added 6 changesets with 12 changes to 2 files | |
158 | updating to branch name2 |
|
158 | updating to branch name2 | |
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
160 | $ hg incoming $remote |
|
160 | $ hg incoming $remote | |
161 | comparing with http://localhost:$HGPORT/ |
|
161 | comparing with http://localhost:$HGPORT/ | |
162 | searching for changes |
|
162 | searching for changes | |
163 | 6 a7892891da29: r2 name1 |
|
163 | 6 a7892891da29: r2 name1 | |
164 | 7 2c8d5d5ec612: r3 name1 |
|
164 | 7 2c8d5d5ec612: r3 name1 | |
165 | 8 e71dbbc70e03: r4 name1 |
|
165 | 8 e71dbbc70e03: r4 name1 | |
166 | 9 025829e08038: r9 both |
|
166 | 9 025829e08038: r9 both | |
167 | 10 8b6bad1512e1: r10 both |
|
167 | 10 8b6bad1512e1: r10 both | |
168 | 11 a19bfa7e7328: r11 both |
|
168 | 11 a19bfa7e7328: r11 both | |
169 | $ hg outgoing $remote |
|
169 | $ hg outgoing $remote | |
170 | comparing with http://localhost:$HGPORT/ |
|
170 | comparing with http://localhost:$HGPORT/ | |
171 | searching for changes |
|
171 | searching for changes | |
172 | no changes found |
|
172 | no changes found | |
173 | [1] |
|
173 | [1] | |
174 | $ hg push $remote |
|
174 | $ hg push $remote | |
175 | pushing to http://localhost:$HGPORT/ |
|
175 | pushing to http://localhost:$HGPORT/ | |
176 | searching for changes |
|
176 | searching for changes | |
177 | no changes found |
|
177 | no changes found | |
178 | [1] |
|
178 | [1] | |
179 | $ hg pull $remote |
|
179 | $ hg pull $remote | |
180 | pulling from http://localhost:$HGPORT/ |
|
180 | pulling from http://localhost:$HGPORT/ | |
181 | searching for changes |
|
181 | searching for changes | |
182 | adding changesets |
|
182 | adding changesets | |
183 | adding manifests |
|
183 | adding manifests | |
184 | adding file changes |
|
184 | adding file changes | |
185 | added 6 changesets with 12 changes to 2 files |
|
185 | added 6 changesets with 12 changes to 2 files | |
186 | (run 'hg update' to get a working copy) |
|
186 | (run 'hg update' to get a working copy) | |
187 | $ hg incoming $remote |
|
187 | $ hg incoming $remote | |
188 | comparing with http://localhost:$HGPORT/ |
|
188 | comparing with http://localhost:$HGPORT/ | |
189 | searching for changes |
|
189 | searching for changes | |
190 | no changes found |
|
190 | no changes found | |
191 | [1] |
|
191 | [1] | |
192 | $ cd .. |
|
192 | $ cd .. | |
193 | $ tstop |
|
193 | $ tstop | |
194 |
|
194 | |||
195 | Remote is empty: |
|
195 | Remote is empty: | |
196 |
|
196 | |||
197 | $ tstart empty2 |
|
197 | $ tstart empty2 | |
198 | $ cd main |
|
198 | $ cd main | |
199 | $ hg incoming $remote |
|
199 | $ hg incoming $remote | |
200 | comparing with http://localhost:$HGPORT/ |
|
200 | comparing with http://localhost:$HGPORT/ | |
201 | searching for changes |
|
201 | searching for changes | |
202 | no changes found |
|
202 | no changes found | |
203 | [1] |
|
203 | [1] | |
204 | $ hg outgoing $remote |
|
204 | $ hg outgoing $remote | |
205 | comparing with http://localhost:$HGPORT/ |
|
205 | comparing with http://localhost:$HGPORT/ | |
206 | searching for changes |
|
206 | searching for changes | |
207 | 0 d57206cc072a: r0 |
|
207 | 0 d57206cc072a: r0 | |
208 | 1 0019a3b924fd: r1 |
|
208 | 1 0019a3b924fd: r1 | |
209 | 2 a7892891da29: r2 name1 |
|
209 | 2 a7892891da29: r2 name1 | |
210 | 3 2c8d5d5ec612: r3 name1 |
|
210 | 3 2c8d5d5ec612: r3 name1 | |
211 | 4 e71dbbc70e03: r4 name1 |
|
211 | 4 e71dbbc70e03: r4 name1 | |
212 | 5 70314b29987d: r5 name2 |
|
212 | 5 70314b29987d: r5 name2 | |
213 | 6 6c6f5d5f3c11: r6 name2 |
|
213 | 6 6c6f5d5f3c11: r6 name2 | |
214 | 7 b6b4d315a2ac: r7 name2 |
|
214 | 7 b6b4d315a2ac: r7 name2 | |
215 | 8 d8f638ac69e9: r8 name2 |
|
215 | 8 d8f638ac69e9: r8 name2 | |
216 | 9 025829e08038: r9 both |
|
216 | 9 025829e08038: r9 both | |
217 | 10 8b6bad1512e1: r10 both |
|
217 | 10 8b6bad1512e1: r10 both | |
218 | 11 a19bfa7e7328: r11 both |
|
218 | 11 a19bfa7e7328: r11 both | |
219 | $ hg pull $remote |
|
219 | $ hg pull $remote | |
220 | pulling from http://localhost:$HGPORT/ |
|
220 | pulling from http://localhost:$HGPORT/ | |
221 | searching for changes |
|
221 | searching for changes | |
222 | no changes found |
|
222 | no changes found | |
223 | $ hg push $remote |
|
223 | $ hg push $remote | |
224 | pushing to http://localhost:$HGPORT/ |
|
224 | pushing to http://localhost:$HGPORT/ | |
225 | searching for changes |
|
225 | searching for changes | |
226 | remote: adding changesets |
|
226 | remote: adding changesets | |
227 | remote: adding manifests |
|
227 | remote: adding manifests | |
228 | remote: adding file changes |
|
228 | remote: adding file changes | |
229 | remote: added 12 changesets with 24 changes to 2 files |
|
229 | remote: added 12 changesets with 24 changes to 2 files | |
230 | $ hg outgoing $remote |
|
230 | $ hg outgoing $remote | |
231 | comparing with http://localhost:$HGPORT/ |
|
231 | comparing with http://localhost:$HGPORT/ | |
232 | searching for changes |
|
232 | searching for changes | |
233 | no changes found |
|
233 | no changes found | |
234 | [1] |
|
234 | [1] | |
235 | $ cd .. |
|
235 | $ cd .. | |
236 | $ tstop |
|
236 | $ tstop | |
237 |
|
237 | |||
238 | Local is superset: |
|
238 | Local is superset: | |
239 |
|
239 | |||
240 | $ hg clone main subset2 --rev name2 |
|
240 | $ hg clone main subset2 --rev name2 | |
241 | adding changesets |
|
241 | adding changesets | |
242 | adding manifests |
|
242 | adding manifests | |
243 | adding file changes |
|
243 | adding file changes | |
244 | added 6 changesets with 12 changes to 2 files |
|
244 | added 6 changesets with 12 changes to 2 files | |
245 | updating to branch name2 |
|
245 | updating to branch name2 | |
246 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
246 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
247 | $ tstart subset2 |
|
247 | $ tstart subset2 | |
248 | $ cd main |
|
248 | $ cd main | |
249 | $ hg incoming $remote |
|
249 | $ hg incoming $remote | |
250 | comparing with http://localhost:$HGPORT/ |
|
250 | comparing with http://localhost:$HGPORT/ | |
251 | searching for changes |
|
251 | searching for changes | |
252 | no changes found |
|
252 | no changes found | |
253 | [1] |
|
253 | [1] | |
254 | $ hg outgoing $remote |
|
254 | $ hg outgoing $remote | |
255 | comparing with http://localhost:$HGPORT/ |
|
255 | comparing with http://localhost:$HGPORT/ | |
256 | searching for changes |
|
256 | searching for changes | |
257 | 2 a7892891da29: r2 name1 |
|
257 | 2 a7892891da29: r2 name1 | |
258 | 3 2c8d5d5ec612: r3 name1 |
|
258 | 3 2c8d5d5ec612: r3 name1 | |
259 | 4 e71dbbc70e03: r4 name1 |
|
259 | 4 e71dbbc70e03: r4 name1 | |
260 | 9 025829e08038: r9 both |
|
260 | 9 025829e08038: r9 both | |
261 | 10 8b6bad1512e1: r10 both |
|
261 | 10 8b6bad1512e1: r10 both | |
262 | 11 a19bfa7e7328: r11 both |
|
262 | 11 a19bfa7e7328: r11 both | |
263 | $ hg pull $remote |
|
263 | $ hg pull $remote | |
264 | pulling from http://localhost:$HGPORT/ |
|
264 | pulling from http://localhost:$HGPORT/ | |
265 | searching for changes |
|
265 | searching for changes | |
266 | no changes found |
|
266 | no changes found | |
267 | $ hg push $remote |
|
267 | $ hg push $remote | |
268 | pushing to http://localhost:$HGPORT/ |
|
268 | pushing to http://localhost:$HGPORT/ | |
269 | searching for changes |
|
269 | searching for changes | |
270 | abort: push creates new remote branches: both, name1! |
|
270 | abort: push creates new remote branches: both, name1! | |
271 | (use 'hg push --new-branch' to create new remote branches) |
|
271 | (use 'hg push --new-branch' to create new remote branches) | |
272 | [255] |
|
272 | [255] | |
273 | $ hg push $remote --new-branch |
|
273 | $ hg push $remote --new-branch | |
274 | pushing to http://localhost:$HGPORT/ |
|
274 | pushing to http://localhost:$HGPORT/ | |
275 | searching for changes |
|
275 | searching for changes | |
276 | remote: adding changesets |
|
276 | remote: adding changesets | |
277 | remote: adding manifests |
|
277 | remote: adding manifests | |
278 | remote: adding file changes |
|
278 | remote: adding file changes | |
279 | remote: added 6 changesets with 12 changes to 2 files |
|
279 | remote: added 6 changesets with 12 changes to 2 files | |
280 | $ hg outgoing $remote |
|
280 | $ hg outgoing $remote | |
281 | comparing with http://localhost:$HGPORT/ |
|
281 | comparing with http://localhost:$HGPORT/ | |
282 | searching for changes |
|
282 | searching for changes | |
283 | no changes found |
|
283 | no changes found | |
284 | [1] |
|
284 | [1] | |
285 | $ cd .. |
|
285 | $ cd .. | |
286 | $ tstop |
|
286 | $ tstop | |
287 |
|
287 | |||
288 | Partial pull: |
|
288 | Partial pull: | |
289 |
|
289 | |||
290 | $ tstart main |
|
290 | $ tstart main | |
291 | $ hg clone $remote partial --rev name2 |
|
291 | $ hg clone $remote partial --rev name2 | |
292 | adding changesets |
|
292 | adding changesets | |
293 | adding manifests |
|
293 | adding manifests | |
294 | adding file changes |
|
294 | adding file changes | |
295 | added 6 changesets with 12 changes to 2 files |
|
295 | added 6 changesets with 12 changes to 2 files | |
296 | updating to branch name2 |
|
296 | updating to branch name2 | |
297 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
297 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
298 | $ cd partial |
|
298 | $ cd partial | |
299 | $ hg incoming $remote |
|
299 | $ hg incoming $remote | |
300 | comparing with http://localhost:$HGPORT/ |
|
300 | comparing with http://localhost:$HGPORT/ | |
301 | searching for changes |
|
301 | searching for changes | |
302 | 6 a7892891da29: r2 name1 |
|
302 | 6 a7892891da29: r2 name1 | |
303 | 7 2c8d5d5ec612: r3 name1 |
|
303 | 7 2c8d5d5ec612: r3 name1 | |
304 | 8 e71dbbc70e03: r4 name1 |
|
304 | 8 e71dbbc70e03: r4 name1 | |
305 | 9 025829e08038: r9 both |
|
305 | 9 025829e08038: r9 both | |
306 | 10 8b6bad1512e1: r10 both |
|
306 | 10 8b6bad1512e1: r10 both | |
307 | 11 a19bfa7e7328: r11 both |
|
307 | 11 a19bfa7e7328: r11 both | |
308 | $ hg incoming $remote --rev name1 |
|
308 | $ hg incoming $remote --rev name1 | |
309 | comparing with http://localhost:$HGPORT/ |
|
309 | comparing with http://localhost:$HGPORT/ | |
310 | searching for changes |
|
310 | searching for changes | |
311 | 6 a7892891da29: r2 name1 |
|
311 | 6 a7892891da29: r2 name1 | |
312 | 7 2c8d5d5ec612: r3 name1 |
|
312 | 7 2c8d5d5ec612: r3 name1 | |
313 | 8 e71dbbc70e03: r4 name1 |
|
313 | 8 e71dbbc70e03: r4 name1 | |
314 | $ hg pull $remote --rev name1 |
|
314 | $ hg pull $remote --rev name1 | |
315 | pulling from http://localhost:$HGPORT/ |
|
315 | pulling from http://localhost:$HGPORT/ | |
316 | searching for changes |
|
316 | searching for changes | |
317 | adding changesets |
|
317 | adding changesets | |
318 | adding manifests |
|
318 | adding manifests | |
319 | adding file changes |
|
319 | adding file changes | |
320 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
320 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
321 | (run 'hg heads' to see heads) |
|
321 | (run 'hg heads' to see heads) | |
322 | $ hg incoming $remote |
|
322 | $ hg incoming $remote | |
323 | comparing with http://localhost:$HGPORT/ |
|
323 | comparing with http://localhost:$HGPORT/ | |
324 | searching for changes |
|
324 | searching for changes | |
325 | 9 025829e08038: r9 both |
|
325 | 9 025829e08038: r9 both | |
326 | 10 8b6bad1512e1: r10 both |
|
326 | 10 8b6bad1512e1: r10 both | |
327 | 11 a19bfa7e7328: r11 both |
|
327 | 11 a19bfa7e7328: r11 both | |
328 | $ cd .. |
|
328 | $ cd .. | |
329 | $ tstop |
|
329 | $ tstop | |
330 |
|
330 | |||
331 | Both have new stuff in new named branches: |
|
331 | Both have new stuff in new named branches: | |
332 |
|
332 | |||
333 | $ hg clone main repo1a --rev name1 -q |
|
333 | $ hg clone main repo1a --rev name1 -q | |
334 | $ hg clone repo1a repo1b -q |
|
334 | $ hg clone repo1a repo1b -q | |
335 | $ hg clone main repo2a --rev name2 -q |
|
335 | $ hg clone main repo2a --rev name2 -q | |
336 | $ hg clone repo2a repo2b -q |
|
336 | $ hg clone repo2a repo2b -q | |
337 | $ tstart repo1a |
|
337 | $ tstart repo1a | |
338 |
|
338 | |||
339 | $ cd repo2a |
|
339 | $ cd repo2a | |
340 | $ hg incoming $remote |
|
340 | $ hg incoming $remote | |
341 | comparing with http://localhost:$HGPORT/ |
|
341 | comparing with http://localhost:$HGPORT/ | |
342 | searching for changes |
|
342 | searching for changes | |
343 | 6 a7892891da29: r2 name1 |
|
343 | 6 a7892891da29: r2 name1 | |
344 | 7 2c8d5d5ec612: r3 name1 |
|
344 | 7 2c8d5d5ec612: r3 name1 | |
345 | 8 e71dbbc70e03: r4 name1 |
|
345 | 8 e71dbbc70e03: r4 name1 | |
346 | $ hg outgoing $remote |
|
346 | $ hg outgoing $remote | |
347 | comparing with http://localhost:$HGPORT/ |
|
347 | comparing with http://localhost:$HGPORT/ | |
348 | searching for changes |
|
348 | searching for changes | |
349 | 2 70314b29987d: r5 name2 |
|
349 | 2 70314b29987d: r5 name2 | |
350 | 3 6c6f5d5f3c11: r6 name2 |
|
350 | 3 6c6f5d5f3c11: r6 name2 | |
351 | 4 b6b4d315a2ac: r7 name2 |
|
351 | 4 b6b4d315a2ac: r7 name2 | |
352 | 5 d8f638ac69e9: r8 name2 |
|
352 | 5 d8f638ac69e9: r8 name2 | |
353 | $ hg push $remote --new-branch |
|
353 | $ hg push $remote --new-branch | |
354 | pushing to http://localhost:$HGPORT/ |
|
354 | pushing to http://localhost:$HGPORT/ | |
355 | searching for changes |
|
355 | searching for changes | |
356 | remote: adding changesets |
|
356 | remote: adding changesets | |
357 | remote: adding manifests |
|
357 | remote: adding manifests | |
358 | remote: adding file changes |
|
358 | remote: adding file changes | |
359 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
|
359 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) | |
360 | $ hg pull $remote |
|
360 | $ hg pull $remote | |
361 | pulling from http://localhost:$HGPORT/ |
|
361 | pulling from http://localhost:$HGPORT/ | |
362 | searching for changes |
|
362 | searching for changes | |
363 | adding changesets |
|
363 | adding changesets | |
364 | adding manifests |
|
364 | adding manifests | |
365 | adding file changes |
|
365 | adding file changes | |
366 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
366 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
367 | (run 'hg heads' to see heads) |
|
367 | (run 'hg heads' to see heads) | |
368 | $ hg incoming $remote |
|
368 | $ hg incoming $remote | |
369 | comparing with http://localhost:$HGPORT/ |
|
369 | comparing with http://localhost:$HGPORT/ | |
370 | searching for changes |
|
370 | searching for changes | |
371 | no changes found |
|
371 | no changes found | |
372 | [1] |
|
372 | [1] | |
373 | $ hg outgoing $remote |
|
373 | $ hg outgoing $remote | |
374 | comparing with http://localhost:$HGPORT/ |
|
374 | comparing with http://localhost:$HGPORT/ | |
375 | searching for changes |
|
375 | searching for changes | |
376 | no changes found |
|
376 | no changes found | |
377 | [1] |
|
377 | [1] | |
378 | $ cd .. |
|
378 | $ cd .. | |
379 | $ tstop |
|
379 | $ tstop | |
380 |
|
380 | |||
381 | $ tstart repo1b |
|
381 | $ tstart repo1b | |
382 | $ cd repo2b |
|
382 | $ cd repo2b | |
383 | $ hg incoming $remote |
|
383 | $ hg incoming $remote | |
384 | comparing with http://localhost:$HGPORT/ |
|
384 | comparing with http://localhost:$HGPORT/ | |
385 | searching for changes |
|
385 | searching for changes | |
386 | 6 a7892891da29: r2 name1 |
|
386 | 6 a7892891da29: r2 name1 | |
387 | 7 2c8d5d5ec612: r3 name1 |
|
387 | 7 2c8d5d5ec612: r3 name1 | |
388 | 8 e71dbbc70e03: r4 name1 |
|
388 | 8 e71dbbc70e03: r4 name1 | |
389 | $ hg outgoing $remote |
|
389 | $ hg outgoing $remote | |
390 | comparing with http://localhost:$HGPORT/ |
|
390 | comparing with http://localhost:$HGPORT/ | |
391 | searching for changes |
|
391 | searching for changes | |
392 | 2 70314b29987d: r5 name2 |
|
392 | 2 70314b29987d: r5 name2 | |
393 | 3 6c6f5d5f3c11: r6 name2 |
|
393 | 3 6c6f5d5f3c11: r6 name2 | |
394 | 4 b6b4d315a2ac: r7 name2 |
|
394 | 4 b6b4d315a2ac: r7 name2 | |
395 | 5 d8f638ac69e9: r8 name2 |
|
395 | 5 d8f638ac69e9: r8 name2 | |
396 | $ hg pull $remote |
|
396 | $ hg pull $remote | |
397 | pulling from http://localhost:$HGPORT/ |
|
397 | pulling from http://localhost:$HGPORT/ | |
398 | searching for changes |
|
398 | searching for changes | |
399 | adding changesets |
|
399 | adding changesets | |
400 | adding manifests |
|
400 | adding manifests | |
401 | adding file changes |
|
401 | adding file changes | |
402 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
402 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
403 | (run 'hg heads' to see heads) |
|
403 | (run 'hg heads' to see heads) | |
404 | $ hg push $remote --new-branch |
|
404 | $ hg push $remote --new-branch | |
405 | pushing to http://localhost:$HGPORT/ |
|
405 | pushing to http://localhost:$HGPORT/ | |
406 | searching for changes |
|
406 | searching for changes | |
407 | remote: adding changesets |
|
407 | remote: adding changesets | |
408 | remote: adding manifests |
|
408 | remote: adding manifests | |
409 | remote: adding file changes |
|
409 | remote: adding file changes | |
410 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
|
410 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) | |
411 | $ hg incoming $remote |
|
411 | $ hg incoming $remote | |
412 | comparing with http://localhost:$HGPORT/ |
|
412 | comparing with http://localhost:$HGPORT/ | |
413 | searching for changes |
|
413 | searching for changes | |
414 | no changes found |
|
414 | no changes found | |
415 | [1] |
|
415 | [1] | |
416 | $ hg outgoing $remote |
|
416 | $ hg outgoing $remote | |
417 | comparing with http://localhost:$HGPORT/ |
|
417 | comparing with http://localhost:$HGPORT/ | |
418 | searching for changes |
|
418 | searching for changes | |
419 | no changes found |
|
419 | no changes found | |
420 | [1] |
|
420 | [1] | |
421 | $ cd .. |
|
421 | $ cd .. | |
422 | $ tstop |
|
422 | $ tstop | |
423 |
|
423 | |||
424 | Both have new stuff in existing named branches: |
|
424 | Both have new stuff in existing named branches: | |
425 |
|
425 | |||
426 | $ rm -r repo1a repo1b repo2a repo2b |
|
426 | $ rm -r repo1a repo1b repo2a repo2b | |
427 | $ hg clone main repo1a --rev 3 --rev 8 -q |
|
427 | $ hg clone main repo1a --rev 3 --rev 8 -q | |
428 | $ hg clone repo1a repo1b -q |
|
428 | $ hg clone repo1a repo1b -q | |
429 | $ hg clone main repo2a --rev 4 --rev 7 -q |
|
429 | $ hg clone main repo2a --rev 4 --rev 7 -q | |
430 | $ hg clone repo2a repo2b -q |
|
430 | $ hg clone repo2a repo2b -q | |
431 | $ tstart repo1a |
|
431 | $ tstart repo1a | |
432 |
|
432 | |||
433 | $ cd repo2a |
|
433 | $ cd repo2a | |
434 | $ hg incoming $remote |
|
434 | $ hg incoming $remote | |
435 | comparing with http://localhost:$HGPORT/ |
|
435 | comparing with http://localhost:$HGPORT/ | |
436 | searching for changes |
|
436 | searching for changes | |
437 | 8 d8f638ac69e9: r8 name2 |
|
437 | 8 d8f638ac69e9: r8 name2 | |
438 | $ hg outgoing $remote |
|
438 | $ hg outgoing $remote | |
439 | comparing with http://localhost:$HGPORT/ |
|
439 | comparing with http://localhost:$HGPORT/ | |
440 | searching for changes |
|
440 | searching for changes | |
441 | 4 e71dbbc70e03: r4 name1 |
|
441 | 4 e71dbbc70e03: r4 name1 | |
442 | $ hg push $remote --new-branch |
|
442 | $ hg push $remote --new-branch | |
443 | pushing to http://localhost:$HGPORT/ |
|
443 | pushing to http://localhost:$HGPORT/ | |
444 | searching for changes |
|
444 | searching for changes | |
445 | remote: adding changesets |
|
445 | remote: adding changesets | |
446 | remote: adding manifests |
|
446 | remote: adding manifests | |
447 | remote: adding file changes |
|
447 | remote: adding file changes | |
448 | remote: added 1 changesets with 2 changes to 2 files |
|
448 | remote: added 1 changesets with 2 changes to 2 files | |
449 | $ hg pull $remote |
|
449 | $ hg pull $remote | |
450 | pulling from http://localhost:$HGPORT/ |
|
450 | pulling from http://localhost:$HGPORT/ | |
451 | searching for changes |
|
451 | searching for changes | |
452 | adding changesets |
|
452 | adding changesets | |
453 | adding manifests |
|
453 | adding manifests | |
454 | adding file changes |
|
454 | adding file changes | |
455 | added 1 changesets with 2 changes to 2 files |
|
455 | added 1 changesets with 2 changes to 2 files | |
456 | (run 'hg update' to get a working copy) |
|
456 | (run 'hg update' to get a working copy) | |
457 | $ hg incoming $remote |
|
457 | $ hg incoming $remote | |
458 | comparing with http://localhost:$HGPORT/ |
|
458 | comparing with http://localhost:$HGPORT/ | |
459 | searching for changes |
|
459 | searching for changes | |
460 | no changes found |
|
460 | no changes found | |
461 | [1] |
|
461 | [1] | |
462 | $ hg outgoing $remote |
|
462 | $ hg outgoing $remote | |
463 | comparing with http://localhost:$HGPORT/ |
|
463 | comparing with http://localhost:$HGPORT/ | |
464 | searching for changes |
|
464 | searching for changes | |
465 | no changes found |
|
465 | no changes found | |
466 | [1] |
|
466 | [1] | |
467 | $ cd .. |
|
467 | $ cd .. | |
468 | $ tstop |
|
468 | $ tstop | |
469 |
|
469 | |||
470 | $ tstart repo1b |
|
470 | $ tstart repo1b | |
471 | $ cd repo2b |
|
471 | $ cd repo2b | |
472 | $ hg incoming $remote |
|
472 | $ hg incoming $remote | |
473 | comparing with http://localhost:$HGPORT/ |
|
473 | comparing with http://localhost:$HGPORT/ | |
474 | searching for changes |
|
474 | searching for changes | |
475 | 8 d8f638ac69e9: r8 name2 |
|
475 | 8 d8f638ac69e9: r8 name2 | |
476 | $ hg outgoing $remote |
|
476 | $ hg outgoing $remote | |
477 | comparing with http://localhost:$HGPORT/ |
|
477 | comparing with http://localhost:$HGPORT/ | |
478 | searching for changes |
|
478 | searching for changes | |
479 | 4 e71dbbc70e03: r4 name1 |
|
479 | 4 e71dbbc70e03: r4 name1 | |
480 | $ hg pull $remote |
|
480 | $ hg pull $remote | |
481 | pulling from http://localhost:$HGPORT/ |
|
481 | pulling from http://localhost:$HGPORT/ | |
482 | searching for changes |
|
482 | searching for changes | |
483 | adding changesets |
|
483 | adding changesets | |
484 | adding manifests |
|
484 | adding manifests | |
485 | adding file changes |
|
485 | adding file changes | |
486 | added 1 changesets with 2 changes to 2 files |
|
486 | added 1 changesets with 2 changes to 2 files | |
487 | (run 'hg update' to get a working copy) |
|
487 | (run 'hg update' to get a working copy) | |
488 | $ hg push $remote --new-branch |
|
488 | $ hg push $remote --new-branch | |
489 | pushing to http://localhost:$HGPORT/ |
|
489 | pushing to http://localhost:$HGPORT/ | |
490 | searching for changes |
|
490 | searching for changes | |
491 | remote: adding changesets |
|
491 | remote: adding changesets | |
492 | remote: adding manifests |
|
492 | remote: adding manifests | |
493 | remote: adding file changes |
|
493 | remote: adding file changes | |
494 | remote: added 1 changesets with 2 changes to 2 files |
|
494 | remote: added 1 changesets with 2 changes to 2 files | |
495 | $ hg incoming $remote |
|
495 | $ hg incoming $remote | |
496 | comparing with http://localhost:$HGPORT/ |
|
496 | comparing with http://localhost:$HGPORT/ | |
497 | searching for changes |
|
497 | searching for changes | |
498 | no changes found |
|
498 | no changes found | |
499 | [1] |
|
499 | [1] | |
500 | $ hg outgoing $remote |
|
500 | $ hg outgoing $remote | |
501 | comparing with http://localhost:$HGPORT/ |
|
501 | comparing with http://localhost:$HGPORT/ | |
502 | searching for changes |
|
502 | searching for changes | |
503 | no changes found |
|
503 | no changes found | |
504 | [1] |
|
504 | [1] | |
505 | $ cd .. |
|
505 | $ cd .. | |
|
506 | #if zstd | |||
506 | $ tstop show |
|
507 | $ tstop show | |
507 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
508 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
508 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
509 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
509 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
510 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
510 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
511 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
511 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
512 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
512 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
513 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
513 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
514 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
514 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
515 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
515 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
516 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
516 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
517 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
517 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
518 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
518 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
519 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
519 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
520 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
520 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
521 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
521 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
522 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
522 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
523 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
523 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
524 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
524 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
525 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
525 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
526 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
526 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
527 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
527 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
528 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
528 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
529 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
529 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
530 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
530 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
531 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
531 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) |
|
532 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) | |
532 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
533 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
533 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
534 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
534 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
535 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
535 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
536 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
536 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 |
|
537 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 | |
|
538 | #else | |||
|
539 | $ tstop show | |||
|
540 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |||
|
541 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
542 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
543 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
544 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
545 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
546 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |||
|
547 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
548 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
549 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
550 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |||
|
551 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
552 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
553 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
554 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
555 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
556 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
557 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |||
|
558 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
559 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
560 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
561 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
562 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
563 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
564 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) | |||
|
565 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
566 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |||
|
567 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
568 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |||
|
569 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2 | |||
|
570 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now