rugged 1.3.1 → 1.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +34 -2
- data/ext/rugged/extconf.rb +6 -3
- data/ext/rugged/rugged.c +16 -0
- data/ext/rugged/rugged.h +4 -0
- data/ext/rugged/rugged_blame.c +2 -0
- data/ext/rugged/rugged_blob.c +3 -0
- data/ext/rugged/rugged_commit.c +1 -0
- data/ext/rugged/rugged_config.c +9 -2
- data/ext/rugged/rugged_diff.c +1 -0
- data/ext/rugged/rugged_index.c +2 -0
- data/ext/rugged/rugged_patch.c +1 -0
- data/ext/rugged/rugged_rebase.c +1 -0
- data/ext/rugged/rugged_reference.c +1 -0
- data/ext/rugged/rugged_remote.c +28 -10
- data/ext/rugged/rugged_repo.c +7 -9
- data/ext/rugged/rugged_revwalk.c +5 -1
- data/ext/rugged/rugged_settings.c +5 -0
- data/ext/rugged/rugged_submodule.c +1 -0
- data/ext/rugged/rugged_tag.c +1 -0
- data/ext/rugged/rugged_tree.c +4 -0
- data/lib/rugged/index.rb +1 -1
- data/lib/rugged/tree.rb +5 -1
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +132 -288
- data/vendor/libgit2/COPYING +106 -19
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/ExperimentalFeatures.cmake +23 -0
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
- data/vendor/libgit2/cmake/FindPCRE.cmake +12 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
- data/vendor/libgit2/cmake/SelectHashes.cmake +91 -53
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +33 -31
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +3 -1
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/deps/zlib/adler32.c +7 -0
- data/vendor/libgit2/deps/zlib/crc32.c +975 -288
- data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
- data/vendor/libgit2/deps/zlib/deflate.c +83 -31
- data/vendor/libgit2/deps/zlib/deflate.h +12 -15
- data/vendor/libgit2/deps/zlib/gzguts.h +3 -2
- data/vendor/libgit2/deps/zlib/infback.c +2 -1
- data/vendor/libgit2/deps/zlib/inffast.c +14 -14
- data/vendor/libgit2/deps/zlib/inflate.c +39 -8
- data/vendor/libgit2/deps/zlib/inflate.h +3 -2
- data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
- data/vendor/libgit2/deps/zlib/trees.c +27 -48
- data/vendor/libgit2/deps/zlib/zlib.h +126 -100
- data/vendor/libgit2/deps/zlib/zutil.c +2 -2
- data/vendor/libgit2/deps/zlib/zutil.h +12 -9
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +11 -2
- data/vendor/libgit2/include/git2/blame.h +4 -1
- data/vendor/libgit2/include/git2/blob.h +14 -1
- data/vendor/libgit2/include/git2/branch.h +4 -2
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +2 -2
- data/vendor/libgit2/include/git2/checkout.h +5 -2
- data/vendor/libgit2/include/git2/clone.h +3 -3
- data/vendor/libgit2/include/git2/commit.h +2 -0
- data/vendor/libgit2/include/git2/common.h +38 -7
- data/vendor/libgit2/include/git2/config.h +25 -9
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +9 -1
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +18 -10
- data/vendor/libgit2/include/git2/email.h +1 -1
- data/vendor/libgit2/include/git2/errors.h +18 -3
- data/vendor/libgit2/include/git2/experimental.h +20 -0
- data/vendor/libgit2/include/git2/filter.h +7 -2
- data/vendor/libgit2/include/git2/graph.h +1 -0
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +11 -5
- data/vendor/libgit2/include/git2/indexer.h +48 -0
- data/vendor/libgit2/include/git2/merge.h +24 -4
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/object.h +49 -0
- data/vendor/libgit2/include/git2/odb.h +94 -13
- data/vendor/libgit2/include/git2/odb_backend.h +107 -19
- data/vendor/libgit2/include/git2/oid.h +115 -15
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +8 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +9 -1
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +2 -2
- data/vendor/libgit2/include/git2/remote.h +184 -37
- data/vendor/libgit2/include/git2/repository.h +34 -10
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +61 -7
- data/vendor/libgit2/include/git2/status.h +14 -5
- data/vendor/libgit2/include/git2/strarray.h +0 -13
- data/vendor/libgit2/include/git2/submodule.h +7 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +3 -6
- data/vendor/libgit2/include/git2/sys/remote.h +46 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +46 -39
- data/vendor/libgit2/include/git2/tag.h +1 -0
- data/vendor/libgit2/include/git2/tree.h +4 -3
- data/vendor/libgit2/include/git2/types.h +7 -7
- data/vendor/libgit2/include/git2/version.h +27 -6
- data/vendor/libgit2/include/git2/worktree.h +12 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +177 -419
- data/vendor/libgit2/src/README.md +12 -0
- data/vendor/libgit2/src/cli/CMakeLists.txt +57 -0
- data/vendor/libgit2/src/cli/README.md +26 -0
- data/vendor/libgit2/src/cli/cli.h +20 -0
- data/vendor/libgit2/src/cli/cmd.c +21 -0
- data/vendor/libgit2/src/cli/cmd.h +33 -0
- data/vendor/libgit2/src/cli/cmd_cat_file.c +204 -0
- data/vendor/libgit2/src/cli/cmd_clone.c +176 -0
- data/vendor/libgit2/src/cli/cmd_hash_object.c +154 -0
- data/vendor/libgit2/src/cli/cmd_help.c +86 -0
- data/vendor/libgit2/src/cli/error.h +51 -0
- data/vendor/libgit2/src/cli/main.c +106 -0
- data/vendor/libgit2/src/cli/opt.c +669 -0
- data/vendor/libgit2/src/cli/opt.h +349 -0
- data/vendor/libgit2/src/cli/opt_usage.c +194 -0
- data/vendor/libgit2/src/cli/opt_usage.h +35 -0
- data/vendor/libgit2/src/cli/progress.c +345 -0
- data/vendor/libgit2/src/cli/progress.h +117 -0
- data/vendor/libgit2/src/cli/sighandler.h +20 -0
- data/vendor/libgit2/src/cli/unix/sighandler.c +36 -0
- data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
- data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
- data/vendor/libgit2/src/libgit2/CMakeLists.txt +141 -0
- data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +1 -1
- data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +2 -2
- data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +18 -18
- data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +2 -2
- data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +18 -18
- data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +18 -18
- data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +4 -4
- data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +18 -13
- data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +2 -0
- data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +1 -1
- data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +38 -29
- data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +3 -3
- data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +164 -118
- data/vendor/libgit2/src/{branch.h → libgit2/branch.h} +15 -3
- data/vendor/libgit2/src/libgit2/buf.c +126 -0
- data/vendor/libgit2/src/libgit2/buf.h +50 -0
- data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +74 -68
- data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +13 -13
- data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +96 -67
- data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +178 -73
- data/vendor/libgit2/src/libgit2/commit.h +87 -0
- data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +122 -89
- data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +14 -4
- data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +7 -4
- data/vendor/libgit2/src/libgit2/common.h +55 -0
- data/vendor/libgit2/src/{config.c → libgit2/config.c} +107 -71
- data/vendor/libgit2/src/{config.h → libgit2/config.h} +15 -2
- data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +105 -93
- data/vendor/libgit2/src/{config_mem.c → libgit2/config_mem.c} +9 -9
- data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +27 -23
- data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +24 -21
- data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +35 -27
- data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +30 -9
- data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +2 -4
- data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +34 -36
- data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +3 -3
- data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +44 -26
- data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +47 -18
- data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +5 -3
- data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +112 -100
- data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +40 -29
- data/vendor/libgit2/src/libgit2/diff_stats.h +18 -0
- data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +13 -8
- data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +4 -8
- data/vendor/libgit2/src/{email.c → libgit2/email.c} +55 -39
- data/vendor/libgit2/src/{email.h → libgit2/email.h} +1 -1
- data/vendor/libgit2/src/{errors.c → libgit2/errors.c} +18 -18
- data/vendor/libgit2/src/{errors.h → libgit2/errors.h} +1 -2
- data/vendor/libgit2/src/libgit2/experimental.h.in +13 -0
- data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +72 -27
- data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +1 -1
- data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +23 -23
- data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +127 -53
- data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +26 -5
- data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +20 -20
- data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +35 -34
- data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +2 -2
- data/vendor/libgit2/src/{index.c → libgit2/index.c} +91 -90
- data/vendor/libgit2/src/{index.h → libgit2/index.h} +6 -3
- data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +173 -92
- data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +71 -61
- data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +5 -5
- data/vendor/libgit2/src/{libgit2.c → libgit2/libgit2.c} +54 -11
- data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +38 -36
- data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +30 -30
- data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +1 -14
- data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +2 -2
- data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +13 -3
- data/vendor/libgit2/src/{message.c → libgit2/message.c} +21 -10
- data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +112 -92
- data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +5 -4
- data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +15 -12
- data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +5 -2
- data/vendor/libgit2/src/{netops.c → libgit2/netops.c} +1 -2
- data/vendor/libgit2/src/{netops.h → libgit2/netops.h} +1 -1
- data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +25 -34
- data/vendor/libgit2/src/{object.c → libgit2/object.c} +135 -30
- data/vendor/libgit2/src/{object.h → libgit2/object.h} +12 -3
- data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +228 -81
- data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +44 -5
- data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +192 -134
- data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +18 -5
- data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +137 -85
- data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +136 -90
- data/vendor/libgit2/src/libgit2/oid.h +273 -0
- data/vendor/libgit2/src/{oidmap.c → libgit2/oidmap.c} +1 -1
- data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +56 -30
- data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +11 -6
- data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +114 -84
- data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +31 -16
- data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +4 -3
- data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +3 -3
- data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +1 -0
- data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +27 -11
- data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +5 -5
- data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +29 -29
- data/vendor/libgit2/src/libgit2/path.c +375 -0
- data/vendor/libgit2/src/libgit2/path.h +68 -0
- data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +6 -6
- data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +2 -2
- data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +4 -1
- data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +1 -1
- data/vendor/libgit2/src/{push.c → libgit2/push.c} +43 -38
- data/vendor/libgit2/src/{push.h → libgit2/push.h} +4 -16
- data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +9 -9
- data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +2 -2
- data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +119 -107
- data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +506 -197
- data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +7 -5
- data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +1 -2
- data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +34 -32
- data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +2 -2
- data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +32 -37
- data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +5 -2
- data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +718 -420
- data/vendor/libgit2/src/libgit2/remote.h +100 -0
- data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +690 -366
- data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +21 -9
- data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +8 -5
- data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +14 -14
- data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +71 -42
- data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +12 -8
- data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +12 -6
- data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +1 -1
- data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +235 -61
- data/vendor/libgit2/src/{status.c → libgit2/status.c} +4 -1
- data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +1 -0
- data/vendor/libgit2/src/libgit2/strarray.h +25 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +8 -6
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +1 -1
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +7 -3
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +3 -3
- data/vendor/libgit2/src/{streams → libgit2/streams}/socket.c +4 -1
- data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +177 -161
- data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +1 -1
- data/vendor/libgit2/src/libgit2/sysdir.c +650 -0
- data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +53 -18
- data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +73 -42
- data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +2 -2
- data/vendor/libgit2/src/{threadstate.c → libgit2/threadstate.c} +3 -3
- data/vendor/libgit2/src/{threadstate.h → libgit2/threadstate.h} +2 -2
- data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +1 -14
- data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +5 -22
- data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +1 -1
- data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +1 -1
- data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +10 -10
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +7 -9
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +2 -3
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.c +12 -13
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.c +10 -10
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +9 -11
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +41 -20
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +2 -3
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +75 -66
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +10 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +138 -116
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +92 -133
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +35 -32
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +177 -65
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +97 -49
- data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.c +365 -198
- data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +58 -59
- data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +8 -8
- data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +2 -2
- data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +93 -83
- data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +4 -4
- data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +121 -94
- data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +1 -1
- data/vendor/libgit2/src/libgit2/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiff.h +15 -15
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.c +134 -108
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.c +23 -7
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xhistogram.c +87 -78
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xinclude.h +1 -12
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmerge.c +104 -117
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xpatience.c +6 -17
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.c +15 -20
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.c +18 -7
- data/vendor/libgit2/src/util/CMakeLists.txt +80 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.h +1 -1
- data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
- data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{array.h → util/array.h} +1 -1
- data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
- data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +1 -1
- data/vendor/libgit2/src/{date.c → util/date.c} +14 -20
- data/vendor/libgit2/src/util/date.h +33 -0
- data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +29 -29
- data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +2 -2
- data/vendor/libgit2/src/{path.c → util/fs_path.c} +580 -615
- data/vendor/libgit2/src/{path.h → util/fs_path.h} +234 -181
- data/vendor/libgit2/src/{futils.c → util/futils.c} +135 -90
- data/vendor/libgit2/src/{futils.h → util/futils.h} +28 -15
- data/vendor/libgit2/src/{features.h.in → util/git2_features.h.in} +15 -1
- data/vendor/libgit2/src/{common.h → util/git2_util.h} +20 -59
- data/vendor/libgit2/src/util/hash/builtin.c +53 -0
- data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +3 -3
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
- data/vendor/libgit2/src/util/hash/common_crypto.c +112 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
- data/vendor/libgit2/src/util/hash/mbedtls.c +92 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
- data/vendor/libgit2/src/util/hash/openssl.c +195 -0
- data/vendor/libgit2/src/util/hash/openssl.h +45 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha.h +243 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
- data/vendor/libgit2/src/util/hash/sha.h +70 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +1 -1
- data/vendor/libgit2/src/util/hash/win32.c +549 -0
- data/vendor/libgit2/src/util/hash/win32.h +60 -0
- data/vendor/libgit2/src/util/hash.c +158 -0
- data/vendor/libgit2/src/util/hash.h +61 -0
- data/vendor/libgit2/src/{khash.h → util/khash.h} +1 -1
- data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
- data/vendor/libgit2/src/util/net.c +1003 -0
- data/vendor/libgit2/src/{net.h → util/net.h} +18 -4
- data/vendor/libgit2/src/{pool.h → util/pool.h} +1 -1
- data/vendor/libgit2/src/{posix.c → util/posix.c} +3 -3
- data/vendor/libgit2/src/{posix.h → util/posix.h} +4 -1
- data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +2 -2
- data/vendor/libgit2/src/util/rand.c +234 -0
- data/vendor/libgit2/src/util/rand.h +37 -0
- data/vendor/libgit2/src/{regexp.c → util/regexp.c} +4 -4
- data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
- data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
- data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
- data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +1 -1
- data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +2 -2
- data/vendor/libgit2/src/{buffer.c → util/str.c} +157 -151
- data/vendor/libgit2/src/util/str.h +357 -0
- data/vendor/libgit2/src/{strmap.h → util/strmap.h} +1 -1
- data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
- data/vendor/libgit2/src/{thread.h → util/thread.h} +23 -22
- data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
- data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -3
- data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -4
- data/vendor/libgit2/src/{unix → util/unix}/realpath.c +1 -3
- data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
- data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
- data/vendor/libgit2/src/{util.c → util/util.c} +15 -15
- data/vendor/libgit2/src/{util.h → util/util.h} +4 -29
- data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
- data/vendor/libgit2/src/{vector.h → util/vector.h} +2 -2
- data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +140 -9
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +3 -1
- data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -2
- data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +12 -28
- data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
- data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +2 -3
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +3 -4
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
- data/vendor/libgit2/src/{zstream.c → util/zstream.c} +5 -5
- data/vendor/libgit2/src/{zstream.h → util/zstream.h} +5 -5
- metadata +402 -356
- data/vendor/libgit2/src/buffer.h +0 -374
- data/vendor/libgit2/src/commit.h +0 -46
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +0 -57
- data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
- data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
- data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
- data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
- data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
- data/vendor/libgit2/src/hash/sha1.h +0 -38
- data/vendor/libgit2/src/hash.c +0 -110
- data/vendor/libgit2/src/hash.h +0 -46
- data/vendor/libgit2/src/message.h +0 -17
- data/vendor/libgit2/src/net.c +0 -540
- data/vendor/libgit2/src/oid.h +0 -51
- data/vendor/libgit2/src/remote.h +0 -55
- data/vendor/libgit2/src/sysdir.c +0 -347
- data/vendor/libgit2/src/win32/findfile.c +0 -230
- data/vendor/libgit2/src/win32/findfile.h +0 -19
- /data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
- /data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
- /data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +0 -0
- /data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +0 -0
- /data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
- /data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +0 -0
- /data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +0 -0
- /data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -0
- /data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +0 -0
- /data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +0 -0
- /data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +0 -0
- /data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +0 -0
- /data/vendor/libgit2/src/{config_entries.c → libgit2/config_entries.c} +0 -0
- /data/vendor/libgit2/src/{config_entries.h → libgit2/config_entries.h} +0 -0
- /data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
- /data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +0 -0
- /data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
- /data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
- /data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
- /data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +0 -0
- /data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
- /data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
- /data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +0 -0
- /data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
- /data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +0 -0
- /data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +0 -0
- /data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
- /data/vendor/libgit2/src/{idxmap.c → libgit2/idxmap.c} +0 -0
- /data/vendor/libgit2/src/{idxmap.h → libgit2/idxmap.h} +0 -0
- /data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
- /data/vendor/libgit2/src/{libgit2.h → libgit2/libgit2.h} +0 -0
- /data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
- /data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
- /data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
- /data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
- /data/vendor/libgit2/src/{offmap.c → libgit2/offmap.c} +0 -0
- /data/vendor/libgit2/src/{offmap.h → libgit2/offmap.h} +0 -0
- /data/vendor/libgit2/src/{oidarray.c → libgit2/oidarray.c} +0 -0
- /data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +0 -0
- /data/vendor/libgit2/src/{oidmap.h → libgit2/oidmap.h} +0 -0
- /data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +0 -0
- /data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
- /data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
- /data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
- /data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
- /data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +0 -0
- /data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +0 -0
- /data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
- /data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
- /data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.h +0 -0
- /data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmacros.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xtypes.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.h +0 -0
- /data/vendor/libgit2/src/{alloc.c → util/alloc.c} +0 -0
- /data/vendor/libgit2/src/{alloc.h → util/alloc.h} +0 -0
- /data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.c +0 -0
- /data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.c +0 -0
- /data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.c +0 -0
- /data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
- /data/vendor/libgit2/src/{integer.h → util/integer.h} +0 -0
- /data/vendor/libgit2/src/{pool.c → util/pool.c} +0 -0
- /data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
- /data/vendor/libgit2/src/{strmap.c → util/strmap.c} +0 -0
- /data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
- /data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
- /data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
- /data/vendor/libgit2/src/{vector.c → util/vector.c} +0 -0
- /data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/error.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
@@ -7,6 +7,16 @@
|
|
7
7
|
|
8
8
|
#include "common.h"
|
9
9
|
|
10
|
+
#include "pack-objects.h"
|
11
|
+
#include "refs.h"
|
12
|
+
#include "posix.h"
|
13
|
+
#include "fs_path.h"
|
14
|
+
#include "repository.h"
|
15
|
+
#include "odb.h"
|
16
|
+
#include "push.h"
|
17
|
+
#include "remote.h"
|
18
|
+
#include "proxy.h"
|
19
|
+
|
10
20
|
#include "git2/types.h"
|
11
21
|
#include "git2/net.h"
|
12
22
|
#include "git2/repository.h"
|
@@ -18,29 +28,16 @@
|
|
18
28
|
#include "git2/pack.h"
|
19
29
|
#include "git2/commit.h"
|
20
30
|
#include "git2/revparse.h"
|
21
|
-
|
22
|
-
#include "pack-objects.h"
|
23
|
-
#include "refs.h"
|
24
|
-
#include "posix.h"
|
25
|
-
#include "path.h"
|
26
|
-
#include "buffer.h"
|
27
|
-
#include "repository.h"
|
28
|
-
#include "odb.h"
|
29
|
-
#include "push.h"
|
30
|
-
#include "remote.h"
|
31
|
-
#include "proxy.h"
|
31
|
+
#include "git2/sys/remote.h"
|
32
32
|
|
33
33
|
typedef struct {
|
34
34
|
git_transport parent;
|
35
35
|
git_remote *owner;
|
36
36
|
char *url;
|
37
37
|
int direction;
|
38
|
-
int flags;
|
39
38
|
git_atomic32 cancelled;
|
40
39
|
git_repository *repo;
|
41
|
-
|
42
|
-
git_transport_message_cb error_cb;
|
43
|
-
void *message_cb_payload;
|
40
|
+
git_remote_connect_options connect_opts;
|
44
41
|
git_vector refs;
|
45
42
|
unsigned connected : 1,
|
46
43
|
have_refs : 1;
|
@@ -71,7 +68,7 @@ static int add_ref(transport_local *t, const char *name)
|
|
71
68
|
git_remote_head *head;
|
72
69
|
git_oid obj_id;
|
73
70
|
git_object *obj = NULL, *target = NULL;
|
74
|
-
|
71
|
+
git_str buf = GIT_STR_INIT;
|
75
72
|
int error;
|
76
73
|
|
77
74
|
if ((error = git_reference_lookup(&ref, t->repo, name)) < 0)
|
@@ -132,11 +129,11 @@ static int add_ref(transport_local *t, const char *name)
|
|
132
129
|
head = git__calloc(1, sizeof(git_remote_head));
|
133
130
|
GIT_ERROR_CHECK_ALLOC(head);
|
134
131
|
|
135
|
-
if (
|
132
|
+
if (git_str_join(&buf, 0, name, peeled) < 0) {
|
136
133
|
free_head(head);
|
137
134
|
return -1;
|
138
135
|
}
|
139
|
-
head->name =
|
136
|
+
head->name = git_str_detach(&buf);
|
140
137
|
|
141
138
|
if (!(error = git_tag_peel(&target, (git_tag *)obj))) {
|
142
139
|
git_oid_cpy(&head->oid, git_object_id(target));
|
@@ -201,41 +198,37 @@ on_error:
|
|
201
198
|
static int local_connect(
|
202
199
|
git_transport *transport,
|
203
200
|
const char *url,
|
204
|
-
|
205
|
-
|
206
|
-
const git_proxy_options *proxy,
|
207
|
-
int direction, int flags)
|
201
|
+
int direction,
|
202
|
+
const git_remote_connect_options *connect_opts)
|
208
203
|
{
|
209
204
|
git_repository *repo;
|
210
205
|
int error;
|
211
|
-
transport_local *t = (transport_local *)
|
206
|
+
transport_local *t = (transport_local *)transport;
|
212
207
|
const char *path;
|
213
|
-
|
214
|
-
|
215
|
-
GIT_UNUSED(cred_acquire_cb);
|
216
|
-
GIT_UNUSED(cred_acquire_payload);
|
217
|
-
GIT_UNUSED(proxy);
|
208
|
+
git_str buf = GIT_STR_INIT;
|
218
209
|
|
219
210
|
if (t->connected)
|
220
211
|
return 0;
|
221
212
|
|
213
|
+
if (git_remote_connect_options_normalize(&t->connect_opts, t->owner->repo, connect_opts) < 0)
|
214
|
+
return -1;
|
215
|
+
|
222
216
|
free_heads(&t->refs);
|
223
217
|
|
224
218
|
t->url = git__strdup(url);
|
225
219
|
GIT_ERROR_CHECK_ALLOC(t->url);
|
226
220
|
t->direction = direction;
|
227
|
-
t->flags = flags;
|
228
221
|
|
229
222
|
/* 'url' may be a url or path; convert to a path */
|
230
|
-
if ((error =
|
231
|
-
|
223
|
+
if ((error = git_fs_path_from_url_or_path(&buf, url)) < 0) {
|
224
|
+
git_str_dispose(&buf);
|
232
225
|
return error;
|
233
226
|
}
|
234
|
-
path =
|
227
|
+
path = git_str_cstr(&buf);
|
235
228
|
|
236
229
|
error = git_repository_open(&repo, path);
|
237
230
|
|
238
|
-
|
231
|
+
git_str_dispose(&buf);
|
239
232
|
|
240
233
|
if (error < 0)
|
241
234
|
return -1;
|
@@ -250,6 +243,40 @@ static int local_connect(
|
|
250
243
|
return 0;
|
251
244
|
}
|
252
245
|
|
246
|
+
static int local_set_connect_opts(
|
247
|
+
git_transport *transport,
|
248
|
+
const git_remote_connect_options *connect_opts)
|
249
|
+
{
|
250
|
+
transport_local *t = (transport_local *)transport;
|
251
|
+
|
252
|
+
if (!t->connected) {
|
253
|
+
git_error_set(GIT_ERROR_NET, "cannot reconfigure a transport that is not connected");
|
254
|
+
return -1;
|
255
|
+
}
|
256
|
+
|
257
|
+
return git_remote_connect_options_normalize(&t->connect_opts, t->owner->repo, connect_opts);
|
258
|
+
}
|
259
|
+
|
260
|
+
static int local_capabilities(unsigned int *capabilities, git_transport *transport)
|
261
|
+
{
|
262
|
+
GIT_UNUSED(transport);
|
263
|
+
|
264
|
+
*capabilities = GIT_REMOTE_CAPABILITY_TIP_OID |
|
265
|
+
GIT_REMOTE_CAPABILITY_REACHABLE_OID;
|
266
|
+
return 0;
|
267
|
+
}
|
268
|
+
|
269
|
+
#ifdef GIT_EXPERIMENTAL_SHA256
|
270
|
+
static int local_oid_type(git_oid_t *out, git_transport *transport)
|
271
|
+
{
|
272
|
+
transport_local *t = (transport_local *)transport;
|
273
|
+
|
274
|
+
*out = t->repo->oid_type;
|
275
|
+
|
276
|
+
return 0;
|
277
|
+
}
|
278
|
+
#endif
|
279
|
+
|
253
280
|
static int local_ls(const git_remote_head ***out, size_t *size, git_transport *transport)
|
254
281
|
{
|
255
282
|
transport_local *t = (transport_local *)transport;
|
@@ -338,30 +365,28 @@ static int transfer_to_push_transfer(const git_indexer_progress *stats, void *pa
|
|
338
365
|
|
339
366
|
static int local_push(
|
340
367
|
git_transport *transport,
|
341
|
-
git_push *push
|
342
|
-
const git_remote_callbacks *cbs)
|
368
|
+
git_push *push)
|
343
369
|
{
|
344
370
|
transport_local *t = (transport_local *)transport;
|
371
|
+
git_remote_callbacks *cbs = &t->connect_opts.callbacks;
|
345
372
|
git_repository *remote_repo = NULL;
|
346
373
|
push_spec *spec;
|
347
374
|
char *url = NULL;
|
348
375
|
const char *path;
|
349
|
-
|
376
|
+
git_str buf = GIT_STR_INIT, odb_path = GIT_STR_INIT;
|
350
377
|
int error;
|
351
378
|
size_t j;
|
352
379
|
|
353
|
-
GIT_UNUSED(cbs);
|
354
|
-
|
355
380
|
/* 'push->remote->url' may be a url or path; convert to a path */
|
356
|
-
if ((error =
|
357
|
-
|
381
|
+
if ((error = git_fs_path_from_url_or_path(&buf, push->remote->url)) < 0) {
|
382
|
+
git_str_dispose(&buf);
|
358
383
|
return error;
|
359
384
|
}
|
360
|
-
path =
|
385
|
+
path = git_str_cstr(&buf);
|
361
386
|
|
362
387
|
error = git_repository_open(&remote_repo, path);
|
363
388
|
|
364
|
-
|
389
|
+
git_str_dispose(&buf);
|
365
390
|
|
366
391
|
if (error < 0)
|
367
392
|
return error;
|
@@ -378,12 +403,12 @@ static int local_push(
|
|
378
403
|
goto on_error;
|
379
404
|
}
|
380
405
|
|
381
|
-
if ((error =
|
382
|
-
|| (error =
|
406
|
+
if ((error = git_repository__item_path(&odb_path, remote_repo, GIT_REPOSITORY_ITEM_OBJECTS)) < 0
|
407
|
+
|| (error = git_str_joinpath(&odb_path, odb_path.ptr, "pack")) < 0)
|
383
408
|
goto on_error;
|
384
409
|
|
385
410
|
error = git_packbuilder_write(push->pb, odb_path.ptr, 0, transfer_to_push_transfer, (void *) cbs);
|
386
|
-
|
411
|
+
git_str_dispose(&odb_path);
|
387
412
|
|
388
413
|
if (error < 0)
|
389
414
|
goto on_error;
|
@@ -441,12 +466,11 @@ static int local_push(
|
|
441
466
|
}
|
442
467
|
|
443
468
|
if (push->specs.length) {
|
444
|
-
int flags = t->flags;
|
445
469
|
url = git__strdup(t->url);
|
446
470
|
|
447
471
|
if (!url || t->parent.close(&t->parent) < 0 ||
|
448
472
|
t->parent.connect(&t->parent, url,
|
449
|
-
|
473
|
+
GIT_DIRECTION_PUSH, NULL))
|
450
474
|
goto on_error;
|
451
475
|
}
|
452
476
|
|
@@ -479,31 +503,41 @@ static const char *compressing_objects_fmt = "Compressing objects: %.0f%% (%d/%d
|
|
479
503
|
|
480
504
|
static int local_counting(int stage, unsigned int current, unsigned int total, void *payload)
|
481
505
|
{
|
482
|
-
|
506
|
+
git_str progress_info = GIT_STR_INIT;
|
483
507
|
transport_local *t = payload;
|
484
508
|
int error;
|
485
509
|
|
486
|
-
if (!t->
|
510
|
+
if (!t->connect_opts.callbacks.sideband_progress)
|
487
511
|
return 0;
|
488
512
|
|
489
513
|
if (stage == GIT_PACKBUILDER_ADDING_OBJECTS) {
|
490
|
-
|
514
|
+
git_str_printf(&progress_info, counting_objects_fmt, current);
|
491
515
|
} else if (stage == GIT_PACKBUILDER_DELTAFICATION) {
|
492
516
|
float perc = (((float) current) / total) * 100;
|
493
|
-
|
517
|
+
git_str_printf(&progress_info, compressing_objects_fmt, perc, current, total);
|
494
518
|
if (current == total)
|
495
|
-
|
519
|
+
git_str_printf(&progress_info, ", done\n");
|
496
520
|
else
|
497
|
-
|
521
|
+
git_str_putc(&progress_info, '\r');
|
498
522
|
|
499
523
|
}
|
500
524
|
|
501
|
-
if (
|
525
|
+
if (git_str_oom(&progress_info))
|
502
526
|
return -1;
|
503
527
|
|
504
|
-
|
505
|
-
|
528
|
+
if (progress_info.size > INT_MAX) {
|
529
|
+
git_error_set(GIT_ERROR_NET, "remote sent overly large progress data");
|
530
|
+
git_str_dispose(&progress_info);
|
531
|
+
return -1;
|
532
|
+
}
|
533
|
+
|
506
534
|
|
535
|
+
error = t->connect_opts.callbacks.sideband_progress(
|
536
|
+
progress_info.ptr,
|
537
|
+
(int)progress_info.size,
|
538
|
+
t->connect_opts.callbacks.payload);
|
539
|
+
|
540
|
+
git_str_dispose(&progress_info);
|
507
541
|
return error;
|
508
542
|
}
|
509
543
|
|
@@ -533,9 +567,7 @@ static int foreach_reference_cb(git_reference *reference, void *payload)
|
|
533
567
|
static int local_download_pack(
|
534
568
|
git_transport *transport,
|
535
569
|
git_repository *repo,
|
536
|
-
git_indexer_progress *stats
|
537
|
-
git_indexer_progress_cb progress_cb,
|
538
|
-
void *progress_payload)
|
570
|
+
git_indexer_progress *stats)
|
539
571
|
{
|
540
572
|
transport_local *t = (transport_local*)transport;
|
541
573
|
git_revwalk *walk = NULL;
|
@@ -545,10 +577,12 @@ static int local_download_pack(
|
|
545
577
|
git_packbuilder *pack = NULL;
|
546
578
|
git_odb_writepack *writepack = NULL;
|
547
579
|
git_odb *odb = NULL;
|
548
|
-
|
580
|
+
git_str progress_info = GIT_STR_INIT;
|
581
|
+
foreach_data data = {0};
|
549
582
|
|
550
583
|
if ((error = git_revwalk_new(&walk, t->repo)) < 0)
|
551
584
|
goto cleanup;
|
585
|
+
|
552
586
|
git_revwalk_sorting(walk, GIT_SORT_TIME);
|
553
587
|
|
554
588
|
if ((error = git_packbuilder_new(&pack, t->repo)) < 0)
|
@@ -584,73 +618,67 @@ static int local_download_pack(
|
|
584
618
|
if ((error = git_packbuilder_insert_walk(pack, walk)))
|
585
619
|
goto cleanup;
|
586
620
|
|
587
|
-
if (
|
588
|
-
|
589
|
-
|
590
|
-
|
591
|
-
|
592
|
-
|
621
|
+
if (t->connect_opts.callbacks.sideband_progress) {
|
622
|
+
if ((error = git_str_printf(
|
623
|
+
&progress_info,
|
624
|
+
counting_objects_fmt,
|
625
|
+
git_packbuilder_object_count(pack))) < 0 ||
|
626
|
+
(error = t->connect_opts.callbacks.sideband_progress(
|
627
|
+
progress_info.ptr,
|
628
|
+
(int)progress_info.size,
|
629
|
+
t->connect_opts.callbacks.payload)) < 0)
|
630
|
+
goto cleanup;
|
631
|
+
}
|
593
632
|
|
594
633
|
/* Walk the objects, building a packfile */
|
595
634
|
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
|
596
635
|
goto cleanup;
|
597
636
|
|
598
637
|
/* One last one with the newline */
|
599
|
-
|
600
|
-
|
601
|
-
|
602
|
-
|
603
|
-
|
604
|
-
|
605
|
-
|
606
|
-
|
638
|
+
if (t->connect_opts.callbacks.sideband_progress) {
|
639
|
+
git_str_clear(&progress_info);
|
640
|
+
|
641
|
+
if ((error = git_str_printf(
|
642
|
+
&progress_info,
|
643
|
+
counting_objects_fmt,
|
644
|
+
git_packbuilder_object_count(pack))) < 0 ||
|
645
|
+
(error = git_str_putc(&progress_info, '\n')) < 0 ||
|
646
|
+
(error = t->connect_opts.callbacks.sideband_progress(
|
647
|
+
progress_info.ptr,
|
648
|
+
(int)progress_info.size,
|
649
|
+
t->connect_opts.callbacks.payload)) < 0)
|
650
|
+
goto cleanup;
|
651
|
+
}
|
607
652
|
|
608
|
-
if ((error = git_odb_write_pack(
|
653
|
+
if ((error = git_odb_write_pack(
|
654
|
+
&writepack,
|
655
|
+
odb,
|
656
|
+
t->connect_opts.callbacks.transfer_progress,
|
657
|
+
t->connect_opts.callbacks.payload)) < 0)
|
609
658
|
goto cleanup;
|
610
659
|
|
611
660
|
/* Write the data to the ODB */
|
612
|
-
|
613
|
-
|
614
|
-
|
615
|
-
|
616
|
-
data.progress_payload = progress_payload;
|
617
|
-
data.writepack = writepack;
|
661
|
+
data.stats = stats;
|
662
|
+
data.progress_cb = t->connect_opts.callbacks.transfer_progress;
|
663
|
+
data.progress_payload = t->connect_opts.callbacks.payload;
|
664
|
+
data.writepack = writepack;
|
618
665
|
|
619
|
-
|
620
|
-
|
666
|
+
/* autodetect */
|
667
|
+
git_packbuilder_set_threads(pack, 0);
|
621
668
|
|
622
|
-
|
623
|
-
|
624
|
-
}
|
669
|
+
if ((error = git_packbuilder_foreach(pack, foreach_cb, &data)) != 0)
|
670
|
+
goto cleanup;
|
625
671
|
|
626
672
|
error = writepack->commit(writepack, stats);
|
627
673
|
|
628
674
|
cleanup:
|
629
675
|
if (writepack) writepack->free(writepack);
|
630
|
-
|
676
|
+
git_str_dispose(&progress_info);
|
631
677
|
git_packbuilder_free(pack);
|
632
678
|
git_revwalk_free(walk);
|
633
679
|
return error;
|
634
680
|
}
|
635
681
|
|
636
|
-
static int local_set_callbacks(
|
637
|
-
git_transport *transport,
|
638
|
-
git_transport_message_cb progress_cb,
|
639
|
-
git_transport_message_cb error_cb,
|
640
|
-
git_transport_certificate_check_cb certificate_check_cb,
|
641
|
-
void *message_cb_payload)
|
642
|
-
{
|
643
|
-
transport_local *t = (transport_local *)transport;
|
644
|
-
|
645
|
-
GIT_UNUSED(certificate_check_cb);
|
646
|
-
|
647
|
-
t->progress_cb = progress_cb;
|
648
|
-
t->error_cb = error_cb;
|
649
|
-
t->message_cb_payload = message_cb_payload;
|
650
|
-
|
651
|
-
return 0;
|
652
|
-
}
|
653
|
-
|
654
682
|
static int local_is_connected(git_transport *transport)
|
655
683
|
{
|
656
684
|
transport_local *t = (transport_local *)transport;
|
@@ -658,15 +686,6 @@ static int local_is_connected(git_transport *transport)
|
|
658
686
|
return t->connected;
|
659
687
|
}
|
660
688
|
|
661
|
-
static int local_read_flags(git_transport *transport, int *flags)
|
662
|
-
{
|
663
|
-
transport_local *t = (transport_local *)transport;
|
664
|
-
|
665
|
-
*flags = t->flags;
|
666
|
-
|
667
|
-
return 0;
|
668
|
-
}
|
669
|
-
|
670
689
|
static void local_cancel(git_transport *transport)
|
671
690
|
{
|
672
691
|
transport_local *t = (transport_local *)transport;
|
@@ -721,8 +740,12 @@ int git_transport_local(git_transport **out, git_remote *owner, void *param)
|
|
721
740
|
GIT_ERROR_CHECK_ALLOC(t);
|
722
741
|
|
723
742
|
t->parent.version = GIT_TRANSPORT_VERSION;
|
724
|
-
t->parent.set_callbacks = local_set_callbacks;
|
725
743
|
t->parent.connect = local_connect;
|
744
|
+
t->parent.set_connect_opts = local_set_connect_opts;
|
745
|
+
t->parent.capabilities = local_capabilities;
|
746
|
+
#ifdef GIT_EXPERIMENTAL_SHA256
|
747
|
+
t->parent.oid_type = local_oid_type;
|
748
|
+
#endif
|
726
749
|
t->parent.negotiate_fetch = local_negotiate_fetch;
|
727
750
|
t->parent.download_pack = local_download_pack;
|
728
751
|
t->parent.push = local_push;
|
@@ -730,7 +753,6 @@ int git_transport_local(git_transport **out, git_remote *owner, void *param)
|
|
730
753
|
t->parent.free = local_free;
|
731
754
|
t->parent.ls = local_ls;
|
732
755
|
t->parent.is_connected = local_is_connected;
|
733
|
-
t->parent.read_flags = local_read_flags;
|
734
756
|
t->parent.cancel = local_cancel;
|
735
757
|
|
736
758
|
if ((error = git_vector_init(&t->refs, 0, NULL)) < 0) {
|