obsdiscovery: add more debug output
we add a summary debug output to help gathering data.
--- a/hgext3rd/evolve/obsdiscovery.py Thu May 18 16:59:25 2017 +0200
+++ b/hgext3rd/evolve/obsdiscovery.py Thu May 18 17:03:11 2017 +0200
@@ -308,6 +308,7 @@
' - %d obshashrange queries in %.4f seconds\n')
logmsg %= (len(missing), len(probeset), querycount, duration)
ui.log('evoext-obsdiscovery', logmsg)
+ ui.debug(logmsg)
return sorted(missing)
def _queryrange(ui, repo, remote, allentries):
--- a/tests/test-discovery-obshashrange.t Thu May 18 16:59:25 2017 +0200
+++ b/tests/test-discovery-obshashrange.t Thu May 18 17:03:11 2017 +0200
@@ -190,17 +190,63 @@
$ hg add foo
$ hg commit -m foo
$ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'`
- $ hg push -f
+ $ hg push -f --debug
pushing to ssh://user@dummy/server
+ running python "/home/marmoute/src/mercurial-dev/tests/dummyssh" user@dummy 'hg -R server serve --stdio'
+ sending hello command
+ sending between command
+ remote: 516
+ remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+ remote: 1
+ preparing listkeys for "phases"
+ sending listkeys command
+ received listkey for "phases": 58 bytes
+ query 1; heads
+ sending batch command
searching for changes
+ taking quick initial sample
+ query 2; still undecided: 5, sample size is: 5
+ sending known command
+ 2 total queries
+ preparing listkeys for "phases"
+ sending listkeys command
+ received listkey for "phases": 58 bytes
+ preparing listkeys for "namespaces"
+ sending listkeys command
+ received listkey for "namespaces": 40 bytes
OBSEXC: computing relevant nodes
OBSEXC: looking for common markers in 6 nodes
+ query 0; add more sample (target 100, current 1)
+ query 0; sample size is 9, largest range 5
+ sending evoext_obshashrange_v0 command
+ obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob)
OBSEXC: computing markers relevant to 1 nodes
+ checking for updated bookmarks
+ preparing listkeys for "bookmarks"
+ sending listkeys command
+ received listkey for "bookmarks": 0 bytes
+ 1 changesets found
+ list of changesets:
+ 45f8b879de922f6a6e620ba04205730335b6fc7e
+ sending unbundle command
+ bundle2-output-bundle: "HG20", 4 parts total
+ bundle2-output-part: "replycaps" 172 bytes payload
+ bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
+ bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
+ bundle2-output-part: "obsmarkers" streamed payload
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 1 new obsolescence markers
+ bundle2-input-bundle: with-transaction
+ bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
+ bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
+ bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
+ bundle2-input-bundle: 2 parts total
+ preparing listkeys for "phases"
+ sending listkeys command
+ received listkey for "phases": 58 bytes
$ hg -R ../server blackbox
* @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
* @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)
@@ -277,10 +323,10 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 1o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f exited 0 after *.?? seconds (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob)