Show More
@@ -1217,7 +1217,11 b' def handlepushkeyreply(op, inpart):' | |||||
1217 | def handleobsmarker(op, inpart): |
|
1217 | def handleobsmarker(op, inpart): | |
1218 | """add a stream of obsmarkers to the repo""" |
|
1218 | """add a stream of obsmarkers to the repo""" | |
1219 | tr = op.gettransaction() |
|
1219 | tr = op.gettransaction() | |
1220 | new = op.repo.obsstore.mergemarkers(tr, inpart.read()) |
|
1220 | markerdata = inpart.read() | |
|
1221 | if op.ui.config('experimental', 'obsmarkers-exchange-debug', False): | |||
|
1222 | op.ui.write(('obsmarker-exchange: %i bytes received\n') | |||
|
1223 | % len(markerdata)) | |||
|
1224 | new = op.repo.obsstore.mergemarkers(tr, markerdata) | |||
1221 | if new: |
|
1225 | if new: | |
1222 | op.repo.ui.status(_('%i new obsolescence markers\n') % new) |
|
1226 | op.repo.ui.status(_('%i new obsolescence markers\n') % new) | |
1223 | op.records.add('obsmarkers', {'new': new}) |
|
1227 | op.records.add('obsmarkers', {'new': new}) |
@@ -616,6 +616,15 b' List of both' | |||||
616 |
|
616 | |||
617 | #if serve |
|
617 | #if serve | |
618 |
|
618 | |||
|
619 | Test the debug output for exchange | |||
|
620 | ---------------------------------- | |||
|
621 | ||||
|
622 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' --config 'experimental.bundle2-exp=True' | |||
|
623 | pulling from ../tmpb | |||
|
624 | searching for changes | |||
|
625 | no changes found | |||
|
626 | obsmarker-exchange: 346 bytes received | |||
|
627 | ||||
619 | check hgweb does not explode |
|
628 | check hgweb does not explode | |
620 | ==================================== |
|
629 | ==================================== | |
621 |
|
630 |
General Comments 0
You need to be logged in to leave comments.
Login now