mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
4ad5f2e492
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.
129 lines
2.9 KiB
Turing
129 lines
2.9 KiB
Turing
|
|
$ cat << EOF >> $HGRCPATH
|
|
> [format]
|
|
> usegeneraldelta=yes
|
|
> EOF
|
|
|
|
bundle w/o type option
|
|
|
|
$ hg init t1
|
|
$ hg init t2
|
|
$ cd t1
|
|
$ echo blablablablabla > file.txt
|
|
$ hg ci -Ama
|
|
adding file.txt
|
|
$ hg log | grep summary
|
|
summary: a
|
|
$ hg bundle ../b1 ../t2
|
|
searching for changes
|
|
1 changesets found
|
|
|
|
$ cd ../t2
|
|
$ hg pull ../b1
|
|
pulling from ../b1
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
(run 'hg update' to get a working copy)
|
|
$ hg up
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg log | grep summary
|
|
summary: a
|
|
$ cd ..
|
|
|
|
test bundle types
|
|
|
|
$ for t in "None" "bzip2" "gzip" "none-v2" "v2" "v1" "gzip-v1"; do
|
|
> echo % test bundle type $t
|
|
> hg init t$t
|
|
> cd t1
|
|
> hg bundle -t $t ../b$t ../t$t
|
|
> f -q -B6 -D ../b$t; echo
|
|
> cd ../t$t
|
|
> hg debugbundle ../b$t
|
|
> hg debugbundle --spec ../b$t
|
|
> echo
|
|
> cd ..
|
|
> done
|
|
% test bundle type None
|
|
searching for changes
|
|
1 changesets found
|
|
HG20\x00\x00 (esc)
|
|
Stream params: {}
|
|
changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
none-v2
|
|
|
|
% test bundle type bzip2
|
|
searching for changes
|
|
1 changesets found
|
|
HG20\x00\x00 (esc)
|
|
Stream params: sortdict([('Compression', 'BZ')])
|
|
changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
bzip2-v2
|
|
|
|
% test bundle type gzip
|
|
searching for changes
|
|
1 changesets found
|
|
HG20\x00\x00 (esc)
|
|
Stream params: sortdict([('Compression', 'GZ')])
|
|
changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
gzip-v2
|
|
|
|
% test bundle type none-v2
|
|
searching for changes
|
|
1 changesets found
|
|
HG20\x00\x00 (esc)
|
|
Stream params: {}
|
|
changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
none-v2
|
|
|
|
% test bundle type v2
|
|
searching for changes
|
|
1 changesets found
|
|
HG20\x00\x00 (esc)
|
|
Stream params: sortdict([('Compression', 'BZ')])
|
|
changegroup -- "sortdict([('version', '02'), ('nbchanges', '1')])"
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
bzip2-v2
|
|
|
|
% test bundle type v1
|
|
searching for changes
|
|
1 changesets found
|
|
HG10BZ
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
bzip2-v1
|
|
|
|
% test bundle type gzip-v1
|
|
searching for changes
|
|
1 changesets found
|
|
HG10GZ
|
|
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
|
|
gzip-v1
|
|
|
|
|
|
test garbage file
|
|
|
|
$ echo garbage > bgarbage
|
|
$ hg init tgarbage
|
|
$ cd tgarbage
|
|
$ hg pull ../bgarbage
|
|
pulling from ../bgarbage
|
|
abort: ../bgarbage: not a Mercurial bundle
|
|
[255]
|
|
$ cd ..
|
|
|
|
test invalid bundle type
|
|
|
|
$ cd t1
|
|
$ hg bundle -a -t garbage ../bgarbage
|
|
abort: garbage is not a recognized bundle specification
|
|
(see "hg help bundle" for supported values for --type)
|
|
[255]
|
|
$ cd ..
|