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
data/vendor/libgit2/src/odb.c
CHANGED
@@ -124,6 +124,13 @@ git_otype git_odb_object_type(git_odb_object *object)
|
|
124
124
|
return object->cached.type;
|
125
125
|
}
|
126
126
|
|
127
|
+
int git_odb_object_dup(git_odb_object **dest, git_odb_object *source)
|
128
|
+
{
|
129
|
+
git_cached_obj_incref(source);
|
130
|
+
*dest = source;
|
131
|
+
return 0;
|
132
|
+
}
|
133
|
+
|
127
134
|
void git_odb_object_free(git_odb_object *object)
|
128
135
|
{
|
129
136
|
if (object == NULL)
|
@@ -168,7 +175,6 @@ int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type)
|
|
168
175
|
error = -1;
|
169
176
|
|
170
177
|
goto done;
|
171
|
-
return -1;
|
172
178
|
}
|
173
179
|
|
174
180
|
error = git_hash_final(out, &ctx);
|
@@ -179,28 +185,30 @@ done:
|
|
179
185
|
}
|
180
186
|
|
181
187
|
int git_odb__hashfd_filtered(
|
182
|
-
git_oid *out, git_file fd, size_t size, git_otype type,
|
188
|
+
git_oid *out, git_file fd, size_t size, git_otype type, git_filter_list *fl)
|
183
189
|
{
|
184
190
|
int error;
|
185
191
|
git_buf raw = GIT_BUF_INIT;
|
186
|
-
git_buf filtered = GIT_BUF_INIT;
|
187
192
|
|
188
|
-
if (!
|
193
|
+
if (!fl)
|
189
194
|
return git_odb__hashfd(out, fd, size, type);
|
190
195
|
|
191
196
|
/* size of data is used in header, so we have to read the whole file
|
192
197
|
* into memory to apply filters before beginning to calculate the hash
|
193
198
|
*/
|
194
199
|
|
195
|
-
if (!(error = git_futils_readbuffer_fd(&raw, fd, size)))
|
196
|
-
|
200
|
+
if (!(error = git_futils_readbuffer_fd(&raw, fd, size))) {
|
201
|
+
git_buf post = GIT_BUF_INIT;
|
202
|
+
|
203
|
+
error = git_filter_list_apply_to_data(&post, fl, &raw);
|
197
204
|
|
198
|
-
|
205
|
+
git_buf_free(&raw);
|
199
206
|
|
200
|
-
|
201
|
-
|
207
|
+
if (!error)
|
208
|
+
error = git_odb_hash(out, post.ptr, post.size, type);
|
202
209
|
|
203
|
-
|
210
|
+
git_buf_free(&post);
|
211
|
+
}
|
204
212
|
|
205
213
|
return error;
|
206
214
|
}
|
@@ -232,6 +240,7 @@ int git_odb__hashlink(git_oid *out, const char *path)
|
|
232
240
|
link_data[size] = '\0';
|
233
241
|
if (read_len != (ssize_t)size) {
|
234
242
|
giterr_set(GITERR_OS, "Failed to read symlink data for '%s'", path);
|
243
|
+
git__free(link_data);
|
235
244
|
return -1;
|
236
245
|
}
|
237
246
|
|
@@ -290,10 +299,10 @@ typedef struct {
|
|
290
299
|
git_otype type;
|
291
300
|
} fake_wstream;
|
292
301
|
|
293
|
-
static int fake_wstream__fwrite(
|
302
|
+
static int fake_wstream__fwrite(git_odb_stream *_stream, const git_oid *oid)
|
294
303
|
{
|
295
304
|
fake_wstream *stream = (fake_wstream *)_stream;
|
296
|
-
return _stream->backend->write(
|
305
|
+
return _stream->backend->write(_stream->backend, oid, stream->buffer, stream->size, stream->type);
|
297
306
|
}
|
298
307
|
|
299
308
|
static int fake_wstream__write(git_odb_stream *_stream, const char *data, size_t len)
|
@@ -436,7 +445,7 @@ int git_odb_get_backend(git_odb_backend **out, git_odb *odb, size_t pos)
|
|
436
445
|
{
|
437
446
|
backend_internal *internal;
|
438
447
|
|
439
|
-
assert(
|
448
|
+
assert(out && odb);
|
440
449
|
internal = git_vector_get(&odb->backends, pos);
|
441
450
|
|
442
451
|
if (internal && internal->backend) {
|
@@ -444,7 +453,7 @@ int git_odb_get_backend(git_odb_backend **out, git_odb *odb, size_t pos)
|
|
444
453
|
return 0;
|
445
454
|
}
|
446
455
|
|
447
|
-
giterr_set(GITERR_ODB, "No ODB backend loaded at index " PRIuZ, pos);
|
456
|
+
giterr_set(GITERR_ODB, "No ODB backend loaded at index %" PRIuZ, pos);
|
448
457
|
return GIT_ENOTFOUND;
|
449
458
|
}
|
450
459
|
|
@@ -483,7 +492,7 @@ static int add_default_backends(
|
|
483
492
|
#endif
|
484
493
|
|
485
494
|
/* add the loose object backend */
|
486
|
-
if (git_odb_backend_loose(&loose, objects_dir, -1, 0) < 0 ||
|
495
|
+
if (git_odb_backend_loose(&loose, objects_dir, -1, 0, 0, 0) < 0 ||
|
487
496
|
add_backend_internal(db, loose, GIT_LOOSE_PRIORITY, as_alternates, inode) < 0)
|
488
497
|
return -1;
|
489
498
|
|
@@ -607,7 +616,6 @@ int git_odb_exists(git_odb *db, const git_oid *id)
|
|
607
616
|
git_odb_object *object;
|
608
617
|
size_t i;
|
609
618
|
bool found = false;
|
610
|
-
bool refreshed = false;
|
611
619
|
|
612
620
|
assert(db && id);
|
613
621
|
|
@@ -616,26 +624,75 @@ int git_odb_exists(git_odb *db, const git_oid *id)
|
|
616
624
|
return (int)true;
|
617
625
|
}
|
618
626
|
|
619
|
-
attempt_lookup:
|
620
627
|
for (i = 0; i < db->backends.length && !found; ++i) {
|
621
628
|
backend_internal *internal = git_vector_get(&db->backends, i);
|
622
629
|
git_odb_backend *b = internal->backend;
|
623
630
|
|
624
631
|
if (b->exists != NULL)
|
625
|
-
found = b->exists(b, id);
|
632
|
+
found = (bool)b->exists(b, id);
|
626
633
|
}
|
627
634
|
|
628
|
-
|
629
|
-
|
630
|
-
|
631
|
-
|
635
|
+
return (int)found;
|
636
|
+
}
|
637
|
+
|
638
|
+
int git_odb_exists_prefix(
|
639
|
+
git_oid *out, git_odb *db, const git_oid *short_id, size_t len)
|
640
|
+
{
|
641
|
+
int error = GIT_ENOTFOUND, num_found = 0;
|
642
|
+
size_t i;
|
643
|
+
git_oid key = {{0}}, last_found = {{0}}, found;
|
644
|
+
|
645
|
+
assert(db && short_id);
|
646
|
+
|
647
|
+
if (len < GIT_OID_MINPREFIXLEN)
|
648
|
+
return git_odb__error_ambiguous("prefix length too short");
|
649
|
+
if (len > GIT_OID_HEXSZ)
|
650
|
+
len = GIT_OID_HEXSZ;
|
651
|
+
|
652
|
+
if (len == GIT_OID_HEXSZ) {
|
653
|
+
if (git_odb_exists(db, short_id)) {
|
654
|
+
if (out)
|
655
|
+
git_oid_cpy(out, short_id);
|
656
|
+
return 0;
|
657
|
+
} else {
|
658
|
+
return git_odb__error_notfound("no match for id prefix", short_id);
|
632
659
|
}
|
660
|
+
}
|
633
661
|
|
634
|
-
|
635
|
-
|
662
|
+
/* just copy valid part of short_id */
|
663
|
+
memcpy(&key.id, short_id->id, (len + 1) / 2);
|
664
|
+
if (len & 1)
|
665
|
+
key.id[len / 2] &= 0xF0;
|
666
|
+
|
667
|
+
for (i = 0; i < db->backends.length; ++i) {
|
668
|
+
backend_internal *internal = git_vector_get(&db->backends, i);
|
669
|
+
git_odb_backend *b = internal->backend;
|
670
|
+
|
671
|
+
if (!b->exists_prefix)
|
672
|
+
continue;
|
673
|
+
|
674
|
+
error = b->exists_prefix(&found, b, &key, len);
|
675
|
+
if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH)
|
676
|
+
continue;
|
677
|
+
if (error)
|
678
|
+
return error;
|
679
|
+
|
680
|
+
/* make sure found item doesn't introduce ambiguity */
|
681
|
+
if (num_found) {
|
682
|
+
if (git_oid__cmp(&last_found, &found))
|
683
|
+
return git_odb__error_ambiguous("multiple matches for prefix");
|
684
|
+
} else {
|
685
|
+
git_oid_cpy(&last_found, &found);
|
686
|
+
num_found++;
|
687
|
+
}
|
636
688
|
}
|
637
689
|
|
638
|
-
|
690
|
+
if (!num_found)
|
691
|
+
return git_odb__error_notfound("no match for id prefix", &key);
|
692
|
+
if (out)
|
693
|
+
git_oid_cpy(out, &last_found);
|
694
|
+
|
695
|
+
return 0;
|
639
696
|
}
|
640
697
|
|
641
698
|
int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id)
|
@@ -699,7 +756,6 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id)
|
|
699
756
|
{
|
700
757
|
size_t i, reads = 0;
|
701
758
|
int error;
|
702
|
-
bool refreshed = false;
|
703
759
|
git_rawobj raw;
|
704
760
|
git_odb_object *object;
|
705
761
|
|
@@ -709,7 +765,6 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id)
|
|
709
765
|
if (*out != NULL)
|
710
766
|
return 0;
|
711
767
|
|
712
|
-
attempt_lookup:
|
713
768
|
error = GIT_ENOTFOUND;
|
714
769
|
|
715
770
|
for (i = 0; i < db->backends.length && error < 0; ++i) {
|
@@ -722,20 +777,13 @@ attempt_lookup:
|
|
722
777
|
}
|
723
778
|
}
|
724
779
|
|
725
|
-
if (error == GIT_ENOTFOUND && !refreshed) {
|
726
|
-
if ((error = git_odb_refresh(db)) < 0)
|
727
|
-
return error;
|
728
|
-
|
729
|
-
refreshed = true;
|
730
|
-
goto attempt_lookup;
|
731
|
-
}
|
732
|
-
|
733
780
|
if (error && error != GIT_PASSTHROUGH) {
|
734
781
|
if (!reads)
|
735
782
|
return git_odb__error_notfound("no match for id", id);
|
736
783
|
return error;
|
737
784
|
}
|
738
785
|
|
786
|
+
giterr_clear();
|
739
787
|
if ((object = odb_object__alloc(id, &raw)) == NULL)
|
740
788
|
return -1;
|
741
789
|
|
@@ -748,17 +796,16 @@ int git_odb_read_prefix(
|
|
748
796
|
{
|
749
797
|
size_t i;
|
750
798
|
int error = GIT_ENOTFOUND;
|
751
|
-
git_oid found_full_oid = {{0}};
|
799
|
+
git_oid key = {{0}}, found_full_oid = {{0}};
|
752
800
|
git_rawobj raw;
|
753
801
|
void *data = NULL;
|
754
|
-
bool found = false
|
802
|
+
bool found = false;
|
755
803
|
git_odb_object *object;
|
756
804
|
|
757
805
|
assert(out && db);
|
758
806
|
|
759
807
|
if (len < GIT_OID_MINPREFIXLEN)
|
760
808
|
return git_odb__error_ambiguous("prefix length too short");
|
761
|
-
|
762
809
|
if (len > GIT_OID_HEXSZ)
|
763
810
|
len = GIT_OID_HEXSZ;
|
764
811
|
|
@@ -768,14 +815,18 @@ int git_odb_read_prefix(
|
|
768
815
|
return 0;
|
769
816
|
}
|
770
817
|
|
771
|
-
|
818
|
+
/* just copy valid part of short_id */
|
819
|
+
memcpy(&key.id, short_id->id, (len + 1) / 2);
|
820
|
+
if (len & 1)
|
821
|
+
key.id[len / 2] &= 0xF0;
|
822
|
+
|
772
823
|
for (i = 0; i < db->backends.length; ++i) {
|
773
824
|
backend_internal *internal = git_vector_get(&db->backends, i);
|
774
825
|
git_odb_backend *b = internal->backend;
|
775
826
|
|
776
827
|
if (b->read_prefix != NULL) {
|
777
828
|
git_oid full_oid;
|
778
|
-
error = b->read_prefix(&full_oid, &raw.data, &raw.len, &raw.type, b,
|
829
|
+
error = b->read_prefix(&full_oid, &raw.data, &raw.len, &raw.type, b, &key, len);
|
779
830
|
if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH)
|
780
831
|
continue;
|
781
832
|
|
@@ -785,24 +836,18 @@ attempt_lookup:
|
|
785
836
|
git__free(data);
|
786
837
|
data = raw.data;
|
787
838
|
|
788
|
-
if (found && git_oid__cmp(&full_oid, &found_full_oid))
|
839
|
+
if (found && git_oid__cmp(&full_oid, &found_full_oid)) {
|
840
|
+
git__free(raw.data);
|
789
841
|
return git_odb__error_ambiguous("multiple matches for prefix");
|
842
|
+
}
|
790
843
|
|
791
844
|
found_full_oid = full_oid;
|
792
845
|
found = true;
|
793
846
|
}
|
794
847
|
}
|
795
848
|
|
796
|
-
if (!found && !refreshed) {
|
797
|
-
if ((error = git_odb_refresh(db)) < 0)
|
798
|
-
return error;
|
799
|
-
|
800
|
-
refreshed = true;
|
801
|
-
goto attempt_lookup;
|
802
|
-
}
|
803
|
-
|
804
849
|
if (!found)
|
805
|
-
return git_odb__error_notfound("no match for prefix",
|
850
|
+
return git_odb__error_notfound("no match for prefix", &key);
|
806
851
|
|
807
852
|
if ((object = odb_object__alloc(&found_full_oid, &raw)) == NULL)
|
808
853
|
return -1;
|
@@ -848,7 +893,7 @@ int git_odb_write(
|
|
848
893
|
continue;
|
849
894
|
|
850
895
|
if (b->write != NULL)
|
851
|
-
error = b->write(
|
896
|
+
error = b->write(b, oid, data, len, type);
|
852
897
|
}
|
853
898
|
|
854
899
|
if (!error || error == GIT_PASSTHROUGH)
|
@@ -862,17 +907,27 @@ int git_odb_write(
|
|
862
907
|
return error;
|
863
908
|
|
864
909
|
stream->write(stream, data, len);
|
865
|
-
error = stream->finalize_write(
|
866
|
-
|
910
|
+
error = stream->finalize_write(stream, oid);
|
911
|
+
git_odb_stream_free(stream);
|
867
912
|
|
868
913
|
return error;
|
869
914
|
}
|
870
915
|
|
916
|
+
static void hash_header(git_hash_ctx *ctx, size_t size, git_otype type)
|
917
|
+
{
|
918
|
+
char header[64];
|
919
|
+
int hdrlen;
|
920
|
+
|
921
|
+
hdrlen = git_odb__format_object_header(header, sizeof(header), size, type);
|
922
|
+
git_hash_update(ctx, header, hdrlen);
|
923
|
+
}
|
924
|
+
|
871
925
|
int git_odb_open_wstream(
|
872
926
|
git_odb_stream **stream, git_odb *db, size_t size, git_otype type)
|
873
927
|
{
|
874
928
|
size_t i, writes = 0;
|
875
929
|
int error = GIT_ERROR;
|
930
|
+
git_hash_ctx *ctx = NULL;
|
876
931
|
|
877
932
|
assert(stream && db);
|
878
933
|
|
@@ -893,14 +948,85 @@ int git_odb_open_wstream(
|
|
893
948
|
}
|
894
949
|
}
|
895
950
|
|
896
|
-
if (error
|
897
|
-
error
|
898
|
-
|
899
|
-
|
951
|
+
if (error < 0) {
|
952
|
+
if (error == GIT_PASSTHROUGH)
|
953
|
+
error = 0;
|
954
|
+
else if (!writes)
|
955
|
+
error = git_odb__error_unsupported_in_backend("write object");
|
956
|
+
|
957
|
+
goto done;
|
958
|
+
}
|
959
|
+
|
960
|
+
ctx = git__malloc(sizeof(git_hash_ctx));
|
961
|
+
GITERR_CHECK_ALLOC(ctx);
|
900
962
|
|
963
|
+
if ((error = git_hash_ctx_init(ctx)) < 0)
|
964
|
+
goto done;
|
965
|
+
|
966
|
+
hash_header(ctx, size, type);
|
967
|
+
(*stream)->hash_ctx = ctx;
|
968
|
+
|
969
|
+
(*stream)->declared_size = size;
|
970
|
+
(*stream)->received_bytes = 0;
|
971
|
+
|
972
|
+
done:
|
901
973
|
return error;
|
902
974
|
}
|
903
975
|
|
976
|
+
static int git_odb_stream__invalid_length(
|
977
|
+
const git_odb_stream *stream,
|
978
|
+
const char *action)
|
979
|
+
{
|
980
|
+
giterr_set(GITERR_ODB,
|
981
|
+
"Cannot %s - "
|
982
|
+
"Invalid length. %"PRIuZ" was expected. The "
|
983
|
+
"total size of the received chunks amounts to %"PRIuZ".",
|
984
|
+
action, stream->declared_size, stream->received_bytes);
|
985
|
+
|
986
|
+
return -1;
|
987
|
+
}
|
988
|
+
|
989
|
+
int git_odb_stream_write(git_odb_stream *stream, const char *buffer, size_t len)
|
990
|
+
{
|
991
|
+
git_hash_update(stream->hash_ctx, buffer, len);
|
992
|
+
|
993
|
+
stream->received_bytes += len;
|
994
|
+
|
995
|
+
if (stream->received_bytes > stream->declared_size)
|
996
|
+
return git_odb_stream__invalid_length(stream,
|
997
|
+
"stream_write()");
|
998
|
+
|
999
|
+
return stream->write(stream, buffer, len);
|
1000
|
+
}
|
1001
|
+
|
1002
|
+
int git_odb_stream_finalize_write(git_oid *out, git_odb_stream *stream)
|
1003
|
+
{
|
1004
|
+
if (stream->received_bytes != stream->declared_size)
|
1005
|
+
return git_odb_stream__invalid_length(stream,
|
1006
|
+
"stream_finalize_write()");
|
1007
|
+
|
1008
|
+
git_hash_final(out, stream->hash_ctx);
|
1009
|
+
|
1010
|
+
if (git_odb_exists(stream->backend->odb, out))
|
1011
|
+
return 0;
|
1012
|
+
|
1013
|
+
return stream->finalize_write(stream, out);
|
1014
|
+
}
|
1015
|
+
|
1016
|
+
int git_odb_stream_read(git_odb_stream *stream, char *buffer, size_t len)
|
1017
|
+
{
|
1018
|
+
return stream->read(stream, buffer, len);
|
1019
|
+
}
|
1020
|
+
|
1021
|
+
void git_odb_stream_free(git_odb_stream *stream)
|
1022
|
+
{
|
1023
|
+
if (stream == NULL)
|
1024
|
+
return;
|
1025
|
+
|
1026
|
+
git__free(stream->hash_ctx);
|
1027
|
+
stream->free(stream);
|
1028
|
+
}
|
1029
|
+
|
904
1030
|
int git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oid)
|
905
1031
|
{
|
906
1032
|
size_t i, reads = 0;
|
@@ -926,7 +1052,7 @@ int git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oi
|
|
926
1052
|
return error;
|
927
1053
|
}
|
928
1054
|
|
929
|
-
int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db,
|
1055
|
+
int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload)
|
930
1056
|
{
|
931
1057
|
size_t i, writes = 0;
|
932
1058
|
int error = GIT_ERROR;
|
@@ -943,7 +1069,7 @@ int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer
|
|
943
1069
|
|
944
1070
|
if (b->writepack != NULL) {
|
945
1071
|
++writes;
|
946
|
-
error = b->writepack(out, b, progress_cb, progress_payload);
|
1072
|
+
error = b->writepack(out, b, db, progress_cb, progress_payload);
|
947
1073
|
}
|
948
1074
|
}
|
949
1075
|
|
@@ -998,3 +1124,9 @@ int git_odb__error_ambiguous(const char *message)
|
|
998
1124
|
return GIT_EAMBIGUOUS;
|
999
1125
|
}
|
1000
1126
|
|
1127
|
+
int git_odb_init_backend(git_odb_backend *backend, unsigned int version)
|
1128
|
+
{
|
1129
|
+
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
1130
|
+
backend, version, git_odb_backend, GIT_ODB_BACKEND_INIT);
|
1131
|
+
return 0;
|
1132
|
+
}
|
data/vendor/libgit2/src/odb.h
CHANGED
@@ -14,6 +14,7 @@
|
|
14
14
|
#include "vector.h"
|
15
15
|
#include "cache.h"
|
16
16
|
#include "posix.h"
|
17
|
+
#include "filter.h"
|
17
18
|
|
18
19
|
#define GIT_OBJECTS_DIR "objects/"
|
19
20
|
#define GIT_OBJECT_DIR_MODE 0777
|
@@ -66,7 +67,7 @@ int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type);
|
|
66
67
|
* Acts just like git_odb__hashfd with the addition of filters...
|
67
68
|
*/
|
68
69
|
int git_odb__hashfd_filtered(
|
69
|
-
git_oid *out, git_file fd, size_t len, git_otype type,
|
70
|
+
git_oid *out, git_file fd, size_t len, git_otype type, git_filter_list *fl);
|
70
71
|
|
71
72
|
/*
|
72
73
|
* Hash a `path`, assuming it could be a POSIX symlink: if the path is a
|