Show More
@@ -391,7 +391,7 b' def find_pullbundle(repo, proto, opts, c' | |||||
391 | res = exchange.filterclonebundleentries(repo, res) |
|
391 | res = exchange.filterclonebundleentries(repo, res) | |
392 | if not res: |
|
392 | if not res: | |
393 | return None |
|
393 | return None | |
394 | cl = repo.changelog |
|
394 | cl = repo.unfiltered().changelog | |
395 | heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True) |
|
395 | heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True) | |
396 | common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True) |
|
396 | common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True) | |
397 | compformats = clientcompressionsupport(proto) |
|
397 | compformats = clientcompressionsupport(proto) |
@@ -36,6 +36,8 b' Test pullbundle functionality' | |||||
36 | $ cat <<EOF > .hg/hgrc |
|
36 | $ cat <<EOF > .hg/hgrc | |
37 | > [server] |
|
37 | > [server] | |
38 | > pullbundle = True |
|
38 | > pullbundle = True | |
|
39 | > [experimental] | |||
|
40 | > evolution = True | |||
39 | > [extensions] |
|
41 | > [extensions] | |
40 | > blackbox = |
|
42 | > blackbox = | |
41 | > EOF |
|
43 | > EOF | |
@@ -185,3 +187,24 b' Test recovery from misconfigured server ' | |||||
185 | * sending pullbundle "0.hg" (glob) |
|
187 | * sending pullbundle "0.hg" (glob) | |
186 | * sending pullbundle "0.hg" (glob) |
|
188 | * sending pullbundle "0.hg" (glob) | |
187 | $ rm repo/.hg/blackbox.log |
|
189 | $ rm repo/.hg/blackbox.log | |
|
190 | ||||
|
191 | Test processing when nodes used in the pullbundle.manifest end up being hidden | |||
|
192 | ||||
|
193 | $ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a | |||
|
194 | 1 new obsolescence markers | |||
|
195 | obsoleted 1 changesets | |||
|
196 | $ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log | |||
|
197 | $ cat hg.pid >> $DAEMON_PIDS | |||
|
198 | $ hg clone http://localhost:$HGPORT repo-obs | |||
|
199 | requesting all changes | |||
|
200 | adding changesets | |||
|
201 | adding manifests | |||
|
202 | adding file changes | |||
|
203 | adding changesets | |||
|
204 | adding manifests | |||
|
205 | adding file changes | |||
|
206 | added 2 changesets with 2 changes to 2 files | |||
|
207 | new changesets bbd179dfa0a7:effea6de0384 | |||
|
208 | updating to branch default | |||
|
209 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
210 | $ killdaemons.py |
General Comments 0
You need to be logged in to leave comments.
Login now