rugged 0.19.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +151 -25
- data/ext/rugged/extconf.rb +48 -27
- data/ext/rugged/rugged.c +107 -35
- data/ext/rugged/rugged.h +44 -8
- data/ext/rugged/rugged_blame.c +292 -0
- data/ext/rugged/rugged_blob.c +84 -31
- data/ext/rugged/rugged_branch.c +90 -223
- data/ext/rugged/rugged_branch_collection.c +445 -0
- data/ext/rugged/rugged_commit.c +190 -9
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_cred.c +125 -0
- data/ext/rugged/rugged_diff.c +267 -94
- data/ext/rugged/rugged_diff_delta.c +14 -3
- data/ext/rugged/rugged_diff_hunk.c +31 -28
- data/ext/rugged/rugged_diff_line.c +21 -17
- data/ext/rugged/rugged_index.c +326 -6
- data/ext/rugged/rugged_note.c +39 -34
- data/ext/rugged/rugged_object.c +9 -9
- data/ext/rugged/rugged_patch.c +245 -0
- data/ext/rugged/rugged_reference.c +67 -332
- data/ext/rugged/rugged_reference_collection.c +490 -0
- data/ext/rugged/rugged_remote.c +447 -351
- data/ext/rugged/rugged_remote_collection.c +285 -0
- data/ext/rugged/rugged_repo.c +752 -203
- data/ext/rugged/rugged_revwalk.c +119 -27
- data/ext/rugged/rugged_settings.c +48 -1
- data/ext/rugged/rugged_signature.c +30 -16
- data/ext/rugged/rugged_tag.c +86 -191
- data/ext/rugged/rugged_tag_collection.c +279 -0
- data/ext/rugged/rugged_tree.c +159 -22
- data/lib/rugged/branch.rb +8 -17
- data/lib/rugged/credentials.rb +43 -0
- data/lib/rugged/diff/delta.rb +1 -2
- data/lib/rugged/diff/hunk.rb +4 -9
- data/lib/rugged/diff/line.rb +23 -3
- data/lib/rugged/diff.rb +3 -1
- data/lib/rugged/patch.rb +26 -0
- data/lib/rugged/reference.rb +1 -3
- data/lib/rugged/remote.rb +0 -9
- data/lib/rugged/repository.rb +70 -13
- data/lib/rugged/tag.rb +23 -18
- data/lib/rugged/tree.rb +7 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +8 -1
- data/vendor/libgit2/AUTHORS +75 -0
- data/vendor/libgit2/CMakeLists.txt +490 -0
- data/vendor/libgit2/COPYING +920 -0
- data/vendor/libgit2/Makefile.embed +25 -7
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +16 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +43 -0
- data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake +44 -0
- data/vendor/libgit2/deps/http-parser/LICENSE-MIT +23 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/include/git2/attr.h +2 -1
- data/vendor/libgit2/include/git2/blame.h +213 -0
- data/vendor/libgit2/include/git2/blob.h +57 -29
- data/vendor/libgit2/include/git2/branch.h +56 -44
- data/vendor/libgit2/include/git2/buffer.h +112 -0
- data/vendor/libgit2/include/git2/checkout.h +72 -37
- data/vendor/libgit2/include/git2/cherrypick.h +87 -0
- data/vendor/libgit2/include/git2/clone.h +153 -56
- data/vendor/libgit2/include/git2/commit.h +82 -12
- data/vendor/libgit2/include/git2/common.h +31 -19
- data/vendor/libgit2/include/git2/config.h +124 -19
- data/vendor/libgit2/include/git2/cred_helpers.h +1 -1
- data/vendor/libgit2/include/git2/diff.h +636 -494
- data/vendor/libgit2/include/git2/errors.h +48 -15
- data/vendor/libgit2/include/git2/filter.h +149 -0
- data/vendor/libgit2/include/git2/graph.h +14 -0
- data/vendor/libgit2/include/git2/index.h +95 -54
- data/vendor/libgit2/include/git2/indexer.h +15 -9
- data/vendor/libgit2/include/git2/merge.h +402 -39
- data/vendor/libgit2/include/git2/message.h +9 -14
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +6 -6
- data/vendor/libgit2/include/git2/object.h +34 -2
- data/vendor/libgit2/include/git2/odb.h +77 -14
- data/vendor/libgit2/include/git2/odb_backend.h +50 -6
- data/vendor/libgit2/include/git2/oid.h +4 -8
- data/vendor/libgit2/include/git2/pack.h +58 -4
- data/vendor/libgit2/include/git2/patch.h +277 -0
- data/vendor/libgit2/include/git2/pathspec.h +263 -0
- data/vendor/libgit2/include/git2/push.h +55 -5
- data/vendor/libgit2/include/git2/reflog.h +11 -8
- data/vendor/libgit2/include/git2/refs.h +219 -33
- data/vendor/libgit2/include/git2/refspec.h +3 -4
- data/vendor/libgit2/include/git2/remote.h +216 -76
- data/vendor/libgit2/include/git2/repository.h +85 -40
- data/vendor/libgit2/include/git2/reset.h +15 -4
- data/vendor/libgit2/include/git2/revert.h +86 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +44 -6
- data/vendor/libgit2/include/git2/signature.h +17 -3
- data/vendor/libgit2/include/git2/stash.h +8 -12
- data/vendor/libgit2/include/git2/status.h +67 -18
- data/vendor/libgit2/include/git2/submodule.h +100 -85
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +44 -3
- data/vendor/libgit2/include/git2/sys/diff.h +91 -0
- data/vendor/libgit2/include/git2/sys/filter.h +301 -0
- data/vendor/libgit2/include/git2/sys/index.h +0 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +85 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +33 -11
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +51 -5
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +2 -2
- data/vendor/libgit2/include/git2/sys/repository.h +19 -1
- data/vendor/libgit2/include/git2/transport.h +216 -75
- data/vendor/libgit2/include/git2/tree.h +32 -11
- data/vendor/libgit2/include/git2/types.h +124 -10
- data/vendor/libgit2/include/git2/version.h +4 -2
- data/vendor/libgit2/include/git2.h +41 -40
- data/vendor/libgit2/libgit2.pc.in +10 -0
- data/vendor/libgit2/src/array.h +16 -8
- data/vendor/libgit2/src/attr.c +140 -402
- data/vendor/libgit2/src/attr.h +1 -33
- data/vendor/libgit2/src/attr_file.c +298 -135
- data/vendor/libgit2/src/attr_file.h +61 -22
- data/vendor/libgit2/src/attrcache.c +449 -0
- data/vendor/libgit2/src/attrcache.h +38 -6
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +488 -0
- data/vendor/libgit2/src/blame.h +93 -0
- data/vendor/libgit2/src/blame_git.c +624 -0
- data/vendor/libgit2/src/blame_git.h +20 -0
- data/vendor/libgit2/src/blob.c +137 -92
- data/vendor/libgit2/src/blob.h +9 -0
- data/vendor/libgit2/src/branch.c +175 -156
- data/vendor/libgit2/src/buf_text.c +29 -14
- data/vendor/libgit2/src/buf_text.h +5 -4
- data/vendor/libgit2/src/buffer.c +158 -15
- data/vendor/libgit2/src/buffer.h +33 -20
- data/vendor/libgit2/src/cc-compat.h +8 -2
- data/vendor/libgit2/src/checkout.c +1081 -287
- data/vendor/libgit2/src/checkout.h +1 -1
- data/vendor/libgit2/src/cherrypick.c +226 -0
- data/vendor/libgit2/src/clone.c +297 -245
- data/vendor/libgit2/src/{compress.h → clone.h} +4 -8
- data/vendor/libgit2/src/commit.c +313 -101
- data/vendor/libgit2/src/commit.h +6 -3
- data/vendor/libgit2/src/commit_list.c +3 -3
- data/vendor/libgit2/src/commit_list.h +1 -1
- data/vendor/libgit2/src/common.h +74 -1
- data/vendor/libgit2/src/config.c +570 -145
- data/vendor/libgit2/src/config.h +39 -6
- data/vendor/libgit2/src/config_cache.c +32 -18
- data/vendor/libgit2/src/config_file.c +711 -424
- data/vendor/libgit2/src/config_file.h +4 -3
- data/vendor/libgit2/src/crlf.c +149 -109
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +719 -414
- data/vendor/libgit2/src/diff.h +52 -7
- data/vendor/libgit2/src/diff_driver.c +183 -85
- data/vendor/libgit2/src/diff_driver.h +1 -1
- data/vendor/libgit2/src/diff_file.c +65 -84
- data/vendor/libgit2/src/diff_file.h +12 -10
- data/vendor/libgit2/src/diff_patch.c +274 -333
- data/vendor/libgit2/src/diff_patch.h +10 -9
- data/vendor/libgit2/src/diff_print.c +381 -179
- data/vendor/libgit2/src/diff_stats.c +336 -0
- data/vendor/libgit2/src/diff_tform.c +393 -215
- data/vendor/libgit2/src/diff_xdiff.c +117 -42
- data/vendor/libgit2/src/errors.c +59 -4
- data/vendor/libgit2/src/fetch.c +40 -34
- data/vendor/libgit2/src/fetch.h +2 -5
- data/vendor/libgit2/src/fetchhead.c +14 -7
- data/vendor/libgit2/src/filebuf.c +13 -24
- data/vendor/libgit2/src/filebuf.h +3 -3
- data/vendor/libgit2/src/fileops.c +104 -296
- data/vendor/libgit2/src/fileops.h +23 -94
- data/vendor/libgit2/src/filter.c +642 -43
- data/vendor/libgit2/src/filter.h +7 -66
- data/vendor/libgit2/src/fnmatch.c +46 -3
- data/vendor/libgit2/src/fnmatch.h +24 -3
- data/vendor/libgit2/src/global.c +158 -42
- data/vendor/libgit2/src/global.h +9 -0
- data/vendor/libgit2/src/graph.c +34 -20
- data/vendor/libgit2/src/hash/hash_generic.h +0 -1
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -1
- data/vendor/libgit2/src/hash/hash_win32.c +14 -29
- data/vendor/libgit2/src/hash.h +0 -2
- data/vendor/libgit2/src/hashsig.c +97 -117
- data/vendor/libgit2/src/ident.c +125 -0
- data/vendor/libgit2/src/ignore.c +159 -110
- data/vendor/libgit2/src/ignore.h +13 -3
- data/vendor/libgit2/src/index.c +803 -445
- data/vendor/libgit2/src/index.h +43 -6
- data/vendor/libgit2/src/indexer.c +475 -157
- data/vendor/libgit2/src/iterator.c +198 -55
- data/vendor/libgit2/src/iterator.h +28 -4
- data/vendor/libgit2/src/map.h +1 -0
- data/vendor/libgit2/src/merge.c +849 -142
- data/vendor/libgit2/src/merge.h +11 -4
- data/vendor/libgit2/src/merge_file.c +183 -78
- data/vendor/libgit2/src/merge_file.h +0 -57
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/mwindow.c +117 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +164 -59
- data/vendor/libgit2/src/netops.h +37 -1
- data/vendor/libgit2/src/notes.c +9 -18
- data/vendor/libgit2/src/notes.h +1 -1
- data/vendor/libgit2/src/object.c +78 -2
- data/vendor/libgit2/src/odb.c +191 -59
- data/vendor/libgit2/src/odb.h +2 -1
- data/vendor/libgit2/src/odb_loose.c +66 -51
- data/vendor/libgit2/src/odb_mempack.c +182 -0
- data/vendor/libgit2/src/odb_pack.c +151 -61
- data/vendor/libgit2/src/oid.c +30 -19
- data/vendor/libgit2/src/oid.h +13 -10
- data/vendor/libgit2/src/pack-objects.c +198 -147
- data/vendor/libgit2/src/pack-objects.h +7 -0
- data/vendor/libgit2/src/pack.c +272 -101
- data/vendor/libgit2/src/pack.h +15 -1
- data/vendor/libgit2/src/path.c +359 -117
- data/vendor/libgit2/src/path.h +110 -20
- data/vendor/libgit2/src/pathspec.c +583 -57
- data/vendor/libgit2/src/pathspec.h +36 -15
- data/vendor/libgit2/src/pool.c +4 -5
- data/vendor/libgit2/src/posix.c +45 -2
- data/vendor/libgit2/src/posix.h +13 -5
- data/vendor/libgit2/src/pqueue.c +73 -119
- data/vendor/libgit2/src/pqueue.h +35 -82
- data/vendor/libgit2/src/push.c +116 -48
- data/vendor/libgit2/src/push.h +5 -0
- data/vendor/libgit2/src/refdb.c +45 -6
- data/vendor/libgit2/src/refdb.h +13 -3
- data/vendor/libgit2/src/refdb_fs.c +1130 -551
- data/vendor/libgit2/src/reflog.c +36 -327
- data/vendor/libgit2/src/reflog.h +6 -1
- data/vendor/libgit2/src/refs.c +345 -142
- data/vendor/libgit2/src/refs.h +9 -2
- data/vendor/libgit2/src/refspec.c +90 -62
- data/vendor/libgit2/src/refspec.h +7 -24
- data/vendor/libgit2/src/remote.c +815 -415
- data/vendor/libgit2/src/remote.h +3 -4
- data/vendor/libgit2/src/repository.c +360 -207
- data/vendor/libgit2/src/repository.h +16 -10
- data/vendor/libgit2/src/reset.c +28 -13
- data/vendor/libgit2/src/revert.c +228 -0
- data/vendor/libgit2/src/revparse.c +29 -30
- data/vendor/libgit2/src/revwalk.c +141 -96
- data/vendor/libgit2/src/revwalk.h +6 -1
- data/vendor/libgit2/src/settings.c +140 -0
- data/vendor/libgit2/src/sha1_lookup.c +71 -0
- data/vendor/libgit2/src/sha1_lookup.h +5 -0
- data/vendor/libgit2/src/signature.c +38 -10
- data/vendor/libgit2/src/sortedcache.c +378 -0
- data/vendor/libgit2/src/sortedcache.h +178 -0
- data/vendor/libgit2/src/stash.c +98 -116
- data/vendor/libgit2/src/status.c +88 -60
- data/vendor/libgit2/src/status.h +2 -2
- data/vendor/libgit2/src/strmap.c +32 -0
- data/vendor/libgit2/src/strmap.h +14 -1
- data/vendor/libgit2/src/strnlen.h +23 -0
- data/vendor/libgit2/src/submodule.c +1073 -615
- data/vendor/libgit2/src/submodule.h +89 -21
- data/vendor/libgit2/src/sysdir.c +252 -0
- data/vendor/libgit2/src/sysdir.h +101 -0
- data/vendor/libgit2/src/tag.c +31 -20
- data/vendor/libgit2/src/thread-utils.h +98 -17
- data/vendor/libgit2/src/trace.h +0 -2
- data/vendor/libgit2/src/transport.c +76 -6
- data/vendor/libgit2/src/transports/cred.c +164 -61
- data/vendor/libgit2/src/transports/git.c +41 -48
- data/vendor/libgit2/src/transports/http.c +65 -109
- data/vendor/libgit2/src/transports/local.c +88 -65
- data/vendor/libgit2/src/transports/smart.c +91 -19
- data/vendor/libgit2/src/transports/smart.h +13 -5
- data/vendor/libgit2/src/transports/smart_pkt.c +24 -14
- data/vendor/libgit2/src/transports/smart_protocol.c +268 -113
- data/vendor/libgit2/src/transports/ssh.c +284 -186
- data/vendor/libgit2/src/transports/winhttp.c +279 -198
- data/vendor/libgit2/src/tree-cache.c +21 -23
- data/vendor/libgit2/src/tree-cache.h +1 -0
- data/vendor/libgit2/src/tree.c +109 -92
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +7 -1
- data/vendor/libgit2/src/unix/posix.h +0 -1
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +16 -112
- data/vendor/libgit2/src/util.h +107 -3
- data/vendor/libgit2/src/vector.c +72 -17
- data/vendor/libgit2/src/vector.h +32 -5
- data/vendor/libgit2/src/win32/dir.c +15 -40
- data/vendor/libgit2/src/win32/dir.h +3 -2
- data/vendor/libgit2/src/win32/error.c +5 -31
- data/vendor/libgit2/src/win32/findfile.c +47 -66
- data/vendor/libgit2/src/win32/findfile.h +1 -12
- data/vendor/libgit2/src/win32/git2.rc +40 -0
- data/vendor/libgit2/src/win32/map.c +7 -1
- data/vendor/libgit2/src/win32/mingw-compat.h +3 -0
- data/vendor/libgit2/src/win32/posix.h +17 -11
- data/vendor/libgit2/src/win32/posix_w32.c +424 -292
- data/vendor/libgit2/src/win32/precompiled.h +6 -2
- data/vendor/libgit2/src/win32/pthread.c +141 -18
- data/vendor/libgit2/src/win32/pthread.h +50 -8
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/utf-conv.c +117 -60
- data/vendor/libgit2/src/win32/utf-conv.h +81 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_util.c +139 -0
- data/vendor/libgit2/src/win32/w32_util.h +54 -0
- data/vendor/libgit2/src/zstream.c +156 -0
- data/vendor/libgit2/src/zstream.h +39 -0
- metadata +84 -167
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/compress.c +0 -53
data/vendor/libgit2/src/buffer.c
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
*/
|
7
7
|
#include "buffer.h"
|
8
8
|
#include "posix.h"
|
9
|
-
#include
|
9
|
+
#include "git2/buffer.h"
|
10
10
|
#include <ctype.h>
|
11
11
|
|
12
12
|
/* Used as default value for git_buf->ptr so that people can always
|
@@ -31,7 +31,8 @@ void git_buf_init(git_buf *buf, size_t initial_size)
|
|
31
31
|
git_buf_grow(buf, initial_size);
|
32
32
|
}
|
33
33
|
|
34
|
-
int git_buf_try_grow(
|
34
|
+
int git_buf_try_grow(
|
35
|
+
git_buf *buf, size_t target_size, bool mark_oom, bool preserve_external)
|
35
36
|
{
|
36
37
|
char *new_ptr;
|
37
38
|
size_t new_size;
|
@@ -39,6 +40,9 @@ int git_buf_try_grow(git_buf *buf, size_t target_size, bool mark_oom)
|
|
39
40
|
if (buf->ptr == git_buf__oom)
|
40
41
|
return -1;
|
41
42
|
|
43
|
+
if (!target_size)
|
44
|
+
target_size = buf->size;
|
45
|
+
|
42
46
|
if (target_size <= buf->asize)
|
43
47
|
return 0;
|
44
48
|
|
@@ -61,11 +65,16 @@ int git_buf_try_grow(git_buf *buf, size_t target_size, bool mark_oom)
|
|
61
65
|
new_ptr = git__realloc(new_ptr, new_size);
|
62
66
|
|
63
67
|
if (!new_ptr) {
|
64
|
-
if (mark_oom)
|
68
|
+
if (mark_oom) {
|
69
|
+
if (buf->ptr) git__free(buf->ptr);
|
65
70
|
buf->ptr = git_buf__oom;
|
71
|
+
}
|
66
72
|
return -1;
|
67
73
|
}
|
68
74
|
|
75
|
+
if (preserve_external && !buf->asize && buf->ptr != NULL && buf->size > 0)
|
76
|
+
memcpy(new_ptr, buf->ptr, min(buf->size, new_size));
|
77
|
+
|
69
78
|
buf->asize = new_size;
|
70
79
|
buf->ptr = new_ptr;
|
71
80
|
|
@@ -77,24 +86,44 @@ int git_buf_try_grow(git_buf *buf, size_t target_size, bool mark_oom)
|
|
77
86
|
return 0;
|
78
87
|
}
|
79
88
|
|
89
|
+
int git_buf_grow(git_buf *buffer, size_t target_size)
|
90
|
+
{
|
91
|
+
return git_buf_try_grow(buffer, target_size, true, true);
|
92
|
+
}
|
93
|
+
|
80
94
|
void git_buf_free(git_buf *buf)
|
81
95
|
{
|
82
96
|
if (!buf) return;
|
83
97
|
|
84
|
-
if (buf->ptr !=
|
98
|
+
if (buf->asize > 0 && buf->ptr != NULL && buf->ptr != git_buf__oom)
|
85
99
|
git__free(buf->ptr);
|
86
100
|
|
87
101
|
git_buf_init(buf, 0);
|
88
102
|
}
|
89
103
|
|
104
|
+
void git_buf_sanitize(git_buf *buf)
|
105
|
+
{
|
106
|
+
if (buf->ptr == NULL) {
|
107
|
+
assert(buf->size == 0 && buf->asize == 0);
|
108
|
+
buf->ptr = git_buf__initbuf;
|
109
|
+
} else if (buf->asize > buf->size)
|
110
|
+
buf->ptr[buf->size] = '\0';
|
111
|
+
}
|
112
|
+
|
90
113
|
void git_buf_clear(git_buf *buf)
|
91
114
|
{
|
92
115
|
buf->size = 0;
|
116
|
+
|
117
|
+
if (!buf->ptr) {
|
118
|
+
buf->ptr = git_buf__initbuf;
|
119
|
+
buf->asize = 0;
|
120
|
+
}
|
121
|
+
|
93
122
|
if (buf->asize > 0)
|
94
123
|
buf->ptr[0] = '\0';
|
95
124
|
}
|
96
125
|
|
97
|
-
int git_buf_set(git_buf *buf, const
|
126
|
+
int git_buf_set(git_buf *buf, const void *data, size_t len)
|
98
127
|
{
|
99
128
|
if (len == 0 || data == NULL) {
|
100
129
|
git_buf_clear(buf);
|
@@ -103,8 +132,11 @@ int git_buf_set(git_buf *buf, const char *data, size_t len)
|
|
103
132
|
ENSURE_SIZE(buf, len + 1);
|
104
133
|
memmove(buf->ptr, data, len);
|
105
134
|
}
|
135
|
+
|
106
136
|
buf->size = len;
|
107
|
-
buf->
|
137
|
+
if (buf->asize > buf->size)
|
138
|
+
buf->ptr[buf->size] = '\0';
|
139
|
+
|
108
140
|
}
|
109
141
|
return 0;
|
110
142
|
}
|
@@ -122,6 +154,15 @@ int git_buf_putc(git_buf *buf, char c)
|
|
122
154
|
return 0;
|
123
155
|
}
|
124
156
|
|
157
|
+
int git_buf_putcn(git_buf *buf, char c, size_t len)
|
158
|
+
{
|
159
|
+
ENSURE_SIZE(buf, buf->size + len + 1);
|
160
|
+
memset(buf->ptr + buf->size, c, len);
|
161
|
+
buf->size += len;
|
162
|
+
buf->ptr[buf->size] = '\0';
|
163
|
+
return 0;
|
164
|
+
}
|
165
|
+
|
125
166
|
int git_buf_put(git_buf *buf, const char *data, size_t len)
|
126
167
|
{
|
127
168
|
ENSURE_SIZE(buf, buf->size + len + 1);
|
@@ -137,7 +178,7 @@ int git_buf_puts(git_buf *buf, const char *string)
|
|
137
178
|
return git_buf_put(buf, string, strlen(string));
|
138
179
|
}
|
139
180
|
|
140
|
-
static const char b64str[
|
181
|
+
static const char b64str[] =
|
141
182
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
142
183
|
|
143
184
|
int git_buf_put_base64(git_buf *buf, const char *data, size_t len)
|
@@ -177,6 +218,42 @@ int git_buf_put_base64(git_buf *buf, const char *data, size_t len)
|
|
177
218
|
return 0;
|
178
219
|
}
|
179
220
|
|
221
|
+
static const char b85str[] =
|
222
|
+
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~";
|
223
|
+
|
224
|
+
int git_buf_put_base85(git_buf *buf, const char *data, size_t len)
|
225
|
+
{
|
226
|
+
ENSURE_SIZE(buf, buf->size + (5 * ((len / 4) + !!(len % 4))) + 1);
|
227
|
+
|
228
|
+
while (len) {
|
229
|
+
uint32_t acc = 0;
|
230
|
+
char b85[5];
|
231
|
+
int i;
|
232
|
+
|
233
|
+
for (i = 24; i >= 0; i -= 8) {
|
234
|
+
uint8_t ch = *data++;
|
235
|
+
acc |= ch << i;
|
236
|
+
|
237
|
+
if (--len == 0)
|
238
|
+
break;
|
239
|
+
}
|
240
|
+
|
241
|
+
for (i = 4; i >= 0; i--) {
|
242
|
+
int val = acc % 85;
|
243
|
+
acc /= 85;
|
244
|
+
|
245
|
+
b85[i] = b85str[val];
|
246
|
+
}
|
247
|
+
|
248
|
+
for (i = 0; i < 5; i++)
|
249
|
+
buf->ptr[buf->size++] = b85[i];
|
250
|
+
}
|
251
|
+
|
252
|
+
buf->ptr[buf->size] = '\0';
|
253
|
+
|
254
|
+
return 0;
|
255
|
+
}
|
256
|
+
|
180
257
|
int git_buf_vprintf(git_buf *buf, const char *format, va_list ap)
|
181
258
|
{
|
182
259
|
int len;
|
@@ -194,6 +271,8 @@ int git_buf_vprintf(git_buf *buf, const char *format, va_list ap)
|
|
194
271
|
format, args
|
195
272
|
);
|
196
273
|
|
274
|
+
va_end(args);
|
275
|
+
|
197
276
|
if (len < 0) {
|
198
277
|
git__free(buf->ptr);
|
199
278
|
buf->ptr = git_buf__oom;
|
@@ -253,10 +332,20 @@ void git_buf_consume(git_buf *buf, const char *end)
|
|
253
332
|
|
254
333
|
void git_buf_truncate(git_buf *buf, size_t len)
|
255
334
|
{
|
256
|
-
if (len
|
257
|
-
|
335
|
+
if (len >= buf->size)
|
336
|
+
return;
|
337
|
+
|
338
|
+
buf->size = len;
|
339
|
+
if (buf->size < buf->asize)
|
258
340
|
buf->ptr[buf->size] = '\0';
|
259
|
-
|
341
|
+
}
|
342
|
+
|
343
|
+
void git_buf_shorten(git_buf *buf, size_t amount)
|
344
|
+
{
|
345
|
+
if (buf->size > amount)
|
346
|
+
git_buf_truncate(buf, buf->size - amount);
|
347
|
+
else
|
348
|
+
git_buf_clear(buf);
|
260
349
|
}
|
261
350
|
|
262
351
|
void git_buf_rtruncate_at_char(git_buf *buf, char separator)
|
@@ -396,7 +485,7 @@ int git_buf_join(
|
|
396
485
|
ssize_t offset_a = -1;
|
397
486
|
|
398
487
|
/* not safe to have str_b point internally to the buffer */
|
399
|
-
assert(str_b < buf->ptr || str_b
|
488
|
+
assert(str_b < buf->ptr || str_b >= buf->ptr + buf->size);
|
400
489
|
|
401
490
|
/* figure out if we need to insert a separator */
|
402
491
|
if (separator && strlen_a) {
|
@@ -411,13 +500,14 @@ int git_buf_join(
|
|
411
500
|
|
412
501
|
if (git_buf_grow(buf, strlen_a + strlen_b + need_sep + 1) < 0)
|
413
502
|
return -1;
|
503
|
+
assert(buf->ptr);
|
414
504
|
|
415
505
|
/* fix up internal pointers */
|
416
506
|
if (offset_a >= 0)
|
417
507
|
str_a = buf->ptr + offset_a;
|
418
508
|
|
419
509
|
/* do the actual copying */
|
420
|
-
if (offset_a != 0)
|
510
|
+
if (offset_a != 0 && str_a)
|
421
511
|
memmove(buf->ptr, str_a, strlen_a);
|
422
512
|
if (need_sep)
|
423
513
|
buf->ptr[strlen_a] = separator;
|
@@ -429,6 +519,59 @@ int git_buf_join(
|
|
429
519
|
return 0;
|
430
520
|
}
|
431
521
|
|
522
|
+
int git_buf_join3(
|
523
|
+
git_buf *buf,
|
524
|
+
char separator,
|
525
|
+
const char *str_a,
|
526
|
+
const char *str_b,
|
527
|
+
const char *str_c)
|
528
|
+
{
|
529
|
+
size_t len_a = strlen(str_a), len_b = strlen(str_b), len_c = strlen(str_c);
|
530
|
+
int sep_a = 0, sep_b = 0;
|
531
|
+
char *tgt;
|
532
|
+
|
533
|
+
/* for this function, disallow pointers into the existing buffer */
|
534
|
+
assert(str_a < buf->ptr || str_a >= buf->ptr + buf->size);
|
535
|
+
assert(str_b < buf->ptr || str_b >= buf->ptr + buf->size);
|
536
|
+
assert(str_c < buf->ptr || str_c >= buf->ptr + buf->size);
|
537
|
+
|
538
|
+
if (separator) {
|
539
|
+
if (len_a > 0) {
|
540
|
+
while (*str_b == separator) { str_b++; len_b--; }
|
541
|
+
sep_a = (str_a[len_a - 1] != separator);
|
542
|
+
}
|
543
|
+
if (len_a > 0 || len_b > 0)
|
544
|
+
while (*str_c == separator) { str_c++; len_c--; }
|
545
|
+
if (len_b > 0)
|
546
|
+
sep_b = (str_b[len_b - 1] != separator);
|
547
|
+
}
|
548
|
+
|
549
|
+
if (git_buf_grow(buf, len_a + sep_a + len_b + sep_b + len_c + 1) < 0)
|
550
|
+
return -1;
|
551
|
+
|
552
|
+
tgt = buf->ptr;
|
553
|
+
|
554
|
+
if (len_a) {
|
555
|
+
memcpy(tgt, str_a, len_a);
|
556
|
+
tgt += len_a;
|
557
|
+
}
|
558
|
+
if (sep_a)
|
559
|
+
*tgt++ = separator;
|
560
|
+
if (len_b) {
|
561
|
+
memcpy(tgt, str_b, len_b);
|
562
|
+
tgt += len_b;
|
563
|
+
}
|
564
|
+
if (sep_b)
|
565
|
+
*tgt++ = separator;
|
566
|
+
if (len_c)
|
567
|
+
memcpy(tgt, str_c, len_c);
|
568
|
+
|
569
|
+
buf->size = len_a + sep_a + len_b + sep_b + len_c;
|
570
|
+
buf->ptr[buf->size] = '\0';
|
571
|
+
|
572
|
+
return 0;
|
573
|
+
}
|
574
|
+
|
432
575
|
void git_buf_rtrim(git_buf *buf)
|
433
576
|
{
|
434
577
|
while (buf->size > 0) {
|
@@ -438,7 +581,8 @@ void git_buf_rtrim(git_buf *buf)
|
|
438
581
|
buf->size--;
|
439
582
|
}
|
440
583
|
|
441
|
-
buf->
|
584
|
+
if (buf->asize > buf->size)
|
585
|
+
buf->ptr[buf->size] = '\0';
|
442
586
|
}
|
443
587
|
|
444
588
|
int git_buf_cmp(const git_buf *a, const git_buf *b)
|
@@ -462,8 +606,7 @@ int git_buf_splice(
|
|
462
606
|
/* Ported from git.git
|
463
607
|
* https://github.com/git/git/blob/16eed7c/strbuf.c#L159-176
|
464
608
|
*/
|
465
|
-
|
466
|
-
return -1;
|
609
|
+
ENSURE_SIZE(buf, buf->size + nb_to_insert - nb_to_insert + 1);
|
467
610
|
|
468
611
|
memmove(buf->ptr + where + nb_to_insert,
|
469
612
|
buf->ptr + where + nb_to_remove,
|
data/vendor/libgit2/src/buffer.h
CHANGED
@@ -9,18 +9,25 @@
|
|
9
9
|
|
10
10
|
#include "common.h"
|
11
11
|
#include "git2/strarray.h"
|
12
|
-
#include
|
12
|
+
#include "git2/buffer.h"
|
13
13
|
|
14
|
-
typedef struct {
|
15
|
-
|
16
|
-
|
17
|
-
} git_buf;
|
14
|
+
/* typedef struct {
|
15
|
+
* char *ptr;
|
16
|
+
* size_t asize, size;
|
17
|
+
* } git_buf;
|
18
|
+
*/
|
18
19
|
|
19
20
|
extern char git_buf__initbuf[];
|
20
21
|
extern char git_buf__oom[];
|
21
22
|
|
23
|
+
/* Use to initialize buffer structure when git_buf is on stack */
|
22
24
|
#define GIT_BUF_INIT { git_buf__initbuf, 0, 0 }
|
23
25
|
|
26
|
+
GIT_INLINE(bool) git_buf_is_allocated(const git_buf *buf)
|
27
|
+
{
|
28
|
+
return (buf->ptr != NULL && buf->asize > 0);
|
29
|
+
}
|
30
|
+
|
24
31
|
/**
|
25
32
|
* Initialize a git_buf structure.
|
26
33
|
*
|
@@ -32,27 +39,25 @@ extern void git_buf_init(git_buf *buf, size_t initial_size);
|
|
32
39
|
/**
|
33
40
|
* Attempt to grow the buffer to hold at least `target_size` bytes.
|
34
41
|
*
|
35
|
-
* If the allocation fails, this will return an error. If mark_oom is true,
|
42
|
+
* If the allocation fails, this will return an error. If `mark_oom` is true,
|
36
43
|
* this will mark the buffer as invalid for future operations; if false,
|
37
44
|
* existing buffer content will be preserved, but calling code must handle
|
38
|
-
* that buffer was not expanded.
|
45
|
+
* that buffer was not expanded. If `preserve_external` is true, then any
|
46
|
+
* existing data pointed to be `ptr` even if `asize` is zero will be copied
|
47
|
+
* into the newly allocated buffer.
|
39
48
|
*/
|
40
|
-
extern int git_buf_try_grow(
|
49
|
+
extern int git_buf_try_grow(
|
50
|
+
git_buf *buf, size_t target_size, bool mark_oom, bool preserve_external);
|
41
51
|
|
42
52
|
/**
|
43
|
-
*
|
44
|
-
*
|
45
|
-
*
|
46
|
-
*
|
47
|
-
*
|
48
|
-
* @return 0 on success or -1 on failure
|
53
|
+
* Sanitizes git_buf structures provided from user input. Users of the
|
54
|
+
* library, when providing git_buf's, may wish to provide a NULL ptr for
|
55
|
+
* ease of handling. The buffer routines, however, expect a non-NULL ptr
|
56
|
+
* always. This helper method simply handles NULL input, converting to a
|
57
|
+
* git_buf__initbuf.
|
49
58
|
*/
|
50
|
-
|
51
|
-
{
|
52
|
-
return git_buf_try_grow(buf, target_size, true);
|
53
|
-
}
|
59
|
+
extern void git_buf_sanitize(git_buf *buf);
|
54
60
|
|
55
|
-
extern void git_buf_free(git_buf *buf);
|
56
61
|
extern void git_buf_swap(git_buf *buf_a, git_buf *buf_b);
|
57
62
|
extern char *git_buf_detach(git_buf *buf);
|
58
63
|
extern void git_buf_attach(git_buf *buf, char *ptr, size_t asize);
|
@@ -81,9 +86,9 @@ GIT_INLINE(bool) git_buf_oom(const git_buf *buf)
|
|
81
86
|
* return code of these functions and call them in a series then just call
|
82
87
|
* git_buf_oom at the end.
|
83
88
|
*/
|
84
|
-
int git_buf_set(git_buf *buf, const char *data, size_t len);
|
85
89
|
int git_buf_sets(git_buf *buf, const char *string);
|
86
90
|
int git_buf_putc(git_buf *buf, char c);
|
91
|
+
int git_buf_putcn(git_buf *buf, char c, size_t len);
|
87
92
|
int git_buf_put(git_buf *buf, const char *data, size_t len);
|
88
93
|
int git_buf_puts(git_buf *buf, const char *string);
|
89
94
|
int git_buf_printf(git_buf *buf, const char *format, ...) GIT_FORMAT_PRINTF(2, 3);
|
@@ -91,10 +96,15 @@ int git_buf_vprintf(git_buf *buf, const char *format, va_list ap);
|
|
91
96
|
void git_buf_clear(git_buf *buf);
|
92
97
|
void git_buf_consume(git_buf *buf, const char *end);
|
93
98
|
void git_buf_truncate(git_buf *buf, size_t len);
|
99
|
+
void git_buf_shorten(git_buf *buf, size_t amount);
|
94
100
|
void git_buf_rtruncate_at_char(git_buf *path, char separator);
|
95
101
|
|
102
|
+
/** General join with separator */
|
96
103
|
int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...);
|
104
|
+
/** Fast join of two strings - first may legally point into `buf` data */
|
97
105
|
int git_buf_join(git_buf *buf, char separator, const char *str_a, const char *str_b);
|
106
|
+
/** Fast join of three strings - cannot reference `buf` data */
|
107
|
+
int git_buf_join3(git_buf *buf, char separator, const char *str_a, const char *str_b, const char *str_c);
|
98
108
|
|
99
109
|
/**
|
100
110
|
* Join two strings as paths, inserting a slash between as needed.
|
@@ -148,6 +158,9 @@ int git_buf_cmp(const git_buf *a, const git_buf *b);
|
|
148
158
|
/* Write data as base64 encoded in buffer */
|
149
159
|
int git_buf_put_base64(git_buf *buf, const char *data, size_t len);
|
150
160
|
|
161
|
+
/* Write data as "base85" encoded in buffer */
|
162
|
+
int git_buf_put_base85(git_buf *buf, const char *data, size_t len);
|
163
|
+
|
151
164
|
/*
|
152
165
|
* Insert, remove or replace a portion of the buffer.
|
153
166
|
*
|
@@ -7,6 +7,8 @@
|
|
7
7
|
#ifndef INCLUDE_compat_h__
|
8
8
|
#define INCLUDE_compat_h__
|
9
9
|
|
10
|
+
#include <stdarg.h>
|
11
|
+
|
10
12
|
/*
|
11
13
|
* See if our compiler is known to support flexible array members.
|
12
14
|
*/
|
@@ -54,8 +56,12 @@
|
|
54
56
|
|
55
57
|
#if defined (_MSC_VER)
|
56
58
|
typedef unsigned char bool;
|
57
|
-
#
|
58
|
-
#
|
59
|
+
# ifndef true
|
60
|
+
# define true 1
|
61
|
+
# endif
|
62
|
+
# ifndef false
|
63
|
+
# define false 0
|
64
|
+
# endif
|
59
65
|
#else
|
60
66
|
# include <stdbool.h>
|
61
67
|
#endif
|