rugged 0.19.0 → 0.28.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +184 -33
- data/ext/rugged/extconf.rb +111 -28
- data/ext/rugged/rugged.c +327 -89
- data/ext/rugged/rugged.h +64 -28
- data/ext/rugged/rugged_allocator.c +89 -0
- data/ext/rugged/rugged_backend.c +17 -0
- data/ext/rugged/rugged_blame.c +278 -0
- data/ext/rugged/rugged_blob.c +301 -75
- data/ext/rugged/rugged_branch.c +92 -242
- data/ext/rugged/rugged_branch_collection.c +388 -0
- data/ext/rugged/rugged_commit.c +575 -79
- data/ext/rugged/rugged_config.c +129 -36
- data/ext/rugged/rugged_cred.c +131 -0
- data/ext/rugged/rugged_diff.c +291 -122
- data/ext/rugged/rugged_diff_delta.c +16 -22
- data/ext/rugged/rugged_diff_hunk.c +35 -51
- data/ext/rugged/rugged_diff_line.c +23 -36
- data/ext/rugged/rugged_index.c +289 -152
- data/ext/rugged/rugged_note.c +50 -60
- data/ext/rugged/rugged_object.c +13 -30
- data/ext/rugged/rugged_patch.c +400 -0
- data/ext/rugged/rugged_rebase.c +397 -0
- data/ext/rugged/rugged_reference.c +76 -346
- data/ext/rugged/rugged_reference_collection.c +423 -0
- data/ext/rugged/rugged_remote.c +438 -461
- data/ext/rugged/rugged_remote_collection.c +435 -0
- data/ext/rugged/rugged_repo.c +1548 -365
- data/ext/rugged/rugged_revwalk.c +378 -99
- data/ext/rugged/rugged_settings.c +86 -23
- data/ext/rugged/rugged_signature.c +47 -37
- data/ext/rugged/rugged_submodule.c +835 -0
- data/ext/rugged/rugged_submodule_collection.c +366 -0
- data/ext/rugged/rugged_tag.c +88 -210
- data/ext/rugged/rugged_tag_collection.c +326 -0
- data/ext/rugged/rugged_tree.c +460 -217
- data/lib/rugged/attributes.rb +46 -0
- data/lib/rugged/blob.rb +33 -0
- data/lib/rugged/branch.rb +12 -16
- data/lib/rugged/commit.rb +9 -0
- data/lib/rugged/console.rb +5 -0
- data/lib/rugged/credentials.rb +48 -0
- data/lib/rugged/diff/delta.rb +6 -2
- data/lib/rugged/diff/hunk.rb +9 -9
- data/lib/rugged/diff/line.rb +28 -5
- data/lib/rugged/diff.rb +7 -1
- data/lib/rugged/index.rb +120 -0
- data/lib/rugged/object.rb +5 -0
- data/lib/rugged/patch.rb +41 -0
- data/lib/rugged/reference.rb +6 -3
- data/lib/rugged/remote.rb +5 -9
- data/lib/rugged/repository.rb +126 -14
- data/lib/rugged/submodule_collection.rb +53 -0
- data/lib/rugged/tag.rb +45 -16
- data/lib/rugged/tree.rb +163 -1
- data/lib/rugged/version.rb +6 -1
- data/lib/rugged/walker.rb +5 -0
- data/lib/rugged.rb +16 -1
- data/vendor/libgit2/AUTHORS +77 -0
- data/vendor/libgit2/CMakeLists.txt +317 -0
- data/vendor/libgit2/COPYING +993 -0
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +30 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +29 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +96 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +11 -0
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +26 -0
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +324 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +45 -0
- data/vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +20 -0
- data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
- data/vendor/libgit2/cmake/Modules/IdeSplitSources.cmake +22 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +5 -0
- data/vendor/libgit2/deps/http-parser/COPYING +23 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +5 -2
- data/vendor/libgit2/deps/http-parser/http_parser.h +2 -0
- data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
- data/vendor/libgit2/deps/regex/COPYING +502 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +26 -0
- data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
- data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
- data/vendor/libgit2/deps/winhttp/urlmon.h +45 -0
- data/vendor/libgit2/deps/winhttp/winhttp.def +29 -0
- data/vendor/libgit2/deps/winhttp/winhttp.h +594 -0
- data/vendor/libgit2/deps/winhttp/winhttp64.def +29 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +5 -0
- data/vendor/libgit2/deps/zlib/COPYING +27 -0
- data/vendor/libgit2/deps/zlib/adler32.c +51 -34
- data/vendor/libgit2/deps/zlib/crc32.c +61 -61
- data/vendor/libgit2/deps/zlib/crc32.h +1 -1
- data/vendor/libgit2/deps/zlib/deflate.c +681 -352
- data/vendor/libgit2/deps/zlib/deflate.h +25 -18
- data/vendor/libgit2/deps/zlib/gzguts.h +218 -0
- data/vendor/libgit2/deps/zlib/infback.c +640 -0
- data/vendor/libgit2/deps/zlib/inffast.c +36 -53
- data/vendor/libgit2/deps/zlib/inffixed.h +3 -3
- data/vendor/libgit2/deps/zlib/inflate.c +167 -86
- data/vendor/libgit2/deps/zlib/inflate.h +7 -4
- data/vendor/libgit2/deps/zlib/inftrees.c +24 -50
- data/vendor/libgit2/deps/zlib/trees.c +55 -96
- data/vendor/libgit2/deps/zlib/zconf.h +499 -19
- data/vendor/libgit2/deps/zlib/zlib.h +526 -227
- data/vendor/libgit2/deps/zlib/zutil.c +39 -32
- data/vendor/libgit2/deps/zlib/zutil.h +75 -78
- data/vendor/libgit2/include/git2/annotated_commit.h +125 -0
- data/vendor/libgit2/include/git2/apply.h +129 -0
- data/vendor/libgit2/include/git2/attr.h +36 -21
- data/vendor/libgit2/include/git2/blame.h +229 -0
- data/vendor/libgit2/include/git2/blob.h +81 -44
- data/vendor/libgit2/include/git2/branch.h +81 -42
- data/vendor/libgit2/include/git2/buffer.h +128 -0
- data/vendor/libgit2/include/git2/checkout.h +141 -67
- data/vendor/libgit2/include/git2/cherrypick.h +92 -0
- data/vendor/libgit2/include/git2/clone.h +157 -58
- data/vendor/libgit2/include/git2/commit.h +231 -12
- data/vendor/libgit2/include/git2/common.h +216 -30
- data/vendor/libgit2/include/git2/config.h +274 -48
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -4
- data/vendor/libgit2/include/git2/deprecated.h +253 -0
- data/vendor/libgit2/include/git2/describe.h +189 -0
- data/vendor/libgit2/include/git2/diff.h +985 -575
- data/vendor/libgit2/include/git2/errors.h +93 -52
- data/vendor/libgit2/include/git2/filter.h +217 -0
- data/vendor/libgit2/include/git2/global.h +44 -0
- data/vendor/libgit2/include/git2/graph.h +17 -0
- data/vendor/libgit2/include/git2/ignore.h +2 -2
- data/vendor/libgit2/include/git2/index.h +269 -94
- data/vendor/libgit2/include/git2/indexer.h +44 -12
- data/vendor/libgit2/include/git2/mailmap.h +115 -0
- data/vendor/libgit2/include/git2/merge.h +501 -64
- data/vendor/libgit2/include/git2/message.h +52 -17
- data/vendor/libgit2/include/git2/net.h +11 -5
- data/vendor/libgit2/include/git2/notes.h +120 -16
- data/vendor/libgit2/include/git2/object.h +62 -23
- data/vendor/libgit2/include/git2/odb.h +140 -24
- data/vendor/libgit2/include/git2/odb_backend.h +56 -12
- data/vendor/libgit2/include/git2/oid.h +17 -18
- data/vendor/libgit2/include/git2/oidarray.h +40 -0
- data/vendor/libgit2/include/git2/pack.h +86 -7
- data/vendor/libgit2/include/git2/patch.h +274 -0
- data/vendor/libgit2/include/git2/pathspec.h +280 -0
- data/vendor/libgit2/include/git2/proxy.h +96 -0
- data/vendor/libgit2/include/git2/rebase.h +323 -0
- data/vendor/libgit2/include/git2/reflog.h +12 -9
- data/vendor/libgit2/include/git2/refs.h +241 -46
- data/vendor/libgit2/include/git2/refspec.h +20 -4
- data/vendor/libgit2/include/git2/remote.h +636 -209
- data/vendor/libgit2/include/git2/repository.h +267 -57
- data/vendor/libgit2/include/git2/reset.h +36 -6
- data/vendor/libgit2/include/git2/revert.h +91 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +78 -35
- data/vendor/libgit2/include/git2/signature.h +32 -5
- data/vendor/libgit2/include/git2/stash.h +160 -21
- data/vendor/libgit2/include/git2/status.h +92 -30
- data/vendor/libgit2/include/git2/submodule.h +226 -133
- data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +68 -9
- data/vendor/libgit2/include/git2/sys/diff.h +94 -0
- data/vendor/libgit2/include/git2/sys/filter.h +332 -0
- data/vendor/libgit2/include/git2/sys/hashsig.h +106 -0
- data/vendor/libgit2/include/git2/sys/index.h +6 -5
- data/vendor/libgit2/include/git2/sys/mempack.h +86 -0
- data/vendor/libgit2/include/git2/sys/merge.h +182 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -28
- data/vendor/libgit2/include/git2/sys/openssl.h +38 -0
- data/vendor/libgit2/include/git2/sys/path.h +64 -0
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +79 -19
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +13 -2
- data/vendor/libgit2/include/git2/sys/repository.h +64 -1
- data/vendor/libgit2/include/git2/sys/stream.h +138 -0
- data/vendor/libgit2/include/git2/sys/time.h +31 -0
- data/vendor/libgit2/include/git2/sys/transport.h +439 -0
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +1 -1
- data/vendor/libgit2/include/git2/transaction.h +121 -0
- data/vendor/libgit2/include/git2/transport.h +261 -292
- data/vendor/libgit2/include/git2/tree.h +111 -21
- data/vendor/libgit2/include/git2/types.h +244 -32
- data/vendor/libgit2/include/git2/version.h +5 -2
- data/vendor/libgit2/include/git2/worktree.h +255 -0
- data/vendor/libgit2/include/git2.h +50 -40
- data/vendor/libgit2/libgit2.pc.in +13 -0
- data/vendor/libgit2/src/CMakeLists.txt +525 -0
- data/vendor/libgit2/src/alloc.c +55 -0
- data/vendor/libgit2/src/alloc.h +40 -0
- data/vendor/libgit2/src/annotated_commit.c +228 -0
- data/vendor/libgit2/src/annotated_commit.h +52 -0
- data/vendor/libgit2/src/apply.c +855 -0
- data/vendor/libgit2/src/apply.h +25 -0
- data/vendor/libgit2/src/array.h +74 -16
- data/vendor/libgit2/src/attr.c +239 -408
- data/vendor/libgit2/src/attr.h +3 -33
- data/vendor/libgit2/src/attr_file.c +424 -156
- data/vendor/libgit2/src/attr_file.h +95 -23
- data/vendor/libgit2/src/attrcache.c +469 -0
- data/vendor/libgit2/src/attrcache.h +37 -5
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +532 -0
- data/vendor/libgit2/src/blame.h +95 -0
- data/vendor/libgit2/src/blame_git.c +668 -0
- data/vendor/libgit2/src/blame_git.h +22 -0
- data/vendor/libgit2/src/blob.c +233 -129
- data/vendor/libgit2/src/blob.h +29 -1
- data/vendor/libgit2/src/branch.c +295 -197
- data/vendor/libgit2/src/branch.h +2 -0
- data/vendor/libgit2/src/buf_text.c +52 -27
- data/vendor/libgit2/src/buf_text.h +7 -7
- data/vendor/libgit2/src/buffer.c +609 -52
- data/vendor/libgit2/src/buffer.h +68 -23
- data/vendor/libgit2/src/cache.c +48 -51
- data/vendor/libgit2/src/cache.h +6 -4
- data/vendor/libgit2/src/cc-compat.h +35 -7
- data/vendor/libgit2/src/checkout.c +1827 -483
- data/vendor/libgit2/src/checkout.h +4 -1
- data/vendor/libgit2/src/cherrypick.c +230 -0
- data/vendor/libgit2/src/clone.c +338 -258
- data/vendor/libgit2/src/{compress.h → clone.h} +5 -5
- data/vendor/libgit2/src/commit.c +711 -124
- data/vendor/libgit2/src/commit.h +10 -3
- data/vendor/libgit2/src/commit_list.c +21 -14
- data/vendor/libgit2/src/commit_list.h +9 -3
- data/vendor/libgit2/src/common.h +153 -13
- data/vendor/libgit2/src/config.c +871 -242
- data/vendor/libgit2/src/config.h +58 -14
- data/vendor/libgit2/src/config_backend.h +84 -0
- data/vendor/libgit2/src/config_cache.c +44 -18
- data/vendor/libgit2/src/config_entries.c +259 -0
- data/vendor/libgit2/src/config_entries.h +23 -0
- data/vendor/libgit2/src/config_file.c +837 -1113
- data/vendor/libgit2/src/config_mem.c +224 -0
- data/vendor/libgit2/src/config_parse.c +558 -0
- data/vendor/libgit2/src/config_parse.h +64 -0
- data/vendor/libgit2/src/crlf.c +290 -195
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +275 -71
- data/vendor/libgit2/src/delta.h +80 -58
- data/vendor/libgit2/src/describe.c +893 -0
- data/vendor/libgit2/src/diff.c +330 -1128
- data/vendor/libgit2/src/diff.h +25 -67
- data/vendor/libgit2/src/diff_driver.c +225 -109
- data/vendor/libgit2/src/diff_driver.h +5 -2
- data/vendor/libgit2/src/diff_file.c +128 -103
- data/vendor/libgit2/src/diff_file.h +17 -12
- data/vendor/libgit2/src/diff_generate.c +1622 -0
- data/vendor/libgit2/src/diff_generate.h +128 -0
- data/vendor/libgit2/src/diff_parse.c +108 -0
- data/vendor/libgit2/src/diff_parse.h +20 -0
- data/vendor/libgit2/src/diff_print.c +578 -218
- data/vendor/libgit2/src/diff_stats.c +362 -0
- data/vendor/libgit2/src/diff_tform.c +429 -257
- data/vendor/libgit2/src/diff_tform.h +25 -0
- data/vendor/libgit2/src/diff_xdiff.c +143 -46
- data/vendor/libgit2/src/diff_xdiff.h +12 -5
- data/vendor/libgit2/src/errors.c +150 -34
- data/vendor/libgit2/src/features.h.in +37 -0
- data/vendor/libgit2/src/fetch.c +69 -46
- data/vendor/libgit2/src/fetch.h +6 -12
- data/vendor/libgit2/src/fetchhead.c +40 -33
- data/vendor/libgit2/src/fetchhead.h +5 -4
- data/vendor/libgit2/src/filebuf.c +163 -61
- data/vendor/libgit2/src/filebuf.h +13 -7
- data/vendor/libgit2/src/fileops.c +549 -407
- data/vendor/libgit2/src/fileops.h +97 -106
- data/vendor/libgit2/src/filter.c +989 -46
- data/vendor/libgit2/src/filter.h +21 -70
- data/vendor/libgit2/src/fnmatch.c +67 -11
- data/vendor/libgit2/src/fnmatch.h +27 -7
- data/vendor/libgit2/src/global.c +257 -63
- data/vendor/libgit2/src/global.h +19 -0
- data/vendor/libgit2/src/graph.c +39 -23
- data/vendor/libgit2/src/hash/hash_collisiondetect.h +51 -0
- data/vendor/libgit2/src/hash/hash_common_crypto.h +61 -0
- data/vendor/libgit2/src/hash/hash_generic.c +3 -3
- data/vendor/libgit2/src/hash/hash_generic.h +10 -5
- data/vendor/libgit2/src/hash/hash_mbedtls.c +38 -0
- data/vendor/libgit2/src/hash/hash_mbedtls.h +24 -0
- data/vendor/libgit2/src/hash/hash_openssl.h +26 -8
- data/vendor/libgit2/src/hash/hash_win32.c +71 -43
- data/vendor/libgit2/src/hash/hash_win32.h +4 -3
- data/vendor/libgit2/src/hash/sha1dc/sha1.c +1900 -0
- data/vendor/libgit2/src/hash/sha1dc/sha1.h +110 -0
- data/vendor/libgit2/src/hash/sha1dc/ubc_check.c +372 -0
- data/vendor/libgit2/src/hash/sha1dc/ubc_check.h +52 -0
- data/vendor/libgit2/src/hash.c +0 -1
- data/vendor/libgit2/src/hash.h +13 -6
- data/vendor/libgit2/src/hashsig.c +121 -126
- data/vendor/libgit2/src/ident.c +129 -0
- data/vendor/libgit2/src/idxmap.c +153 -0
- data/vendor/libgit2/src/idxmap.h +41 -0
- data/vendor/libgit2/src/ignore.c +362 -123
- data/vendor/libgit2/src/ignore.h +16 -4
- data/vendor/libgit2/src/index.c +2131 -692
- data/vendor/libgit2/src/index.h +138 -6
- data/vendor/libgit2/src/indexer.c +866 -266
- data/vendor/libgit2/src/indexer.h +16 -0
- data/vendor/libgit2/src/integer.h +106 -0
- data/vendor/libgit2/src/iterator.c +1888 -967
- data/vendor/libgit2/src/iterator.h +130 -67
- data/vendor/libgit2/src/khash.h +43 -29
- data/vendor/libgit2/src/mailmap.c +485 -0
- data/vendor/libgit2/src/mailmap.h +35 -0
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +1679 -479
- data/vendor/libgit2/src/merge.h +89 -22
- data/vendor/libgit2/src/merge_driver.c +426 -0
- data/vendor/libgit2/src/merge_driver.h +62 -0
- data/vendor/libgit2/src/merge_file.c +238 -101
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/message.h +3 -1
- data/vendor/libgit2/src/mwindow.c +123 -15
- data/vendor/libgit2/src/mwindow.h +10 -1
- data/vendor/libgit2/src/netops.c +178 -499
- data/vendor/libgit2/src/netops.h +51 -27
- data/vendor/libgit2/src/notes.c +251 -94
- data/vendor/libgit2/src/notes.h +5 -2
- data/vendor/libgit2/src/object.c +253 -67
- data/vendor/libgit2/src/object.h +40 -2
- data/vendor/libgit2/src/object_api.c +30 -11
- data/vendor/libgit2/src/odb.c +765 -201
- data/vendor/libgit2/src/odb.h +40 -8
- data/vendor/libgit2/src/odb_loose.c +560 -346
- data/vendor/libgit2/src/odb_mempack.c +185 -0
- data/vendor/libgit2/src/odb_pack.c +117 -73
- data/vendor/libgit2/src/offmap.c +113 -0
- data/vendor/libgit2/src/offmap.h +32 -42
- data/vendor/libgit2/src/oid.c +45 -25
- data/vendor/libgit2/src/oid.h +26 -8
- data/vendor/libgit2/src/oidarray.c +34 -0
- data/vendor/libgit2/src/oidarray.h +20 -0
- data/vendor/libgit2/src/oidmap.c +125 -0
- data/vendor/libgit2/src/oidmap.h +30 -17
- data/vendor/libgit2/src/pack-objects.c +688 -265
- data/vendor/libgit2/src/pack-objects.h +27 -13
- data/vendor/libgit2/src/pack.c +418 -202
- data/vendor/libgit2/src/pack.h +25 -16
- data/vendor/libgit2/src/parse.c +124 -0
- data/vendor/libgit2/src/parse.h +61 -0
- data/vendor/libgit2/src/patch.c +223 -0
- data/vendor/libgit2/src/patch.h +68 -0
- data/vendor/libgit2/src/patch_generate.c +901 -0
- data/vendor/libgit2/src/patch_generate.h +69 -0
- data/vendor/libgit2/src/patch_parse.c +1136 -0
- data/vendor/libgit2/src/patch_parse.h +51 -0
- data/vendor/libgit2/src/path.c +1247 -241
- data/vendor/libgit2/src/path.h +353 -57
- data/vendor/libgit2/src/pathspec.c +586 -58
- data/vendor/libgit2/src/pathspec.h +37 -15
- data/vendor/libgit2/src/pool.c +134 -221
- data/vendor/libgit2/src/pool.h +38 -50
- data/vendor/libgit2/src/posix.c +76 -10
- data/vendor/libgit2/src/posix.h +74 -32
- data/vendor/libgit2/src/pqueue.c +79 -117
- data/vendor/libgit2/src/pqueue.h +38 -82
- data/vendor/libgit2/src/proxy.c +39 -0
- data/vendor/libgit2/src/proxy.h +17 -0
- data/vendor/libgit2/src/push.c +178 -279
- data/vendor/libgit2/src/push.h +93 -4
- data/vendor/libgit2/src/reader.c +265 -0
- data/vendor/libgit2/src/reader.h +107 -0
- data/vendor/libgit2/src/rebase.c +1364 -0
- data/vendor/libgit2/src/refdb.c +74 -19
- data/vendor/libgit2/src/refdb.h +16 -3
- data/vendor/libgit2/src/refdb_fs.c +1472 -603
- data/vendor/libgit2/src/refdb_fs.h +4 -0
- data/vendor/libgit2/src/reflog.c +40 -330
- data/vendor/libgit2/src/reflog.h +8 -2
- data/vendor/libgit2/src/refs.c +641 -225
- data/vendor/libgit2/src/refs.h +53 -6
- data/vendor/libgit2/src/refspec.c +175 -62
- data/vendor/libgit2/src/refspec.h +10 -25
- data/vendor/libgit2/src/remote.c +1741 -723
- data/vendor/libgit2/src/remote.h +17 -5
- data/vendor/libgit2/src/repository.c +1505 -421
- data/vendor/libgit2/src/repository.h +95 -15
- data/vendor/libgit2/src/reset.c +63 -26
- data/vendor/libgit2/src/revert.c +232 -0
- data/vendor/libgit2/src/revparse.c +94 -80
- data/vendor/libgit2/src/revwalk.c +427 -194
- data/vendor/libgit2/src/revwalk.h +14 -5
- data/vendor/libgit2/src/settings.c +290 -0
- data/vendor/libgit2/src/sha1_lookup.c +16 -159
- data/vendor/libgit2/src/sha1_lookup.h +5 -4
- data/vendor/libgit2/src/signature.c +138 -26
- data/vendor/libgit2/src/signature.h +5 -0
- data/vendor/libgit2/src/sortedcache.c +395 -0
- data/vendor/libgit2/src/sortedcache.h +180 -0
- data/vendor/libgit2/src/stash.c +629 -168
- data/vendor/libgit2/src/status.c +125 -75
- data/vendor/libgit2/src/status.h +4 -2
- data/vendor/libgit2/src/stdalloc.c +120 -0
- data/vendor/libgit2/src/stdalloc.h +17 -0
- data/vendor/libgit2/src/stream.h +86 -0
- data/vendor/libgit2/src/streams/mbedtls.c +483 -0
- data/vendor/libgit2/src/streams/mbedtls.h +23 -0
- data/vendor/libgit2/src/streams/openssl.c +789 -0
- data/vendor/libgit2/src/streams/openssl.h +23 -0
- data/vendor/libgit2/src/streams/registry.c +118 -0
- data/vendor/libgit2/src/streams/registry.h +19 -0
- data/vendor/libgit2/src/streams/socket.c +235 -0
- data/vendor/libgit2/src/streams/socket.h +23 -0
- data/vendor/libgit2/src/streams/stransport.c +323 -0
- data/vendor/libgit2/src/streams/stransport.h +21 -0
- data/vendor/libgit2/src/streams/tls.c +73 -0
- data/vendor/libgit2/src/streams/tls.h +31 -0
- data/vendor/libgit2/src/strmap.c +147 -0
- data/vendor/libgit2/src/strmap.h +46 -51
- data/vendor/libgit2/src/strnlen.h +24 -0
- data/vendor/libgit2/src/submodule.c +1633 -877
- data/vendor/libgit2/src/submodule.h +83 -21
- data/vendor/libgit2/src/sysdir.c +355 -0
- data/vendor/libgit2/src/sysdir.h +119 -0
- data/vendor/libgit2/src/tag.c +87 -62
- data/vendor/libgit2/src/tag.h +4 -1
- data/vendor/libgit2/src/thread-utils.c +3 -0
- data/vendor/libgit2/src/thread-utils.h +71 -35
- data/vendor/libgit2/src/trace.c +4 -4
- data/vendor/libgit2/src/trace.h +11 -3
- data/vendor/libgit2/src/trailer.c +416 -0
- data/vendor/libgit2/src/transaction.c +382 -0
- data/vendor/libgit2/src/transaction.h +14 -0
- data/vendor/libgit2/src/transport.c +133 -67
- data/vendor/libgit2/src/transports/auth.c +75 -0
- data/vendor/libgit2/src/transports/auth.h +64 -0
- data/vendor/libgit2/src/transports/auth_negotiate.c +277 -0
- data/vendor/libgit2/src/transports/auth_negotiate.h +27 -0
- data/vendor/libgit2/src/transports/cred.c +296 -68
- data/vendor/libgit2/src/transports/cred.h +16 -0
- data/vendor/libgit2/src/transports/cred_helpers.c +4 -0
- data/vendor/libgit2/src/transports/git.c +108 -90
- data/vendor/libgit2/src/transports/http.c +803 -258
- data/vendor/libgit2/src/transports/http.h +25 -0
- data/vendor/libgit2/src/transports/local.c +265 -169
- data/vendor/libgit2/src/transports/smart.c +255 -45
- data/vendor/libgit2/src/transports/smart.h +42 -22
- data/vendor/libgit2/src/transports/smart_pkt.c +250 -159
- data/vendor/libgit2/src/transports/smart_protocol.c +414 -196
- data/vendor/libgit2/src/transports/ssh.c +645 -236
- data/vendor/libgit2/src/transports/ssh.h +14 -0
- data/vendor/libgit2/src/transports/winhttp.c +809 -353
- data/vendor/libgit2/src/tree-cache.c +138 -52
- data/vendor/libgit2/src/tree-cache.h +14 -7
- data/vendor/libgit2/src/tree.c +620 -259
- data/vendor/libgit2/src/tree.h +12 -19
- data/vendor/libgit2/src/tsort.c +3 -2
- data/vendor/libgit2/src/unix/map.c +25 -7
- data/vendor/libgit2/src/unix/posix.h +77 -12
- data/vendor/libgit2/src/unix/pthread.h +56 -0
- data/vendor/libgit2/src/unix/realpath.c +12 -8
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +349 -165
- data/vendor/libgit2/src/util.h +167 -85
- data/vendor/libgit2/src/varint.c +43 -0
- data/vendor/libgit2/src/varint.h +17 -0
- data/vendor/libgit2/src/vector.c +156 -33
- data/vendor/libgit2/src/vector.h +41 -5
- data/vendor/libgit2/src/win32/dir.c +22 -42
- data/vendor/libgit2/src/win32/dir.h +7 -5
- data/vendor/libgit2/src/win32/error.c +6 -32
- data/vendor/libgit2/src/win32/error.h +4 -2
- data/vendor/libgit2/src/win32/findfile.c +62 -69
- data/vendor/libgit2/src/win32/findfile.h +5 -13
- data/vendor/libgit2/src/win32/git2.rc +44 -0
- data/vendor/libgit2/src/win32/map.c +39 -11
- data/vendor/libgit2/src/win32/mingw-compat.h +10 -11
- data/vendor/libgit2/src/win32/msvc-compat.h +10 -33
- data/vendor/libgit2/src/win32/path_w32.c +476 -0
- data/vendor/libgit2/src/win32/path_w32.h +104 -0
- data/vendor/libgit2/src/win32/posix.h +35 -30
- data/vendor/libgit2/src/win32/posix_w32.c +659 -327
- data/vendor/libgit2/src/win32/precompiled.h +7 -2
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/thread.c +258 -0
- data/vendor/libgit2/src/win32/thread.h +64 -0
- data/vendor/libgit2/src/win32/utf-conv.c +127 -62
- data/vendor/libgit2/src/win32/utf-conv.h +47 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_buffer.c +54 -0
- data/vendor/libgit2/src/win32/w32_buffer.h +20 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +438 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +129 -0
- data/vendor/libgit2/src/win32/w32_stack.c +193 -0
- data/vendor/libgit2/src/win32/w32_stack.h +140 -0
- data/vendor/libgit2/src/win32/w32_util.c +95 -0
- data/vendor/libgit2/src/win32/w32_util.h +170 -0
- data/vendor/libgit2/src/win32/win32-compat.h +52 -0
- data/vendor/libgit2/src/worktree.c +578 -0
- data/vendor/libgit2/src/worktree.h +39 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +33 -18
- data/vendor/libgit2/src/xdiff/xdiffi.c +578 -88
- data/vendor/libgit2/src/xdiff/xdiffi.h +3 -2
- data/vendor/libgit2/src/xdiff/xemit.c +106 -45
- data/vendor/libgit2/src/xdiff/xemit.h +3 -3
- data/vendor/libgit2/src/xdiff/xhistogram.c +5 -4
- data/vendor/libgit2/src/xdiff/xinclude.h +3 -2
- data/vendor/libgit2/src/xdiff/xmacros.h +2 -2
- data/vendor/libgit2/src/xdiff/xmerge.c +167 -48
- data/vendor/libgit2/src/xdiff/xpatience.c +42 -10
- data/vendor/libgit2/src/xdiff/xprepare.c +14 -14
- data/vendor/libgit2/src/xdiff/xprepare.h +2 -2
- data/vendor/libgit2/src/xdiff/xtypes.h +2 -2
- data/vendor/libgit2/src/xdiff/xutils.c +60 -56
- data/vendor/libgit2/src/xdiff/xutils.h +3 -5
- data/vendor/libgit2/src/zstream.c +205 -0
- data/vendor/libgit2/src/zstream.h +53 -0
- metadata +281 -233
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/Makefile.embed +0 -42
- data/vendor/libgit2/include/git2/push.h +0 -131
- data/vendor/libgit2/include/git2/threads.h +0 -50
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/bswap.h +0 -97
- data/vendor/libgit2/src/compress.c +0 -53
- data/vendor/libgit2/src/config_file.h +0 -60
- data/vendor/libgit2/src/delta-apply.c +0 -134
- data/vendor/libgit2/src/delta-apply.h +0 -50
- data/vendor/libgit2/src/diff_patch.c +0 -995
- data/vendor/libgit2/src/diff_patch.h +0 -46
- data/vendor/libgit2/src/hashsig.h +0 -72
- data/vendor/libgit2/src/merge_file.h +0 -71
- data/vendor/libgit2/src/win32/pthread.c +0 -144
- data/vendor/libgit2/src/win32/pthread.h +0 -50
@@ -4,7 +4,9 @@
|
|
4
4
|
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
5
|
* a Linking Exception. For full terms see the included COPYING file.
|
6
6
|
*/
|
7
|
+
|
7
8
|
#include "common.h"
|
9
|
+
|
8
10
|
#include "git2/types.h"
|
9
11
|
#include "git2/net.h"
|
10
12
|
#include "git2/repository.h"
|
@@ -16,7 +18,7 @@
|
|
16
18
|
#include "git2/pack.h"
|
17
19
|
#include "git2/commit.h"
|
18
20
|
#include "git2/revparse.h"
|
19
|
-
|
21
|
+
|
20
22
|
#include "pack-objects.h"
|
21
23
|
#include "refs.h"
|
22
24
|
#include "posix.h"
|
@@ -26,6 +28,7 @@
|
|
26
28
|
#include "odb.h"
|
27
29
|
#include "push.h"
|
28
30
|
#include "remote.h"
|
31
|
+
#include "proxy.h"
|
29
32
|
|
30
33
|
typedef struct {
|
31
34
|
git_transport parent;
|
@@ -35,57 +38,91 @@ typedef struct {
|
|
35
38
|
int flags;
|
36
39
|
git_atomic cancelled;
|
37
40
|
git_repository *repo;
|
41
|
+
git_transport_message_cb progress_cb;
|
42
|
+
git_transport_message_cb error_cb;
|
43
|
+
void *message_cb_payload;
|
38
44
|
git_vector refs;
|
39
45
|
unsigned connected : 1,
|
40
46
|
have_refs : 1;
|
41
47
|
} transport_local;
|
42
48
|
|
49
|
+
static void free_head(git_remote_head *head)
|
50
|
+
{
|
51
|
+
git__free(head->name);
|
52
|
+
git__free(head->symref_target);
|
53
|
+
git__free(head);
|
54
|
+
}
|
55
|
+
|
56
|
+
static void free_heads(git_vector *heads)
|
57
|
+
{
|
58
|
+
git_remote_head *head;
|
59
|
+
size_t i;
|
60
|
+
|
61
|
+
git_vector_foreach(heads, i, head)
|
62
|
+
free_head(head);
|
63
|
+
|
64
|
+
git_vector_free(heads);
|
65
|
+
}
|
66
|
+
|
43
67
|
static int add_ref(transport_local *t, const char *name)
|
44
68
|
{
|
45
69
|
const char peeled[] = "^{}";
|
70
|
+
git_reference *ref, *resolved;
|
46
71
|
git_remote_head *head;
|
72
|
+
git_oid obj_id;
|
47
73
|
git_object *obj = NULL, *target = NULL;
|
48
74
|
git_buf buf = GIT_BUF_INIT;
|
49
75
|
int error;
|
50
76
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
head->name = git__strdup(name);
|
55
|
-
GITERR_CHECK_ALLOC(head->name);
|
77
|
+
if ((error = git_reference_lookup(&ref, t->repo, name)) < 0)
|
78
|
+
return error;
|
56
79
|
|
57
|
-
error =
|
80
|
+
error = git_reference_resolve(&resolved, ref);
|
58
81
|
if (error < 0) {
|
59
|
-
|
60
|
-
git__free(head);
|
82
|
+
git_reference_free(ref);
|
61
83
|
if (!strcmp(name, GIT_HEAD_FILE) && error == GIT_ENOTFOUND) {
|
62
|
-
/* This is actually okay. Empty repos often have a HEAD that
|
63
|
-
* a nonexistent "refs/heads/master". */
|
64
|
-
|
84
|
+
/* This is actually okay. Empty repos often have a HEAD that
|
85
|
+
* points to a nonexistent "refs/heads/master". */
|
86
|
+
git_error_clear();
|
65
87
|
return 0;
|
66
88
|
}
|
67
89
|
return error;
|
68
90
|
}
|
69
91
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
92
|
+
git_oid_cpy(&obj_id, git_reference_target(resolved));
|
93
|
+
git_reference_free(resolved);
|
94
|
+
|
95
|
+
head = git__calloc(1, sizeof(git_remote_head));
|
96
|
+
GIT_ERROR_CHECK_ALLOC(head);
|
97
|
+
|
98
|
+
head->name = git__strdup(name);
|
99
|
+
GIT_ERROR_CHECK_ALLOC(head->name);
|
100
|
+
|
101
|
+
git_oid_cpy(&head->oid, &obj_id);
|
102
|
+
|
103
|
+
if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
|
104
|
+
head->symref_target = git__strdup(git_reference_symbolic_target(ref));
|
105
|
+
GIT_ERROR_CHECK_ALLOC(head->symref_target);
|
106
|
+
}
|
107
|
+
git_reference_free(ref);
|
108
|
+
|
109
|
+
if ((error = git_vector_insert(&t->refs, head)) < 0) {
|
110
|
+
free_head(head);
|
111
|
+
return error;
|
75
112
|
}
|
76
113
|
|
77
114
|
/* If it's not a tag, we don't need to try to peel it */
|
78
115
|
if (git__prefixcmp(name, GIT_REFS_TAGS_DIR))
|
79
116
|
return 0;
|
80
117
|
|
81
|
-
if (git_object_lookup(&obj, t->repo, &head->oid,
|
82
|
-
return
|
118
|
+
if ((error = git_object_lookup(&obj, t->repo, &head->oid, GIT_OBJECT_ANY)) < 0)
|
119
|
+
return error;
|
83
120
|
|
84
121
|
head = NULL;
|
85
122
|
|
86
123
|
/* If it's not an annotated tag, or if we're mocking
|
87
124
|
* git-receive-pack, just get out */
|
88
|
-
if (git_object_type(obj) !=
|
125
|
+
if (git_object_type(obj) != GIT_OBJECT_TAG ||
|
89
126
|
t->direction != GIT_DIRECTION_FETCH) {
|
90
127
|
git_object_free(obj);
|
91
128
|
return 0;
|
@@ -93,28 +130,26 @@ static int add_ref(transport_local *t, const char *name)
|
|
93
130
|
|
94
131
|
/* And if it's a tag, peel it, and add it to the list */
|
95
132
|
head = git__calloc(1, sizeof(git_remote_head));
|
96
|
-
|
97
|
-
if (git_buf_join(&buf, 0, name, peeled) < 0)
|
98
|
-
return -1;
|
133
|
+
GIT_ERROR_CHECK_ALLOC(head);
|
99
134
|
|
135
|
+
if (git_buf_join(&buf, 0, name, peeled) < 0) {
|
136
|
+
free_head(head);
|
137
|
+
return -1;
|
138
|
+
}
|
100
139
|
head->name = git_buf_detach(&buf);
|
101
140
|
|
102
|
-
if (git_tag_peel(&target, (git_tag *)
|
103
|
-
|
141
|
+
if (!(error = git_tag_peel(&target, (git_tag *)obj))) {
|
142
|
+
git_oid_cpy(&head->oid, git_object_id(target));
|
104
143
|
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
if (git_vector_insert(&t->refs, head) < 0)
|
110
|
-
return -1;
|
111
|
-
|
112
|
-
return 0;
|
144
|
+
if ((error = git_vector_insert(&t->refs, head)) < 0) {
|
145
|
+
free_head(head);
|
146
|
+
}
|
147
|
+
}
|
113
148
|
|
114
|
-
on_error:
|
115
149
|
git_object_free(obj);
|
116
150
|
git_object_free(target);
|
117
|
-
|
151
|
+
|
152
|
+
return error;
|
118
153
|
}
|
119
154
|
|
120
155
|
static int store_refs(transport_local *t)
|
@@ -161,13 +196,14 @@ on_error:
|
|
161
196
|
|
162
197
|
/*
|
163
198
|
* Try to open the url as a git directory. The direction doesn't
|
164
|
-
* matter in this case because we're
|
199
|
+
* matter in this case because we're calculating the heads ourselves.
|
165
200
|
*/
|
166
201
|
static int local_connect(
|
167
202
|
git_transport *transport,
|
168
203
|
const char *url,
|
169
204
|
git_cred_acquire_cb cred_acquire_cb,
|
170
205
|
void *cred_acquire_payload,
|
206
|
+
const git_proxy_options *proxy,
|
171
207
|
int direction, int flags)
|
172
208
|
{
|
173
209
|
git_repository *repo;
|
@@ -178,27 +214,28 @@ static int local_connect(
|
|
178
214
|
|
179
215
|
GIT_UNUSED(cred_acquire_cb);
|
180
216
|
GIT_UNUSED(cred_acquire_payload);
|
217
|
+
GIT_UNUSED(proxy);
|
218
|
+
|
219
|
+
if (t->connected)
|
220
|
+
return 0;
|
221
|
+
|
222
|
+
free_heads(&t->refs);
|
181
223
|
|
182
224
|
t->url = git__strdup(url);
|
183
|
-
|
225
|
+
GIT_ERROR_CHECK_ALLOC(t->url);
|
184
226
|
t->direction = direction;
|
185
227
|
t->flags = flags;
|
186
228
|
|
187
|
-
/*
|
188
|
-
if (
|
189
|
-
|
190
|
-
|
191
|
-
return -1;
|
192
|
-
}
|
193
|
-
path = git_buf_cstr(&buf);
|
194
|
-
|
195
|
-
} else { /* We assume transport->url is already a path */
|
196
|
-
path = t->url;
|
229
|
+
/* 'url' may be a url or path; convert to a path */
|
230
|
+
if ((error = git_path_from_url_or_path(&buf, url)) < 0) {
|
231
|
+
git_buf_dispose(&buf);
|
232
|
+
return error;
|
197
233
|
}
|
234
|
+
path = git_buf_cstr(&buf);
|
198
235
|
|
199
236
|
error = git_repository_open(&repo, path);
|
200
237
|
|
201
|
-
|
238
|
+
git_buf_dispose(&buf);
|
202
239
|
|
203
240
|
if (error < 0)
|
204
241
|
return -1;
|
@@ -213,21 +250,17 @@ static int local_connect(
|
|
213
250
|
return 0;
|
214
251
|
}
|
215
252
|
|
216
|
-
static int local_ls(
|
253
|
+
static int local_ls(const git_remote_head ***out, size_t *size, git_transport *transport)
|
217
254
|
{
|
218
255
|
transport_local *t = (transport_local *)transport;
|
219
|
-
unsigned int i;
|
220
|
-
git_remote_head *head = NULL;
|
221
256
|
|
222
257
|
if (!t->have_refs) {
|
223
|
-
|
258
|
+
git_error_set(GIT_ERROR_NET, "the transport has not yet loaded the refs");
|
224
259
|
return -1;
|
225
260
|
}
|
226
261
|
|
227
|
-
|
228
|
-
|
229
|
-
return GIT_EUSER;
|
230
|
-
}
|
262
|
+
*out = (const git_remote_head **)t->refs.contents;
|
263
|
+
*size = t->refs.length;
|
231
264
|
|
232
265
|
return 0;
|
233
266
|
}
|
@@ -254,57 +287,14 @@ static int local_negotiate_fetch(
|
|
254
287
|
git_oid_cpy(&rhead->loid, git_object_id(obj));
|
255
288
|
else if (error != GIT_ENOTFOUND)
|
256
289
|
return error;
|
290
|
+
else
|
291
|
+
git_error_clear();
|
257
292
|
git_object_free(obj);
|
258
|
-
giterr_clear();
|
259
293
|
}
|
260
294
|
|
261
295
|
return 0;
|
262
296
|
}
|
263
297
|
|
264
|
-
static int local_push_copy_object(
|
265
|
-
git_odb *local_odb,
|
266
|
-
git_odb *remote_odb,
|
267
|
-
git_pobject *obj)
|
268
|
-
{
|
269
|
-
int error = 0;
|
270
|
-
git_odb_object *odb_obj = NULL;
|
271
|
-
git_odb_stream *odb_stream;
|
272
|
-
size_t odb_obj_size;
|
273
|
-
git_otype odb_obj_type;
|
274
|
-
git_oid remote_odb_obj_oid;
|
275
|
-
|
276
|
-
/* Object already exists in the remote ODB; do nothing and return 0*/
|
277
|
-
if (git_odb_exists(remote_odb, &obj->id))
|
278
|
-
return 0;
|
279
|
-
|
280
|
-
if ((error = git_odb_read(&odb_obj, local_odb, &obj->id)) < 0)
|
281
|
-
return error;
|
282
|
-
|
283
|
-
odb_obj_size = git_odb_object_size(odb_obj);
|
284
|
-
odb_obj_type = git_odb_object_type(odb_obj);
|
285
|
-
|
286
|
-
if ((error = git_odb_open_wstream(&odb_stream, remote_odb,
|
287
|
-
odb_obj_size, odb_obj_type)) < 0)
|
288
|
-
goto on_error;
|
289
|
-
|
290
|
-
if (odb_stream->write(odb_stream, (char *)git_odb_object_data(odb_obj),
|
291
|
-
odb_obj_size) < 0 ||
|
292
|
-
odb_stream->finalize_write(&remote_odb_obj_oid, odb_stream) < 0) {
|
293
|
-
error = -1;
|
294
|
-
} else if (git_oid__cmp(&obj->id, &remote_odb_obj_oid) != 0) {
|
295
|
-
giterr_set(GITERR_ODB, "Error when writing object to remote odb "
|
296
|
-
"during local push operation. Remote odb object oid does not "
|
297
|
-
"match local oid.");
|
298
|
-
error = -1;
|
299
|
-
}
|
300
|
-
|
301
|
-
odb_stream->free(odb_stream);
|
302
|
-
|
303
|
-
on_error:
|
304
|
-
git_odb_object_free(odb_obj);
|
305
|
-
return error;
|
306
|
-
}
|
307
|
-
|
308
298
|
static int local_push_update_remote_ref(
|
309
299
|
git_repository *remote_repo,
|
310
300
|
const char *lref,
|
@@ -315,14 +305,11 @@ static int local_push_update_remote_ref(
|
|
315
305
|
int error;
|
316
306
|
git_reference *remote_ref = NULL;
|
317
307
|
|
318
|
-
/*
|
319
|
-
|
320
|
-
|
321
|
-
if (lref) {
|
308
|
+
/* check for lhs, if it's empty it means to delete */
|
309
|
+
if (lref[0] != '\0') {
|
322
310
|
/* Create or update a ref */
|
323
|
-
|
324
|
-
|
325
|
-
return error;
|
311
|
+
error = git_reference_create(NULL, remote_repo, rref, loid,
|
312
|
+
!git_oid_iszero(roid), NULL);
|
326
313
|
} else {
|
327
314
|
/* Delete a ref */
|
328
315
|
if ((error = git_reference_lookup(&remote_ref, remote_repo, rref)) < 0) {
|
@@ -331,58 +318,84 @@ static int local_push_update_remote_ref(
|
|
331
318
|
return error;
|
332
319
|
}
|
333
320
|
|
334
|
-
|
335
|
-
return error;
|
336
|
-
|
321
|
+
error = git_reference_delete(remote_ref);
|
337
322
|
git_reference_free(remote_ref);
|
338
323
|
}
|
339
324
|
|
340
|
-
return
|
325
|
+
return error;
|
326
|
+
}
|
327
|
+
|
328
|
+
static int transfer_to_push_transfer(const git_transfer_progress *stats, void *payload)
|
329
|
+
{
|
330
|
+
const git_remote_callbacks *cbs = payload;
|
331
|
+
|
332
|
+
if (!cbs || !cbs->push_transfer_progress)
|
333
|
+
return 0;
|
334
|
+
|
335
|
+
return cbs->push_transfer_progress(stats->received_objects, stats->total_objects, stats->received_bytes,
|
336
|
+
cbs->payload);
|
341
337
|
}
|
342
338
|
|
343
339
|
static int local_push(
|
344
340
|
git_transport *transport,
|
345
|
-
git_push *push
|
341
|
+
git_push *push,
|
342
|
+
const git_remote_callbacks *cbs)
|
346
343
|
{
|
347
344
|
transport_local *t = (transport_local *)transport;
|
348
|
-
git_odb *remote_odb = NULL;
|
349
|
-
git_odb *local_odb = NULL;
|
350
345
|
git_repository *remote_repo = NULL;
|
351
346
|
push_spec *spec;
|
352
347
|
char *url = NULL;
|
348
|
+
const char *path;
|
349
|
+
git_buf buf = GIT_BUF_INIT, odb_path = GIT_BUF_INIT;
|
353
350
|
int error;
|
354
|
-
unsigned int i;
|
355
351
|
size_t j;
|
356
352
|
|
357
|
-
|
353
|
+
GIT_UNUSED(cbs);
|
354
|
+
|
355
|
+
/* 'push->remote->url' may be a url or path; convert to a path */
|
356
|
+
if ((error = git_path_from_url_or_path(&buf, push->remote->url)) < 0) {
|
357
|
+
git_buf_dispose(&buf);
|
358
|
+
return error;
|
359
|
+
}
|
360
|
+
path = git_buf_cstr(&buf);
|
361
|
+
|
362
|
+
error = git_repository_open(&remote_repo, path);
|
363
|
+
|
364
|
+
git_buf_dispose(&buf);
|
365
|
+
|
366
|
+
if (error < 0)
|
358
367
|
return error;
|
359
368
|
|
360
369
|
/* We don't currently support pushing locally to non-bare repos. Proper
|
361
370
|
non-bare repo push support would require checking configs to see if
|
362
|
-
we should override the default 'don't let this happen' behavior
|
371
|
+
we should override the default 'don't let this happen' behavior.
|
372
|
+
|
373
|
+
Note that this is only an issue when pushing to the current branch,
|
374
|
+
but we forbid all pushes just in case */
|
363
375
|
if (!remote_repo->is_bare) {
|
364
|
-
error =
|
376
|
+
error = GIT_EBAREREPO;
|
377
|
+
git_error_set(GIT_ERROR_INVALID, "local push doesn't (yet) support pushing to non-bare repos.");
|
365
378
|
goto on_error;
|
366
379
|
}
|
367
380
|
|
368
|
-
if ((error =
|
369
|
-
(error =
|
381
|
+
if ((error = git_repository_item_path(&odb_path, remote_repo, GIT_REPOSITORY_ITEM_OBJECTS)) < 0
|
382
|
+
|| (error = git_buf_joinpath(&odb_path, odb_path.ptr, "pack")) < 0)
|
370
383
|
goto on_error;
|
371
384
|
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
385
|
+
error = git_packbuilder_write(push->pb, odb_path.ptr, 0, transfer_to_push_transfer, (void *) cbs);
|
386
|
+
git_buf_dispose(&odb_path);
|
387
|
+
|
388
|
+
if (error < 0)
|
389
|
+
goto on_error;
|
377
390
|
|
378
391
|
push->unpack_ok = 1;
|
379
392
|
|
380
393
|
git_vector_foreach(&push->specs, j, spec) {
|
381
394
|
push_status *status;
|
382
395
|
const git_error *last;
|
383
|
-
char *ref = spec->
|
396
|
+
char *ref = spec->refspec.dst;
|
384
397
|
|
385
|
-
status = git__calloc(sizeof(push_status)
|
398
|
+
status = git__calloc(1, sizeof(push_status));
|
386
399
|
if (!status)
|
387
400
|
goto on_error;
|
388
401
|
|
@@ -392,7 +405,7 @@ static int local_push(
|
|
392
405
|
goto on_error;
|
393
406
|
}
|
394
407
|
|
395
|
-
error = local_push_update_remote_ref(remote_repo, spec->
|
408
|
+
error = local_push_update_remote_ref(remote_repo, spec->refspec.src, spec->refspec.dst,
|
396
409
|
&spec->loid, &spec->roid);
|
397
410
|
|
398
411
|
switch (error) {
|
@@ -405,7 +418,7 @@ static int local_push(
|
|
405
418
|
status->msg = git__strdup("Remote branch not found to delete");
|
406
419
|
break;
|
407
420
|
default:
|
408
|
-
last =
|
421
|
+
last = git_error_last();
|
409
422
|
|
410
423
|
if (last && last->message)
|
411
424
|
status->msg = git__strdup(last->message);
|
@@ -433,7 +446,7 @@ static int local_push(
|
|
433
446
|
|
434
447
|
if (!url || t->parent.close(&t->parent) < 0 ||
|
435
448
|
t->parent.connect(&t->parent, url,
|
436
|
-
|
449
|
+
NULL, NULL, NULL, GIT_DIRECTION_PUSH, flags))
|
437
450
|
goto on_error;
|
438
451
|
}
|
439
452
|
|
@@ -448,7 +461,7 @@ on_error:
|
|
448
461
|
|
449
462
|
typedef struct foreach_data {
|
450
463
|
git_transfer_progress *stats;
|
451
|
-
|
464
|
+
git_transfer_progress_cb progress_cb;
|
452
465
|
void *progress_payload;
|
453
466
|
git_odb_writepack *writepack;
|
454
467
|
} foreach_data;
|
@@ -458,14 +471,70 @@ static int foreach_cb(void *buf, size_t len, void *payload)
|
|
458
471
|
foreach_data *data = (foreach_data*)payload;
|
459
472
|
|
460
473
|
data->stats->received_bytes += len;
|
461
|
-
return data->writepack->
|
474
|
+
return data->writepack->append(data->writepack, buf, len, data->stats);
|
475
|
+
}
|
476
|
+
|
477
|
+
static const char *counting_objects_fmt = "Counting objects %d\r";
|
478
|
+
static const char *compressing_objects_fmt = "Compressing objects: %.0f%% (%d/%d)";
|
479
|
+
|
480
|
+
static int local_counting(int stage, unsigned int current, unsigned int total, void *payload)
|
481
|
+
{
|
482
|
+
git_buf progress_info = GIT_BUF_INIT;
|
483
|
+
transport_local *t = payload;
|
484
|
+
int error;
|
485
|
+
|
486
|
+
if (!t->progress_cb)
|
487
|
+
return 0;
|
488
|
+
|
489
|
+
if (stage == GIT_PACKBUILDER_ADDING_OBJECTS) {
|
490
|
+
git_buf_printf(&progress_info, counting_objects_fmt, current);
|
491
|
+
} else if (stage == GIT_PACKBUILDER_DELTAFICATION) {
|
492
|
+
float perc = (((float) current) / total) * 100;
|
493
|
+
git_buf_printf(&progress_info, compressing_objects_fmt, perc, current, total);
|
494
|
+
if (current == total)
|
495
|
+
git_buf_printf(&progress_info, ", done\n");
|
496
|
+
else
|
497
|
+
git_buf_putc(&progress_info, '\r');
|
498
|
+
|
499
|
+
}
|
500
|
+
|
501
|
+
if (git_buf_oom(&progress_info))
|
502
|
+
return -1;
|
503
|
+
|
504
|
+
error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload);
|
505
|
+
git_buf_dispose(&progress_info);
|
506
|
+
|
507
|
+
return error;
|
508
|
+
}
|
509
|
+
|
510
|
+
static int foreach_reference_cb(git_reference *reference, void *payload)
|
511
|
+
{
|
512
|
+
git_revwalk *walk = (git_revwalk *)payload;
|
513
|
+
int error;
|
514
|
+
|
515
|
+
if (git_reference_type(reference) != GIT_REFERENCE_DIRECT) {
|
516
|
+
git_reference_free(reference);
|
517
|
+
return 0;
|
518
|
+
}
|
519
|
+
|
520
|
+
error = git_revwalk_hide(walk, git_reference_target(reference));
|
521
|
+
/* The reference is in the local repository, so the target may not
|
522
|
+
* exist on the remote. It also may not be a commit. */
|
523
|
+
if (error == GIT_ENOTFOUND || error == GIT_ERROR_INVALID) {
|
524
|
+
git_error_clear();
|
525
|
+
error = 0;
|
526
|
+
}
|
527
|
+
|
528
|
+
git_reference_free(reference);
|
529
|
+
|
530
|
+
return error;
|
462
531
|
}
|
463
532
|
|
464
533
|
static int local_download_pack(
|
465
534
|
git_transport *transport,
|
466
535
|
git_repository *repo,
|
467
536
|
git_transfer_progress *stats,
|
468
|
-
|
537
|
+
git_transfer_progress_cb progress_cb,
|
469
538
|
void *progress_payload)
|
470
539
|
{
|
471
540
|
transport_local *t = (transport_local*)transport;
|
@@ -473,10 +542,10 @@ static int local_download_pack(
|
|
473
542
|
git_remote_head *rhead;
|
474
543
|
unsigned int i;
|
475
544
|
int error = -1;
|
476
|
-
git_oid oid;
|
477
545
|
git_packbuilder *pack = NULL;
|
478
546
|
git_odb_writepack *writepack = NULL;
|
479
547
|
git_odb *odb = NULL;
|
548
|
+
git_buf progress_info = GIT_BUF_INIT;
|
480
549
|
|
481
550
|
if ((error = git_revwalk_new(&walk, t->repo)) < 0)
|
482
551
|
goto cleanup;
|
@@ -485,6 +554,8 @@ static int local_download_pack(
|
|
485
554
|
if ((error = git_packbuilder_new(&pack, t->repo)) < 0)
|
486
555
|
goto cleanup;
|
487
556
|
|
557
|
+
git_packbuilder_set_callbacks(pack, local_counting, t);
|
558
|
+
|
488
559
|
stats->total_objects = 0;
|
489
560
|
stats->indexed_objects = 0;
|
490
561
|
stats->received_objects = 0;
|
@@ -492,46 +563,49 @@ static int local_download_pack(
|
|
492
563
|
|
493
564
|
git_vector_foreach(&t->refs, i, rhead) {
|
494
565
|
git_object *obj;
|
495
|
-
if ((error = git_object_lookup(&obj, t->repo, &rhead->oid,
|
566
|
+
if ((error = git_object_lookup(&obj, t->repo, &rhead->oid, GIT_OBJECT_ANY)) < 0)
|
496
567
|
goto cleanup;
|
497
568
|
|
498
|
-
if (git_object_type(obj) ==
|
569
|
+
if (git_object_type(obj) == GIT_OBJECT_COMMIT) {
|
499
570
|
/* Revwalker includes only wanted commits */
|
500
571
|
error = git_revwalk_push(walk, &rhead->oid);
|
501
|
-
if (!git_oid_iszero(&rhead->loid))
|
502
|
-
error = git_revwalk_hide(walk, &rhead->loid);
|
503
572
|
} else {
|
504
573
|
/* Tag or some other wanted object. Add it on its own */
|
505
|
-
error =
|
574
|
+
error = git_packbuilder_insert_recur(pack, &rhead->oid, rhead->name);
|
506
575
|
}
|
507
576
|
git_object_free(obj);
|
577
|
+
if (error < 0)
|
578
|
+
goto cleanup;
|
508
579
|
}
|
509
580
|
|
510
|
-
|
511
|
-
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
|
581
|
+
if ((error = git_reference_foreach(repo, foreach_reference_cb, walk)))
|
512
582
|
goto cleanup;
|
513
583
|
|
514
|
-
|
515
|
-
|
584
|
+
if ((error = git_packbuilder_insert_walk(pack, walk)))
|
585
|
+
goto cleanup;
|
516
586
|
|
517
|
-
|
518
|
-
|
587
|
+
if ((error = git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack))) < 0)
|
588
|
+
goto cleanup;
|
519
589
|
|
520
|
-
|
521
|
-
|
590
|
+
if (t->progress_cb &&
|
591
|
+
(error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0)
|
592
|
+
goto cleanup;
|
522
593
|
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
git_commit_free(commit);
|
527
|
-
goto cleanup;
|
528
|
-
}
|
594
|
+
/* Walk the objects, building a packfile */
|
595
|
+
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
|
596
|
+
goto cleanup;
|
529
597
|
|
530
|
-
|
531
|
-
|
532
|
-
|
598
|
+
/* One last one with the newline */
|
599
|
+
git_buf_clear(&progress_info);
|
600
|
+
git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack));
|
601
|
+
if ((error = git_buf_putc(&progress_info, '\n')) < 0)
|
602
|
+
goto cleanup;
|
533
603
|
|
534
|
-
if (
|
604
|
+
if (t->progress_cb &&
|
605
|
+
(error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0)
|
606
|
+
goto cleanup;
|
607
|
+
|
608
|
+
if ((error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) != 0)
|
535
609
|
goto cleanup;
|
536
610
|
|
537
611
|
/* Write the data to the ODB */
|
@@ -542,18 +616,41 @@ static int local_download_pack(
|
|
542
616
|
data.progress_payload = progress_payload;
|
543
617
|
data.writepack = writepack;
|
544
618
|
|
545
|
-
|
619
|
+
/* autodetect */
|
620
|
+
git_packbuilder_set_threads(pack, 0);
|
621
|
+
|
622
|
+
if ((error = git_packbuilder_foreach(pack, foreach_cb, &data)) != 0)
|
546
623
|
goto cleanup;
|
547
624
|
}
|
625
|
+
|
548
626
|
error = writepack->commit(writepack, stats);
|
549
627
|
|
550
628
|
cleanup:
|
551
629
|
if (writepack) writepack->free(writepack);
|
630
|
+
git_buf_dispose(&progress_info);
|
552
631
|
git_packbuilder_free(pack);
|
553
632
|
git_revwalk_free(walk);
|
554
633
|
return error;
|
555
634
|
}
|
556
635
|
|
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
|
+
|
557
654
|
static int local_is_connected(git_transport *transport)
|
558
655
|
{
|
559
656
|
transport_local *t = (transport_local *)transport;
|
@@ -599,15 +696,8 @@ static int local_close(git_transport *transport)
|
|
599
696
|
static void local_free(git_transport *transport)
|
600
697
|
{
|
601
698
|
transport_local *t = (transport_local *)transport;
|
602
|
-
size_t i;
|
603
|
-
git_remote_head *head;
|
604
699
|
|
605
|
-
|
606
|
-
git__free(head->name);
|
607
|
-
git__free(head);
|
608
|
-
}
|
609
|
-
|
610
|
-
git_vector_free(&t->refs);
|
700
|
+
free_heads(&t->refs);
|
611
701
|
|
612
702
|
/* Close the transport, if it's still open. */
|
613
703
|
local_close(transport);
|
@@ -622,14 +712,16 @@ static void local_free(git_transport *transport)
|
|
622
712
|
|
623
713
|
int git_transport_local(git_transport **out, git_remote *owner, void *param)
|
624
714
|
{
|
715
|
+
int error;
|
625
716
|
transport_local *t;
|
626
717
|
|
627
718
|
GIT_UNUSED(param);
|
628
719
|
|
629
720
|
t = git__calloc(1, sizeof(transport_local));
|
630
|
-
|
721
|
+
GIT_ERROR_CHECK_ALLOC(t);
|
631
722
|
|
632
723
|
t->parent.version = GIT_TRANSPORT_VERSION;
|
724
|
+
t->parent.set_callbacks = local_set_callbacks;
|
633
725
|
t->parent.connect = local_connect;
|
634
726
|
t->parent.negotiate_fetch = local_negotiate_fetch;
|
635
727
|
t->parent.download_pack = local_download_pack;
|
@@ -641,7 +733,11 @@ int git_transport_local(git_transport **out, git_remote *owner, void *param)
|
|
641
733
|
t->parent.read_flags = local_read_flags;
|
642
734
|
t->parent.cancel = local_cancel;
|
643
735
|
|
644
|
-
git_vector_init(&t->refs, 0, NULL)
|
736
|
+
if ((error = git_vector_init(&t->refs, 0, NULL)) < 0) {
|
737
|
+
git__free(t);
|
738
|
+
return error;
|
739
|
+
}
|
740
|
+
|
645
741
|
t->owner = owner;
|
646
742
|
|
647
743
|
*out = (git_transport *) t;
|