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
@@ -14,8 +14,6 @@
|
|
14
14
|
#include "git2/revparse.h"
|
15
15
|
#include "merge.h"
|
16
16
|
|
17
|
-
#include <regex.h>
|
18
|
-
|
19
17
|
git_commit_list_node *git_revwalk__commit_lookup(
|
20
18
|
git_revwalk *walk, const git_oid *oid)
|
21
19
|
{
|
@@ -41,28 +39,50 @@ git_commit_list_node *git_revwalk__commit_lookup(
|
|
41
39
|
return commit;
|
42
40
|
}
|
43
41
|
|
44
|
-
static
|
42
|
+
static int mark_uninteresting(git_revwalk *walk, git_commit_list_node *commit)
|
45
43
|
{
|
44
|
+
int error;
|
46
45
|
unsigned short i;
|
46
|
+
git_array_t(git_commit_list_node *) pending = GIT_ARRAY_INIT;
|
47
|
+
git_commit_list_node **tmp;
|
48
|
+
|
47
49
|
assert(commit);
|
48
50
|
|
49
|
-
|
51
|
+
git_array_init_to_size(pending, 2);
|
52
|
+
GITERR_CHECK_ARRAY(pending);
|
50
53
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
+
do {
|
55
|
+
commit->uninteresting = 1;
|
56
|
+
|
57
|
+
if ((error = git_commit_list_parse(walk, commit)) < 0)
|
58
|
+
return error;
|
59
|
+
|
60
|
+
for (i = 0; i < commit->out_degree; ++i)
|
61
|
+
if (!commit->parents[i]->uninteresting) {
|
62
|
+
git_commit_list_node **node = git_array_alloc(pending);
|
63
|
+
GITERR_CHECK_ALLOC(node);
|
64
|
+
*node = commit->parents[i];
|
65
|
+
}
|
66
|
+
|
67
|
+
tmp = git_array_pop(pending);
|
68
|
+
commit = tmp ? *tmp : NULL;
|
69
|
+
|
70
|
+
} while (commit != NULL);
|
54
71
|
|
55
|
-
|
56
|
-
|
57
|
-
|
72
|
+
git_array_clear(pending);
|
73
|
+
|
74
|
+
return 0;
|
58
75
|
}
|
59
76
|
|
60
77
|
static int process_commit(git_revwalk *walk, git_commit_list_node *commit, int hide)
|
61
78
|
{
|
62
79
|
int error;
|
63
80
|
|
64
|
-
if (hide)
|
65
|
-
|
81
|
+
if (!hide && walk->hide_cb)
|
82
|
+
hide = walk->hide_cb(&commit->oid, walk->hide_cb_payload);
|
83
|
+
|
84
|
+
if (hide && mark_uninteresting(walk, commit) < 0)
|
85
|
+
return -1;
|
66
86
|
|
67
87
|
if (commit->seen)
|
68
88
|
return 0;
|
@@ -72,38 +92,55 @@ static int process_commit(git_revwalk *walk, git_commit_list_node *commit, int h
|
|
72
92
|
if ((error = git_commit_list_parse(walk, commit)) < 0)
|
73
93
|
return error;
|
74
94
|
|
75
|
-
|
95
|
+
if (!hide)
|
96
|
+
return walk->enqueue(walk, commit);
|
97
|
+
|
98
|
+
return 0;
|
76
99
|
}
|
77
100
|
|
78
101
|
static int process_commit_parents(git_revwalk *walk, git_commit_list_node *commit)
|
79
102
|
{
|
80
|
-
unsigned short i;
|
103
|
+
unsigned short i, max;
|
81
104
|
int error = 0;
|
82
105
|
|
83
|
-
|
106
|
+
max = commit->out_degree;
|
107
|
+
if (walk->first_parent && commit->out_degree)
|
108
|
+
max = 1;
|
109
|
+
|
110
|
+
for (i = 0; i < max && !error; ++i)
|
84
111
|
error = process_commit(walk, commit->parents[i], commit->uninteresting);
|
85
112
|
|
86
113
|
return error;
|
87
114
|
}
|
88
115
|
|
89
|
-
static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting)
|
116
|
+
static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting, int from_glob)
|
90
117
|
{
|
91
|
-
|
92
|
-
|
118
|
+
git_oid commit_id;
|
119
|
+
int error;
|
120
|
+
git_object *obj, *oobj;
|
93
121
|
git_commit_list_node *commit;
|
94
122
|
|
95
|
-
if (git_object_lookup(&
|
96
|
-
return
|
123
|
+
if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJ_ANY)) < 0)
|
124
|
+
return error;
|
97
125
|
|
98
|
-
|
99
|
-
git_object_free(
|
126
|
+
error = git_object_peel(&obj, oobj, GIT_OBJ_COMMIT);
|
127
|
+
git_object_free(oobj);
|
100
128
|
|
101
|
-
if (
|
102
|
-
|
129
|
+
if (error == GIT_ENOTFOUND) {
|
130
|
+
/* If this comes from e.g. push_glob("tags"), ignore this */
|
131
|
+
if (from_glob)
|
132
|
+
return 0;
|
133
|
+
|
134
|
+
giterr_set(GITERR_INVALID, "Object is not a committish");
|
103
135
|
return -1;
|
104
136
|
}
|
137
|
+
if (error < 0)
|
138
|
+
return error;
|
105
139
|
|
106
|
-
|
140
|
+
git_oid_cpy(&commit_id, git_object_id(obj));
|
141
|
+
git_object_free(obj);
|
142
|
+
|
143
|
+
commit = git_revwalk__commit_lookup(walk, &commit_id);
|
107
144
|
if (commit == NULL)
|
108
145
|
return -1; /* error already reported by failed lookup */
|
109
146
|
|
@@ -121,82 +158,65 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting)
|
|
121
158
|
int git_revwalk_push(git_revwalk *walk, const git_oid *oid)
|
122
159
|
{
|
123
160
|
assert(walk && oid);
|
124
|
-
return push_commit(walk, oid, 0);
|
161
|
+
return push_commit(walk, oid, 0, false);
|
125
162
|
}
|
126
163
|
|
127
164
|
|
128
165
|
int git_revwalk_hide(git_revwalk *walk, const git_oid *oid)
|
129
166
|
{
|
130
167
|
assert(walk && oid);
|
131
|
-
return push_commit(walk, oid, 1);
|
168
|
+
return push_commit(walk, oid, 1, false);
|
132
169
|
}
|
133
170
|
|
134
|
-
static int push_ref(git_revwalk *walk, const char *refname, int hide)
|
171
|
+
static int push_ref(git_revwalk *walk, const char *refname, int hide, int from_glob)
|
135
172
|
{
|
136
173
|
git_oid oid;
|
137
174
|
|
138
175
|
if (git_reference_name_to_id(&oid, walk->repo, refname) < 0)
|
139
176
|
return -1;
|
140
177
|
|
141
|
-
return push_commit(walk, &oid, hide);
|
142
|
-
}
|
143
|
-
|
144
|
-
struct push_cb_data {
|
145
|
-
git_revwalk *walk;
|
146
|
-
int hide;
|
147
|
-
};
|
148
|
-
|
149
|
-
static int push_glob_cb(const char *refname, void *data_)
|
150
|
-
{
|
151
|
-
struct push_cb_data *data = (struct push_cb_data *)data_;
|
152
|
-
|
153
|
-
return push_ref(data->walk, refname, data->hide);
|
178
|
+
return push_commit(walk, &oid, hide, from_glob);
|
154
179
|
}
|
155
180
|
|
156
181
|
static int push_glob(git_revwalk *walk, const char *glob, int hide)
|
157
182
|
{
|
183
|
+
int error = 0;
|
158
184
|
git_buf buf = GIT_BUF_INIT;
|
159
|
-
|
160
|
-
|
185
|
+
git_reference *ref;
|
186
|
+
git_reference_iterator *iter;
|
187
|
+
size_t wildcard;
|
161
188
|
|
162
189
|
assert(walk && glob);
|
163
190
|
|
164
191
|
/* refs/ is implied if not given in the glob */
|
165
|
-
if (
|
166
|
-
|
167
|
-
|
192
|
+
if (git__prefixcmp(glob, GIT_REFS_DIR) != 0)
|
193
|
+
git_buf_joinpath(&buf, GIT_REFS_DIR, glob);
|
194
|
+
else
|
168
195
|
git_buf_puts(&buf, glob);
|
169
|
-
}
|
170
|
-
|
171
|
-
/* If no '?', '*' or '[' exist, we append '/ *' to the glob */
|
172
|
-
memset(&preg, 0x0, sizeof(regex_t));
|
173
|
-
if (regcomp(&preg, "[?*[]", REG_EXTENDED)) {
|
174
|
-
giterr_set(GITERR_OS, "Regex failed to compile");
|
175
|
-
git_buf_free(&buf);
|
176
|
-
return -1;
|
177
|
-
}
|
178
|
-
|
179
|
-
if (regexec(&preg, glob, 0, NULL, 0))
|
180
|
-
git_buf_puts(&buf, "/*");
|
181
|
-
|
182
196
|
if (git_buf_oom(&buf))
|
183
|
-
|
197
|
+
return -1;
|
184
198
|
|
185
|
-
|
186
|
-
|
199
|
+
/* If no '?', '*' or '[' exist, we append '/ *' to the glob */
|
200
|
+
wildcard = strcspn(glob, "?*[");
|
201
|
+
if (!glob[wildcard])
|
202
|
+
git_buf_put(&buf, "/*", 2);
|
187
203
|
|
188
|
-
if (
|
189
|
-
|
190
|
-
goto on_error;
|
204
|
+
if ((error = git_reference_iterator_glob_new(&iter, walk->repo, buf.ptr)) < 0)
|
205
|
+
goto out;
|
191
206
|
|
192
|
-
|
193
|
-
|
194
|
-
|
207
|
+
while ((error = git_reference_next(&ref, iter)) == 0) {
|
208
|
+
error = push_ref(walk, git_reference_name(ref), hide, true);
|
209
|
+
git_reference_free(ref);
|
210
|
+
if (error < 0)
|
211
|
+
break;
|
212
|
+
}
|
213
|
+
git_reference_iterator_free(iter);
|
195
214
|
|
196
|
-
|
197
|
-
|
215
|
+
if (error == GIT_ITEROVER)
|
216
|
+
error = 0;
|
217
|
+
out:
|
198
218
|
git_buf_free(&buf);
|
199
|
-
return
|
219
|
+
return error;
|
200
220
|
}
|
201
221
|
|
202
222
|
int git_revwalk_push_glob(git_revwalk *walk, const char *glob)
|
@@ -214,19 +234,19 @@ int git_revwalk_hide_glob(git_revwalk *walk, const char *glob)
|
|
214
234
|
int git_revwalk_push_head(git_revwalk *walk)
|
215
235
|
{
|
216
236
|
assert(walk);
|
217
|
-
return push_ref(walk, GIT_HEAD_FILE, 0);
|
237
|
+
return push_ref(walk, GIT_HEAD_FILE, 0, false);
|
218
238
|
}
|
219
239
|
|
220
240
|
int git_revwalk_hide_head(git_revwalk *walk)
|
221
241
|
{
|
222
242
|
assert(walk);
|
223
|
-
return push_ref(walk, GIT_HEAD_FILE, 1);
|
243
|
+
return push_ref(walk, GIT_HEAD_FILE, 1, false);
|
224
244
|
}
|
225
245
|
|
226
246
|
int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
|
227
247
|
{
|
228
248
|
assert(walk && refname);
|
229
|
-
return push_ref(walk, refname, 0);
|
249
|
+
return push_ref(walk, refname, 0, false);
|
230
250
|
}
|
231
251
|
|
232
252
|
int git_revwalk_push_range(git_revwalk *walk, const char *range)
|
@@ -243,10 +263,10 @@ int git_revwalk_push_range(git_revwalk *walk, const char *range)
|
|
243
263
|
return GIT_EINVALIDSPEC;
|
244
264
|
}
|
245
265
|
|
246
|
-
if ((error = push_commit(walk, git_object_id(revspec.from), 1)))
|
266
|
+
if ((error = push_commit(walk, git_object_id(revspec.from), 1, false)))
|
247
267
|
goto out;
|
248
268
|
|
249
|
-
error = push_commit(walk, git_object_id(revspec.to), 0);
|
269
|
+
error = push_commit(walk, git_object_id(revspec.to), 0, false);
|
250
270
|
|
251
271
|
out:
|
252
272
|
git_object_free(revspec.from);
|
@@ -257,7 +277,7 @@ out:
|
|
257
277
|
int git_revwalk_hide_ref(git_revwalk *walk, const char *refname)
|
258
278
|
{
|
259
279
|
assert(walk && refname);
|
260
|
-
return push_ref(walk, refname, 1);
|
280
|
+
return push_ref(walk, refname, 1, false);
|
261
281
|
}
|
262
282
|
|
263
283
|
static int revwalk_enqueue_timesort(git_revwalk *walk, git_commit_list_node *commit)
|
@@ -275,15 +295,14 @@ static int revwalk_next_timesort(git_commit_list_node **object_out, git_revwalk
|
|
275
295
|
int error;
|
276
296
|
git_commit_list_node *next;
|
277
297
|
|
278
|
-
while ((next = git_pqueue_pop(&walk->iterator_time)) != NULL)
|
279
|
-
if ((error = process_commit_parents(walk, next)) < 0)
|
280
|
-
return error;
|
281
|
-
|
298
|
+
while ((next = git_pqueue_pop(&walk->iterator_time)) != NULL)
|
282
299
|
if (!next->uninteresting) {
|
300
|
+
if ((error = process_commit_parents(walk, next)) < 0)
|
301
|
+
return error;
|
302
|
+
|
283
303
|
*object_out = next;
|
284
304
|
return 0;
|
285
305
|
}
|
286
|
-
}
|
287
306
|
|
288
307
|
giterr_clear();
|
289
308
|
return GIT_ITEROVER;
|
@@ -294,15 +313,14 @@ static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk
|
|
294
313
|
int error;
|
295
314
|
git_commit_list_node *next;
|
296
315
|
|
297
|
-
while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL)
|
298
|
-
if ((error = process_commit_parents(walk, next)) < 0)
|
299
|
-
return error;
|
300
|
-
|
316
|
+
while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL)
|
301
317
|
if (!next->uninteresting) {
|
318
|
+
if ((error = process_commit_parents(walk, next)) < 0)
|
319
|
+
return error;
|
320
|
+
|
302
321
|
*object_out = next;
|
303
322
|
return 0;
|
304
323
|
}
|
305
|
-
}
|
306
324
|
|
307
325
|
giterr_clear();
|
308
326
|
return GIT_ITEROVER;
|
@@ -311,7 +329,7 @@ static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk
|
|
311
329
|
static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk *walk)
|
312
330
|
{
|
313
331
|
git_commit_list_node *next;
|
314
|
-
unsigned short i;
|
332
|
+
unsigned short i, max;
|
315
333
|
|
316
334
|
for (;;) {
|
317
335
|
next = git_commit_list_pop(&walk->iterator_topo);
|
@@ -325,7 +343,12 @@ static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk
|
|
325
343
|
continue;
|
326
344
|
}
|
327
345
|
|
328
|
-
|
346
|
+
|
347
|
+
max = next->out_degree;
|
348
|
+
if (walk->first_parent && next->out_degree)
|
349
|
+
max = 1;
|
350
|
+
|
351
|
+
for (i = 0; i < max; ++i) {
|
329
352
|
git_commit_list_node *parent = next->parents[i];
|
330
353
|
|
331
354
|
if (--parent->in_degree == 0 && parent->topo_delay) {
|
@@ -352,7 +375,6 @@ static int prepare_walk(git_revwalk *walk)
|
|
352
375
|
int error;
|
353
376
|
unsigned int i;
|
354
377
|
git_commit_list_node *next, *two;
|
355
|
-
git_commit_list *bases = NULL;
|
356
378
|
|
357
379
|
/*
|
358
380
|
* If walk->one is NULL, there were no positive references,
|
@@ -363,11 +385,6 @@ static int prepare_walk(git_revwalk *walk)
|
|
363
385
|
return GIT_ITEROVER;
|
364
386
|
}
|
365
387
|
|
366
|
-
/* first figure out what the merge bases are */
|
367
|
-
if (git_merge__bases_many(&bases, walk, walk->one, &walk->twos) < 0)
|
368
|
-
return -1;
|
369
|
-
|
370
|
-
git_commit_list_free(&bases);
|
371
388
|
if (process_commit(walk, walk->one, walk->one->uninteresting) < 0)
|
372
389
|
return -1;
|
373
390
|
|
@@ -424,7 +441,8 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo)
|
|
424
441
|
walk->commits = git_oidmap_alloc();
|
425
442
|
GITERR_CHECK_ALLOC(walk->commits);
|
426
443
|
|
427
|
-
if (git_pqueue_init(
|
444
|
+
if (git_pqueue_init(
|
445
|
+
&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 ||
|
428
446
|
git_vector_init(&walk->twos, 4, NULL) < 0 ||
|
429
447
|
git_pool_init(&walk->commit_pool, 1,
|
430
448
|
git_pool__suggest_items_per_page(COMMIT_ALLOC) * COMMIT_ALLOC) < 0)
|
@@ -483,6 +501,11 @@ void git_revwalk_sorting(git_revwalk *walk, unsigned int sort_mode)
|
|
483
501
|
}
|
484
502
|
}
|
485
503
|
|
504
|
+
void git_revwalk_simplify_first_parent(git_revwalk *walk)
|
505
|
+
{
|
506
|
+
walk->first_parent = 1;
|
507
|
+
}
|
508
|
+
|
486
509
|
int git_revwalk_next(git_oid *oid, git_revwalk *walk)
|
487
510
|
{
|
488
511
|
int error;
|
@@ -532,3 +555,25 @@ void git_revwalk_reset(git_revwalk *walk)
|
|
532
555
|
git_vector_clear(&walk->twos);
|
533
556
|
}
|
534
557
|
|
558
|
+
int git_revwalk_add_hide_cb(
|
559
|
+
git_revwalk *walk,
|
560
|
+
git_revwalk_hide_cb hide_cb,
|
561
|
+
void *payload)
|
562
|
+
{
|
563
|
+
assert(walk);
|
564
|
+
|
565
|
+
if (walk->walking)
|
566
|
+
git_revwalk_reset(walk);
|
567
|
+
|
568
|
+
if (walk->hide_cb) {
|
569
|
+
/* There is already a callback added */
|
570
|
+
giterr_set(GITERR_INVALID, "There is already a callback added to hide commits in revision walker.");
|
571
|
+
return -1;
|
572
|
+
}
|
573
|
+
|
574
|
+
walk->hide_cb = hide_cb;
|
575
|
+
walk->hide_cb_payload = payload;
|
576
|
+
|
577
|
+
return 0;
|
578
|
+
}
|
579
|
+
|
@@ -31,12 +31,17 @@ struct git_revwalk {
|
|
31
31
|
int (*get_next)(git_commit_list_node **, git_revwalk *);
|
32
32
|
int (*enqueue)(git_revwalk *, git_commit_list_node *);
|
33
33
|
|
34
|
-
unsigned walking:1
|
34
|
+
unsigned walking:1,
|
35
|
+
first_parent: 1;
|
35
36
|
unsigned int sorting;
|
36
37
|
|
37
38
|
/* merge base calculation */
|
38
39
|
git_commit_list_node *one;
|
39
40
|
git_vector twos;
|
41
|
+
|
42
|
+
/* hide callback */
|
43
|
+
git_revwalk_hide_cb hide_cb;
|
44
|
+
void *hide_cb_payload;
|
40
45
|
};
|
41
46
|
|
42
47
|
git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid);
|
@@ -0,0 +1,140 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#include <git2.h>
|
9
|
+
#include "common.h"
|
10
|
+
#include "sysdir.h"
|
11
|
+
#include "cache.h"
|
12
|
+
|
13
|
+
void git_libgit2_version(int *major, int *minor, int *rev)
|
14
|
+
{
|
15
|
+
*major = LIBGIT2_VER_MAJOR;
|
16
|
+
*minor = LIBGIT2_VER_MINOR;
|
17
|
+
*rev = LIBGIT2_VER_REVISION;
|
18
|
+
}
|
19
|
+
|
20
|
+
int git_libgit2_features()
|
21
|
+
{
|
22
|
+
return 0
|
23
|
+
#ifdef GIT_THREADS
|
24
|
+
| GIT_FEATURE_THREADS
|
25
|
+
#endif
|
26
|
+
#if defined(GIT_SSL) || defined(GIT_WINHTTP)
|
27
|
+
| GIT_FEATURE_HTTPS
|
28
|
+
#endif
|
29
|
+
#if defined(GIT_SSH)
|
30
|
+
| GIT_FEATURE_SSH
|
31
|
+
#endif
|
32
|
+
;
|
33
|
+
}
|
34
|
+
|
35
|
+
/* Declarations for tuneable settings */
|
36
|
+
extern size_t git_mwindow__window_size;
|
37
|
+
extern size_t git_mwindow__mapped_limit;
|
38
|
+
|
39
|
+
static int config_level_to_sysdir(int config_level)
|
40
|
+
{
|
41
|
+
int val = -1;
|
42
|
+
|
43
|
+
switch (config_level) {
|
44
|
+
case GIT_CONFIG_LEVEL_SYSTEM: val = GIT_SYSDIR_SYSTEM; break;
|
45
|
+
case GIT_CONFIG_LEVEL_XDG: val = GIT_SYSDIR_XDG; break;
|
46
|
+
case GIT_CONFIG_LEVEL_GLOBAL: val = GIT_SYSDIR_GLOBAL; break;
|
47
|
+
default:
|
48
|
+
giterr_set(
|
49
|
+
GITERR_INVALID, "Invalid config path selector %d", config_level);
|
50
|
+
}
|
51
|
+
|
52
|
+
return val;
|
53
|
+
}
|
54
|
+
|
55
|
+
int git_libgit2_opts(int key, ...)
|
56
|
+
{
|
57
|
+
int error = 0;
|
58
|
+
va_list ap;
|
59
|
+
|
60
|
+
va_start(ap, key);
|
61
|
+
|
62
|
+
switch (key) {
|
63
|
+
case GIT_OPT_SET_MWINDOW_SIZE:
|
64
|
+
git_mwindow__window_size = va_arg(ap, size_t);
|
65
|
+
break;
|
66
|
+
|
67
|
+
case GIT_OPT_GET_MWINDOW_SIZE:
|
68
|
+
*(va_arg(ap, size_t *)) = git_mwindow__window_size;
|
69
|
+
break;
|
70
|
+
|
71
|
+
case GIT_OPT_SET_MWINDOW_MAPPED_LIMIT:
|
72
|
+
git_mwindow__mapped_limit = va_arg(ap, size_t);
|
73
|
+
break;
|
74
|
+
|
75
|
+
case GIT_OPT_GET_MWINDOW_MAPPED_LIMIT:
|
76
|
+
*(va_arg(ap, size_t *)) = git_mwindow__mapped_limit;
|
77
|
+
break;
|
78
|
+
|
79
|
+
case GIT_OPT_GET_SEARCH_PATH:
|
80
|
+
if ((error = config_level_to_sysdir(va_arg(ap, int))) >= 0) {
|
81
|
+
git_buf *out = va_arg(ap, git_buf *);
|
82
|
+
const git_buf *tmp;
|
83
|
+
|
84
|
+
git_buf_sanitize(out);
|
85
|
+
if ((error = git_sysdir_get(&tmp, error)) < 0)
|
86
|
+
break;
|
87
|
+
|
88
|
+
error = git_buf_sets(out, tmp->ptr);
|
89
|
+
}
|
90
|
+
break;
|
91
|
+
|
92
|
+
case GIT_OPT_SET_SEARCH_PATH:
|
93
|
+
if ((error = config_level_to_sysdir(va_arg(ap, int))) >= 0)
|
94
|
+
error = git_sysdir_set(error, va_arg(ap, const char *));
|
95
|
+
break;
|
96
|
+
|
97
|
+
case GIT_OPT_SET_CACHE_OBJECT_LIMIT:
|
98
|
+
{
|
99
|
+
git_otype type = (git_otype)va_arg(ap, int);
|
100
|
+
size_t size = va_arg(ap, size_t);
|
101
|
+
error = git_cache_set_max_object_size(type, size);
|
102
|
+
break;
|
103
|
+
}
|
104
|
+
|
105
|
+
case GIT_OPT_SET_CACHE_MAX_SIZE:
|
106
|
+
git_cache__max_storage = va_arg(ap, ssize_t);
|
107
|
+
break;
|
108
|
+
|
109
|
+
case GIT_OPT_ENABLE_CACHING:
|
110
|
+
git_cache__enabled = (va_arg(ap, int) != 0);
|
111
|
+
break;
|
112
|
+
|
113
|
+
case GIT_OPT_GET_CACHED_MEMORY:
|
114
|
+
*(va_arg(ap, ssize_t *)) = git_cache__current_storage.val;
|
115
|
+
*(va_arg(ap, ssize_t *)) = git_cache__max_storage;
|
116
|
+
break;
|
117
|
+
|
118
|
+
case GIT_OPT_GET_TEMPLATE_PATH:
|
119
|
+
{
|
120
|
+
git_buf *out = va_arg(ap, git_buf *);
|
121
|
+
const git_buf *tmp;
|
122
|
+
|
123
|
+
git_buf_sanitize(out);
|
124
|
+
if ((error = git_sysdir_get(&tmp, GIT_SYSDIR_TEMPLATE)) < 0)
|
125
|
+
break;
|
126
|
+
|
127
|
+
error = git_buf_sets(out, tmp->ptr);
|
128
|
+
}
|
129
|
+
break;
|
130
|
+
|
131
|
+
case GIT_OPT_SET_TEMPLATE_PATH:
|
132
|
+
error = git_sysdir_set(GIT_SYSDIR_TEMPLATE, va_arg(ap, const char *));
|
133
|
+
break;
|
134
|
+
}
|
135
|
+
|
136
|
+
va_end(ap);
|
137
|
+
|
138
|
+
return error;
|
139
|
+
}
|
140
|
+
|
@@ -9,6 +9,7 @@
|
|
9
9
|
|
10
10
|
#include "sha1_lookup.h"
|
11
11
|
#include "common.h"
|
12
|
+
#include "oid.h"
|
12
13
|
|
13
14
|
/*
|
14
15
|
* Conventional binary search loop looks like this:
|
@@ -108,7 +109,54 @@ int sha1_entry_pos(const void *table,
|
|
108
109
|
* byte 0 thru (ofs-1) are the same between
|
109
110
|
* lo and hi; ofs is the first byte that is
|
110
111
|
* different.
|
112
|
+
*
|
113
|
+
* If ofs==20, then no bytes are different,
|
114
|
+
* meaning we have entries with duplicate
|
115
|
+
* keys. We know that we are in a solid run
|
116
|
+
* of this entry (because the entries are
|
117
|
+
* sorted, and our lo and hi are the same,
|
118
|
+
* there can be nothing but this single key
|
119
|
+
* in between). So we can stop the search.
|
120
|
+
* Either one of these entries is it (and
|
121
|
+
* we do not care which), or we do not have
|
122
|
+
* it.
|
123
|
+
*
|
124
|
+
* Furthermore, we know that one of our
|
125
|
+
* endpoints must be the edge of the run of
|
126
|
+
* duplicates. For example, given this
|
127
|
+
* sequence:
|
128
|
+
*
|
129
|
+
* idx 0 1 2 3 4 5
|
130
|
+
* key A C C C C D
|
131
|
+
*
|
132
|
+
* If we are searching for "B", we might
|
133
|
+
* hit the duplicate run at lo=1, hi=3
|
134
|
+
* (e.g., by first mi=3, then mi=0). But we
|
135
|
+
* can never have lo > 1, because B < C.
|
136
|
+
* That is, if our key is less than the
|
137
|
+
* run, we know that "lo" is the edge, but
|
138
|
+
* we can say nothing of "hi". Similarly,
|
139
|
+
* if our key is greater than the run, we
|
140
|
+
* know that "hi" is the edge, but we can
|
141
|
+
* say nothing of "lo".
|
142
|
+
*
|
143
|
+
* Therefore if we do not find it, we also
|
144
|
+
* know where it would go if it did exist:
|
145
|
+
* just on the far side of the edge that we
|
146
|
+
* know about.
|
111
147
|
*/
|
148
|
+
if (ofs == 20) {
|
149
|
+
mi = lo;
|
150
|
+
mi_key = base + elem_size * mi + key_offset;
|
151
|
+
cmp = memcmp(mi_key, key, 20);
|
152
|
+
if (!cmp)
|
153
|
+
return mi;
|
154
|
+
if (cmp < 0)
|
155
|
+
return -1 - hi;
|
156
|
+
else
|
157
|
+
return -1 - lo;
|
158
|
+
}
|
159
|
+
|
112
160
|
hiv = hi_key[ofs_0];
|
113
161
|
if (ofs_0 < 19)
|
114
162
|
hiv = (hiv << 8) | hi_key[ofs_0+1];
|
@@ -176,3 +224,26 @@ int sha1_entry_pos(const void *table,
|
|
176
224
|
} while (lo < hi);
|
177
225
|
return -((int)lo)-1;
|
178
226
|
}
|
227
|
+
|
228
|
+
int sha1_position(const void *table,
|
229
|
+
size_t stride,
|
230
|
+
unsigned lo, unsigned hi,
|
231
|
+
const unsigned char *key)
|
232
|
+
{
|
233
|
+
const unsigned char *base = table;
|
234
|
+
|
235
|
+
do {
|
236
|
+
unsigned mi = (lo + hi) / 2;
|
237
|
+
int cmp = git_oid__hashcmp(base + mi * stride, key);
|
238
|
+
|
239
|
+
if (!cmp)
|
240
|
+
return mi;
|
241
|
+
|
242
|
+
if (cmp > 0)
|
243
|
+
hi = mi;
|
244
|
+
else
|
245
|
+
lo = mi+1;
|
246
|
+
} while (lo < hi);
|
247
|
+
|
248
|
+
return -((int)lo)-1;
|
249
|
+
}
|