comparison tests/test-generaldelta.t @ 29593:953839de96ab

bundle2: store changeset count when creating file bundles The bundle2 changegroup part has an advisory param saying how many changesets are in the part. Before this patch, we were setting this part when generating bundle2 parts via the wire protocol but not when generating local bundle2 files. A side effect of not setting the changeset count part is that progress bars don't work when applying changesets. As the tests show, this impacted clone bundles, shelve, backup bundles, `hg unbundle`, and anything touching bundle2 files. This patch adds a backdoor to allow us to pass state from changegroup generation into the unbundler. We store the number of changesets in the changegroup in this state and use it to populate the aforementioned advisory part parameter when generating the bundle2 bundle. I concede that I'm not thrilled by how state is being passed in changegroup.py (it feels a bit hacky). I would love to overhaul the rather confusing set of functions in changegroup.py with something that passes rich objects around instead of e.g. low-level generators. However, given the code freeze for 3.9 is imminent, I'd rather not undertake this endeavor right now. This feels like the easiest way to get the parameter added to the changegroup part.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 17 Jul 2016 15:13:51 -0700
parents 37cccad55410
children 318a24b52eeb
comparison
equal deleted inserted replaced
29592:37cccad55410 29593:953839de96ab
153 $ hg --config extensions.strip= strip . 153 $ hg --config extensions.strip= strip .
154 0 files updated, 0 files merged, 5 files removed, 0 files unresolved 154 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
155 saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg (glob) 155 saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg (glob)
156 $ hg debugbundle .hg/strip-backup/* 156 $ hg debugbundle .hg/strip-backup/*
157 Stream params: sortdict([('Compression', 'BZ')]) 157 Stream params: sortdict([('Compression', 'BZ')])
158 changegroup -- "sortdict([('version', '02')])" 158 changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
159 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 159 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9
160 160
161 $ cd .. 161 $ cd ..