equal
deleted
inserted
replaced
120 > bundle2=$TESTTMP/bundle2.py |
120 > bundle2=$TESTTMP/bundle2.py |
121 > EOF |
121 > EOF |
122 |
122 |
123 Test a pull with an remote-changegroup |
123 Test a pull with an remote-changegroup |
124 |
124 |
125 $ hg bundle -R repo --base '0:4' -r '5:7' bundle.hg |
125 $ hg bundle -R repo --type v1 --base '0:4' -r '5:7' bundle.hg |
126 3 changesets found |
126 3 changesets found |
127 $ cat > repo/.hg/bundle2maker << EOF |
127 $ cat > repo/.hg/bundle2maker << EOF |
128 > remote-changegroup http://localhost:$HGPORT/bundle.hg bundle.hg |
128 > remote-changegroup http://localhost:$HGPORT/bundle.hg bundle.hg |
129 > EOF |
129 > EOF |
130 $ hg clone orig clone -r 3 -r 4 |
130 $ hg clone orig clone -r 3 -r 4 |
162 |
162 |
163 $ rm -rf clone |
163 $ rm -rf clone |
164 |
164 |
165 Test a pull with an remote-changegroup and a following changegroup |
165 Test a pull with an remote-changegroup and a following changegroup |
166 |
166 |
167 $ hg bundle -R repo --base 2 -r '3:4' bundle2.hg |
167 $ hg bundle -R repo --type v1 --base 2 -r '3:4' bundle2.hg |
168 2 changesets found |
168 2 changesets found |
169 $ cat > repo/.hg/bundle2maker << EOF |
169 $ cat > repo/.hg/bundle2maker << EOF |
170 > remote-changegroup http://localhost:$HGPORT/bundle2.hg bundle2.hg |
170 > remote-changegroup http://localhost:$HGPORT/bundle2.hg bundle2.hg |
171 > changegroup 0:4 5:7 |
171 > changegroup 0:4 5:7 |
172 > EOF |
172 > EOF |
210 |
210 |
211 $ rm -rf clone |
211 $ rm -rf clone |
212 |
212 |
213 Test a pull with a changegroup followed by an remote-changegroup |
213 Test a pull with a changegroup followed by an remote-changegroup |
214 |
214 |
215 $ hg bundle -R repo --base '0:4' -r '5:7' bundle3.hg |
215 $ hg bundle -R repo --type v1 --base '0:4' -r '5:7' bundle3.hg |
216 3 changesets found |
216 3 changesets found |
217 $ cat > repo/.hg/bundle2maker << EOF |
217 $ cat > repo/.hg/bundle2maker << EOF |
218 > changegroup 000000000000 :4 |
218 > changegroup 000000000000 :4 |
219 > remote-changegroup http://localhost:$HGPORT/bundle3.hg bundle3.hg |
219 > remote-changegroup http://localhost:$HGPORT/bundle3.hg bundle3.hg |
220 > EOF |
220 > EOF |
258 |
258 |
259 $ rm -rf clone |
259 $ rm -rf clone |
260 |
260 |
261 Test a pull with two remote-changegroups and a changegroup |
261 Test a pull with two remote-changegroups and a changegroup |
262 |
262 |
263 $ hg bundle -R repo --base 2 -r '3:4' bundle4.hg |
263 $ hg bundle -R repo --type v1 --base 2 -r '3:4' bundle4.hg |
264 2 changesets found |
264 2 changesets found |
265 $ hg bundle -R repo --base '3:4' -r '5:6' bundle5.hg |
265 $ hg bundle -R repo --type v1 --base '3:4' -r '5:6' bundle5.hg |
266 2 changesets found |
266 2 changesets found |
267 $ cat > repo/.hg/bundle2maker << EOF |
267 $ cat > repo/.hg/bundle2maker << EOF |
268 > remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg |
268 > remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg |
269 > remote-changegroup http://localhost:$HGPORT/bundle5.hg bundle5.hg |
269 > remote-changegroup http://localhost:$HGPORT/bundle5.hg bundle5.hg |
270 > changegroup 0:6 7 |
270 > changegroup 0:6 7 |
314 |
314 |
315 $ rm -rf clone |
315 $ rm -rf clone |
316 |
316 |
317 Hash digest tests |
317 Hash digest tests |
318 |
318 |
319 $ hg bundle -R repo -a bundle6.hg |
319 $ hg bundle -R repo --type v1 -a bundle6.hg |
320 8 changesets found |
320 8 changesets found |
321 |
321 |
322 $ cat > repo/.hg/bundle2maker << EOF |
322 $ cat > repo/.hg/bundle2maker << EOF |
323 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} |
323 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} |
324 > EOF |
324 > EOF |