rugged 0.19.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +151 -25
- data/ext/rugged/extconf.rb +48 -27
- data/ext/rugged/rugged.c +107 -35
- data/ext/rugged/rugged.h +44 -8
- data/ext/rugged/rugged_blame.c +292 -0
- data/ext/rugged/rugged_blob.c +84 -31
- data/ext/rugged/rugged_branch.c +90 -223
- data/ext/rugged/rugged_branch_collection.c +445 -0
- data/ext/rugged/rugged_commit.c +190 -9
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_cred.c +125 -0
- data/ext/rugged/rugged_diff.c +267 -94
- data/ext/rugged/rugged_diff_delta.c +14 -3
- data/ext/rugged/rugged_diff_hunk.c +31 -28
- data/ext/rugged/rugged_diff_line.c +21 -17
- data/ext/rugged/rugged_index.c +326 -6
- data/ext/rugged/rugged_note.c +39 -34
- data/ext/rugged/rugged_object.c +9 -9
- data/ext/rugged/rugged_patch.c +245 -0
- data/ext/rugged/rugged_reference.c +67 -332
- data/ext/rugged/rugged_reference_collection.c +490 -0
- data/ext/rugged/rugged_remote.c +447 -351
- data/ext/rugged/rugged_remote_collection.c +285 -0
- data/ext/rugged/rugged_repo.c +752 -203
- data/ext/rugged/rugged_revwalk.c +119 -27
- data/ext/rugged/rugged_settings.c +48 -1
- data/ext/rugged/rugged_signature.c +30 -16
- data/ext/rugged/rugged_tag.c +86 -191
- data/ext/rugged/rugged_tag_collection.c +279 -0
- data/ext/rugged/rugged_tree.c +159 -22
- data/lib/rugged/branch.rb +8 -17
- data/lib/rugged/credentials.rb +43 -0
- data/lib/rugged/diff/delta.rb +1 -2
- data/lib/rugged/diff/hunk.rb +4 -9
- data/lib/rugged/diff/line.rb +23 -3
- data/lib/rugged/diff.rb +3 -1
- data/lib/rugged/patch.rb +26 -0
- data/lib/rugged/reference.rb +1 -3
- data/lib/rugged/remote.rb +0 -9
- data/lib/rugged/repository.rb +70 -13
- data/lib/rugged/tag.rb +23 -18
- data/lib/rugged/tree.rb +7 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +8 -1
- data/vendor/libgit2/AUTHORS +75 -0
- data/vendor/libgit2/CMakeLists.txt +490 -0
- data/vendor/libgit2/COPYING +920 -0
- data/vendor/libgit2/Makefile.embed +25 -7
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +16 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +43 -0
- data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake +44 -0
- data/vendor/libgit2/deps/http-parser/LICENSE-MIT +23 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/include/git2/attr.h +2 -1
- data/vendor/libgit2/include/git2/blame.h +213 -0
- data/vendor/libgit2/include/git2/blob.h +57 -29
- data/vendor/libgit2/include/git2/branch.h +56 -44
- data/vendor/libgit2/include/git2/buffer.h +112 -0
- data/vendor/libgit2/include/git2/checkout.h +72 -37
- data/vendor/libgit2/include/git2/cherrypick.h +87 -0
- data/vendor/libgit2/include/git2/clone.h +153 -56
- data/vendor/libgit2/include/git2/commit.h +82 -12
- data/vendor/libgit2/include/git2/common.h +31 -19
- data/vendor/libgit2/include/git2/config.h +124 -19
- data/vendor/libgit2/include/git2/cred_helpers.h +1 -1
- data/vendor/libgit2/include/git2/diff.h +636 -494
- data/vendor/libgit2/include/git2/errors.h +48 -15
- data/vendor/libgit2/include/git2/filter.h +149 -0
- data/vendor/libgit2/include/git2/graph.h +14 -0
- data/vendor/libgit2/include/git2/index.h +95 -54
- data/vendor/libgit2/include/git2/indexer.h +15 -9
- data/vendor/libgit2/include/git2/merge.h +402 -39
- data/vendor/libgit2/include/git2/message.h +9 -14
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +6 -6
- data/vendor/libgit2/include/git2/object.h +34 -2
- data/vendor/libgit2/include/git2/odb.h +77 -14
- data/vendor/libgit2/include/git2/odb_backend.h +50 -6
- data/vendor/libgit2/include/git2/oid.h +4 -8
- data/vendor/libgit2/include/git2/pack.h +58 -4
- data/vendor/libgit2/include/git2/patch.h +277 -0
- data/vendor/libgit2/include/git2/pathspec.h +263 -0
- data/vendor/libgit2/include/git2/push.h +55 -5
- data/vendor/libgit2/include/git2/reflog.h +11 -8
- data/vendor/libgit2/include/git2/refs.h +219 -33
- data/vendor/libgit2/include/git2/refspec.h +3 -4
- data/vendor/libgit2/include/git2/remote.h +216 -76
- data/vendor/libgit2/include/git2/repository.h +85 -40
- data/vendor/libgit2/include/git2/reset.h +15 -4
- data/vendor/libgit2/include/git2/revert.h +86 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +44 -6
- data/vendor/libgit2/include/git2/signature.h +17 -3
- data/vendor/libgit2/include/git2/stash.h +8 -12
- data/vendor/libgit2/include/git2/status.h +67 -18
- data/vendor/libgit2/include/git2/submodule.h +100 -85
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +44 -3
- data/vendor/libgit2/include/git2/sys/diff.h +91 -0
- data/vendor/libgit2/include/git2/sys/filter.h +301 -0
- data/vendor/libgit2/include/git2/sys/index.h +0 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +85 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +33 -11
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +51 -5
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +2 -2
- data/vendor/libgit2/include/git2/sys/repository.h +19 -1
- data/vendor/libgit2/include/git2/transport.h +216 -75
- data/vendor/libgit2/include/git2/tree.h +32 -11
- data/vendor/libgit2/include/git2/types.h +124 -10
- data/vendor/libgit2/include/git2/version.h +4 -2
- data/vendor/libgit2/include/git2.h +41 -40
- data/vendor/libgit2/libgit2.pc.in +10 -0
- data/vendor/libgit2/src/array.h +16 -8
- data/vendor/libgit2/src/attr.c +140 -402
- data/vendor/libgit2/src/attr.h +1 -33
- data/vendor/libgit2/src/attr_file.c +298 -135
- data/vendor/libgit2/src/attr_file.h +61 -22
- data/vendor/libgit2/src/attrcache.c +449 -0
- data/vendor/libgit2/src/attrcache.h +38 -6
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +488 -0
- data/vendor/libgit2/src/blame.h +93 -0
- data/vendor/libgit2/src/blame_git.c +624 -0
- data/vendor/libgit2/src/blame_git.h +20 -0
- data/vendor/libgit2/src/blob.c +137 -92
- data/vendor/libgit2/src/blob.h +9 -0
- data/vendor/libgit2/src/branch.c +175 -156
- data/vendor/libgit2/src/buf_text.c +29 -14
- data/vendor/libgit2/src/buf_text.h +5 -4
- data/vendor/libgit2/src/buffer.c +158 -15
- data/vendor/libgit2/src/buffer.h +33 -20
- data/vendor/libgit2/src/cc-compat.h +8 -2
- data/vendor/libgit2/src/checkout.c +1081 -287
- data/vendor/libgit2/src/checkout.h +1 -1
- data/vendor/libgit2/src/cherrypick.c +226 -0
- data/vendor/libgit2/src/clone.c +297 -245
- data/vendor/libgit2/src/{compress.h → clone.h} +4 -8
- data/vendor/libgit2/src/commit.c +313 -101
- data/vendor/libgit2/src/commit.h +6 -3
- data/vendor/libgit2/src/commit_list.c +3 -3
- data/vendor/libgit2/src/commit_list.h +1 -1
- data/vendor/libgit2/src/common.h +74 -1
- data/vendor/libgit2/src/config.c +570 -145
- data/vendor/libgit2/src/config.h +39 -6
- data/vendor/libgit2/src/config_cache.c +32 -18
- data/vendor/libgit2/src/config_file.c +711 -424
- data/vendor/libgit2/src/config_file.h +4 -3
- data/vendor/libgit2/src/crlf.c +149 -109
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +719 -414
- data/vendor/libgit2/src/diff.h +52 -7
- data/vendor/libgit2/src/diff_driver.c +183 -85
- data/vendor/libgit2/src/diff_driver.h +1 -1
- data/vendor/libgit2/src/diff_file.c +65 -84
- data/vendor/libgit2/src/diff_file.h +12 -10
- data/vendor/libgit2/src/diff_patch.c +274 -333
- data/vendor/libgit2/src/diff_patch.h +10 -9
- data/vendor/libgit2/src/diff_print.c +381 -179
- data/vendor/libgit2/src/diff_stats.c +336 -0
- data/vendor/libgit2/src/diff_tform.c +393 -215
- data/vendor/libgit2/src/diff_xdiff.c +117 -42
- data/vendor/libgit2/src/errors.c +59 -4
- data/vendor/libgit2/src/fetch.c +40 -34
- data/vendor/libgit2/src/fetch.h +2 -5
- data/vendor/libgit2/src/fetchhead.c +14 -7
- data/vendor/libgit2/src/filebuf.c +13 -24
- data/vendor/libgit2/src/filebuf.h +3 -3
- data/vendor/libgit2/src/fileops.c +104 -296
- data/vendor/libgit2/src/fileops.h +23 -94
- data/vendor/libgit2/src/filter.c +642 -43
- data/vendor/libgit2/src/filter.h +7 -66
- data/vendor/libgit2/src/fnmatch.c +46 -3
- data/vendor/libgit2/src/fnmatch.h +24 -3
- data/vendor/libgit2/src/global.c +158 -42
- data/vendor/libgit2/src/global.h +9 -0
- data/vendor/libgit2/src/graph.c +34 -20
- data/vendor/libgit2/src/hash/hash_generic.h +0 -1
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -1
- data/vendor/libgit2/src/hash/hash_win32.c +14 -29
- data/vendor/libgit2/src/hash.h +0 -2
- data/vendor/libgit2/src/hashsig.c +97 -117
- data/vendor/libgit2/src/ident.c +125 -0
- data/vendor/libgit2/src/ignore.c +159 -110
- data/vendor/libgit2/src/ignore.h +13 -3
- data/vendor/libgit2/src/index.c +803 -445
- data/vendor/libgit2/src/index.h +43 -6
- data/vendor/libgit2/src/indexer.c +475 -157
- data/vendor/libgit2/src/iterator.c +198 -55
- data/vendor/libgit2/src/iterator.h +28 -4
- data/vendor/libgit2/src/map.h +1 -0
- data/vendor/libgit2/src/merge.c +849 -142
- data/vendor/libgit2/src/merge.h +11 -4
- data/vendor/libgit2/src/merge_file.c +183 -78
- data/vendor/libgit2/src/merge_file.h +0 -57
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/mwindow.c +117 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +164 -59
- data/vendor/libgit2/src/netops.h +37 -1
- data/vendor/libgit2/src/notes.c +9 -18
- data/vendor/libgit2/src/notes.h +1 -1
- data/vendor/libgit2/src/object.c +78 -2
- data/vendor/libgit2/src/odb.c +191 -59
- data/vendor/libgit2/src/odb.h +2 -1
- data/vendor/libgit2/src/odb_loose.c +66 -51
- data/vendor/libgit2/src/odb_mempack.c +182 -0
- data/vendor/libgit2/src/odb_pack.c +151 -61
- data/vendor/libgit2/src/oid.c +30 -19
- data/vendor/libgit2/src/oid.h +13 -10
- data/vendor/libgit2/src/pack-objects.c +198 -147
- data/vendor/libgit2/src/pack-objects.h +7 -0
- data/vendor/libgit2/src/pack.c +272 -101
- data/vendor/libgit2/src/pack.h +15 -1
- data/vendor/libgit2/src/path.c +359 -117
- data/vendor/libgit2/src/path.h +110 -20
- data/vendor/libgit2/src/pathspec.c +583 -57
- data/vendor/libgit2/src/pathspec.h +36 -15
- data/vendor/libgit2/src/pool.c +4 -5
- data/vendor/libgit2/src/posix.c +45 -2
- data/vendor/libgit2/src/posix.h +13 -5
- data/vendor/libgit2/src/pqueue.c +73 -119
- data/vendor/libgit2/src/pqueue.h +35 -82
- data/vendor/libgit2/src/push.c +116 -48
- data/vendor/libgit2/src/push.h +5 -0
- data/vendor/libgit2/src/refdb.c +45 -6
- data/vendor/libgit2/src/refdb.h +13 -3
- data/vendor/libgit2/src/refdb_fs.c +1130 -551
- data/vendor/libgit2/src/reflog.c +36 -327
- data/vendor/libgit2/src/reflog.h +6 -1
- data/vendor/libgit2/src/refs.c +345 -142
- data/vendor/libgit2/src/refs.h +9 -2
- data/vendor/libgit2/src/refspec.c +90 -62
- data/vendor/libgit2/src/refspec.h +7 -24
- data/vendor/libgit2/src/remote.c +815 -415
- data/vendor/libgit2/src/remote.h +3 -4
- data/vendor/libgit2/src/repository.c +360 -207
- data/vendor/libgit2/src/repository.h +16 -10
- data/vendor/libgit2/src/reset.c +28 -13
- data/vendor/libgit2/src/revert.c +228 -0
- data/vendor/libgit2/src/revparse.c +29 -30
- data/vendor/libgit2/src/revwalk.c +141 -96
- data/vendor/libgit2/src/revwalk.h +6 -1
- data/vendor/libgit2/src/settings.c +140 -0
- data/vendor/libgit2/src/sha1_lookup.c +71 -0
- data/vendor/libgit2/src/sha1_lookup.h +5 -0
- data/vendor/libgit2/src/signature.c +38 -10
- data/vendor/libgit2/src/sortedcache.c +378 -0
- data/vendor/libgit2/src/sortedcache.h +178 -0
- data/vendor/libgit2/src/stash.c +98 -116
- data/vendor/libgit2/src/status.c +88 -60
- data/vendor/libgit2/src/status.h +2 -2
- data/vendor/libgit2/src/strmap.c +32 -0
- data/vendor/libgit2/src/strmap.h +14 -1
- data/vendor/libgit2/src/strnlen.h +23 -0
- data/vendor/libgit2/src/submodule.c +1073 -615
- data/vendor/libgit2/src/submodule.h +89 -21
- data/vendor/libgit2/src/sysdir.c +252 -0
- data/vendor/libgit2/src/sysdir.h +101 -0
- data/vendor/libgit2/src/tag.c +31 -20
- data/vendor/libgit2/src/thread-utils.h +98 -17
- data/vendor/libgit2/src/trace.h +0 -2
- data/vendor/libgit2/src/transport.c +76 -6
- data/vendor/libgit2/src/transports/cred.c +164 -61
- data/vendor/libgit2/src/transports/git.c +41 -48
- data/vendor/libgit2/src/transports/http.c +65 -109
- data/vendor/libgit2/src/transports/local.c +88 -65
- data/vendor/libgit2/src/transports/smart.c +91 -19
- data/vendor/libgit2/src/transports/smart.h +13 -5
- data/vendor/libgit2/src/transports/smart_pkt.c +24 -14
- data/vendor/libgit2/src/transports/smart_protocol.c +268 -113
- data/vendor/libgit2/src/transports/ssh.c +284 -186
- data/vendor/libgit2/src/transports/winhttp.c +279 -198
- data/vendor/libgit2/src/tree-cache.c +21 -23
- data/vendor/libgit2/src/tree-cache.h +1 -0
- data/vendor/libgit2/src/tree.c +109 -92
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +7 -1
- data/vendor/libgit2/src/unix/posix.h +0 -1
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +16 -112
- data/vendor/libgit2/src/util.h +107 -3
- data/vendor/libgit2/src/vector.c +72 -17
- data/vendor/libgit2/src/vector.h +32 -5
- data/vendor/libgit2/src/win32/dir.c +15 -40
- data/vendor/libgit2/src/win32/dir.h +3 -2
- data/vendor/libgit2/src/win32/error.c +5 -31
- data/vendor/libgit2/src/win32/findfile.c +47 -66
- data/vendor/libgit2/src/win32/findfile.h +1 -12
- data/vendor/libgit2/src/win32/git2.rc +40 -0
- data/vendor/libgit2/src/win32/map.c +7 -1
- data/vendor/libgit2/src/win32/mingw-compat.h +3 -0
- data/vendor/libgit2/src/win32/posix.h +17 -11
- data/vendor/libgit2/src/win32/posix_w32.c +424 -292
- data/vendor/libgit2/src/win32/precompiled.h +6 -2
- data/vendor/libgit2/src/win32/pthread.c +141 -18
- data/vendor/libgit2/src/win32/pthread.h +50 -8
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/utf-conv.c +117 -60
- data/vendor/libgit2/src/win32/utf-conv.h +81 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_util.c +139 -0
- data/vendor/libgit2/src/win32/w32_util.h +54 -0
- data/vendor/libgit2/src/zstream.c +156 -0
- data/vendor/libgit2/src/zstream.h +39 -0
- metadata +84 -167
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/compress.c +0 -53
@@ -7,13 +7,14 @@
|
|
7
7
|
|
8
8
|
#include "pack-objects.h"
|
9
9
|
|
10
|
-
#include "
|
10
|
+
#include "zstream.h"
|
11
11
|
#include "delta.h"
|
12
12
|
#include "iterator.h"
|
13
13
|
#include "netops.h"
|
14
14
|
#include "pack.h"
|
15
15
|
#include "thread-utils.h"
|
16
16
|
#include "tree.h"
|
17
|
+
#include "util.h"
|
17
18
|
|
18
19
|
#include "git2/pack.h"
|
19
20
|
#include "git2/commit.h"
|
@@ -25,7 +26,7 @@ struct unpacked {
|
|
25
26
|
git_pobject *object;
|
26
27
|
void *data;
|
27
28
|
struct git_delta_index *index;
|
28
|
-
|
29
|
+
int depth;
|
29
30
|
};
|
30
31
|
|
31
32
|
struct tree_walk_context {
|
@@ -34,7 +35,7 @@ struct tree_walk_context {
|
|
34
35
|
};
|
35
36
|
|
36
37
|
struct pack_write_context {
|
37
|
-
|
38
|
+
git_indexer *indexer;
|
38
39
|
git_transfer_progress *stats;
|
39
40
|
};
|
40
41
|
|
@@ -57,6 +58,12 @@ struct pack_write_context {
|
|
57
58
|
#define git_packbuilder__progress_lock(pb) GIT_PACKBUILDER__MUTEX_OP(pb, progress_mutex, lock)
|
58
59
|
#define git_packbuilder__progress_unlock(pb) GIT_PACKBUILDER__MUTEX_OP(pb, progress_mutex, unlock)
|
59
60
|
|
61
|
+
/* The minimal interval between progress updates (in seconds). */
|
62
|
+
#define MIN_PROGRESS_UPDATE_INTERVAL 0.5
|
63
|
+
|
64
|
+
/* Size of the buffer to feed to zlib */
|
65
|
+
#define COMPRESS_BUFLEN (1024 * 1024)
|
66
|
+
|
60
67
|
static unsigned name_hash(const char *name)
|
61
68
|
{
|
62
69
|
unsigned c, hash = 0;
|
@@ -83,8 +90,8 @@ static int packbuilder_config(git_packbuilder *pb)
|
|
83
90
|
int ret;
|
84
91
|
int64_t val;
|
85
92
|
|
86
|
-
if (
|
87
|
-
return
|
93
|
+
if ((ret = git_repository_config_snapshot(&config, pb->repo)) < 0)
|
94
|
+
return ret;
|
88
95
|
|
89
96
|
#define config_get(KEY,DST,DFLT) do { \
|
90
97
|
ret = git_config_get_int64(&val, config, KEY); \
|
@@ -102,6 +109,8 @@ static int packbuilder_config(git_packbuilder *pb)
|
|
102
109
|
|
103
110
|
#undef config_get
|
104
111
|
|
112
|
+
git_config_free(config);
|
113
|
+
|
105
114
|
return 0;
|
106
115
|
}
|
107
116
|
|
@@ -123,6 +132,7 @@ int git_packbuilder_new(git_packbuilder **out, git_repository *repo)
|
|
123
132
|
pb->nr_threads = 1; /* do not spawn any thread by default */
|
124
133
|
|
125
134
|
if (git_hash_ctx_init(&pb->ctx) < 0 ||
|
135
|
+
git_zstream_init(&pb->zstream) < 0 ||
|
126
136
|
git_repository_odb(&pb->odb, repo) < 0 ||
|
127
137
|
packbuilder_config(pb) < 0)
|
128
138
|
goto on_error;
|
@@ -201,53 +211,40 @@ int git_packbuilder_insert(git_packbuilder *pb, const git_oid *oid,
|
|
201
211
|
po = pb->object_list + pb->nr_objects;
|
202
212
|
memset(po, 0x0, sizeof(*po));
|
203
213
|
|
204
|
-
if (git_odb_read_header(&po->size, &po->type, pb->odb, oid) < 0)
|
205
|
-
return
|
214
|
+
if ((ret = git_odb_read_header(&po->size, &po->type, pb->odb, oid)) < 0)
|
215
|
+
return ret;
|
206
216
|
|
207
217
|
pb->nr_objects++;
|
208
218
|
git_oid_cpy(&po->id, oid);
|
209
219
|
po->hash = name_hash(name);
|
210
220
|
|
211
221
|
pos = kh_put(oid, pb->object_ix, &po->id, &ret);
|
222
|
+
if (ret < 0) {
|
223
|
+
giterr_set_oom();
|
224
|
+
return ret;
|
225
|
+
}
|
212
226
|
assert(ret != 0);
|
213
227
|
kh_value(pb->object_ix, pos) = po;
|
214
228
|
|
215
229
|
pb->done = false;
|
216
|
-
return 0;
|
217
|
-
}
|
218
|
-
|
219
|
-
/*
|
220
|
-
* The per-object header is a pretty dense thing, which is
|
221
|
-
* - first byte: low four bits are "size",
|
222
|
-
* then three bits of "type",
|
223
|
-
* with the high bit being "size continues".
|
224
|
-
* - each byte afterwards: low seven bits are size continuation,
|
225
|
-
* with the high bit being "size continues"
|
226
|
-
*/
|
227
|
-
static int gen_pack_object_header(
|
228
|
-
unsigned char *hdr,
|
229
|
-
unsigned long size,
|
230
|
-
git_otype type)
|
231
|
-
{
|
232
|
-
unsigned char *hdr_base;
|
233
|
-
unsigned char c;
|
234
230
|
|
235
|
-
|
231
|
+
if (pb->progress_cb) {
|
232
|
+
double current_time = git__timer();
|
233
|
+
double elapsed = current_time - pb->last_progress_report_time;
|
236
234
|
|
237
|
-
|
235
|
+
if (elapsed >= MIN_PROGRESS_UPDATE_INTERVAL) {
|
236
|
+
pb->last_progress_report_time = current_time;
|
238
237
|
|
239
|
-
|
240
|
-
|
241
|
-
|
238
|
+
ret = pb->progress_cb(
|
239
|
+
GIT_PACKBUILDER_ADDING_OBJECTS,
|
240
|
+
pb->nr_objects, 0, pb->progress_cb_payload);
|
242
241
|
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
size >>= 7;
|
242
|
+
if (ret)
|
243
|
+
return giterr_set_after_callback(ret);
|
244
|
+
}
|
247
245
|
}
|
248
|
-
*hdr++ = c;
|
249
246
|
|
250
|
-
return
|
247
|
+
return 0;
|
251
248
|
}
|
252
249
|
|
253
250
|
static int get_delta(void **out, git_odb *odb, git_pobject *po)
|
@@ -284,76 +281,96 @@ on_error:
|
|
284
281
|
return -1;
|
285
282
|
}
|
286
283
|
|
287
|
-
static int write_object(
|
284
|
+
static int write_object(
|
285
|
+
git_packbuilder *pb,
|
286
|
+
git_pobject *po,
|
287
|
+
int (*write_cb)(void *buf, size_t size, void *cb_data),
|
288
|
+
void *cb_data)
|
288
289
|
{
|
289
290
|
git_odb_object *obj = NULL;
|
290
|
-
git_buf zbuf = GIT_BUF_INIT;
|
291
291
|
git_otype type;
|
292
|
-
unsigned char hdr[10];
|
293
|
-
|
294
|
-
|
295
|
-
|
292
|
+
unsigned char hdr[10], *zbuf = NULL;
|
293
|
+
void *data = NULL;
|
294
|
+
size_t hdr_len, zbuf_len = COMPRESS_BUFLEN, data_len;
|
295
|
+
int error;
|
296
296
|
|
297
|
+
/*
|
298
|
+
* If we have a delta base, let's use the delta to save space.
|
299
|
+
* Otherwise load the whole object. 'data' ends up pointing to
|
300
|
+
* whatever data we want to put into the packfile.
|
301
|
+
*/
|
297
302
|
if (po->delta) {
|
298
303
|
if (po->delta_data)
|
299
304
|
data = po->delta_data;
|
300
|
-
else if (get_delta(&data, pb->odb, po) < 0)
|
301
|
-
goto
|
302
|
-
|
305
|
+
else if ((error = get_delta(&data, pb->odb, po)) < 0)
|
306
|
+
goto done;
|
307
|
+
|
308
|
+
data_len = po->delta_size;
|
303
309
|
type = GIT_OBJ_REF_DELTA;
|
304
310
|
} else {
|
305
|
-
if (git_odb_read(&obj, pb->odb, &po->id))
|
306
|
-
goto
|
311
|
+
if ((error = git_odb_read(&obj, pb->odb, &po->id)) < 0)
|
312
|
+
goto done;
|
307
313
|
|
308
314
|
data = (void *)git_odb_object_data(obj);
|
309
|
-
|
315
|
+
data_len = git_odb_object_size(obj);
|
310
316
|
type = git_odb_object_type(obj);
|
311
317
|
}
|
312
318
|
|
313
319
|
/* Write header */
|
314
|
-
hdr_len =
|
320
|
+
hdr_len = git_packfile__object_header(hdr, data_len, type);
|
315
321
|
|
316
|
-
if (
|
317
|
-
|
318
|
-
|
319
|
-
if (git_hash_update(&pb->ctx, hdr, hdr_len) < 0)
|
320
|
-
goto on_error;
|
322
|
+
if ((error = write_cb(hdr, hdr_len, cb_data)) < 0 ||
|
323
|
+
(error = git_hash_update(&pb->ctx, hdr, hdr_len)) < 0)
|
324
|
+
goto done;
|
321
325
|
|
322
326
|
if (type == GIT_OBJ_REF_DELTA) {
|
323
|
-
if (
|
324
|
-
git_hash_update(&pb->ctx, po->delta->id.id, GIT_OID_RAWSZ) < 0)
|
325
|
-
goto
|
327
|
+
if ((error = write_cb(po->delta->id.id, GIT_OID_RAWSZ, cb_data)) < 0 ||
|
328
|
+
(error = git_hash_update(&pb->ctx, po->delta->id.id, GIT_OID_RAWSZ)) < 0)
|
329
|
+
goto done;
|
326
330
|
}
|
327
331
|
|
328
332
|
/* Write data */
|
329
|
-
if (po->z_delta_size)
|
330
|
-
|
331
|
-
else if (git__compress(&zbuf, data, size) < 0)
|
332
|
-
goto on_error;
|
333
|
-
else {
|
334
|
-
if (po->delta)
|
335
|
-
git__free(data);
|
336
|
-
data = zbuf.ptr;
|
337
|
-
size = (unsigned long)zbuf.size;
|
338
|
-
}
|
333
|
+
if (po->z_delta_size) {
|
334
|
+
data_len = po->z_delta_size;
|
339
335
|
|
340
|
-
|
341
|
-
|
342
|
-
|
336
|
+
if ((error = write_cb(data, data_len, cb_data)) < 0 ||
|
337
|
+
(error = git_hash_update(&pb->ctx, data, data_len)) < 0)
|
338
|
+
goto done;
|
339
|
+
} else {
|
340
|
+
zbuf = git__malloc(zbuf_len);
|
341
|
+
GITERR_CHECK_ALLOC(zbuf);
|
343
342
|
|
344
|
-
|
345
|
-
|
343
|
+
git_zstream_reset(&pb->zstream);
|
344
|
+
git_zstream_set_input(&pb->zstream, data, data_len);
|
346
345
|
|
347
|
-
|
348
|
-
|
346
|
+
while (!git_zstream_done(&pb->zstream)) {
|
347
|
+
if ((error = git_zstream_get_output(zbuf, &zbuf_len, &pb->zstream)) < 0 ||
|
348
|
+
(error = write_cb(zbuf, zbuf_len, cb_data)) < 0 ||
|
349
|
+
(error = git_hash_update(&pb->ctx, zbuf, zbuf_len)) < 0)
|
350
|
+
goto done;
|
351
|
+
|
352
|
+
zbuf_len = COMPRESS_BUFLEN; /* reuse buffer */
|
353
|
+
}
|
354
|
+
}
|
355
|
+
|
356
|
+
/*
|
357
|
+
* If po->delta is true, data is a delta and it is our
|
358
|
+
* responsibility to free it (otherwise it's a git_object's
|
359
|
+
* data). We set po->delta_data to NULL in case we got the
|
360
|
+
* data from there instead of get_delta(). If we didn't,
|
361
|
+
* there's no harm.
|
362
|
+
*/
|
363
|
+
if (po->delta) {
|
364
|
+
git__free(data);
|
365
|
+
po->delta_data = NULL;
|
366
|
+
}
|
349
367
|
|
350
368
|
pb->nr_written++;
|
351
|
-
return 0;
|
352
369
|
|
353
|
-
|
370
|
+
done:
|
371
|
+
git__free(zbuf);
|
354
372
|
git_odb_object_free(obj);
|
355
|
-
|
356
|
-
return -1;
|
373
|
+
return error;
|
357
374
|
}
|
358
375
|
|
359
376
|
enum write_one_status {
|
@@ -363,9 +380,15 @@ enum write_one_status {
|
|
363
380
|
WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
|
364
381
|
};
|
365
382
|
|
366
|
-
static int write_one(
|
367
|
-
|
383
|
+
static int write_one(
|
384
|
+
enum write_one_status *status,
|
385
|
+
git_packbuilder *pb,
|
386
|
+
git_pobject *po,
|
387
|
+
int (*write_cb)(void *buf, size_t size, void *cb_data),
|
388
|
+
void *cb_data)
|
368
389
|
{
|
390
|
+
int error;
|
391
|
+
|
369
392
|
if (po->recursing) {
|
370
393
|
*status = WRITE_ONE_RECURSIVE;
|
371
394
|
return 0;
|
@@ -376,21 +399,20 @@ static int write_one(git_buf *buf, git_packbuilder *pb, git_pobject *po,
|
|
376
399
|
|
377
400
|
if (po->delta) {
|
378
401
|
po->recursing = 1;
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
402
|
+
|
403
|
+
if ((error = write_one(status, pb, po->delta, write_cb, cb_data)) < 0)
|
404
|
+
return error;
|
405
|
+
|
406
|
+
/* we cannot depend on this one */
|
407
|
+
if (*status == WRITE_ONE_RECURSIVE)
|
384
408
|
po->delta = NULL;
|
385
|
-
break;
|
386
|
-
default:
|
387
|
-
break;
|
388
|
-
}
|
389
409
|
}
|
390
410
|
|
411
|
+
*status = WRITE_ONE_WRITTEN;
|
391
412
|
po->written = 1;
|
392
413
|
po->recursing = 0;
|
393
|
-
|
414
|
+
|
415
|
+
return write_object(pb, po, write_cb, cb_data);
|
394
416
|
}
|
395
417
|
|
396
418
|
GIT_INLINE(void) add_to_write_order(git_pobject **wo, unsigned int *endp,
|
@@ -505,8 +527,10 @@ static git_pobject **compute_write_order(git_packbuilder *pb)
|
|
505
527
|
/*
|
506
528
|
* Mark objects that are at the tip of tags.
|
507
529
|
*/
|
508
|
-
if (git_tag_foreach(pb->repo, &cb_tag_foreach, pb) < 0)
|
530
|
+
if (git_tag_foreach(pb->repo, &cb_tag_foreach, pb) < 0) {
|
531
|
+
git__free(wo);
|
509
532
|
return NULL;
|
533
|
+
}
|
510
534
|
|
511
535
|
/*
|
512
536
|
* Give the objects in the original recency order until
|
@@ -568,58 +592,62 @@ static git_pobject **compute_write_order(git_packbuilder *pb)
|
|
568
592
|
}
|
569
593
|
|
570
594
|
static int write_pack(git_packbuilder *pb,
|
571
|
-
|
572
|
-
|
595
|
+
int (*write_cb)(void *buf, size_t size, void *cb_data),
|
596
|
+
void *cb_data)
|
573
597
|
{
|
574
598
|
git_pobject **write_order;
|
575
599
|
git_pobject *po;
|
576
|
-
git_buf buf = GIT_BUF_INIT;
|
577
600
|
enum write_one_status status;
|
578
601
|
struct git_pack_header ph;
|
602
|
+
git_oid entry_oid;
|
579
603
|
unsigned int i = 0;
|
604
|
+
int error = 0;
|
580
605
|
|
581
606
|
write_order = compute_write_order(pb);
|
582
|
-
if (write_order == NULL)
|
583
|
-
|
607
|
+
if (write_order == NULL) {
|
608
|
+
error = -1;
|
609
|
+
goto done;
|
610
|
+
}
|
584
611
|
|
585
612
|
/* Write pack header */
|
586
613
|
ph.hdr_signature = htonl(PACK_SIGNATURE);
|
587
614
|
ph.hdr_version = htonl(PACK_VERSION);
|
588
615
|
ph.hdr_entries = htonl(pb->nr_objects);
|
589
616
|
|
590
|
-
if (
|
591
|
-
|
592
|
-
|
593
|
-
if (git_hash_update(&pb->ctx, &ph, sizeof(ph)) < 0)
|
594
|
-
goto on_error;
|
617
|
+
if ((error = write_cb(&ph, sizeof(ph), cb_data)) < 0 ||
|
618
|
+
(error = git_hash_update(&pb->ctx, &ph, sizeof(ph))) < 0)
|
619
|
+
goto done;
|
595
620
|
|
596
621
|
pb->nr_remaining = pb->nr_objects;
|
597
622
|
do {
|
598
623
|
pb->nr_written = 0;
|
599
624
|
for ( ; i < pb->nr_objects; ++i) {
|
600
625
|
po = write_order[i];
|
601
|
-
|
602
|
-
|
603
|
-
|
604
|
-
goto on_error;
|
605
|
-
git_buf_clear(&buf);
|
626
|
+
|
627
|
+
if ((error = write_one(&status, pb, po, write_cb, cb_data)) < 0)
|
628
|
+
goto done;
|
606
629
|
}
|
607
630
|
|
608
631
|
pb->nr_remaining -= pb->nr_written;
|
609
632
|
} while (pb->nr_remaining && i < pb->nr_objects);
|
610
633
|
|
611
|
-
|
612
|
-
|
634
|
+
if ((error = git_hash_final(&entry_oid, &pb->ctx)) < 0)
|
635
|
+
goto done;
|
613
636
|
|
614
|
-
|
615
|
-
goto on_error;
|
637
|
+
error = write_cb(entry_oid.id, GIT_OID_RAWSZ, cb_data);
|
616
638
|
|
617
|
-
|
639
|
+
done:
|
640
|
+
/* if callback cancelled writing, we must still free delta_data */
|
641
|
+
for ( ; i < pb->nr_objects; ++i) {
|
642
|
+
po = write_order[i];
|
643
|
+
if (po->delta_data) {
|
644
|
+
git__free(po->delta_data);
|
645
|
+
po->delta_data = NULL;
|
646
|
+
}
|
647
|
+
}
|
618
648
|
|
619
|
-
on_error:
|
620
649
|
git__free(write_order);
|
621
|
-
|
622
|
-
return -1;
|
650
|
+
return error;
|
623
651
|
}
|
624
652
|
|
625
653
|
static int write_pack_buf(void *buf, size_t size, void *data)
|
@@ -674,7 +702,7 @@ static int delta_cacheable(git_packbuilder *pb, unsigned long src_size,
|
|
674
702
|
}
|
675
703
|
|
676
704
|
static int try_delta(git_packbuilder *pb, struct unpacked *trg,
|
677
|
-
struct unpacked *src,
|
705
|
+
struct unpacked *src, int max_depth,
|
678
706
|
unsigned long *mem_usage, int *ret)
|
679
707
|
{
|
680
708
|
git_pobject *trg_object = trg->object;
|
@@ -839,7 +867,7 @@ static unsigned long free_unpacked(struct unpacked *n)
|
|
839
867
|
|
840
868
|
static int find_deltas(git_packbuilder *pb, git_pobject **list,
|
841
869
|
unsigned int *list_size, unsigned int window,
|
842
|
-
|
870
|
+
int depth)
|
843
871
|
{
|
844
872
|
git_pobject *po;
|
845
873
|
git_buf zbuf = GIT_BUF_INIT;
|
@@ -854,8 +882,7 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list,
|
|
854
882
|
|
855
883
|
for (;;) {
|
856
884
|
struct unpacked *n = array + idx;
|
857
|
-
|
858
|
-
int j, best_base = -1;
|
885
|
+
int max_depth, j, best_base = -1;
|
859
886
|
|
860
887
|
git_packbuilder__progress_lock(pb);
|
861
888
|
if (!*list_size) {
|
@@ -926,7 +953,7 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list,
|
|
926
953
|
* between writes at that moment.
|
927
954
|
*/
|
928
955
|
if (po->delta_data) {
|
929
|
-
if (
|
956
|
+
if (git_zstream_deflatebuf(&zbuf, po->delta_data, po->delta_size) < 0)
|
930
957
|
goto on_error;
|
931
958
|
|
932
959
|
git__free(po->delta_data);
|
@@ -1048,7 +1075,7 @@ static void *threaded_find_deltas(void *arg)
|
|
1048
1075
|
|
1049
1076
|
static int ll_find_deltas(git_packbuilder *pb, git_pobject **list,
|
1050
1077
|
unsigned int list_size, unsigned int window,
|
1051
|
-
|
1078
|
+
int depth)
|
1052
1079
|
{
|
1053
1080
|
struct thread_params *p;
|
1054
1081
|
int i, ret, active_threads = 0;
|
@@ -1182,7 +1209,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list,
|
|
1182
1209
|
git_mutex_unlock(&target->mutex);
|
1183
1210
|
|
1184
1211
|
if (!sub_size) {
|
1185
|
-
git_thread_join(target->thread, NULL);
|
1212
|
+
git_thread_join(&target->thread, NULL);
|
1186
1213
|
git_cond_free(&target->cond);
|
1187
1214
|
git_mutex_free(&target->mutex);
|
1188
1215
|
active_threads--;
|
@@ -1205,6 +1232,13 @@ static int prepare_pack(git_packbuilder *pb)
|
|
1205
1232
|
if (pb->nr_objects == 0 || pb->done)
|
1206
1233
|
return 0; /* nothing to do */
|
1207
1234
|
|
1235
|
+
/*
|
1236
|
+
* Although we do not report progress during deltafication, we
|
1237
|
+
* at least report that we are in the deltafication stage
|
1238
|
+
*/
|
1239
|
+
if (pb->progress_cb)
|
1240
|
+
pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload);
|
1241
|
+
|
1208
1242
|
delta_list = git__malloc(pb->nr_objects * sizeof(*delta_list));
|
1209
1243
|
GITERR_CHECK_ALLOC(delta_list);
|
1210
1244
|
|
@@ -1244,61 +1278,71 @@ int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t siz
|
|
1244
1278
|
int git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb)
|
1245
1279
|
{
|
1246
1280
|
PREPARE_PACK;
|
1281
|
+
git_buf_sanitize(buf);
|
1247
1282
|
return write_pack(pb, &write_pack_buf, buf);
|
1248
1283
|
}
|
1249
1284
|
|
1250
1285
|
static int write_cb(void *buf, size_t len, void *payload)
|
1251
1286
|
{
|
1252
1287
|
struct pack_write_context *ctx = payload;
|
1253
|
-
return
|
1288
|
+
return git_indexer_append(ctx->indexer, buf, len, ctx->stats);
|
1254
1289
|
}
|
1255
1290
|
|
1256
1291
|
int git_packbuilder_write(
|
1257
1292
|
git_packbuilder *pb,
|
1258
1293
|
const char *path,
|
1259
|
-
|
1294
|
+
unsigned int mode,
|
1295
|
+
git_transfer_progress_cb progress_cb,
|
1260
1296
|
void *progress_cb_payload)
|
1261
1297
|
{
|
1262
|
-
|
1298
|
+
git_indexer *indexer;
|
1263
1299
|
git_transfer_progress stats;
|
1264
1300
|
struct pack_write_context ctx;
|
1265
1301
|
|
1266
1302
|
PREPARE_PACK;
|
1267
1303
|
|
1268
|
-
if (
|
1269
|
-
&indexer, path, progress_cb, progress_cb_payload) < 0)
|
1304
|
+
if (git_indexer_new(
|
1305
|
+
&indexer, path, mode, pb->odb, progress_cb, progress_cb_payload) < 0)
|
1270
1306
|
return -1;
|
1271
1307
|
|
1272
1308
|
ctx.indexer = indexer;
|
1273
1309
|
ctx.stats = &stats;
|
1274
1310
|
|
1275
1311
|
if (git_packbuilder_foreach(pb, write_cb, &ctx) < 0 ||
|
1276
|
-
|
1277
|
-
|
1312
|
+
git_indexer_commit(indexer, &stats) < 0) {
|
1313
|
+
git_indexer_free(indexer);
|
1278
1314
|
return -1;
|
1279
1315
|
}
|
1280
1316
|
|
1281
|
-
|
1317
|
+
git_oid_cpy(&pb->pack_oid, git_indexer_hash(indexer));
|
1318
|
+
|
1319
|
+
git_indexer_free(indexer);
|
1282
1320
|
return 0;
|
1283
1321
|
}
|
1284
1322
|
|
1285
1323
|
#undef PREPARE_PACK
|
1286
1324
|
|
1287
|
-
|
1325
|
+
const git_oid *git_packbuilder_hash(git_packbuilder *pb)
|
1326
|
+
{
|
1327
|
+
return &pb->pack_oid;
|
1328
|
+
}
|
1329
|
+
|
1330
|
+
static int cb_tree_walk(
|
1331
|
+
const char *root, const git_tree_entry *entry, void *payload)
|
1288
1332
|
{
|
1333
|
+
int error;
|
1289
1334
|
struct tree_walk_context *ctx = payload;
|
1290
1335
|
|
1291
1336
|
/* A commit inside a tree represents a submodule commit and should be skipped. */
|
1292
1337
|
if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT)
|
1293
1338
|
return 0;
|
1294
1339
|
|
1295
|
-
if (git_buf_sets(&ctx->buf, root)
|
1296
|
-
git_buf_puts(&ctx->buf, git_tree_entry_name(entry))
|
1297
|
-
|
1340
|
+
if (!(error = git_buf_sets(&ctx->buf, root)) &&
|
1341
|
+
!(error = git_buf_puts(&ctx->buf, git_tree_entry_name(entry))))
|
1342
|
+
error = git_packbuilder_insert(
|
1343
|
+
ctx->pb, git_tree_entry_id(entry), git_buf_cstr(&ctx->buf));
|
1298
1344
|
|
1299
|
-
return
|
1300
|
-
git_tree_entry_id(entry),
|
1301
|
-
git_buf_cstr(&ctx->buf));
|
1345
|
+
return error;
|
1302
1346
|
}
|
1303
1347
|
|
1304
1348
|
int git_packbuilder_insert_commit(git_packbuilder *pb, const git_oid *oid)
|
@@ -1318,22 +1362,17 @@ int git_packbuilder_insert_commit(git_packbuilder *pb, const git_oid *oid)
|
|
1318
1362
|
|
1319
1363
|
int git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *oid)
|
1320
1364
|
{
|
1321
|
-
|
1365
|
+
int error;
|
1366
|
+
git_tree *tree = NULL;
|
1322
1367
|
struct tree_walk_context context = { pb, GIT_BUF_INIT };
|
1323
1368
|
|
1324
|
-
if (git_tree_lookup(&tree, pb->repo, oid)
|
1325
|
-
git_packbuilder_insert(pb, oid, NULL)
|
1326
|
-
|
1327
|
-
|
1328
|
-
if (git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, &context) < 0) {
|
1329
|
-
git_tree_free(tree);
|
1330
|
-
git_buf_free(&context.buf);
|
1331
|
-
return -1;
|
1332
|
-
}
|
1369
|
+
if (!(error = git_tree_lookup(&tree, pb->repo, oid)) &&
|
1370
|
+
!(error = git_packbuilder_insert(pb, oid, NULL)))
|
1371
|
+
error = git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, &context);
|
1333
1372
|
|
1334
1373
|
git_tree_free(tree);
|
1335
1374
|
git_buf_free(&context.buf);
|
1336
|
-
return
|
1375
|
+
return error;
|
1337
1376
|
}
|
1338
1377
|
|
1339
1378
|
uint32_t git_packbuilder_object_count(git_packbuilder *pb)
|
@@ -1346,6 +1385,17 @@ uint32_t git_packbuilder_written(git_packbuilder *pb)
|
|
1346
1385
|
return pb->nr_written;
|
1347
1386
|
}
|
1348
1387
|
|
1388
|
+
int git_packbuilder_set_callbacks(git_packbuilder *pb, git_packbuilder_progress progress_cb, void *progress_cb_payload)
|
1389
|
+
{
|
1390
|
+
if (!pb)
|
1391
|
+
return -1;
|
1392
|
+
|
1393
|
+
pb->progress_cb = progress_cb;
|
1394
|
+
pb->progress_cb_payload = progress_cb_payload;
|
1395
|
+
|
1396
|
+
return 0;
|
1397
|
+
}
|
1398
|
+
|
1349
1399
|
void git_packbuilder_free(git_packbuilder *pb)
|
1350
1400
|
{
|
1351
1401
|
if (pb == NULL)
|
@@ -1369,6 +1419,7 @@ void git_packbuilder_free(git_packbuilder *pb)
|
|
1369
1419
|
git__free(pb->object_list);
|
1370
1420
|
|
1371
1421
|
git_hash_ctx_cleanup(&pb->ctx);
|
1422
|
+
git_zstream_free(&pb->zstream);
|
1372
1423
|
|
1373
1424
|
git__free(pb);
|
1374
1425
|
}
|
@@ -14,8 +14,10 @@
|
|
14
14
|
#include "hash.h"
|
15
15
|
#include "oidmap.h"
|
16
16
|
#include "netops.h"
|
17
|
+
#include "zstream.h"
|
17
18
|
|
18
19
|
#include "git2/oid.h"
|
20
|
+
#include "git2/pack.h"
|
19
21
|
|
20
22
|
#define GIT_PACK_WINDOW 10 /* number of objects to possibly delta against */
|
21
23
|
#define GIT_PACK_DEPTH 50 /* max delta depth */
|
@@ -53,6 +55,7 @@ struct git_packbuilder {
|
|
53
55
|
git_odb *odb; /* associated object database */
|
54
56
|
|
55
57
|
git_hash_ctx ctx;
|
58
|
+
git_zstream zstream;
|
56
59
|
|
57
60
|
uint32_t nr_objects,
|
58
61
|
nr_alloc,
|
@@ -79,6 +82,10 @@ struct git_packbuilder {
|
|
79
82
|
|
80
83
|
int nr_threads; /* nr of threads to use */
|
81
84
|
|
85
|
+
git_packbuilder_progress progress_cb;
|
86
|
+
void *progress_cb_payload;
|
87
|
+
double last_progress_report_time; /* the time progress was last reported */
|
88
|
+
|
82
89
|
bool done;
|
83
90
|
};
|
84
91
|
|