Show More
@@ -241,8 +241,10 b' def findcommonheads(ui, local, remote,' | |||||
241 | elapsed = util.timer() - start |
|
241 | elapsed = util.timer() - start | |
242 | ui.progress(_('searching'), None) |
|
242 | ui.progress(_('searching'), None) | |
243 | ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) |
|
243 | ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) | |
244 |
msg = 'found %d common and %d |
|
244 | msg = ('found %d common and %d unknown server heads,' | |
245 | ui.log('discovery', msg, len(result), len(srvheadhashes), roundtrips, |
|
245 | ' %d roundtrips in %.4fs\n') | |
|
246 | missing = set(result) - set(srvheads) | |||
|
247 | ui.log('discovery', msg, len(result), len(missing), roundtrips, | |||
246 | elapsed) |
|
248 | elapsed) | |
247 |
|
249 | |||
248 | if not result and srvheadhashes != [nullid]: |
|
250 | if not result and srvheadhashes != [nullid]: |
@@ -404,7 +404,7 b' fixed in 86c35b7ae300:' | |||||
404 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
404 | 101 102 103 104 105 106 107 108 109 110 (no-eol) | |
405 | $ hg -R r1 --config extensions.blackbox= blackbox |
|
405 | $ hg -R r1 --config extensions.blackbox= blackbox | |
406 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> outgoing r2 *-T{rev} * (glob) |
|
406 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> outgoing r2 *-T{rev} * (glob) | |
407 |
* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 |
|
407 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob) | |
408 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) |
|
408 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) | |
409 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> blackbox (glob) |
|
409 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> blackbox (glob) | |
410 | $ cd .. |
|
410 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now