test for range based discovery

==============================

  $ . $TESTDIR/testlib/pythonpath.sh

  $ cat << EOF >> $HGRCPATH

  > [extensions]

  > hgext3rd.evolve =

  > blackbox =

  > [defaults]

  > blackbox = -l 100

  > [experimental]

  > obshashrange=1

  > verbose-obsolescence-exchange=1

  > [ui]

  > logtemplate = "{rev} {node|short} {desc} {tags}\n"

  > ssh=python "$RUNTESTDIR/dummyssh"

  > [alias]

  > debugobsolete=debugobsolete -d '0 0'

  > EOF

  $ getid() {

  >     hg log --hidden --template '{node}\n' --rev "$1" --config 'extensions.blackbox=!'

  > }

  $ hg init server

  $ hg clone ssh://user@dummy/server client

  no changes found

  updating to branch default

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd server

  $ hg debugbuilddag '.+7'

  $ hg blackbox

  * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)

  * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 0o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (8r, 0o) (glob)

  * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> blackbox (glob)

  $ rm .hg/blackbox.log

  $ hg log -G

  o  7 4de32a90b66c r7 tip

  |

  o  6 f69452c5b1af r6

  |

  o  5 c8d03c1b5e94 r5

  |

  o  4 bebd167eb94d r4

  |

  o  3 2dc09a01254d r3

  |

  o  2 01241442b3c2 r2

  |

  o  1 66f7d451a68b r1

  |

  o  0 1ea73414a91b r0

  $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'`

  $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'`

  $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'`

  $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'`

  $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'`

  $ hg debugobsolete

  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  $ hg blackbox

  * @0000000000000000000000000000000000000000 (*)> log -G (glob)

  * @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2-visible with 0 tags (glob)

  * @0000000000000000000000000000000000000000 (*)> log -G exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob)

  * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 (glob)

  * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d (glob)

  * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 (glob)

  * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd (glob)

  * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> blackbox (glob)

  $ rm .hg/blackbox.log

  $ hg debugobshashrange --subranges --rev tip

           rev         node        index         size        depth      obshash

             7 4de32a90b66c            0            8            8 38d1e7ad86ea

             3 2dc09a01254d            0            4            4 000000000000

             7 4de32a90b66c            4            4            8 38d1e7ad86ea

             3 2dc09a01254d            2            2            4 000000000000

             7 4de32a90b66c            6            2            8 033544c939f0

             1 66f7d451a68b            0            2            2 17ff8dd63509

             5 c8d03c1b5e94            4            2            6 57f6cf3757a2

             2 01241442b3c2            2            1            3 1ed3c61fb39a

             0 1ea73414a91b            0            1            1 000000000000

             3 2dc09a01254d            3            1            4 000000000000

             7 4de32a90b66c            7            1            8 033544c939f0

             1 66f7d451a68b            1            1            2 17ff8dd63509

             4 bebd167eb94d            4            1            5 bbe4d7fe27a8

             5 c8d03c1b5e94            5            1            6 446c2dc3bce5

             6 f69452c5b1af            6            1            7 000000000000

  $ cd .. 

testing simple pull

===================

  $ cd client

  $ hg pull --rev 4

  pulling from ssh://user@dummy/server

  adding changesets

  adding manifests

  adding file changes

  added 5 changesets with 0 changes to 0 files

  3 new obsolescence markers

  (run 'hg update' to get a working copy)

  $ hg -R ../server blackbox

  * @0000000000000000000000000000000000000000 (*)> debugobshashrange --subranges --rev tip (glob)

  * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobshashrange --subranges --rev tip exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)

  * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> blackbox (glob)

  $ rm ../server/.hg/blackbox.log

  $ hg -R ../server/ debugobsolete --rev ::4 | sort

  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  $ rm ../server/.hg/blackbox.log

  $ hg blackbox

  * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 3o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)

  * @0000000000000000000000000000000000000000 (*)> 5 incoming changes - new heads: bebd167eb94d (glob)

  * @0000000000000000000000000000000000000000 (*)> pull --rev 4 exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> blackbox (glob)

  $ rm .hg/blackbox.log

  $ hg debugobsolete | sort

  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

testing simple push

===================

  $ hg up

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo foo > foo

  $ hg add foo

  $ hg commit -m foo

  $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'`

  $ hg push -f --debug

  pushing to ssh://user@dummy/server

  running python "*/dummyssh" user@dummy 'hg -R server serve --stdio' (glob)

  sending hello command

  sending between command

  remote: 532

  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 httpheader=1024 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 evo-ext-obscache in *.???? seconds (1r, 0o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 2 nodes (glob)

  * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)

  * @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)

  * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> blackbox (glob)

  $ rm ../server/.hg/blackbox.log

testing push with extra local markers

=====================================

  $ hg log -G

  @  5 45f8b879de92 foo tip

  |

  o  4 bebd167eb94d r4

  |

  o  3 2dc09a01254d r3

  |

  o  2 01241442b3c2 r2

  |

  o  1 66f7d451a68b r1

  |

  o  0 1ea73414a91b r0

  $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'`

  $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'`

  $ hg push

  pushing to ssh://user@dummy/server

  searching for changes

  OBSEXC: computing relevant nodes

  OBSEXC: looking for common markers in 6 nodes

  OBSEXC: computing markers relevant to 2 nodes

  no changes found

  remote: 2 new obsolescence markers

  [1]

  $ hg -R ../server blackbox

  * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)

  * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob)

  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 2o) (glob)

  * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> blackbox (glob)

  $ rm ../server/.hg/blackbox.log

  $ hg -R ../server/ debugobsolete --rev ::tip | sort

  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

  $ hg blackbox

  * @0000000000000000000000000000000000000000 (*)> debugobsolete (glob)

  * @0000000000000000000000000000000000000000 (*)> debugobsolete exited 0 after *.?? seconds (glob)

  * @0000000000000000000000000000000000000000 (*)> up (glob)

  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> up exited 0 after *.?? seconds (glob)