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/blob.c
CHANGED
@@ -50,25 +50,28 @@ int git_blob__parse(void *blob, git_odb_object *odb_obj)
|
|
50
50
|
return 0;
|
51
51
|
}
|
52
52
|
|
53
|
-
int git_blob_create_frombuffer(
|
53
|
+
int git_blob_create_frombuffer(
|
54
|
+
git_oid *id, git_repository *repo, const void *buffer, size_t len)
|
54
55
|
{
|
55
56
|
int error;
|
56
57
|
git_odb *odb;
|
57
58
|
git_odb_stream *stream;
|
58
59
|
|
60
|
+
assert(id && repo);
|
61
|
+
|
59
62
|
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 ||
|
60
63
|
(error = git_odb_open_wstream(&stream, odb, len, GIT_OBJ_BLOB)) < 0)
|
61
64
|
return error;
|
62
65
|
|
63
|
-
if ((error =
|
64
|
-
error =
|
66
|
+
if ((error = git_odb_stream_write(stream, buffer, len)) == 0)
|
67
|
+
error = git_odb_stream_finalize_write(id, stream);
|
65
68
|
|
66
|
-
|
69
|
+
git_odb_stream_free(stream);
|
67
70
|
return error;
|
68
71
|
}
|
69
72
|
|
70
73
|
static int write_file_stream(
|
71
|
-
git_oid *
|
74
|
+
git_oid *id, git_odb *odb, const char *path, git_off_t file_size)
|
72
75
|
{
|
73
76
|
int fd, error;
|
74
77
|
char buffer[4096];
|
@@ -80,12 +83,12 @@ static int write_file_stream(
|
|
80
83
|
return error;
|
81
84
|
|
82
85
|
if ((fd = git_futils_open_ro(path)) < 0) {
|
83
|
-
|
86
|
+
git_odb_stream_free(stream);
|
84
87
|
return -1;
|
85
88
|
}
|
86
89
|
|
87
90
|
while (!error && (read_len = p_read(fd, buffer, sizeof(buffer))) > 0) {
|
88
|
-
error =
|
91
|
+
error = git_odb_stream_write(stream, buffer, read_len);
|
89
92
|
written += read_len;
|
90
93
|
}
|
91
94
|
|
@@ -97,41 +100,37 @@ static int write_file_stream(
|
|
97
100
|
}
|
98
101
|
|
99
102
|
if (!error)
|
100
|
-
error =
|
103
|
+
error = git_odb_stream_finalize_write(id, stream);
|
101
104
|
|
102
|
-
|
105
|
+
git_odb_stream_free(stream);
|
103
106
|
return error;
|
104
107
|
}
|
105
108
|
|
106
109
|
static int write_file_filtered(
|
107
|
-
git_oid *
|
110
|
+
git_oid *id,
|
111
|
+
git_off_t *size,
|
108
112
|
git_odb *odb,
|
109
113
|
const char *full_path,
|
110
|
-
|
114
|
+
git_filter_list *fl)
|
111
115
|
{
|
112
116
|
int error;
|
113
|
-
git_buf
|
114
|
-
git_buf dest = GIT_BUF_INIT;
|
115
|
-
|
116
|
-
if ((error = git_futils_readbuffer(&source, full_path)) < 0)
|
117
|
-
return error;
|
118
|
-
|
119
|
-
error = git_filters_apply(&dest, &source, filters);
|
117
|
+
git_buf tgt = GIT_BUF_INIT;
|
120
118
|
|
121
|
-
|
122
|
-
* and we don't want to ODB write to choke */
|
123
|
-
git_buf_free(&source);
|
119
|
+
error = git_filter_list_apply_to_file(&tgt, fl, NULL, full_path);
|
124
120
|
|
125
121
|
/* Write the file to disk if it was properly filtered */
|
126
|
-
if (!error)
|
127
|
-
|
122
|
+
if (!error) {
|
123
|
+
*size = tgt.size;
|
124
|
+
|
125
|
+
error = git_odb_write(id, odb, tgt.ptr, tgt.size, GIT_OBJ_BLOB);
|
126
|
+
}
|
128
127
|
|
129
|
-
git_buf_free(&
|
128
|
+
git_buf_free(&tgt);
|
130
129
|
return error;
|
131
130
|
}
|
132
131
|
|
133
132
|
static int write_symlink(
|
134
|
-
git_oid *
|
133
|
+
git_oid *id, git_odb *odb, const char *path, size_t link_size)
|
135
134
|
{
|
136
135
|
char *link_data;
|
137
136
|
ssize_t read_len;
|
@@ -147,50 +146,73 @@ static int write_symlink(
|
|
147
146
|
return -1;
|
148
147
|
}
|
149
148
|
|
150
|
-
error = git_odb_write(
|
149
|
+
error = git_odb_write(id, odb, (void *)link_data, link_size, GIT_OBJ_BLOB);
|
151
150
|
git__free(link_data);
|
152
151
|
return error;
|
153
152
|
}
|
154
153
|
|
155
|
-
|
154
|
+
int git_blob__create_from_paths(
|
155
|
+
git_oid *id,
|
156
|
+
struct stat *out_st,
|
157
|
+
git_repository *repo,
|
158
|
+
const char *content_path,
|
159
|
+
const char *hint_path,
|
160
|
+
mode_t hint_mode,
|
161
|
+
bool try_load_filters)
|
156
162
|
{
|
157
163
|
int error;
|
158
164
|
struct stat st;
|
159
165
|
git_odb *odb = NULL;
|
160
166
|
git_off_t size;
|
167
|
+
mode_t mode;
|
168
|
+
git_buf path = GIT_BUF_INIT;
|
161
169
|
|
162
170
|
assert(hint_path || !try_load_filters);
|
163
171
|
|
164
|
-
if (
|
165
|
-
|
172
|
+
if (!content_path) {
|
173
|
+
if (git_repository__ensure_not_bare(repo, "create blob from file") < 0)
|
174
|
+
return GIT_EBAREREPO;
|
175
|
+
|
176
|
+
if (git_buf_joinpath(
|
177
|
+
&path, git_repository_workdir(repo), hint_path) < 0)
|
178
|
+
return -1;
|
179
|
+
|
180
|
+
content_path = path.ptr;
|
181
|
+
}
|
182
|
+
|
183
|
+
if ((error = git_path_lstat(content_path, &st)) < 0 ||
|
184
|
+
(error = git_repository_odb(&odb, repo)) < 0)
|
185
|
+
goto done;
|
186
|
+
|
187
|
+
if (out_st)
|
188
|
+
memcpy(out_st, &st, sizeof(st));
|
166
189
|
|
167
190
|
size = st.st_size;
|
191
|
+
mode = hint_mode ? hint_mode : st.st_mode;
|
168
192
|
|
169
|
-
if (S_ISLNK(
|
170
|
-
error = write_symlink(
|
193
|
+
if (S_ISLNK(mode)) {
|
194
|
+
error = write_symlink(id, odb, content_path, (size_t)size);
|
171
195
|
} else {
|
172
|
-
|
173
|
-
int filter_count = 0;
|
196
|
+
git_filter_list *fl = NULL;
|
174
197
|
|
175
|
-
if (try_load_filters)
|
198
|
+
if (try_load_filters)
|
176
199
|
/* Load the filters for writing this file to the ODB */
|
177
|
-
|
178
|
-
&
|
179
|
-
|
200
|
+
error = git_filter_list_load(
|
201
|
+
&fl, repo, NULL, hint_path,
|
202
|
+
GIT_FILTER_TO_ODB, GIT_FILTER_OPT_DEFAULT);
|
180
203
|
|
181
|
-
if (
|
182
|
-
/*
|
183
|
-
|
184
|
-
} else if (filter_count == 0) {
|
204
|
+
if (error < 0)
|
205
|
+
/* well, that didn't work */;
|
206
|
+
else if (fl == NULL)
|
185
207
|
/* No filters need to be applied to the document: we can stream
|
186
208
|
* directly from disk */
|
187
|
-
error = write_file_stream(
|
188
|
-
|
209
|
+
error = write_file_stream(id, odb, content_path, size);
|
210
|
+
else {
|
189
211
|
/* We need to apply one or more filters */
|
190
|
-
error = write_file_filtered(
|
191
|
-
}
|
212
|
+
error = write_file_filtered(id, &size, odb, content_path, fl);
|
192
213
|
|
193
|
-
|
214
|
+
git_filter_list_free(fl);
|
215
|
+
}
|
194
216
|
|
195
217
|
/*
|
196
218
|
* TODO: eventually support streaming filtered files, for files
|
@@ -207,34 +229,21 @@ static int blob_create_internal(git_oid *oid, git_repository *repo, const char *
|
|
207
229
|
*/
|
208
230
|
}
|
209
231
|
|
232
|
+
done:
|
233
|
+
git_odb_free(odb);
|
234
|
+
git_buf_free(&path);
|
235
|
+
|
210
236
|
return error;
|
211
237
|
}
|
212
238
|
|
213
|
-
int git_blob_create_fromworkdir(
|
239
|
+
int git_blob_create_fromworkdir(
|
240
|
+
git_oid *id, git_repository *repo, const char *path)
|
214
241
|
{
|
215
|
-
|
216
|
-
const char *workdir;
|
217
|
-
int error;
|
218
|
-
|
219
|
-
if ((error = git_repository__ensure_not_bare(repo, "create blob from file")) < 0)
|
220
|
-
return error;
|
221
|
-
|
222
|
-
workdir = git_repository_workdir(repo);
|
223
|
-
|
224
|
-
if (git_buf_joinpath(&full_path, workdir, path) < 0) {
|
225
|
-
git_buf_free(&full_path);
|
226
|
-
return -1;
|
227
|
-
}
|
228
|
-
|
229
|
-
error = blob_create_internal(
|
230
|
-
oid, repo, git_buf_cstr(&full_path),
|
231
|
-
git_buf_cstr(&full_path) + strlen(workdir), true);
|
232
|
-
|
233
|
-
git_buf_free(&full_path);
|
234
|
-
return error;
|
242
|
+
return git_blob__create_from_paths(id, NULL, repo, NULL, path, 0, true);
|
235
243
|
}
|
236
244
|
|
237
|
-
int git_blob_create_fromdisk(
|
245
|
+
int git_blob_create_fromdisk(
|
246
|
+
git_oid *id, git_repository *repo, const char *path)
|
238
247
|
{
|
239
248
|
int error;
|
240
249
|
git_buf full_path = GIT_BUF_INIT;
|
@@ -251,8 +260,8 @@ int git_blob_create_fromdisk(git_oid *oid, git_repository *repo, const char *pat
|
|
251
260
|
if (workdir && !git__prefixcmp(hintpath, workdir))
|
252
261
|
hintpath += strlen(workdir);
|
253
262
|
|
254
|
-
error =
|
255
|
-
|
263
|
+
error = git_blob__create_from_paths(
|
264
|
+
id, NULL, repo, git_buf_cstr(&full_path), hintpath, 0, true);
|
256
265
|
|
257
266
|
git_buf_free(&full_path);
|
258
267
|
return error;
|
@@ -261,65 +270,101 @@ int git_blob_create_fromdisk(git_oid *oid, git_repository *repo, const char *pat
|
|
261
270
|
#define BUFFER_SIZE 4096
|
262
271
|
|
263
272
|
int git_blob_create_fromchunks(
|
264
|
-
git_oid *
|
273
|
+
git_oid *id,
|
265
274
|
git_repository *repo,
|
266
275
|
const char *hintpath,
|
267
276
|
int (*source_cb)(char *content, size_t max_length, void *payload),
|
268
277
|
void *payload)
|
269
278
|
{
|
270
|
-
int error
|
279
|
+
int error;
|
271
280
|
char *content = NULL;
|
272
281
|
git_filebuf file = GIT_FILEBUF_INIT;
|
273
282
|
git_buf path = GIT_BUF_INIT;
|
274
283
|
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
goto cleanup;
|
284
|
+
assert(id && repo && source_cb);
|
285
|
+
|
286
|
+
if ((error = git_buf_joinpath(
|
287
|
+
&path, git_repository_path(repo), GIT_OBJECTS_DIR "streamed")) < 0)
|
288
|
+
goto cleanup;
|
281
289
|
|
282
290
|
content = git__malloc(BUFFER_SIZE);
|
283
291
|
GITERR_CHECK_ALLOC(content);
|
284
292
|
|
285
|
-
if (
|
293
|
+
if ((error = git_filebuf_open(
|
294
|
+
&file, git_buf_cstr(&path), GIT_FILEBUF_TEMPORARY, 0666)) < 0)
|
286
295
|
goto cleanup;
|
287
296
|
|
288
297
|
while (1) {
|
289
|
-
read_bytes = source_cb(content, BUFFER_SIZE, payload);
|
298
|
+
int read_bytes = source_cb(content, BUFFER_SIZE, payload);
|
290
299
|
|
291
|
-
|
292
|
-
|
293
|
-
if (read_bytes <= 0)
|
300
|
+
if (!read_bytes)
|
294
301
|
break;
|
295
302
|
|
296
|
-
if (
|
303
|
+
if (read_bytes > BUFFER_SIZE) {
|
304
|
+
giterr_set(GITERR_OBJECT, "Invalid chunk size while creating blob");
|
305
|
+
error = GIT_EBUFS;
|
306
|
+
} else if (read_bytes < 0) {
|
307
|
+
error = giterr_set_after_callback(read_bytes);
|
308
|
+
} else {
|
309
|
+
error = git_filebuf_write(&file, content, read_bytes);
|
310
|
+
}
|
311
|
+
|
312
|
+
if (error < 0)
|
297
313
|
goto cleanup;
|
298
314
|
}
|
299
315
|
|
300
|
-
if (
|
301
|
-
goto cleanup;
|
302
|
-
|
303
|
-
if (git_filebuf_flush(&file) < 0)
|
316
|
+
if ((error = git_filebuf_flush(&file)) < 0)
|
304
317
|
goto cleanup;
|
305
318
|
|
306
|
-
error =
|
319
|
+
error = git_blob__create_from_paths(
|
320
|
+
id, NULL, repo, file.path_lock, hintpath, 0, hintpath != NULL);
|
307
321
|
|
308
322
|
cleanup:
|
309
323
|
git_buf_free(&path);
|
310
324
|
git_filebuf_cleanup(&file);
|
311
325
|
git__free(content);
|
326
|
+
|
312
327
|
return error;
|
313
328
|
}
|
314
329
|
|
315
|
-
int git_blob_is_binary(git_blob *blob)
|
330
|
+
int git_blob_is_binary(const git_blob *blob)
|
316
331
|
{
|
317
332
|
git_buf content;
|
318
333
|
|
319
334
|
assert(blob);
|
320
335
|
|
321
|
-
content.ptr
|
322
|
-
content.size
|
336
|
+
content.ptr = blob->odb_object->buffer;
|
337
|
+
content.size =
|
338
|
+
min(blob->odb_object->cached.size, GIT_FILTER_BYTES_TO_CHECK_NUL);
|
339
|
+
content.asize = 0;
|
323
340
|
|
324
341
|
return git_buf_text_is_binary(&content);
|
325
342
|
}
|
343
|
+
|
344
|
+
int git_blob_filtered_content(
|
345
|
+
git_buf *out,
|
346
|
+
git_blob *blob,
|
347
|
+
const char *path,
|
348
|
+
int check_for_binary_data)
|
349
|
+
{
|
350
|
+
int error = 0;
|
351
|
+
git_filter_list *fl = NULL;
|
352
|
+
|
353
|
+
assert(blob && path && out);
|
354
|
+
|
355
|
+
git_buf_sanitize(out);
|
356
|
+
|
357
|
+
if (check_for_binary_data && git_blob_is_binary(blob))
|
358
|
+
return 0;
|
359
|
+
|
360
|
+
if (!(error = git_filter_list_load(
|
361
|
+
&fl, git_blob_owner(blob), blob, path,
|
362
|
+
GIT_FILTER_TO_WORKTREE, GIT_FILTER_OPT_DEFAULT))) {
|
363
|
+
|
364
|
+
error = git_filter_list_apply_to_blob(out, fl, blob);
|
365
|
+
|
366
|
+
git_filter_list_free(fl);
|
367
|
+
}
|
368
|
+
|
369
|
+
return error;
|
370
|
+
}
|
data/vendor/libgit2/src/blob.h
CHANGED
@@ -21,4 +21,13 @@ void git_blob__free(void *blob);
|
|
21
21
|
int git_blob__parse(void *blob, git_odb_object *obj);
|
22
22
|
int git_blob__getbuf(git_buf *buffer, git_blob *blob);
|
23
23
|
|
24
|
+
extern int git_blob__create_from_paths(
|
25
|
+
git_oid *out_oid,
|
26
|
+
struct stat *out_st,
|
27
|
+
git_repository *repo,
|
28
|
+
const char *full_path,
|
29
|
+
const char *hint_path,
|
30
|
+
mode_t hint_mode,
|
31
|
+
bool apply_filters);
|
32
|
+
|
24
33
|
#endif
|