rugged 0.28.5 → 0.99.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/rugged/extconf.rb +3 -1
- data/ext/rugged/rugged.c +35 -31
- data/ext/rugged/rugged.h +13 -0
- data/ext/rugged/rugged_blob.c +11 -9
- data/ext/rugged/rugged_commit.c +17 -15
- data/ext/rugged/rugged_diff.c +4 -26
- data/ext/rugged/rugged_index.c +4 -2
- data/ext/rugged/rugged_note.c +5 -3
- data/ext/rugged/rugged_object.c +57 -10
- data/ext/rugged/rugged_rebase.c +3 -1
- data/ext/rugged/rugged_remote.c +0 -6
- data/ext/rugged/rugged_repo.c +222 -17
- data/ext/rugged/rugged_tag.c +8 -6
- data/ext/rugged/rugged_tree.c +18 -16
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +38 -19
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +5 -1
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
- data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +110 -0
- data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +53 -0
- data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +124 -0
- data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +66 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +21 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +33 -0
- data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +1422 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
- data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
- data/vendor/libgit2/deps/ntlmclient/util.c +21 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
- data/vendor/libgit2/deps/pcre/config.h.in +57 -0
- data/vendor/libgit2/deps/pcre/pcre.h +641 -0
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
- data/vendor/libgit2/deps/pcre/pcre_compile.c +9800 -0
- data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
- data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
- data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
- data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
- data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
- data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
- data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
- data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
- data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
- data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
- data/vendor/libgit2/deps/pcre/pcreposix.c +421 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/apply.h +22 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +2 -2
- data/vendor/libgit2/include/git2/blob.h +44 -12
- data/vendor/libgit2/include/git2/branch.h +74 -57
- data/vendor/libgit2/include/git2/buffer.h +20 -14
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +46 -14
- data/vendor/libgit2/include/git2/cherrypick.h +3 -3
- data/vendor/libgit2/include/git2/clone.h +2 -2
- data/vendor/libgit2/include/git2/commit.h +23 -1
- data/vendor/libgit2/include/git2/common.h +15 -6
- data/vendor/libgit2/include/git2/config.h +12 -12
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
- data/vendor/libgit2/include/git2/credential.h +314 -0
- data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
- data/vendor/libgit2/include/git2/deprecated.h +314 -3
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +16 -14
- data/vendor/libgit2/include/git2/errors.h +4 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +2 -1
- data/vendor/libgit2/include/git2/indexer.h +48 -4
- data/vendor/libgit2/include/git2/merge.h +6 -10
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/object.h +2 -14
- data/vendor/libgit2/include/git2/odb.h +3 -2
- data/vendor/libgit2/include/git2/odb_backend.h +5 -4
- data/vendor/libgit2/include/git2/oid.h +11 -6
- data/vendor/libgit2/include/git2/pack.h +12 -1
- data/vendor/libgit2/include/git2/proxy.h +6 -4
- data/vendor/libgit2/include/git2/rebase.h +46 -2
- data/vendor/libgit2/include/git2/refs.h +19 -0
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +24 -2
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +7 -3
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +25 -16
- data/vendor/libgit2/include/git2/submodule.h +20 -3
- data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
- data/vendor/libgit2/include/git2/sys/cred.h +15 -0
- data/vendor/libgit2/include/git2/sys/credential.h +90 -0
- data/vendor/libgit2/include/git2/sys/index.h +4 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
- data/vendor/libgit2/include/git2/sys/merge.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +57 -21
- data/vendor/libgit2/include/git2/sys/repository.h +17 -6
- data/vendor/libgit2/include/git2/sys/transport.h +4 -4
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transport.h +11 -340
- data/vendor/libgit2/include/git2/tree.h +5 -3
- data/vendor/libgit2/include/git2/types.h +4 -89
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/src/CMakeLists.txt +89 -224
- data/vendor/libgit2/src/alloc.c +2 -14
- data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
- data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
- data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
- data/vendor/libgit2/src/apply.c +31 -15
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +189 -96
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +47 -47
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +17 -5
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +21 -7
- data/vendor/libgit2/src/blob.c +81 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +60 -32
- data/vendor/libgit2/src/buffer.c +5 -0
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +26 -33
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +26 -16
- data/vendor/libgit2/src/cherrypick.c +7 -1
- data/vendor/libgit2/src/clone.c +29 -7
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +70 -22
- data/vendor/libgit2/src/commit.h +6 -0
- data/vendor/libgit2/src/commit_list.c +28 -76
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +3 -75
- data/vendor/libgit2/src/config.c +31 -40
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +39 -39
- data/vendor/libgit2/src/config_entries.c +69 -99
- data/vendor/libgit2/src/config_entries.h +1 -0
- data/vendor/libgit2/src/config_file.c +337 -380
- data/vendor/libgit2/src/config_mem.c +12 -16
- data/vendor/libgit2/src/config_parse.c +49 -29
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +206 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +21 -20
- data/vendor/libgit2/src/diff.c +43 -66
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +12 -10
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +26 -26
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +1 -1
- data/vendor/libgit2/src/diff_print.c +25 -13
- data/vendor/libgit2/src/diff_stats.c +1 -1
- data/vendor/libgit2/src/diff_tform.c +11 -11
- data/vendor/libgit2/src/errors.c +21 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +7 -2
- data/vendor/libgit2/src/fetchhead.c +9 -9
- data/vendor/libgit2/src/filebuf.c +1 -1
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +16 -8
- data/vendor/libgit2/src/{fileops.c → futils.c} +20 -17
- data/vendor/libgit2/src/{fileops.h → futils.h} +5 -5
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +19 -21
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
- data/vendor/libgit2/src/hash/sha1/collisiondetect.h +19 -0
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
- data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
- data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
- data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
- data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
- data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
- data/vendor/libgit2/src/hash/sha1/openssl.h +19 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
- data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hashsig.c +1 -1
- data/vendor/libgit2/src/idxmap.c +91 -65
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +26 -35
- data/vendor/libgit2/src/index.c +103 -81
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +69 -70
- data/vendor/libgit2/src/integer.h +11 -4
- data/vendor/libgit2/src/iterator.c +32 -28
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +55 -41
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +1 -1
- data/vendor/libgit2/src/mwindow.c +18 -23
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +411 -0
- data/vendor/libgit2/src/net.h +57 -0
- data/vendor/libgit2/src/netops.c +6 -222
- data/vendor/libgit2/src/netops.h +1 -37
- data/vendor/libgit2/src/notes.c +2 -2
- data/vendor/libgit2/src/object.c +3 -3
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +41 -23
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +17 -10
- data/vendor/libgit2/src/odb_mempack.c +13 -24
- data/vendor/libgit2/src/odb_pack.c +4 -4
- data/vendor/libgit2/src/offmap.c +43 -55
- data/vendor/libgit2/src/offmap.h +102 -24
- data/vendor/libgit2/src/oid.c +19 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +25 -32
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +97 -129
- data/vendor/libgit2/src/pack.h +15 -18
- data/vendor/libgit2/src/parse.c +10 -0
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +1 -1
- data/vendor/libgit2/src/patch_generate.c +1 -1
- data/vendor/libgit2/src/patch_parse.c +30 -9
- data/vendor/libgit2/src/path.c +43 -6
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +14 -14
- data/vendor/libgit2/src/pool.c +26 -22
- data/vendor/libgit2/src/pool.h +7 -7
- data/vendor/libgit2/src/posix.c +7 -7
- data/vendor/libgit2/src/posix.h +12 -1
- data/vendor/libgit2/src/proxy.c +7 -2
- data/vendor/libgit2/src/push.c +10 -5
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +87 -28
- data/vendor/libgit2/src/refdb.c +12 -0
- data/vendor/libgit2/src/refdb_fs.c +215 -169
- data/vendor/libgit2/src/reflog.c +11 -13
- data/vendor/libgit2/src/refs.c +34 -23
- data/vendor/libgit2/src/refs.h +8 -1
- data/vendor/libgit2/src/refspec.c +9 -16
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +57 -55
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +120 -103
- data/vendor/libgit2/src/repository.h +49 -40
- data/vendor/libgit2/src/revert.c +6 -1
- data/vendor/libgit2/src/revparse.c +18 -19
- data/vendor/libgit2/src/revwalk.c +71 -33
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +13 -1
- data/vendor/libgit2/src/sortedcache.c +12 -26
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +45 -65
- data/vendor/libgit2/src/status.c +17 -11
- data/vendor/libgit2/src/streams/openssl.c +53 -1
- data/vendor/libgit2/src/streams/socket.c +2 -2
- data/vendor/libgit2/src/strmap.c +37 -84
- data/vendor/libgit2/src/strmap.h +105 -33
- data/vendor/libgit2/src/submodule.c +151 -126
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/tag.c +10 -2
- data/vendor/libgit2/src/trace.c +1 -1
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +46 -32
- data/vendor/libgit2/src/transaction.c +3 -8
- data/vendor/libgit2/src/transports/auth.c +16 -15
- data/vendor/libgit2/src/transports/auth.h +18 -11
- data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
- data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
- data/vendor/libgit2/src/transports/credential.c +476 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +21 -8
- data/vendor/libgit2/src/transports/git.c +11 -16
- data/vendor/libgit2/src/transports/http.c +488 -1248
- data/vendor/libgit2/src/transports/http.h +4 -1
- data/vendor/libgit2/src/transports/httpclient.c +1526 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +10 -10
- data/vendor/libgit2/src/transports/smart.c +19 -19
- data/vendor/libgit2/src/transports/smart.h +3 -3
- data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
- data/vendor/libgit2/src/transports/ssh.c +77 -59
- data/vendor/libgit2/src/transports/winhttp.c +266 -241
- data/vendor/libgit2/src/tree-cache.c +14 -7
- data/vendor/libgit2/src/tree.c +16 -26
- data/vendor/libgit2/src/unix/map.c +1 -1
- data/vendor/libgit2/src/unix/posix.h +2 -12
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +51 -53
- data/vendor/libgit2/src/util.h +16 -21
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +12 -2
- data/vendor/libgit2/src/win32/path_w32.h +0 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +48 -5
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -5
- data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
- data/vendor/libgit2/src/win32/w32_stack.c +4 -9
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +31 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -32
- data/vendor/libgit2/src/worktree.c +36 -22
- data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +5 -0
- data/vendor/libgit2/src/zstream.h +1 -0
- metadata +108 -38
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/regex/COPYING +0 -502
- data/vendor/libgit2/deps/regex/config.h +0 -7
- data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
- data/vendor/libgit2/deps/regex/regex.c +0 -92
- data/vendor/libgit2/deps/regex/regex.h +0 -582
- data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
- data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
- data/vendor/libgit2/deps/regex/regexec.c +0 -4369
- data/vendor/libgit2/include/git2/inttypes.h +0 -309
- data/vendor/libgit2/include/git2/sys/time.h +0 -31
- data/vendor/libgit2/libgit2.pc.in +0 -13
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/transports/cred.c +0 -390
data/vendor/libgit2/src/index.c
CHANGED
@@ -27,29 +27,6 @@
|
|
27
27
|
#include "git2/config.h"
|
28
28
|
#include "git2/sys/index.h"
|
29
29
|
|
30
|
-
#define INSERT_IN_MAP_EX(idx, map, e, err) do { \
|
31
|
-
if ((idx)->ignore_case) \
|
32
|
-
git_idxmap_icase_insert((git_idxmap_icase *) (map), (e), (e), (err)); \
|
33
|
-
else \
|
34
|
-
git_idxmap_insert((map), (e), (e), (err)); \
|
35
|
-
} while (0)
|
36
|
-
|
37
|
-
#define INSERT_IN_MAP(idx, e, err) INSERT_IN_MAP_EX(idx, (idx)->entries_map, e, err)
|
38
|
-
|
39
|
-
#define LOOKUP_IN_MAP(p, idx, k) do { \
|
40
|
-
if ((idx)->ignore_case) \
|
41
|
-
(p) = git_idxmap_icase_lookup_index((git_idxmap_icase *) index->entries_map, (k)); \
|
42
|
-
else \
|
43
|
-
(p) = git_idxmap_lookup_index(index->entries_map, (k)); \
|
44
|
-
} while (0)
|
45
|
-
|
46
|
-
#define DELETE_IN_MAP(idx, e) do { \
|
47
|
-
if ((idx)->ignore_case) \
|
48
|
-
git_idxmap_icase_delete((git_idxmap_icase *) (idx)->entries_map, (e)); \
|
49
|
-
else \
|
50
|
-
git_idxmap_delete((idx)->entries_map, (e)); \
|
51
|
-
} while (0)
|
52
|
-
|
53
30
|
static int index_apply_to_wd_diff(git_index *index, int action, const git_strarray *paths,
|
54
31
|
unsigned int flags,
|
55
32
|
git_index_matched_path_cb cb, void *payload);
|
@@ -148,6 +125,30 @@ static int write_index(git_oid *checksum, git_index *index, git_filebuf *file);
|
|
148
125
|
static void index_entry_free(git_index_entry *entry);
|
149
126
|
static void index_entry_reuc_free(git_index_reuc_entry *reuc);
|
150
127
|
|
128
|
+
GIT_INLINE(int) index_map_set(git_idxmap *map, git_index_entry *e, bool ignore_case)
|
129
|
+
{
|
130
|
+
if (ignore_case)
|
131
|
+
return git_idxmap_icase_set((git_idxmap_icase *) map, e, e);
|
132
|
+
else
|
133
|
+
return git_idxmap_set(map, e, e);
|
134
|
+
}
|
135
|
+
|
136
|
+
GIT_INLINE(int) index_map_delete(git_idxmap *map, git_index_entry *e, bool ignore_case)
|
137
|
+
{
|
138
|
+
if (ignore_case)
|
139
|
+
return git_idxmap_icase_delete((git_idxmap_icase *) map, e);
|
140
|
+
else
|
141
|
+
return git_idxmap_delete(map, e);
|
142
|
+
}
|
143
|
+
|
144
|
+
GIT_INLINE(int) index_map_resize(git_idxmap *map, size_t count, bool ignore_case)
|
145
|
+
{
|
146
|
+
if (ignore_case)
|
147
|
+
return git_idxmap_icase_resize((git_idxmap_icase *) map, count);
|
148
|
+
else
|
149
|
+
return git_idxmap_resize(map, count);
|
150
|
+
}
|
151
|
+
|
151
152
|
int git_index_entry_srch(const void *key, const void *array_member)
|
152
153
|
{
|
153
154
|
const struct entry_srch_key *srch_key = key;
|
@@ -423,10 +424,10 @@ int git_index_open(git_index **index_out, const char *index_path)
|
|
423
424
|
}
|
424
425
|
|
425
426
|
if (git_vector_init(&index->entries, 32, git_index_entry_cmp) < 0 ||
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
427
|
+
git_idxmap_new(&index->entries_map) < 0 ||
|
428
|
+
git_vector_init(&index->names, 8, conflict_name_cmp) < 0 ||
|
429
|
+
git_vector_init(&index->reuc, 8, reuc_cmp) < 0 ||
|
430
|
+
git_vector_init(&index->deleted, 8, git_index_entry_cmp) < 0)
|
430
431
|
goto fail;
|
431
432
|
|
432
433
|
index->entries_cmp_path = git__strcmp_cb;
|
@@ -507,7 +508,7 @@ static int index_remove_entry(git_index *index, size_t pos)
|
|
507
508
|
|
508
509
|
if (entry != NULL) {
|
509
510
|
git_tree_cache_invalidate_path(index->tree, entry->path);
|
510
|
-
|
511
|
+
index_map_delete(index->entries_map, entry, index->ignore_case);
|
511
512
|
}
|
512
513
|
|
513
514
|
error = git_vector_remove(&index->entries, pos);
|
@@ -538,13 +539,19 @@ int git_index_clear(git_index *index)
|
|
538
539
|
git_idxmap_clear(index->entries_map);
|
539
540
|
while (!error && index->entries.length > 0)
|
540
541
|
error = index_remove_entry(index, index->entries.length - 1);
|
542
|
+
|
543
|
+
if (error)
|
544
|
+
goto done;
|
545
|
+
|
541
546
|
index_free_deleted(index);
|
542
547
|
|
543
|
-
|
544
|
-
|
548
|
+
if ((error = git_index_name_clear(index)) < 0 ||
|
549
|
+
(error = git_index_reuc_clear(index)) < 0)
|
550
|
+
goto done;
|
545
551
|
|
546
552
|
git_futils_filestamp_set(&index->stamp, NULL);
|
547
553
|
|
554
|
+
done:
|
548
555
|
return error;
|
549
556
|
}
|
550
557
|
|
@@ -570,11 +577,11 @@ int git_index_set_caps(git_index *index, int caps)
|
|
570
577
|
return create_index_error(
|
571
578
|
-1, "cannot access repository to set index caps");
|
572
579
|
|
573
|
-
if (!
|
580
|
+
if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_IGNORECASE))
|
574
581
|
index->ignore_case = (val != 0);
|
575
|
-
if (!
|
582
|
+
if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_FILEMODE))
|
576
583
|
index->distrust_filemode = (val == 0);
|
577
|
-
if (!
|
584
|
+
if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_SYMLINKS))
|
578
585
|
index->no_symlinks = (val == 0);
|
579
586
|
}
|
580
587
|
else {
|
@@ -852,20 +859,24 @@ const git_index_entry *git_index_get_bypath(
|
|
852
859
|
git_index *index, const char *path, int stage)
|
853
860
|
{
|
854
861
|
git_index_entry key = {{ 0 }};
|
855
|
-
|
862
|
+
git_index_entry *value;
|
856
863
|
|
857
864
|
assert(index);
|
858
865
|
|
859
866
|
key.path = path;
|
860
867
|
GIT_INDEX_ENTRY_STAGE_SET(&key, stage);
|
861
868
|
|
862
|
-
|
869
|
+
if (index->ignore_case)
|
870
|
+
value = git_idxmap_icase_get((git_idxmap_icase *) index->entries_map, &key);
|
871
|
+
else
|
872
|
+
value = git_idxmap_get(index->entries_map, &key);
|
863
873
|
|
864
|
-
if (
|
865
|
-
|
874
|
+
if (!value) {
|
875
|
+
git_error_set(GIT_ERROR_INDEX, "index does not contain '%s'", path);
|
876
|
+
return NULL;
|
877
|
+
}
|
866
878
|
|
867
|
-
|
868
|
-
return NULL;
|
879
|
+
return value;
|
869
880
|
}
|
870
881
|
|
871
882
|
void git_index_entry__init_from_stat(
|
@@ -1398,10 +1409,9 @@ static int index_insert(
|
|
1398
1409
|
* at the sorted position. (Since we re-sort after each insert to
|
1399
1410
|
* check for dups, this is actually cheaper in the long run.)
|
1400
1411
|
*/
|
1401
|
-
if ((error = git_vector_insert_sorted(&index->entries, entry, index_no_dups)) < 0
|
1412
|
+
if ((error = git_vector_insert_sorted(&index->entries, entry, index_no_dups)) < 0 ||
|
1413
|
+
(error = index_map_set(index->entries_map, entry, index->ignore_case)) < 0)
|
1402
1414
|
goto out;
|
1403
|
-
|
1404
|
-
INSERT_IN_MAP(index, entry, &error);
|
1405
1415
|
}
|
1406
1416
|
|
1407
1417
|
index->dirty = 1;
|
@@ -1453,7 +1463,7 @@ GIT_INLINE(bool) valid_filemode(const int filemode)
|
|
1453
1463
|
return (is_file_or_link(filemode) || filemode == GIT_FILEMODE_COMMIT);
|
1454
1464
|
}
|
1455
1465
|
|
1456
|
-
int
|
1466
|
+
int git_index_add_from_buffer(
|
1457
1467
|
git_index *index, const git_index_entry *source_entry,
|
1458
1468
|
const void *buffer, size_t len)
|
1459
1469
|
{
|
@@ -1473,17 +1483,22 @@ int git_index_add_frombuffer(
|
|
1473
1483
|
return -1;
|
1474
1484
|
}
|
1475
1485
|
|
1486
|
+
if (len > UINT32_MAX) {
|
1487
|
+
git_error_set(GIT_ERROR_INDEX, "buffer is too large");
|
1488
|
+
return -1;
|
1489
|
+
}
|
1490
|
+
|
1476
1491
|
if (index_entry_dup(&entry, index, source_entry) < 0)
|
1477
1492
|
return -1;
|
1478
1493
|
|
1479
|
-
error =
|
1494
|
+
error = git_blob_create_from_buffer(&id, INDEX_OWNER(index), buffer, len);
|
1480
1495
|
if (error < 0) {
|
1481
1496
|
index_entry_free(entry);
|
1482
1497
|
return error;
|
1483
1498
|
}
|
1484
1499
|
|
1485
1500
|
git_oid_cpy(&entry->id, &id);
|
1486
|
-
entry->file_size = len;
|
1501
|
+
entry->file_size = (uint32_t)len;
|
1487
1502
|
|
1488
1503
|
if ((error = index_insert(index, &entry, 1, true, true, true)) < 0)
|
1489
1504
|
return error;
|
@@ -1610,41 +1625,42 @@ int git_index_remove_bypath(git_index *index, const char *path)
|
|
1610
1625
|
int git_index__fill(git_index *index, const git_vector *source_entries)
|
1611
1626
|
{
|
1612
1627
|
const git_index_entry *source_entry = NULL;
|
1628
|
+
int error = 0;
|
1613
1629
|
size_t i;
|
1614
|
-
int ret = 0;
|
1615
1630
|
|
1616
1631
|
assert(index);
|
1617
1632
|
|
1618
1633
|
if (!source_entries->length)
|
1619
1634
|
return 0;
|
1620
1635
|
|
1621
|
-
git_vector_size_hint(&index->entries, source_entries->length)
|
1622
|
-
|
1636
|
+
if (git_vector_size_hint(&index->entries, source_entries->length) < 0 ||
|
1637
|
+
index_map_resize(index->entries_map, (size_t)(source_entries->length * 1.3),
|
1638
|
+
index->ignore_case) < 0)
|
1639
|
+
return -1;
|
1623
1640
|
|
1624
1641
|
git_vector_foreach(source_entries, i, source_entry) {
|
1625
1642
|
git_index_entry *entry = NULL;
|
1626
1643
|
|
1627
|
-
if ((
|
1644
|
+
if ((error = index_entry_dup(&entry, index, source_entry)) < 0)
|
1628
1645
|
break;
|
1629
1646
|
|
1630
1647
|
index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen);
|
1631
1648
|
entry->flags_extended |= GIT_INDEX_ENTRY_UPTODATE;
|
1632
1649
|
entry->mode = git_index__create_mode(entry->mode);
|
1633
1650
|
|
1634
|
-
if ((
|
1651
|
+
if ((error = git_vector_insert(&index->entries, entry)) < 0)
|
1635
1652
|
break;
|
1636
1653
|
|
1637
|
-
|
1638
|
-
if (ret < 0)
|
1654
|
+
if ((error = index_map_set(index->entries_map, entry, index->ignore_case)) < 0)
|
1639
1655
|
break;
|
1640
1656
|
|
1641
1657
|
index->dirty = 1;
|
1642
1658
|
}
|
1643
1659
|
|
1644
|
-
if (!
|
1660
|
+
if (!error)
|
1645
1661
|
git_vector_sort(&index->entries);
|
1646
1662
|
|
1647
|
-
return
|
1663
|
+
return error;
|
1648
1664
|
}
|
1649
1665
|
|
1650
1666
|
|
@@ -1677,7 +1693,7 @@ int git_index_remove(git_index *index, const char *path, int stage)
|
|
1677
1693
|
remove_key.path = path;
|
1678
1694
|
GIT_INDEX_ENTRY_STAGE_SET(&remove_key, stage);
|
1679
1695
|
|
1680
|
-
|
1696
|
+
index_map_delete(index->entries_map, &remove_key, index->ignore_case);
|
1681
1697
|
|
1682
1698
|
if (index_find(&position, index, path, 0, stage) < 0) {
|
1683
1699
|
git_error_set(
|
@@ -2126,7 +2142,7 @@ int git_index_name_add(git_index *index,
|
|
2126
2142
|
return 0;
|
2127
2143
|
}
|
2128
2144
|
|
2129
|
-
|
2145
|
+
int git_index_name_clear(git_index *index)
|
2130
2146
|
{
|
2131
2147
|
size_t i;
|
2132
2148
|
git_index_name_entry *conflict_name;
|
@@ -2139,6 +2155,8 @@ void git_index_name_clear(git_index *index)
|
|
2139
2155
|
git_vector_clear(&index->names);
|
2140
2156
|
|
2141
2157
|
index->dirty = 1;
|
2158
|
+
|
2159
|
+
return 0;
|
2142
2160
|
}
|
2143
2161
|
|
2144
2162
|
size_t git_index_reuc_entrycount(git_index *index)
|
@@ -2235,7 +2253,7 @@ int git_index_reuc_remove(git_index *index, size_t position)
|
|
2235
2253
|
return error;
|
2236
2254
|
}
|
2237
2255
|
|
2238
|
-
|
2256
|
+
int git_index_reuc_clear(git_index *index)
|
2239
2257
|
{
|
2240
2258
|
size_t i;
|
2241
2259
|
|
@@ -2247,6 +2265,8 @@ void git_index_reuc_clear(git_index *index)
|
|
2247
2265
|
git_vector_clear(&index->reuc);
|
2248
2266
|
|
2249
2267
|
index->dirty = 1;
|
2268
|
+
|
2269
|
+
return 0;
|
2250
2270
|
}
|
2251
2271
|
|
2252
2272
|
static int index_error_invalid(const char *message)
|
@@ -2607,10 +2627,8 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
|
|
2607
2627
|
|
2608
2628
|
assert(!index->entries.length);
|
2609
2629
|
|
2610
|
-
if (index->ignore_case)
|
2611
|
-
|
2612
|
-
else
|
2613
|
-
git_idxmap_resize(index->entries_map, header.entry_count);
|
2630
|
+
if ((error = index_map_resize(index->entries_map, header.entry_count, index->ignore_case)) < 0)
|
2631
|
+
return error;
|
2614
2632
|
|
2615
2633
|
/* Parse all the entries */
|
2616
2634
|
for (i = 0; i < header.entry_count && buffer_size > INDEX_FOOTER_SIZE; ++i) {
|
@@ -2627,9 +2645,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
|
|
2627
2645
|
goto done;
|
2628
2646
|
}
|
2629
2647
|
|
2630
|
-
|
2631
|
-
|
2632
|
-
if (error < 0) {
|
2648
|
+
if ((error = index_map_set(index->entries_map, entry, index->ignore_case)) < 0) {
|
2633
2649
|
index_entry_free(entry);
|
2634
2650
|
goto done;
|
2635
2651
|
}
|
@@ -3106,7 +3122,7 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
|
|
3106
3122
|
size_t i;
|
3107
3123
|
git_index_entry *e;
|
3108
3124
|
|
3109
|
-
if (
|
3125
|
+
if (git_idxmap_new(&entries_map) < 0)
|
3110
3126
|
return -1;
|
3111
3127
|
|
3112
3128
|
git_vector_set_cmp(&entries, index->entries._cmp); /* match sort */
|
@@ -3124,15 +3140,11 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
|
|
3124
3140
|
if ((error = git_tree_walk(tree, GIT_TREEWALK_POST, read_tree_cb, &data)) < 0)
|
3125
3141
|
goto cleanup;
|
3126
3142
|
|
3127
|
-
if (index->ignore_case)
|
3128
|
-
|
3129
|
-
else
|
3130
|
-
git_idxmap_resize(entries_map, entries.length);
|
3143
|
+
if ((error = index_map_resize(entries_map, entries.length, index->ignore_case)) < 0)
|
3144
|
+
goto cleanup;
|
3131
3145
|
|
3132
3146
|
git_vector_foreach(&entries, i, e) {
|
3133
|
-
|
3134
|
-
|
3135
|
-
if (error < 0) {
|
3147
|
+
if ((error = index_map_set(entries_map, e, index->ignore_case)) < 0) {
|
3136
3148
|
git_error_set(GIT_ERROR_INDEX, "failed to insert entry into map");
|
3137
3149
|
return error;
|
3138
3150
|
}
|
@@ -3180,14 +3192,13 @@ static int git_index_read_iterator(
|
|
3180
3192
|
assert((new_iterator->flags & GIT_ITERATOR_DONT_IGNORE_CASE));
|
3181
3193
|
|
3182
3194
|
if ((error = git_vector_init(&new_entries, new_length_hint, index->entries._cmp)) < 0 ||
|
3183
|
-
|
3184
|
-
|
3195
|
+
(error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 ||
|
3196
|
+
(error = git_idxmap_new(&new_entries_map)) < 0)
|
3185
3197
|
goto done;
|
3186
3198
|
|
3187
|
-
if (
|
3188
|
-
|
3189
|
-
|
3190
|
-
git_idxmap_resize(new_entries_map, new_length_hint);
|
3199
|
+
if (new_length_hint && (error = index_map_resize(new_entries_map, new_length_hint,
|
3200
|
+
index->ignore_case)) < 0)
|
3201
|
+
goto done;
|
3191
3202
|
|
3192
3203
|
opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE |
|
3193
3204
|
GIT_ITERATOR_INCLUDE_CONFLICTS;
|
@@ -3251,7 +3262,8 @@ static int git_index_read_iterator(
|
|
3251
3262
|
|
3252
3263
|
if (add_entry) {
|
3253
3264
|
if ((error = git_vector_insert(&new_entries, add_entry)) == 0)
|
3254
|
-
|
3265
|
+
error = index_map_set(new_entries_map, add_entry,
|
3266
|
+
index->ignore_case);
|
3255
3267
|
}
|
3256
3268
|
|
3257
3269
|
if (remove_entry && error >= 0)
|
@@ -3275,8 +3287,9 @@ static int git_index_read_iterator(
|
|
3275
3287
|
}
|
3276
3288
|
}
|
3277
3289
|
|
3278
|
-
git_index_name_clear(index)
|
3279
|
-
|
3290
|
+
if ((error = git_index_name_clear(index)) < 0 ||
|
3291
|
+
(error = git_index_reuc_clear(index)) < 0)
|
3292
|
+
goto done;
|
3280
3293
|
|
3281
3294
|
git_vector_swap(&new_entries, &index->entries);
|
3282
3295
|
new_entries_map = git__swap(index->entries_map, new_entries_map);
|
@@ -3700,3 +3713,12 @@ void git_indexwriter_cleanup(git_indexwriter *writer)
|
|
3700
3713
|
git_index_free(writer->index);
|
3701
3714
|
writer->index = NULL;
|
3702
3715
|
}
|
3716
|
+
|
3717
|
+
/* Deprecated functions */
|
3718
|
+
|
3719
|
+
int git_index_add_frombuffer(
|
3720
|
+
git_index *index, const git_index_entry *source_entry,
|
3721
|
+
const void *buffer, size_t len)
|
3722
|
+
{
|
3723
|
+
return git_index_add_from_buffer(index, source_entry, buffer, len);
|
3724
|
+
}
|
data/vendor/libgit2/src/index.h
CHANGED
@@ -19,6 +19,7 @@
|
|
19
19
|
#include "pack.h"
|
20
20
|
#include "filebuf.h"
|
21
21
|
#include "oid.h"
|
22
|
+
#include "oidarray.h"
|
22
23
|
#include "oidmap.h"
|
23
24
|
#include "zstream.h"
|
24
25
|
#include "object.h"
|
@@ -46,8 +47,8 @@ struct git_indexer {
|
|
46
47
|
struct git_pack_header hdr;
|
47
48
|
struct git_pack_file *pack;
|
48
49
|
unsigned int mode;
|
49
|
-
|
50
|
-
|
50
|
+
off64_t off;
|
51
|
+
off64_t entry_start;
|
51
52
|
git_object_t entry_type;
|
52
53
|
git_buf entry_data;
|
53
54
|
git_packfile_stream stream;
|
@@ -57,7 +58,7 @@ struct git_indexer {
|
|
57
58
|
unsigned int fanout[256];
|
58
59
|
git_hash_ctx hash_ctx;
|
59
60
|
git_oid hash;
|
60
|
-
|
61
|
+
git_indexer_progress_cb progress_cb;
|
61
62
|
void *progress_payload;
|
62
63
|
char objbuf[8*1024];
|
63
64
|
|
@@ -74,7 +75,7 @@ struct git_indexer {
|
|
74
75
|
};
|
75
76
|
|
76
77
|
struct delta_info {
|
77
|
-
|
78
|
+
off64_t delta_off;
|
78
79
|
};
|
79
80
|
|
80
81
|
const git_oid *git_indexer_hash(const git_indexer *idx)
|
@@ -115,13 +116,18 @@ static int objects_cmp(const void *a, const void *b)
|
|
115
116
|
return git_oid__cmp(&entrya->oid, &entryb->oid);
|
116
117
|
}
|
117
118
|
|
118
|
-
int
|
119
|
+
int git_indexer_options_init(git_indexer_options *opts, unsigned int version)
|
119
120
|
{
|
120
121
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
121
122
|
opts, version, git_indexer_options, GIT_INDEXER_OPTIONS_INIT);
|
122
123
|
return 0;
|
123
124
|
}
|
124
125
|
|
126
|
+
int git_indexer_init_options(git_indexer_options *opts, unsigned int version)
|
127
|
+
{
|
128
|
+
return git_indexer_options_init(opts, version);
|
129
|
+
}
|
130
|
+
|
125
131
|
int git_indexer_new(
|
126
132
|
git_indexer **out,
|
127
133
|
const char *prefix,
|
@@ -147,8 +153,9 @@ int git_indexer_new(
|
|
147
153
|
git_hash_ctx_init(&idx->hash_ctx);
|
148
154
|
git_hash_ctx_init(&idx->trailer);
|
149
155
|
git_buf_init(&idx->entry_data, 0);
|
150
|
-
|
151
|
-
|
156
|
+
|
157
|
+
if ((error = git_oidmap_new(&idx->expected_oids)) < 0)
|
158
|
+
goto cleanup;
|
152
159
|
|
153
160
|
idx->do_verify = opts.verify;
|
154
161
|
|
@@ -213,7 +220,7 @@ static int store_delta(git_indexer *idx)
|
|
213
220
|
return 0;
|
214
221
|
}
|
215
222
|
|
216
|
-
static int hash_header(git_hash_ctx *ctx,
|
223
|
+
static int hash_header(git_hash_ctx *ctx, off64_t len, git_object_t type)
|
217
224
|
{
|
218
225
|
char buffer[64];
|
219
226
|
size_t hdrlen;
|
@@ -258,7 +265,7 @@ static int advance_delta_offset(git_indexer *idx, git_object_t type)
|
|
258
265
|
if (type == GIT_OBJECT_REF_DELTA) {
|
259
266
|
idx->off += GIT_OID_RAWSZ;
|
260
267
|
} else {
|
261
|
-
|
268
|
+
off64_t base_off = get_delta_base(idx->pack, &w, &idx->off, type, idx->entry_start);
|
262
269
|
git_mwindow_close(&w);
|
263
270
|
if (base_off < 0)
|
264
271
|
return (int)base_off;
|
@@ -284,7 +291,7 @@ static int read_object_stream(git_indexer *idx, git_packfile_stream *stream)
|
|
284
291
|
return 0;
|
285
292
|
}
|
286
293
|
|
287
|
-
static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf,
|
294
|
+
static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, off64_t start, off64_t size)
|
288
295
|
{
|
289
296
|
void *ptr;
|
290
297
|
uint32_t crc;
|
@@ -308,10 +315,8 @@ static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, git_off_t start,
|
|
308
315
|
return 0;
|
309
316
|
}
|
310
317
|
|
311
|
-
static
|
318
|
+
static int add_expected_oid(git_indexer *idx, const git_oid *oid)
|
312
319
|
{
|
313
|
-
int ret;
|
314
|
-
|
315
320
|
/*
|
316
321
|
* If we know about that object because it is stored in our ODB or
|
317
322
|
* because we have already processed it as part of our pack file, we do
|
@@ -321,15 +326,18 @@ static void add_expected_oid(git_indexer *idx, const git_oid *oid)
|
|
321
326
|
!git_oidmap_exists(idx->pack->idx_cache, oid) &&
|
322
327
|
!git_oidmap_exists(idx->expected_oids, oid)) {
|
323
328
|
git_oid *dup = git__malloc(sizeof(*oid));
|
329
|
+
GIT_ERROR_CHECK_ALLOC(dup);
|
324
330
|
git_oid_cpy(dup, oid);
|
325
|
-
|
331
|
+
return git_oidmap_set(idx->expected_oids, dup, dup);
|
326
332
|
}
|
333
|
+
|
334
|
+
return 0;
|
327
335
|
}
|
328
336
|
|
329
337
|
static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
|
330
338
|
{
|
331
339
|
git_object *object;
|
332
|
-
|
340
|
+
git_oid *expected;
|
333
341
|
int error;
|
334
342
|
|
335
343
|
if (obj->type != GIT_OBJECT_BLOB &&
|
@@ -341,11 +349,9 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
|
|
341
349
|
if ((error = git_object__from_raw(&object, obj->data, obj->len, obj->type)) < 0)
|
342
350
|
goto out;
|
343
351
|
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
git__free((git_oid *) key);
|
348
|
-
git_oidmap_delete_at(idx->expected_oids, keyidx);
|
352
|
+
if ((expected = git_oidmap_get(idx->expected_oids, &object->cached.oid)) != NULL) {
|
353
|
+
git_oidmap_delete(idx->expected_oids, &object->cached.oid);
|
354
|
+
git__free(expected);
|
349
355
|
}
|
350
356
|
|
351
357
|
/*
|
@@ -363,7 +369,8 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
|
|
363
369
|
size_t i;
|
364
370
|
|
365
371
|
git_array_foreach(tree->entries, i, entry)
|
366
|
-
add_expected_oid(idx, entry->oid)
|
372
|
+
if (add_expected_oid(idx, entry->oid) < 0)
|
373
|
+
goto out;
|
367
374
|
|
368
375
|
break;
|
369
376
|
}
|
@@ -374,9 +381,11 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
|
|
374
381
|
size_t i;
|
375
382
|
|
376
383
|
git_array_foreach(commit->parent_ids, i, parent_oid)
|
377
|
-
add_expected_oid(idx, parent_oid)
|
384
|
+
if (add_expected_oid(idx, parent_oid) < 0)
|
385
|
+
goto out;
|
378
386
|
|
379
|
-
add_expected_oid(idx, &commit->tree_id)
|
387
|
+
if (add_expected_oid(idx, &commit->tree_id) < 0)
|
388
|
+
goto out;
|
380
389
|
|
381
390
|
break;
|
382
391
|
}
|
@@ -384,7 +393,8 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
|
|
384
393
|
{
|
385
394
|
git_tag *tag = (git_tag *) object;
|
386
395
|
|
387
|
-
add_expected_oid(idx, &tag->target)
|
396
|
+
if (add_expected_oid(idx, &tag->target) < 0)
|
397
|
+
goto out;
|
388
398
|
|
389
399
|
break;
|
390
400
|
}
|
@@ -402,12 +412,11 @@ out:
|
|
402
412
|
static int store_object(git_indexer *idx)
|
403
413
|
{
|
404
414
|
int i, error;
|
405
|
-
size_t k;
|
406
415
|
git_oid oid;
|
407
416
|
struct entry *entry;
|
408
|
-
|
417
|
+
off64_t entry_size;
|
409
418
|
struct git_pack_entry *pentry;
|
410
|
-
|
419
|
+
off64_t entry_start = idx->entry_start;
|
411
420
|
|
412
421
|
entry = git__calloc(1, sizeof(*entry));
|
413
422
|
GIT_ERROR_CHECK_ALLOC(entry);
|
@@ -438,22 +447,18 @@ static int store_object(git_indexer *idx)
|
|
438
447
|
git_oid_cpy(&pentry->sha1, &oid);
|
439
448
|
pentry->offset = entry_start;
|
440
449
|
|
441
|
-
|
442
|
-
|
450
|
+
if (git_oidmap_exists(idx->pack->idx_cache, &pentry->sha1)) {
|
451
|
+
git_error_set(GIT_ERROR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1));
|
443
452
|
git__free(pentry);
|
444
|
-
git_error_set_oom();
|
445
453
|
goto on_error;
|
446
454
|
}
|
447
455
|
|
448
|
-
if (error
|
449
|
-
git_error_set(GIT_ERROR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1));
|
456
|
+
if ((error = git_oidmap_set(idx->pack->idx_cache, &pentry->sha1, pentry)) < 0) {
|
450
457
|
git__free(pentry);
|
458
|
+
git_error_set_oom();
|
451
459
|
goto on_error;
|
452
460
|
}
|
453
461
|
|
454
|
-
|
455
|
-
git_oidmap_set_value_at(idx->pack->idx_cache, k, pentry);
|
456
|
-
|
457
462
|
git_oid_cpy(&entry->oid, &oid);
|
458
463
|
|
459
464
|
if (crc_object(&entry->crc, &idx->pack->mwf, entry_start, entry_size) < 0)
|
@@ -480,10 +485,9 @@ GIT_INLINE(bool) has_entry(git_indexer *idx, git_oid *id)
|
|
480
485
|
return git_oidmap_exists(idx->pack->idx_cache, id);
|
481
486
|
}
|
482
487
|
|
483
|
-
static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry,
|
488
|
+
static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry, off64_t entry_start)
|
484
489
|
{
|
485
|
-
int i
|
486
|
-
size_t k;
|
490
|
+
int i;
|
487
491
|
|
488
492
|
if (entry_start > UINT31_MAX) {
|
489
493
|
entry->offset = UINT32_MAX;
|
@@ -493,15 +497,13 @@ static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_ent
|
|
493
497
|
}
|
494
498
|
|
495
499
|
pentry->offset = entry_start;
|
496
|
-
k = git_oidmap_put(idx->pack->idx_cache, &pentry->sha1, &error);
|
497
500
|
|
498
|
-
if (
|
501
|
+
if (git_oidmap_exists(idx->pack->idx_cache, &pentry->sha1) ||
|
502
|
+
git_oidmap_set(idx->pack->idx_cache, &pentry->sha1, pentry) < 0) {
|
499
503
|
git_error_set(GIT_ERROR_INDEXER, "cannot insert object into pack");
|
500
504
|
return -1;
|
501
505
|
}
|
502
506
|
|
503
|
-
git_oidmap_set_value_at(idx->pack->idx_cache, k, pentry);
|
504
|
-
|
505
507
|
/* Add the object to the list */
|
506
508
|
if (git_vector_insert(&idx->objects, entry) < 0)
|
507
509
|
return -1;
|
@@ -513,7 +515,7 @@ static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_ent
|
|
513
515
|
return 0;
|
514
516
|
}
|
515
517
|
|
516
|
-
static int hash_and_save(git_indexer *idx, git_rawobj *obj,
|
518
|
+
static int hash_and_save(git_indexer *idx, git_rawobj *obj, off64_t entry_start)
|
517
519
|
{
|
518
520
|
git_oid oid;
|
519
521
|
size_t entry_size;
|
@@ -548,7 +550,7 @@ on_error:
|
|
548
550
|
return -1;
|
549
551
|
}
|
550
552
|
|
551
|
-
static int do_progress_callback(git_indexer *idx,
|
553
|
+
static int do_progress_callback(git_indexer *idx, git_indexer_progress *stats)
|
552
554
|
{
|
553
555
|
if (idx->progress_cb)
|
554
556
|
return git_error_set_after_callback_function(
|
@@ -594,12 +596,12 @@ static void hash_partially(git_indexer *idx, const uint8_t *data, size_t size)
|
|
594
596
|
idx->inbuf_len += size - to_expell;
|
595
597
|
}
|
596
598
|
|
597
|
-
static int write_at(git_indexer *idx, const void *data,
|
599
|
+
static int write_at(git_indexer *idx, const void *data, off64_t offset, size_t size)
|
598
600
|
{
|
599
601
|
git_file fd = idx->pack->mwf.fd;
|
600
602
|
size_t mmap_alignment;
|
601
603
|
size_t page_offset;
|
602
|
-
|
604
|
+
off64_t page_start;
|
603
605
|
unsigned char *map_data;
|
604
606
|
git_map map;
|
605
607
|
int error;
|
@@ -625,11 +627,11 @@ static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t
|
|
625
627
|
|
626
628
|
static int append_to_pack(git_indexer *idx, const void *data, size_t size)
|
627
629
|
{
|
628
|
-
|
630
|
+
off64_t new_size;
|
629
631
|
size_t mmap_alignment;
|
630
632
|
size_t page_offset;
|
631
|
-
|
632
|
-
|
633
|
+
off64_t page_start;
|
634
|
+
off64_t current_size = idx->pack->mwf.size;
|
633
635
|
int fd = idx->pack->mwf.fd;
|
634
636
|
int error;
|
635
637
|
|
@@ -656,10 +658,10 @@ static int append_to_pack(git_indexer *idx, const void *data, size_t size)
|
|
656
658
|
return write_at(idx, data, idx->pack->mwf.size, size);
|
657
659
|
}
|
658
660
|
|
659
|
-
static int read_stream_object(git_indexer *idx,
|
661
|
+
static int read_stream_object(git_indexer *idx, git_indexer_progress *stats)
|
660
662
|
{
|
661
663
|
git_packfile_stream *stream = &idx->stream;
|
662
|
-
|
664
|
+
off64_t entry_start = idx->off;
|
663
665
|
size_t entry_size;
|
664
666
|
git_object_t type;
|
665
667
|
git_mwindow *w = NULL;
|
@@ -745,7 +747,7 @@ static int read_stream_object(git_indexer *idx, git_transfer_progress *stats)
|
|
745
747
|
return 0;
|
746
748
|
}
|
747
749
|
|
748
|
-
int git_indexer_append(git_indexer *idx, const void *data, size_t size,
|
750
|
+
int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_indexer_progress *stats)
|
749
751
|
{
|
750
752
|
int error = -1;
|
751
753
|
struct git_pack_header *hdr = &idx->hdr;
|
@@ -781,8 +783,8 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_tran
|
|
781
783
|
return -1;
|
782
784
|
}
|
783
785
|
|
784
|
-
idx->pack->idx_cache
|
785
|
-
|
786
|
+
if (git_oidmap_new(&idx->pack->idx_cache) < 0)
|
787
|
+
return -1;
|
786
788
|
|
787
789
|
idx->pack->has_cache = 1;
|
788
790
|
if (git_vector_init(&idx->objects, total_objects, objects_cmp) < 0)
|
@@ -863,7 +865,7 @@ static int inject_object(git_indexer *idx, git_oid *id)
|
|
863
865
|
git_oid foo = {{0}};
|
864
866
|
unsigned char hdr[64];
|
865
867
|
git_buf buf = GIT_BUF_INIT;
|
866
|
-
|
868
|
+
off64_t entry_start;
|
867
869
|
const void *data;
|
868
870
|
size_t len, hdr_len;
|
869
871
|
int error;
|
@@ -929,7 +931,7 @@ cleanup:
|
|
929
931
|
return error;
|
930
932
|
}
|
931
933
|
|
932
|
-
static int fix_thin_pack(git_indexer *idx,
|
934
|
+
static int fix_thin_pack(git_indexer *idx, git_indexer_progress *stats)
|
933
935
|
{
|
934
936
|
int error, found_ref_delta = 0;
|
935
937
|
unsigned int i;
|
@@ -937,7 +939,7 @@ static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats)
|
|
937
939
|
size_t size;
|
938
940
|
git_object_t type;
|
939
941
|
git_mwindow *w = NULL;
|
940
|
-
|
942
|
+
off64_t curpos = 0;
|
941
943
|
unsigned char *base_info;
|
942
944
|
unsigned int left = 0;
|
943
945
|
git_oid base;
|
@@ -991,7 +993,7 @@ static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats)
|
|
991
993
|
return 0;
|
992
994
|
}
|
993
995
|
|
994
|
-
static int resolve_deltas(git_indexer *idx,
|
996
|
+
static int resolve_deltas(git_indexer *idx, git_indexer_progress *stats)
|
995
997
|
{
|
996
998
|
unsigned int i;
|
997
999
|
int error;
|
@@ -1048,11 +1050,11 @@ static int resolve_deltas(git_indexer *idx, git_transfer_progress *stats)
|
|
1048
1050
|
return 0;
|
1049
1051
|
}
|
1050
1052
|
|
1051
|
-
static int update_header_and_rehash(git_indexer *idx,
|
1053
|
+
static int update_header_and_rehash(git_indexer *idx, git_indexer_progress *stats)
|
1052
1054
|
{
|
1053
1055
|
void *ptr;
|
1054
1056
|
size_t chunk = 1024*1024;
|
1055
|
-
|
1057
|
+
off64_t hashed = 0;
|
1056
1058
|
git_mwindow *w = NULL;
|
1057
1059
|
git_mwindow_file *mwf;
|
1058
1060
|
unsigned int left;
|
@@ -1089,7 +1091,7 @@ static int update_header_and_rehash(git_indexer *idx, git_transfer_progress *sta
|
|
1089
1091
|
return 0;
|
1090
1092
|
}
|
1091
1093
|
|
1092
|
-
int git_indexer_commit(git_indexer *idx,
|
1094
|
+
int git_indexer_commit(git_indexer *idx, git_indexer_progress *stats)
|
1093
1095
|
{
|
1094
1096
|
git_mwindow *w = NULL;
|
1095
1097
|
unsigned int i, long_offsets = 0, left;
|
@@ -1292,7 +1294,9 @@ on_error:
|
|
1292
1294
|
|
1293
1295
|
void git_indexer_free(git_indexer *idx)
|
1294
1296
|
{
|
1295
|
-
|
1297
|
+
const git_oid *key;
|
1298
|
+
git_oid *value;
|
1299
|
+
size_t iter;
|
1296
1300
|
|
1297
1301
|
if (idx == NULL)
|
1298
1302
|
return;
|
@@ -1321,14 +1325,9 @@ void git_indexer_free(git_indexer *idx)
|
|
1321
1325
|
git_mutex_unlock(&git__mwindow_mutex);
|
1322
1326
|
}
|
1323
1327
|
|
1324
|
-
|
1325
|
-
|
1326
|
-
|
1327
|
-
if (git_oidmap_has_data(idx->expected_oids, pos)) {
|
1328
|
-
git__free((git_oid *) git_oidmap_key(idx->expected_oids, pos));
|
1329
|
-
git_oidmap_delete_at(idx->expected_oids, pos);
|
1330
|
-
}
|
1331
|
-
}
|
1328
|
+
iter = 0;
|
1329
|
+
while (git_oidmap_iterate((void **) &value, idx->expected_oids, &iter, &key) == 0)
|
1330
|
+
git__free(value);
|
1332
1331
|
|
1333
1332
|
git_hash_ctx_cleanup(&idx->trailer);
|
1334
1333
|
git_hash_ctx_cleanup(&idx->hash_ctx);
|