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
@@ -8,9 +8,35 @@
|
|
8
8
|
#define INCLUDE_pathspec_h__
|
9
9
|
|
10
10
|
#include "common.h"
|
11
|
+
#include <git2/pathspec.h>
|
11
12
|
#include "buffer.h"
|
12
13
|
#include "vector.h"
|
13
14
|
#include "pool.h"
|
15
|
+
#include "array.h"
|
16
|
+
|
17
|
+
/* public compiled pathspec */
|
18
|
+
struct git_pathspec {
|
19
|
+
git_refcount rc;
|
20
|
+
char *prefix;
|
21
|
+
git_vector pathspec;
|
22
|
+
git_pool pool;
|
23
|
+
};
|
24
|
+
|
25
|
+
enum {
|
26
|
+
PATHSPEC_DATATYPE_STRINGS = 0,
|
27
|
+
PATHSPEC_DATATYPE_DIFF = 1,
|
28
|
+
};
|
29
|
+
|
30
|
+
typedef git_array_t(char *) git_pathspec_string_array_t;
|
31
|
+
|
32
|
+
/* public interface to pathspec matching */
|
33
|
+
struct git_pathspec_match_list {
|
34
|
+
git_pathspec *pathspec;
|
35
|
+
git_array_t(void *) matches;
|
36
|
+
git_pathspec_string_array_t failures;
|
37
|
+
git_pool pool;
|
38
|
+
int datatype;
|
39
|
+
};
|
14
40
|
|
15
41
|
/* what is the common non-wildcard prefix for all items in the pathspec */
|
16
42
|
extern char *git_pathspec_prefix(const git_strarray *pathspec);
|
@@ -19,36 +45,31 @@ extern char *git_pathspec_prefix(const git_strarray *pathspec);
|
|
19
45
|
extern bool git_pathspec_is_empty(const git_strarray *pathspec);
|
20
46
|
|
21
47
|
/* build a vector of fnmatch patterns to evaluate efficiently */
|
22
|
-
extern int
|
48
|
+
extern int git_pathspec__vinit(
|
23
49
|
git_vector *vspec, const git_strarray *strspec, git_pool *strpool);
|
24
50
|
|
25
51
|
/* free data from the pathspec vector */
|
26
|
-
extern void
|
52
|
+
extern void git_pathspec__vfree(git_vector *vspec);
|
53
|
+
|
54
|
+
#define GIT_PATHSPEC_NOMATCH ((size_t)-1)
|
27
55
|
|
28
56
|
/*
|
29
57
|
* Match a path against the vectorized pathspec.
|
30
58
|
* The matched pathspec is passed back into the `matched_pathspec` parameter,
|
31
59
|
* unless it is passed as NULL by the caller.
|
32
60
|
*/
|
33
|
-
extern bool
|
34
|
-
git_vector *vspec,
|
61
|
+
extern bool git_pathspec__match(
|
62
|
+
const git_vector *vspec,
|
35
63
|
const char *path,
|
36
64
|
bool disable_fnmatch,
|
37
65
|
bool casefold,
|
38
|
-
const char **matched_pathspec
|
66
|
+
const char **matched_pathspec,
|
67
|
+
size_t *matched_at);
|
39
68
|
|
40
69
|
/* easy pathspec setup */
|
41
70
|
|
42
|
-
|
43
|
-
char *prefix;
|
44
|
-
git_vector pathspec;
|
45
|
-
git_pool pool;
|
46
|
-
} git_pathspec_context;
|
47
|
-
|
48
|
-
extern int git_pathspec_context_init(
|
49
|
-
git_pathspec_context *ctxt, const git_strarray *paths);
|
71
|
+
extern int git_pathspec__init(git_pathspec *ps, const git_strarray *paths);
|
50
72
|
|
51
|
-
extern void
|
52
|
-
git_pathspec_context *ctxt);
|
73
|
+
extern void git_pathspec__clear(git_pathspec *ps);
|
53
74
|
|
54
75
|
#endif
|
data/vendor/libgit2/src/pool.c
CHANGED
@@ -190,19 +190,18 @@ void *git_pool_malloc(git_pool *pool, uint32_t items)
|
|
190
190
|
|
191
191
|
char *git_pool_strndup(git_pool *pool, const char *str, size_t n)
|
192
192
|
{
|
193
|
-
|
193
|
+
char *ptr = NULL;
|
194
194
|
|
195
195
|
assert(pool && str && pool->item_size == sizeof(char));
|
196
196
|
|
197
|
-
if (n + 1
|
198
|
-
giterr_set_oom();
|
197
|
+
if ((uint32_t)(n + 1) < n)
|
199
198
|
return NULL;
|
200
|
-
}
|
201
199
|
|
202
200
|
if ((ptr = git_pool_malloc(pool, (uint32_t)(n + 1))) != NULL) {
|
203
201
|
memcpy(ptr, str, n);
|
204
|
-
|
202
|
+
ptr[n] = '\0';
|
205
203
|
}
|
204
|
+
|
206
205
|
pool->has_string_alloc = 1;
|
207
206
|
|
208
207
|
return ptr;
|
data/vendor/libgit2/src/posix.c
CHANGED
@@ -99,7 +99,7 @@ const char *p_gai_strerror(int ret)
|
|
99
99
|
|
100
100
|
#endif /* NO_ADDRINFO */
|
101
101
|
|
102
|
-
int p_open(const char *path, int flags, ...)
|
102
|
+
int p_open(const char *path, volatile int flags, ...)
|
103
103
|
{
|
104
104
|
mode_t mode = 0;
|
105
105
|
|
@@ -189,7 +189,7 @@ int p_write(git_file fd, const void *buf, size_t cnt)
|
|
189
189
|
r = write(fd, b, cnt);
|
190
190
|
#endif
|
191
191
|
if (r < 0) {
|
192
|
-
if (errno == EINTR || errno
|
192
|
+
if (errno == EINTR || GIT_ISBLOCKED(errno))
|
193
193
|
continue;
|
194
194
|
return -1;
|
195
195
|
}
|
@@ -203,4 +203,47 @@ int p_write(git_file fd, const void *buf, size_t cnt)
|
|
203
203
|
return 0;
|
204
204
|
}
|
205
205
|
|
206
|
+
#ifdef NO_MMAP
|
207
|
+
|
208
|
+
#include "map.h"
|
209
|
+
|
210
|
+
long git__page_size(void)
|
211
|
+
{
|
212
|
+
/* dummy; here we don't need any alignment anyway */
|
213
|
+
return 4096;
|
214
|
+
}
|
215
|
+
|
216
|
+
|
217
|
+
int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)
|
218
|
+
{
|
219
|
+
GIT_MMAP_VALIDATE(out, len, prot, flags);
|
220
|
+
|
221
|
+
out->data = NULL;
|
222
|
+
out->len = 0;
|
223
|
+
|
224
|
+
if ((prot & GIT_PROT_WRITE) && ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED)) {
|
225
|
+
giterr_set(GITERR_OS, "Trying to map shared-writeable");
|
226
|
+
return -1;
|
227
|
+
}
|
228
|
+
|
229
|
+
out->data = malloc(len);
|
230
|
+
GITERR_CHECK_ALLOC(out->data);
|
206
231
|
|
232
|
+
if ((p_lseek(fd, offset, SEEK_SET) < 0) || ((size_t)p_read(fd, out->data, len) != len)) {
|
233
|
+
giterr_set(GITERR_OS, "mmap emulation failed");
|
234
|
+
return -1;
|
235
|
+
}
|
236
|
+
|
237
|
+
out->len = len;
|
238
|
+
return 0;
|
239
|
+
}
|
240
|
+
|
241
|
+
int p_munmap(git_map *map)
|
242
|
+
{
|
243
|
+
assert(map != NULL);
|
244
|
+
free(map->data);
|
245
|
+
|
246
|
+
return 0;
|
247
|
+
}
|
248
|
+
|
249
|
+
#endif
|
data/vendor/libgit2/src/posix.h
CHANGED
@@ -29,6 +29,15 @@
|
|
29
29
|
#define O_CLOEXEC 0
|
30
30
|
#endif
|
31
31
|
|
32
|
+
/* Determine whether an errno value indicates that a read or write failed
|
33
|
+
* because the descriptor is blocked.
|
34
|
+
*/
|
35
|
+
#if defined(EWOULDBLOCK)
|
36
|
+
#define GIT_ISBLOCKED(e) ((e) == EAGAIN || (e) == EWOULDBLOCK)
|
37
|
+
#else
|
38
|
+
#define GIT_ISBLOCKED(e) ((e) == EAGAIN)
|
39
|
+
#endif
|
40
|
+
|
32
41
|
typedef int git_file;
|
33
42
|
|
34
43
|
/**
|
@@ -39,7 +48,7 @@ typedef int git_file;
|
|
39
48
|
*
|
40
49
|
* Some of the methods are slightly wrapped to provide
|
41
50
|
* saner defaults. Some of these methods are emulated
|
42
|
-
* in Windows
|
51
|
+
* in Windows platforms.
|
43
52
|
*
|
44
53
|
* Use your manpages to check the docs on these.
|
45
54
|
*/
|
@@ -64,6 +73,7 @@ extern int p_rename(const char *from, const char *to);
|
|
64
73
|
#define p_rmdir(p) rmdir(p)
|
65
74
|
#define p_chmod(p,m) chmod(p, m)
|
66
75
|
#define p_access(p,m) access(p,m)
|
76
|
+
#define p_ftruncate(fd, sz) ftruncate(fd, sz)
|
67
77
|
#define p_recv(s,b,l,f) recv(s,b,l,f)
|
68
78
|
#define p_send(s,b,l,f) send(s,b,l,f)
|
69
79
|
typedef int GIT_SOCKET;
|
@@ -71,16 +81,12 @@ typedef int GIT_SOCKET;
|
|
71
81
|
|
72
82
|
#define p_localtime_r localtime_r
|
73
83
|
#define p_gmtime_r gmtime_r
|
74
|
-
#define p_gettimeofday gettimeofday
|
75
84
|
|
76
85
|
#else
|
77
86
|
|
78
87
|
typedef SOCKET GIT_SOCKET;
|
79
|
-
struct timezone;
|
80
88
|
extern struct tm * p_localtime_r (const time_t *timer, struct tm *result);
|
81
89
|
extern struct tm * p_gmtime_r (const time_t *timer, struct tm *result);
|
82
|
-
extern int p_gettimeofday(struct timeval *tv, struct timezone *tz);
|
83
|
-
|
84
90
|
|
85
91
|
#endif
|
86
92
|
|
@@ -93,6 +99,8 @@ extern int p_gettimeofday(struct timeval *tv, struct timezone *tz);
|
|
93
99
|
# include "unix/posix.h"
|
94
100
|
#endif
|
95
101
|
|
102
|
+
#include "strnlen.h"
|
103
|
+
|
96
104
|
#ifdef NO_READDIR_R
|
97
105
|
# include <dirent.h>
|
98
106
|
GIT_INLINE(int) p_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
|
data/vendor/libgit2/src/pqueue.c
CHANGED
@@ -3,161 +3,115 @@
|
|
3
3
|
*
|
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
|
-
*
|
7
|
-
* This file is based on a modified version of the priority queue found
|
8
|
-
* in the Apache project and libpqueue library.
|
9
|
-
*
|
10
|
-
* https://github.com/vy/libpqueue
|
11
|
-
*
|
12
|
-
* Original file notice:
|
13
|
-
*
|
14
|
-
* Copyright 2010 Volkan Yazici <volkan.yazici@gmail.com>
|
15
|
-
* Copyright 2006-2010 The Apache Software Foundation
|
16
|
-
*
|
17
|
-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
18
|
-
* use this file except in compliance with the License. You may obtain a copy of
|
19
|
-
* the License at
|
20
|
-
*
|
21
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
22
|
-
*
|
23
|
-
* Unless required by applicable law or agreed to in writing, software
|
24
|
-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
25
|
-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
26
|
-
* License for the specific language governing permissions and limitations under
|
27
|
-
* the License.
|
28
6
|
*/
|
29
7
|
|
30
|
-
#include "common.h"
|
31
8
|
#include "pqueue.h"
|
9
|
+
#include "util.h"
|
32
10
|
|
33
|
-
#define
|
34
|
-
#define
|
35
|
-
#define
|
11
|
+
#define PQUEUE_LCHILD_OF(I) (((I)<<1)+1)
|
12
|
+
#define PQUEUE_RCHILD_OF(I) (((I)<<1)+2)
|
13
|
+
#define PQUEUE_PARENT_OF(I) (((I)-1)>>1)
|
36
14
|
|
37
|
-
int git_pqueue_init(
|
15
|
+
int git_pqueue_init(
|
16
|
+
git_pqueue *pq,
|
17
|
+
uint32_t flags,
|
18
|
+
size_t init_size,
|
19
|
+
git_vector_cmp cmp)
|
38
20
|
{
|
39
|
-
|
21
|
+
int error = git_vector_init(pq, init_size, cmp);
|
40
22
|
|
41
|
-
|
42
|
-
|
43
|
-
|
23
|
+
if (!error) {
|
24
|
+
/* mix in our flags */
|
25
|
+
pq->flags |= flags;
|
44
26
|
|
45
|
-
|
46
|
-
|
47
|
-
|
27
|
+
/* if fixed size heap, pretend vector is exactly init_size elements */
|
28
|
+
if ((flags & GIT_PQUEUE_FIXED_SIZE) && init_size > 0)
|
29
|
+
pq->_alloc_size = init_size;
|
30
|
+
}
|
48
31
|
|
49
|
-
return
|
32
|
+
return error;
|
50
33
|
}
|
51
34
|
|
52
|
-
|
53
|
-
void git_pqueue_free(git_pqueue *q)
|
35
|
+
static void pqueue_up(git_pqueue *pq, size_t el)
|
54
36
|
{
|
55
|
-
|
56
|
-
|
57
|
-
}
|
37
|
+
size_t parent_el = PQUEUE_PARENT_OF(el);
|
38
|
+
void *kid = git_vector_get(pq, el);
|
58
39
|
|
59
|
-
|
60
|
-
|
61
|
-
q->size = 1;
|
62
|
-
}
|
40
|
+
while (el > 0) {
|
41
|
+
void *parent = pq->contents[parent_el];
|
63
42
|
|
64
|
-
|
65
|
-
|
66
|
-
/* queue element 0 exists but doesn't count since it isn't used. */
|
67
|
-
return (q->size - 1);
|
68
|
-
}
|
43
|
+
if (pq->_cmp(parent, kid) <= 0)
|
44
|
+
break;
|
69
45
|
|
46
|
+
pq->contents[el] = parent;
|
70
47
|
|
71
|
-
|
72
|
-
|
73
|
-
size_t parent_node;
|
74
|
-
void *moving_node = q->d[i];
|
75
|
-
|
76
|
-
for (parent_node = parent(i);
|
77
|
-
((i > 1) && q->cmppri(q->d[parent_node], moving_node));
|
78
|
-
i = parent_node, parent_node = parent(i)) {
|
79
|
-
q->d[i] = q->d[parent_node];
|
48
|
+
el = parent_el;
|
49
|
+
parent_el = PQUEUE_PARENT_OF(el);
|
80
50
|
}
|
81
51
|
|
82
|
-
|
52
|
+
pq->contents[el] = kid;
|
83
53
|
}
|
84
54
|
|
85
|
-
|
86
|
-
static size_t maxchild(git_pqueue *q, size_t i)
|
55
|
+
static void pqueue_down(git_pqueue *pq, size_t el)
|
87
56
|
{
|
88
|
-
|
57
|
+
void *parent = git_vector_get(pq, el), *kid, *rkid;
|
89
58
|
|
90
|
-
|
91
|
-
|
59
|
+
while (1) {
|
60
|
+
size_t kid_el = PQUEUE_LCHILD_OF(el);
|
92
61
|
|
93
|
-
|
94
|
-
|
95
|
-
child_node++; /* use right child instead of left */
|
62
|
+
if ((kid = git_vector_get(pq, kid_el)) == NULL)
|
63
|
+
break;
|
96
64
|
|
97
|
-
|
98
|
-
|
65
|
+
if ((rkid = git_vector_get(pq, kid_el + 1)) != NULL &&
|
66
|
+
pq->_cmp(kid, rkid) > 0) {
|
67
|
+
kid = rkid;
|
68
|
+
kid_el += 1;
|
69
|
+
}
|
99
70
|
|
71
|
+
if (pq->_cmp(parent, kid) <= 0)
|
72
|
+
break;
|
100
73
|
|
101
|
-
|
102
|
-
|
103
|
-
size_t child_node;
|
104
|
-
void *moving_node = q->d[i];
|
105
|
-
|
106
|
-
while ((child_node = maxchild(q, i)) != 0 &&
|
107
|
-
q->cmppri(moving_node, q->d[child_node])) {
|
108
|
-
q->d[i] = q->d[child_node];
|
109
|
-
i = child_node;
|
74
|
+
pq->contents[el] = kid;
|
75
|
+
el = kid_el;
|
110
76
|
}
|
111
77
|
|
112
|
-
|
78
|
+
pq->contents[el] = parent;
|
113
79
|
}
|
114
80
|
|
115
|
-
|
116
|
-
int git_pqueue_insert(git_pqueue *q, void *d)
|
81
|
+
int git_pqueue_insert(git_pqueue *pq, void *item)
|
117
82
|
{
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
q->d = tmp;
|
131
|
-
q->avail = newsize;
|
83
|
+
int error = 0;
|
84
|
+
|
85
|
+
/* if heap is full, pop the top element if new one should replace it */
|
86
|
+
if ((pq->flags & GIT_PQUEUE_FIXED_SIZE) != 0 &&
|
87
|
+
pq->length >= pq->_alloc_size)
|
88
|
+
{
|
89
|
+
/* skip this item if below min item in heap */
|
90
|
+
if (pq->_cmp(item, git_vector_get(pq, 0)) <= 0)
|
91
|
+
return 0;
|
92
|
+
/* otherwise remove the min item before inserting new */
|
93
|
+
(void)git_pqueue_pop(pq);
|
132
94
|
}
|
133
95
|
|
134
|
-
|
135
|
-
|
136
|
-
q->d[i] = d;
|
137
|
-
bubble_up(q, i);
|
96
|
+
if (!(error = git_vector_insert(pq, item)))
|
97
|
+
pqueue_up(pq, pq->length - 1);
|
138
98
|
|
139
|
-
return
|
99
|
+
return error;
|
140
100
|
}
|
141
101
|
|
142
|
-
|
143
|
-
void *git_pqueue_pop(git_pqueue *q)
|
102
|
+
void *git_pqueue_pop(git_pqueue *pq)
|
144
103
|
{
|
145
|
-
void *
|
146
|
-
|
147
|
-
if (
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
}
|
156
|
-
|
104
|
+
void *rval = git_pqueue_get(pq, 0);
|
105
|
+
|
106
|
+
if (git_pqueue_size(pq) > 1) {
|
107
|
+
/* move last item to top of heap, shrink, and push item down */
|
108
|
+
pq->contents[0] = git_vector_last(pq);
|
109
|
+
git_vector_pop(pq);
|
110
|
+
pqueue_down(pq, 0);
|
111
|
+
} else {
|
112
|
+
/* all we need to do is shrink the heap in this case */
|
113
|
+
git_vector_pop(pq);
|
114
|
+
}
|
157
115
|
|
158
|
-
|
159
|
-
{
|
160
|
-
if (!q || q->size == 1)
|
161
|
-
return NULL;
|
162
|
-
return q->d[1];
|
116
|
+
return rval;
|
163
117
|
}
|
data/vendor/libgit2/src/pqueue.h
CHANGED
@@ -3,101 +3,54 @@
|
|
3
3
|
*
|
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
|
-
*
|
7
|
-
* This file is based on a modified version of the priority queue found
|
8
|
-
* in the Apache project and libpqueue library.
|
9
|
-
*
|
10
|
-
* https://github.com/vy/libpqueue
|
11
|
-
*
|
12
|
-
* Original file notice:
|
13
|
-
*
|
14
|
-
* Copyright 2010 Volkan Yazici <volkan.yazici@gmail.com>
|
15
|
-
* Copyright 2006-2010 The Apache Software Foundation
|
16
|
-
*
|
17
|
-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
18
|
-
* use this file except in compliance with the License. You may obtain a copy of
|
19
|
-
* the License at
|
20
|
-
*
|
21
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
22
|
-
*
|
23
|
-
* Unless required by applicable law or agreed to in writing, software
|
24
|
-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
25
|
-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
26
|
-
* License for the specific language governing permissions and limitations under
|
27
|
-
* the License.
|
28
6
|
*/
|
29
|
-
|
30
7
|
#ifndef INCLUDE_pqueue_h__
|
31
8
|
#define INCLUDE_pqueue_h__
|
32
9
|
|
33
|
-
|
34
|
-
typedef int (*git_pqueue_cmp)(void *a, void *b);
|
10
|
+
#include "vector.h"
|
35
11
|
|
36
|
-
|
37
|
-
typedef struct {
|
38
|
-
size_t size, avail, step;
|
39
|
-
git_pqueue_cmp cmppri;
|
40
|
-
void **d;
|
41
|
-
} git_pqueue;
|
12
|
+
typedef git_vector git_pqueue;
|
42
13
|
|
14
|
+
enum {
|
15
|
+
/* flag meaning: don't grow heap, keep highest values only */
|
16
|
+
GIT_PQUEUE_FIXED_SIZE = (GIT_VECTOR_FLAG_MAX << 1),
|
17
|
+
};
|
43
18
|
|
44
19
|
/**
|
45
|
-
*
|
20
|
+
* Initialize priority queue
|
46
21
|
*
|
47
|
-
* @param
|
48
|
-
*
|
49
|
-
* @param
|
50
|
-
*
|
51
|
-
* @
|
52
|
-
*/
|
53
|
-
int git_pqueue_init(
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
* clear all the elements in the queue
|
64
|
-
* @param q the queue
|
65
|
-
*/
|
66
|
-
void git_pqueue_clear(git_pqueue *q);
|
22
|
+
* @param pq The priority queue struct to initialize
|
23
|
+
* @param flags Flags (see above) to control queue behavior
|
24
|
+
* @param init_size The initial queue size
|
25
|
+
* @param cmp The entry priority comparison function
|
26
|
+
* @return 0 on success, <0 on error
|
27
|
+
*/
|
28
|
+
extern int git_pqueue_init(
|
29
|
+
git_pqueue *pq,
|
30
|
+
uint32_t flags,
|
31
|
+
size_t init_size,
|
32
|
+
git_vector_cmp cmp);
|
33
|
+
|
34
|
+
#define git_pqueue_free git_vector_free
|
35
|
+
#define git_pqueue_clear git_vector_clear
|
36
|
+
#define git_pqueue_size git_vector_length
|
37
|
+
#define git_pqueue_get git_vector_get
|
67
38
|
|
68
39
|
/**
|
69
|
-
*
|
70
|
-
*
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
/**
|
76
|
-
* insert an item into the queue.
|
77
|
-
* @param q the queue
|
78
|
-
* @param d the item
|
79
|
-
* @return 0 on success
|
80
|
-
*/
|
81
|
-
int git_pqueue_insert(git_pqueue *q, void *d);
|
82
|
-
|
83
|
-
|
84
|
-
/**
|
85
|
-
* pop the highest-ranking item from the queue.
|
86
|
-
* @param p the queue
|
87
|
-
* @param d where to copy the entry to
|
88
|
-
* @return NULL on error, otherwise the entry
|
40
|
+
* Insert a new item into the queue
|
41
|
+
*
|
42
|
+
* @param pq The priority queue
|
43
|
+
* @param item Pointer to the item data
|
44
|
+
* @return 0 on success, <0 on failure
|
89
45
|
*/
|
90
|
-
|
91
|
-
|
46
|
+
extern int git_pqueue_insert(git_pqueue *pq, void *item);
|
92
47
|
|
93
48
|
/**
|
94
|
-
*
|
95
|
-
*
|
96
|
-
* @param
|
97
|
-
* @return
|
49
|
+
* Remove the top item in the priority queue
|
50
|
+
*
|
51
|
+
* @param pq The priority queue
|
52
|
+
* @return item from heap on success, NULL if queue is empty
|
98
53
|
*/
|
99
|
-
void *
|
100
|
-
|
101
|
-
#endif /* PQUEUE_H */
|
102
|
-
/** @} */
|
54
|
+
extern void *git_pqueue_pop(git_pqueue *pq);
|
103
55
|
|
56
|
+
#endif
|