239 # return any heads in that case, so discard that |
239 # return any heads in that case, so discard that |
240 result.discard(nullrev) |
240 result.discard(nullrev) |
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 missing heads, %d roundtrips in %.4fs\n' |
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]: |
249 if abortwhenunrelated: |
251 if abortwhenunrelated: |
250 raise error.Abort(_("repository is unrelated")) |
252 raise error.Abort(_("repository is unrelated")) |