rugged 0.16.0 → 0.17.0b1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +373 -243
- data/Rakefile +22 -0
- data/ext/rugged/extconf.rb +9 -6
- data/ext/rugged/rugged.c +123 -31
- data/ext/rugged/rugged.h +11 -10
- data/ext/rugged/rugged_blob.c +181 -18
- data/ext/rugged/rugged_commit.c +196 -18
- data/ext/rugged/rugged_config.c +94 -5
- data/ext/rugged/rugged_object.c +54 -1
- data/ext/rugged/rugged_reference.c +203 -15
- data/ext/rugged/{remote.c → rugged_remote.c} +35 -10
- data/ext/rugged/rugged_repo.c +323 -81
- data/ext/rugged/rugged_revwalk.c +57 -4
- data/ext/rugged/rugged_signature.c +3 -3
- data/ext/rugged/rugged_tag.c +72 -1
- data/ext/rugged/rugged_tree.c +70 -2
- data/ext/rugged/vendor/libgit2-dist/deps/regex/config.h +7 -0
- data/ext/rugged/vendor/libgit2-dist/deps/regex/regcomp.c +3856 -0
- data/ext/rugged/vendor/libgit2-dist/deps/regex/regex.c +85 -0
- data/ext/rugged/vendor/libgit2-dist/deps/regex/regex.h +582 -0
- data/ext/rugged/vendor/libgit2-dist/deps/regex/regex_internal.c +1744 -0
- data/ext/rugged/vendor/libgit2-dist/deps/regex/regex_internal.h +810 -0
- data/ext/rugged/vendor/libgit2-dist/deps/regex/regexec.c +4369 -0
- data/ext/rugged/vendor/libgit2-dist/examples/diff.c +238 -0
- data/ext/rugged/vendor/libgit2-dist/examples/general.c +4 -4
- data/ext/rugged/vendor/libgit2-dist/examples/network/fetch.c +101 -85
- data/ext/rugged/vendor/libgit2-dist/examples/network/git2.c +7 -3
- data/ext/rugged/vendor/libgit2-dist/examples/network/index-pack.c +80 -25
- data/ext/rugged/vendor/libgit2-dist/examples/network/ls-remote.c +6 -6
- data/ext/rugged/vendor/libgit2-dist/include/git2/attr.h +224 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/blob.h +59 -5
- data/ext/rugged/vendor/libgit2-dist/include/git2/branch.h +114 -7
- data/ext/rugged/vendor/libgit2-dist/include/git2/commit.h +14 -7
- data/ext/rugged/vendor/libgit2-dist/include/git2/common.h +4 -3
- data/ext/rugged/vendor/libgit2-dist/include/git2/config.h +105 -27
- data/ext/rugged/vendor/libgit2-dist/include/git2/diff.h +409 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/errors.h +47 -82
- data/ext/rugged/vendor/libgit2-dist/include/git2/index.h +25 -10
- data/ext/rugged/vendor/libgit2-dist/include/git2/indexer.h +46 -1
- data/ext/rugged/vendor/libgit2-dist/include/git2/merge.h +35 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/net.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/include/git2/notes.h +139 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/object.h +5 -5
- data/ext/rugged/vendor/libgit2-dist/include/git2/odb.h +13 -13
- data/ext/rugged/vendor/libgit2-dist/include/git2/odb_backend.h +8 -8
- data/ext/rugged/vendor/libgit2-dist/include/git2/oid.h +14 -9
- data/ext/rugged/vendor/libgit2-dist/include/git2/reflog.h +5 -5
- data/ext/rugged/vendor/libgit2-dist/include/git2/refs.h +37 -17
- data/ext/rugged/vendor/libgit2-dist/include/git2/refspec.h +17 -9
- data/ext/rugged/vendor/libgit2-dist/include/git2/remote.h +83 -16
- data/ext/rugged/vendor/libgit2-dist/include/git2/repository.h +24 -10
- data/ext/rugged/vendor/libgit2-dist/include/git2/reset.h +44 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/revparse.h +36 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/revwalk.h +74 -6
- data/ext/rugged/vendor/libgit2-dist/include/git2/signature.h +3 -3
- data/ext/rugged/vendor/libgit2-dist/include/git2/status.h +120 -19
- data/ext/rugged/vendor/libgit2-dist/include/git2/submodule.h +103 -0
- data/ext/rugged/vendor/libgit2-dist/include/git2/tag.h +28 -10
- data/ext/rugged/vendor/libgit2-dist/include/git2/threads.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/include/git2/tree.h +13 -13
- data/ext/rugged/vendor/libgit2-dist/include/git2/types.h +16 -2
- data/ext/rugged/vendor/libgit2-dist/include/git2/version.h +3 -3
- data/ext/rugged/vendor/libgit2-dist/include/git2/windows.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/include/git2.h +7 -2
- data/ext/rugged/vendor/libgit2-dist/src/attr.c +677 -0
- data/ext/rugged/vendor/libgit2-dist/src/attr.h +56 -0
- data/ext/rugged/vendor/libgit2-dist/src/attr_file.c +609 -0
- data/ext/rugged/vendor/libgit2-dist/src/attr_file.h +145 -0
- data/ext/rugged/vendor/libgit2-dist/src/blob.c +213 -60
- data/ext/rugged/vendor/libgit2-dist/src/blob.h +2 -1
- data/ext/rugged/vendor/libgit2-dist/src/branch.c +208 -0
- data/ext/rugged/vendor/libgit2-dist/src/branch.h +17 -0
- data/ext/rugged/vendor/libgit2-dist/src/bswap.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/buffer.c +395 -46
- data/ext/rugged/vendor/libgit2-dist/src/buffer.h +112 -9
- data/ext/rugged/vendor/libgit2-dist/src/cache.c +37 -49
- data/ext/rugged/vendor/libgit2-dist/src/cache.h +7 -17
- data/ext/rugged/vendor/libgit2-dist/src/cc-compat.h +18 -16
- data/ext/rugged/vendor/libgit2-dist/src/commit.c +56 -90
- data/ext/rugged/vendor/libgit2-dist/src/commit.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/common.h +12 -5
- data/ext/rugged/vendor/libgit2-dist/src/{win32 → compat}/fnmatch.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/{win32 → compat}/fnmatch.h +3 -3
- data/ext/rugged/vendor/libgit2-dist/src/config.c +247 -158
- data/ext/rugged/vendor/libgit2-dist/src/config.h +10 -1
- data/ext/rugged/vendor/libgit2-dist/src/config_cache.c +94 -0
- data/ext/rugged/vendor/libgit2-dist/src/config_file.c +606 -496
- data/ext/rugged/vendor/libgit2-dist/src/config_file.h +31 -0
- data/ext/rugged/vendor/libgit2-dist/src/crlf.c +228 -0
- data/ext/rugged/vendor/libgit2-dist/src/date.c +876 -0
- data/ext/rugged/vendor/libgit2-dist/src/delta-apply.c +15 -9
- data/ext/rugged/vendor/libgit2-dist/src/delta-apply.h +2 -2
- data/ext/rugged/vendor/libgit2-dist/src/diff.c +814 -0
- data/ext/rugged/vendor/libgit2-dist/src/diff.h +43 -0
- data/ext/rugged/vendor/libgit2-dist/src/diff_output.c +794 -0
- data/ext/rugged/vendor/libgit2-dist/src/errors.c +89 -74
- data/ext/rugged/vendor/libgit2-dist/src/fetch.c +94 -66
- data/ext/rugged/vendor/libgit2-dist/src/fetch.h +5 -4
- data/ext/rugged/vendor/libgit2-dist/src/filebuf.c +157 -100
- data/ext/rugged/vendor/libgit2-dist/src/filebuf.h +22 -8
- data/ext/rugged/vendor/libgit2-dist/src/fileops.c +330 -206
- data/ext/rugged/vendor/libgit2-dist/src/fileops.h +82 -51
- data/ext/rugged/vendor/libgit2-dist/src/filter.c +165 -0
- data/ext/rugged/vendor/libgit2-dist/src/filter.h +119 -0
- data/ext/rugged/vendor/libgit2-dist/src/global.c +4 -4
- data/ext/rugged/vendor/libgit2-dist/src/global.h +4 -1
- data/ext/rugged/vendor/libgit2-dist/src/hash.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/hash.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/ignore.c +203 -0
- data/ext/rugged/vendor/libgit2-dist/src/ignore.h +38 -0
- data/ext/rugged/vendor/libgit2-dist/src/index.c +220 -169
- data/ext/rugged/vendor/libgit2-dist/src/index.h +5 -1
- data/ext/rugged/vendor/libgit2-dist/src/indexer.c +601 -102
- data/ext/rugged/vendor/libgit2-dist/src/iterator.c +748 -0
- data/ext/rugged/vendor/libgit2-dist/src/iterator.h +151 -0
- data/ext/rugged/vendor/libgit2-dist/src/khash.h +608 -0
- data/ext/rugged/vendor/libgit2-dist/src/map.h +6 -1
- data/ext/rugged/vendor/libgit2-dist/src/message.c +61 -0
- data/ext/rugged/vendor/libgit2-dist/src/message.h +14 -0
- data/ext/rugged/vendor/libgit2-dist/src/mwindow.c +27 -29
- data/ext/rugged/vendor/libgit2-dist/src/mwindow.h +4 -4
- data/ext/rugged/vendor/libgit2-dist/src/netops.c +375 -56
- data/ext/rugged/vendor/libgit2-dist/src/netops.h +12 -9
- data/ext/rugged/vendor/libgit2-dist/src/notes.c +548 -0
- data/ext/rugged/vendor/libgit2-dist/src/notes.h +28 -0
- data/ext/rugged/vendor/libgit2-dist/src/object.c +59 -21
- data/ext/rugged/vendor/libgit2-dist/src/odb.c +212 -175
- data/ext/rugged/vendor/libgit2-dist/src/odb.h +39 -2
- data/ext/rugged/vendor/libgit2-dist/src/odb_loose.c +238 -241
- data/ext/rugged/vendor/libgit2-dist/src/odb_pack.c +94 -106
- data/ext/rugged/vendor/libgit2-dist/src/oid.c +59 -60
- data/ext/rugged/vendor/libgit2-dist/src/oidmap.h +42 -0
- data/ext/rugged/vendor/libgit2-dist/src/pack.c +198 -170
- data/ext/rugged/vendor/libgit2-dist/src/pack.h +16 -9
- data/ext/rugged/vendor/libgit2-dist/src/path.c +496 -106
- data/ext/rugged/vendor/libgit2-dist/src/path.h +214 -20
- data/ext/rugged/vendor/libgit2-dist/src/pkt.c +88 -159
- data/ext/rugged/vendor/libgit2-dist/src/pkt.h +9 -5
- data/ext/rugged/vendor/libgit2-dist/src/pool.c +294 -0
- data/ext/rugged/vendor/libgit2-dist/src/pool.h +125 -0
- data/ext/rugged/vendor/libgit2-dist/src/posix.c +38 -16
- data/ext/rugged/vendor/libgit2-dist/src/posix.h +20 -2
- data/ext/rugged/vendor/libgit2-dist/src/ppc/sha1.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/ppc/sha1.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/pqueue.c +7 -7
- data/ext/rugged/vendor/libgit2-dist/src/pqueue.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/protocol.c +21 -13
- data/ext/rugged/vendor/libgit2-dist/src/protocol.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/reflog.c +125 -103
- data/ext/rugged/vendor/libgit2-dist/src/reflog.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/refs.c +713 -640
- data/ext/rugged/vendor/libgit2-dist/src/refs.h +27 -3
- data/ext/rugged/vendor/libgit2-dist/src/refspec.c +51 -17
- data/ext/rugged/vendor/libgit2-dist/src/refspec.h +13 -1
- data/ext/rugged/vendor/libgit2-dist/src/remote.c +307 -119
- data/ext/rugged/vendor/libgit2-dist/src/remote.h +3 -2
- data/ext/rugged/vendor/libgit2-dist/src/repository.c +593 -442
- data/ext/rugged/vendor/libgit2-dist/src/repository.h +80 -2
- data/ext/rugged/vendor/libgit2-dist/src/reset.c +103 -0
- data/ext/rugged/vendor/libgit2-dist/src/revparse.c +753 -0
- data/ext/rugged/vendor/libgit2-dist/src/revwalk.c +434 -158
- data/ext/rugged/vendor/libgit2-dist/src/sha1.c +3 -3
- data/ext/rugged/vendor/libgit2-dist/src/sha1.h +2 -2
- data/ext/rugged/vendor/libgit2-dist/src/sha1_lookup.c +3 -2
- data/ext/rugged/vendor/libgit2-dist/src/sha1_lookup.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/signature.c +69 -80
- data/ext/rugged/vendor/libgit2-dist/src/signature.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/status.c +184 -638
- data/ext/rugged/vendor/libgit2-dist/src/strmap.h +64 -0
- data/ext/rugged/vendor/libgit2-dist/src/submodule.c +387 -0
- data/ext/rugged/vendor/libgit2-dist/src/tag.c +162 -137
- data/ext/rugged/vendor/libgit2-dist/src/tag.h +2 -1
- data/ext/rugged/vendor/libgit2-dist/src/thread-utils.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/thread-utils.h +8 -8
- data/ext/rugged/vendor/libgit2-dist/src/transport.c +31 -19
- data/ext/rugged/vendor/libgit2-dist/src/transport.h +31 -11
- data/ext/rugged/vendor/libgit2-dist/src/transports/git.c +168 -193
- data/ext/rugged/vendor/libgit2-dist/src/transports/http.c +192 -241
- data/ext/rugged/vendor/libgit2-dist/src/transports/local.c +92 -86
- data/ext/rugged/vendor/libgit2-dist/src/tree-cache.c +32 -49
- data/ext/rugged/vendor/libgit2-dist/src/tree-cache.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/tree.c +172 -145
- data/ext/rugged/vendor/libgit2-dist/src/tree.h +16 -2
- data/ext/rugged/vendor/libgit2-dist/src/tsort.c +16 -14
- data/ext/rugged/vendor/libgit2-dist/src/unix/map.c +8 -24
- data/ext/rugged/vendor/libgit2-dist/src/unix/posix.h +9 -3
- data/ext/rugged/vendor/libgit2-dist/src/util.c +94 -38
- data/ext/rugged/vendor/libgit2-dist/src/util.h +119 -13
- data/ext/rugged/vendor/libgit2-dist/src/vector.c +84 -31
- data/ext/rugged/vendor/libgit2-dist/src/vector.h +37 -4
- data/ext/rugged/vendor/libgit2-dist/src/win32/dir.c +81 -41
- data/ext/rugged/vendor/libgit2-dist/src/{dir.h → win32/dir.h} +4 -9
- data/ext/rugged/vendor/libgit2-dist/src/win32/map.c +19 -35
- data/ext/rugged/vendor/libgit2-dist/src/win32/mingw-compat.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/win32/msvc-compat.h +5 -1
- data/ext/rugged/vendor/libgit2-dist/src/win32/posix.h +10 -8
- data/ext/rugged/vendor/libgit2-dist/src/win32/posix_w32.c +262 -118
- data/ext/rugged/vendor/libgit2-dist/src/win32/pthread.c +12 -9
- data/ext/rugged/vendor/libgit2-dist/src/win32/pthread.h +1 -1
- data/ext/rugged/vendor/libgit2-dist/src/win32/utf-conv.c +30 -26
- data/ext/rugged/vendor/libgit2-dist/src/win32/utf-conv.h +2 -1
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xdiff.h +135 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xdiffi.c +572 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xdiffi.h +63 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xemit.c +253 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xemit.h +36 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xhistogram.c +371 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xinclude.h +46 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xmacros.h +54 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xmerge.c +619 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xpatience.c +358 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xprepare.c +483 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xprepare.h +34 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xtypes.h +67 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xutils.c +419 -0
- data/ext/rugged/vendor/libgit2-dist/src/xdiff/xutils.h +49 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/attr_expect.h +43 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/file.c +226 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/flags.c +108 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/lookup.c +262 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/repo.c +273 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/buf/basic.c +5 -5
- data/ext/rugged/vendor/libgit2-dist/tests-clar/clar_helpers.c +181 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/clar_libgit2.h +55 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/commit.c +44 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/parse.c +350 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/signature.c +65 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/write.c +140 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/config/add.c +3 -3
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/multivar.c +151 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/config/new.c +5 -5
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/config/read.c +44 -32
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/stress.c +61 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/config/write.c +20 -5
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/buffer.c +613 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/core/dirent.c +39 -26
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/env.c +115 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/errors.c +60 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/core/filebuf.c +4 -18
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/hex.c +22 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/core/oid.c +6 -6
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/path.c +420 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/pool.c +85 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/rmdir.c +68 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/core/string.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/strmap.c +102 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/core/strtol.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/vector.c +191 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/date/date.c +15 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/blob.c +254 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/diff_helpers.c +104 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/diff_helpers.h +47 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/index.c +92 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/iterator.c +572 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/patch.c +99 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/tree.c +210 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/workdir.c +543 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/index/read_tree.c +46 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/index/rename.c +2 -12
- data/ext/rugged/vendor/libgit2-dist/tests-clar/index/tests.c +246 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/network/createremotethenload.c +33 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/network/remotelocal.c +137 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/network/remotes.c +183 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/notes/notes.c +133 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/notes/notesref.c +57 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/blob/filter.c +125 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/blob/fromchunks.c +87 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/blob/write.c +69 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/commit/commitstagedfile.c +126 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/lookup.c +63 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/message.c +171 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/chars.c +3 -14
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/compare.c +4 -4
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/convert.c +10 -10
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/data.h +0 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/fromstr.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/hash.c +21 -17
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/short.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/size.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/raw/type2string.c +14 -14
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/write.c +455 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tag/peel.c +56 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tag/read.c +130 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tag/write.c +192 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/object/tree/frompath.c +22 -16
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tree/read.c +75 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tree/write.c +84 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/odb/loose.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/odb/loose_data.h +0 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/mixed.c +24 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/odb/pack_data.h +0 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/odb/packed.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/odb/sorting.c +1 -1
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/create.c +113 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/delete.c +91 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/listall.c +78 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/move.c +72 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/crashes.c +17 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/create.c +149 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/delete.c +85 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/list.c +53 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/listall.c +36 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/lookup.c +42 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/normalize.c +200 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/overwrite.c +136 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/pack.c +67 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/read.c +194 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/reflog.c +123 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/rename.c +339 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/revparse.c +174 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/unicode.c +42 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/discover.c +142 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/repo/getters.c +19 -1
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/init.c +235 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/open.c +282 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/setters.c +80 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/mixed.c +47 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/reset_helpers.c +10 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/reset_helpers.h +6 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/soft.c +102 -0
- data/ext/rugged/vendor/libgit2-dist/{tests/t05-revwalk.c → tests-clar/revwalk/basic.c} +85 -44
- data/ext/rugged/vendor/libgit2-dist/tests-clar/revwalk/mergebase.c +148 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/ignore.c +133 -0
- data/ext/rugged/vendor/libgit2-dist/{tests-clay → tests-clar}/status/single.c +2 -11
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/status_data.h +202 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/status_helpers.c +49 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/status_helpers.h +33 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/submodules.c +112 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/worktree.c +649 -0
- data/ext/rugged/vendor/libgit2-dist/tests-clar/threads/basic.c +20 -0
- data/ext/rugged/vendor/libgit2-dist.tar.gz +0 -0
- data/lib/rugged/commit.rb +35 -0
- data/lib/rugged/object.rb +7 -0
- data/lib/rugged/reference.rb +9 -0
- data/lib/rugged/repository.rb +99 -3
- data/lib/rugged/tag.rb +22 -0
- data/lib/rugged/tree.rb +8 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +4 -1
- data/test/blob_test.rb +2 -2
- data/test/commit_test.rb +27 -13
- data/test/config_test.rb +44 -0
- data/test/coverage/HEAD.json +1 -1
- data/test/fixtures/testrepo.git/config +2 -0
- data/test/fixtures/testrepo.git/objects/7f/043268ea43ce18e3540acaabf9e090c91965b0 +0 -0
- data/test/lib_test.rb +7 -0
- data/test/object_test.rb +3 -3
- data/test/reference_test.rb +46 -8
- data/test/remote_test.rb +8 -2
- data/test/repo_pack_test.rb +3 -3
- data/test/repo_test.rb +79 -11
- data/test/tag_test.rb +9 -2
- data/test/test_helper.rb +21 -0
- data/test/tree_test.rb +18 -6
- metadata +205 -81
- data/ext/rugged/vendor/libgit2-dist/include/git2/zlib.h +0 -40
- data/ext/rugged/vendor/libgit2-dist/src/hashtable.c +0 -243
- data/ext/rugged/vendor/libgit2-dist/src/hashtable.h +0 -80
- data/ext/rugged/vendor/libgit2-dist/tests/t00-core.c +0 -628
- data/ext/rugged/vendor/libgit2-dist/tests/t01-data.h +0 -322
- data/ext/rugged/vendor/libgit2-dist/tests/t01-rawobj.c +0 -638
- data/ext/rugged/vendor/libgit2-dist/tests/t03-data.h +0 -344
- data/ext/rugged/vendor/libgit2-dist/tests/t03-objwrite.c +0 -255
- data/ext/rugged/vendor/libgit2-dist/tests/t04-commit.c +0 -788
- data/ext/rugged/vendor/libgit2-dist/tests/t06-index.c +0 -219
- data/ext/rugged/vendor/libgit2-dist/tests/t07-hashtable.c +0 -192
- data/ext/rugged/vendor/libgit2-dist/tests/t08-tag.c +0 -357
- data/ext/rugged/vendor/libgit2-dist/tests/t09-tree.c +0 -221
- data/ext/rugged/vendor/libgit2-dist/tests/t10-refs.c +0 -1294
- data/ext/rugged/vendor/libgit2-dist/tests/t12-repo.c +0 -174
- data/ext/rugged/vendor/libgit2-dist/tests/t13-threads.c +0 -41
- data/ext/rugged/vendor/libgit2-dist/tests/t17-bufs.c +0 -61
- data/ext/rugged/vendor/libgit2-dist/tests/t18-status.c +0 -448
- data/ext/rugged/vendor/libgit2-dist/tests/test_helpers.c +0 -310
- data/ext/rugged/vendor/libgit2-dist/tests/test_helpers.h +0 -83
- data/ext/rugged/vendor/libgit2-dist/tests/test_lib.c +0 -198
- data/ext/rugged/vendor/libgit2-dist/tests/test_lib.h +0 -54
- data/ext/rugged/vendor/libgit2-dist/tests/test_main.c +0 -89
- data/ext/rugged/vendor/libgit2-dist/tests-clay/clay.h +0 -187
- data/ext/rugged/vendor/libgit2-dist/tests-clay/clay_libgit2.h +0 -28
- data/ext/rugged/vendor/libgit2-dist/tests-clay/clay_main.c +0 -1073
- data/ext/rugged/vendor/libgit2-dist/tests-clay/config/stress.c +0 -39
- data/ext/rugged/vendor/libgit2-dist/tests-clay/core/path.c +0 -139
- data/ext/rugged/vendor/libgit2-dist/tests-clay/core/rmdir.c +0 -50
- data/ext/rugged/vendor/libgit2-dist/tests-clay/core/vector.c +0 -66
- data/ext/rugged/vendor/libgit2-dist/tests-clay/network/remotes.c +0 -50
- data/ext/rugged/vendor/libgit2-dist/tests-clay/repo/init.c +0 -104
- data/ext/rugged/vendor/libgit2-dist/tests-clay/repo/open.c +0 -54
- data/ext/rugged/vendor/libgit2-dist/tests-clay/status/status_data.h +0 -48
- data/ext/rugged/vendor/libgit2-dist/tests-clay/status/worktree.c +0 -124
- data/lib/rugged/objects.rb +0 -45
- data/test/fixtures/testrepo.git/refs/heads/new_name +0 -1
@@ -0,0 +1,64 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) 2012 the libgit2 contributors
|
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
|
+
#ifndef INCLUDE_strmap_h__
|
8
|
+
#define INCLUDE_strmap_h__
|
9
|
+
|
10
|
+
#include "common.h"
|
11
|
+
|
12
|
+
#define kmalloc git__malloc
|
13
|
+
#define kcalloc git__calloc
|
14
|
+
#define krealloc git__realloc
|
15
|
+
#define kfree git__free
|
16
|
+
#include "khash.h"
|
17
|
+
|
18
|
+
__KHASH_TYPE(str, const char *, void *);
|
19
|
+
typedef khash_t(str) git_strmap;
|
20
|
+
|
21
|
+
#define GIT__USE_STRMAP \
|
22
|
+
__KHASH_IMPL(str, static inline, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
|
23
|
+
|
24
|
+
#define git_strmap_alloc() kh_init(str)
|
25
|
+
#define git_strmap_free(h) kh_destroy(str, h), h = NULL
|
26
|
+
#define git_strmap_clear(h) kh_clear(str, h)
|
27
|
+
|
28
|
+
#define git_strmap_num_entries(h) kh_size(h)
|
29
|
+
|
30
|
+
#define git_strmap_lookup_index(h, k) kh_get(str, h, k)
|
31
|
+
#define git_strmap_valid_index(h, idx) (idx != kh_end(h))
|
32
|
+
|
33
|
+
#define git_strmap_exists(h, k) (kh_get(str, h, k) != kh_end(h))
|
34
|
+
|
35
|
+
#define git_strmap_value_at(h, idx) kh_val(h, idx)
|
36
|
+
#define git_strmap_set_value_at(h, idx, v) kh_val(h, idx) = v
|
37
|
+
#define git_strmap_delete_at(h, idx) kh_del(str, h, idx)
|
38
|
+
|
39
|
+
#define git_strmap_insert(h, key, val, rval) do { \
|
40
|
+
khiter_t __pos = kh_put(str, h, key, &rval); \
|
41
|
+
if (rval >= 0) { \
|
42
|
+
if (rval == 0) kh_key(h, __pos) = key; \
|
43
|
+
kh_val(h, __pos) = val; \
|
44
|
+
} } while (0)
|
45
|
+
|
46
|
+
#define git_strmap_insert2(h, key, val, oldv, rval) do { \
|
47
|
+
khiter_t __pos = kh_put(str, h, key, &rval); \
|
48
|
+
if (rval >= 0) { \
|
49
|
+
if (rval == 0) { \
|
50
|
+
oldv = kh_val(h, __pos); \
|
51
|
+
kh_key(h, __pos) = key; \
|
52
|
+
} else { oldv = NULL; } \
|
53
|
+
kh_val(h, __pos) = val; \
|
54
|
+
} } while (0)
|
55
|
+
|
56
|
+
#define git_strmap_delete(h, key) do { \
|
57
|
+
khiter_t __pos = git_strmap_lookup_index(h, key); \
|
58
|
+
if (git_strmap_valid_index(h, __pos)) \
|
59
|
+
git_strmap_delete_at(h, __pos); } while (0)
|
60
|
+
|
61
|
+
#define git_strmap_foreach kh_foreach
|
62
|
+
#define git_strmap_foreach_value kh_foreach_value
|
63
|
+
|
64
|
+
#endif
|
@@ -0,0 +1,387 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) 2012 the libgit2 contributors
|
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 "common.h"
|
9
|
+
#include "git2/config.h"
|
10
|
+
#include "git2/types.h"
|
11
|
+
#include "git2/repository.h"
|
12
|
+
#include "git2/index.h"
|
13
|
+
#include "git2/submodule.h"
|
14
|
+
#include "buffer.h"
|
15
|
+
#include "vector.h"
|
16
|
+
#include "posix.h"
|
17
|
+
#include "config_file.h"
|
18
|
+
#include "config.h"
|
19
|
+
#include "repository.h"
|
20
|
+
|
21
|
+
static git_cvar_map _sm_update_map[] = {
|
22
|
+
{GIT_CVAR_STRING, "checkout", GIT_SUBMODULE_UPDATE_CHECKOUT},
|
23
|
+
{GIT_CVAR_STRING, "rebase", GIT_SUBMODULE_UPDATE_REBASE},
|
24
|
+
{GIT_CVAR_STRING, "merge", GIT_SUBMODULE_UPDATE_MERGE}
|
25
|
+
};
|
26
|
+
|
27
|
+
static git_cvar_map _sm_ignore_map[] = {
|
28
|
+
{GIT_CVAR_STRING, "all", GIT_SUBMODULE_IGNORE_ALL},
|
29
|
+
{GIT_CVAR_STRING, "dirty", GIT_SUBMODULE_IGNORE_DIRTY},
|
30
|
+
{GIT_CVAR_STRING, "untracked", GIT_SUBMODULE_IGNORE_UNTRACKED},
|
31
|
+
{GIT_CVAR_STRING, "none", GIT_SUBMODULE_IGNORE_NONE}
|
32
|
+
};
|
33
|
+
|
34
|
+
static inline khint_t str_hash_no_trailing_slash(const char *s)
|
35
|
+
{
|
36
|
+
khint_t h;
|
37
|
+
|
38
|
+
for (h = 0; *s; ++s)
|
39
|
+
if (s[1] || *s != '/')
|
40
|
+
h = (h << 5) - h + *s;
|
41
|
+
|
42
|
+
return h;
|
43
|
+
}
|
44
|
+
|
45
|
+
static inline int str_equal_no_trailing_slash(const char *a, const char *b)
|
46
|
+
{
|
47
|
+
size_t alen = a ? strlen(a) : 0;
|
48
|
+
size_t blen = b ? strlen(b) : 0;
|
49
|
+
|
50
|
+
if (alen && a[alen] == '/')
|
51
|
+
alen--;
|
52
|
+
if (blen && b[blen] == '/')
|
53
|
+
blen--;
|
54
|
+
|
55
|
+
return (alen == blen && strncmp(a, b, alen) == 0);
|
56
|
+
}
|
57
|
+
|
58
|
+
__KHASH_IMPL(str, static inline, const char *, void *, 1, str_hash_no_trailing_slash, str_equal_no_trailing_slash);
|
59
|
+
|
60
|
+
static git_submodule *submodule_alloc(const char *name)
|
61
|
+
{
|
62
|
+
git_submodule *sm = git__calloc(1, sizeof(git_submodule));
|
63
|
+
if (sm == NULL)
|
64
|
+
return sm;
|
65
|
+
|
66
|
+
sm->path = sm->name = git__strdup(name);
|
67
|
+
if (!sm->name) {
|
68
|
+
git__free(sm);
|
69
|
+
return NULL;
|
70
|
+
}
|
71
|
+
|
72
|
+
return sm;
|
73
|
+
}
|
74
|
+
|
75
|
+
static void submodule_release(git_submodule *sm, int decr)
|
76
|
+
{
|
77
|
+
if (!sm)
|
78
|
+
return;
|
79
|
+
|
80
|
+
sm->refcount -= decr;
|
81
|
+
|
82
|
+
if (sm->refcount == 0) {
|
83
|
+
if (sm->name != sm->path)
|
84
|
+
git__free(sm->path);
|
85
|
+
git__free(sm->name);
|
86
|
+
git__free(sm->url);
|
87
|
+
git__free(sm);
|
88
|
+
}
|
89
|
+
}
|
90
|
+
|
91
|
+
static int submodule_from_entry(
|
92
|
+
git_strmap *smcfg, git_index_entry *entry)
|
93
|
+
{
|
94
|
+
git_submodule *sm;
|
95
|
+
void *old_sm;
|
96
|
+
khiter_t pos;
|
97
|
+
int error;
|
98
|
+
|
99
|
+
pos = git_strmap_lookup_index(smcfg, entry->path);
|
100
|
+
|
101
|
+
if (git_strmap_valid_index(smcfg, pos))
|
102
|
+
sm = git_strmap_value_at(smcfg, pos);
|
103
|
+
else
|
104
|
+
sm = submodule_alloc(entry->path);
|
105
|
+
|
106
|
+
git_oid_cpy(&sm->oid, &entry->oid);
|
107
|
+
|
108
|
+
if (strcmp(sm->path, entry->path) != 0) {
|
109
|
+
if (sm->path != sm->name) {
|
110
|
+
git__free(sm->path);
|
111
|
+
sm->path = sm->name;
|
112
|
+
}
|
113
|
+
sm->path = git__strdup(entry->path);
|
114
|
+
if (!sm->path)
|
115
|
+
goto fail;
|
116
|
+
}
|
117
|
+
|
118
|
+
git_strmap_insert2(smcfg, sm->path, sm, old_sm, error);
|
119
|
+
if (error < 0)
|
120
|
+
goto fail;
|
121
|
+
sm->refcount++;
|
122
|
+
|
123
|
+
if (old_sm && ((git_submodule *)old_sm) != sm) {
|
124
|
+
/* TODO: log warning about multiple entrys for same submodule path */
|
125
|
+
submodule_release(old_sm, 1);
|
126
|
+
}
|
127
|
+
|
128
|
+
return 0;
|
129
|
+
|
130
|
+
fail:
|
131
|
+
submodule_release(sm, 0);
|
132
|
+
return -1;
|
133
|
+
}
|
134
|
+
|
135
|
+
static int submodule_from_config(
|
136
|
+
const char *key, const char *value, void *data)
|
137
|
+
{
|
138
|
+
git_strmap *smcfg = data;
|
139
|
+
const char *namestart;
|
140
|
+
const char *property;
|
141
|
+
git_buf name = GIT_BUF_INIT;
|
142
|
+
git_submodule *sm;
|
143
|
+
void *old_sm = NULL;
|
144
|
+
bool is_path;
|
145
|
+
khiter_t pos;
|
146
|
+
int error;
|
147
|
+
|
148
|
+
if (git__prefixcmp(key, "submodule.") != 0)
|
149
|
+
return 0;
|
150
|
+
|
151
|
+
namestart = key + strlen("submodule.");
|
152
|
+
property = strrchr(namestart, '.');
|
153
|
+
if (property == NULL)
|
154
|
+
return 0;
|
155
|
+
property++;
|
156
|
+
is_path = (strcmp(property, "path") == 0);
|
157
|
+
|
158
|
+
if (git_buf_set(&name, namestart, property - namestart - 1) < 0)
|
159
|
+
return -1;
|
160
|
+
|
161
|
+
pos = git_strmap_lookup_index(smcfg, name.ptr);
|
162
|
+
if (!git_strmap_valid_index(smcfg, pos) && is_path)
|
163
|
+
pos = git_strmap_lookup_index(smcfg, value);
|
164
|
+
if (!git_strmap_valid_index(smcfg, pos))
|
165
|
+
sm = submodule_alloc(name.ptr);
|
166
|
+
else
|
167
|
+
sm = git_strmap_value_at(smcfg, pos);
|
168
|
+
if (!sm)
|
169
|
+
goto fail;
|
170
|
+
|
171
|
+
if (strcmp(sm->name, name.ptr) != 0) {
|
172
|
+
assert(sm->path == sm->name);
|
173
|
+
sm->name = git_buf_detach(&name);
|
174
|
+
|
175
|
+
git_strmap_insert2(smcfg, sm->name, sm, old_sm, error);
|
176
|
+
if (error < 0)
|
177
|
+
goto fail;
|
178
|
+
sm->refcount++;
|
179
|
+
}
|
180
|
+
else if (is_path && strcmp(sm->path, value) != 0) {
|
181
|
+
assert(sm->path == sm->name);
|
182
|
+
sm->path = git__strdup(value);
|
183
|
+
if (sm->path == NULL)
|
184
|
+
goto fail;
|
185
|
+
|
186
|
+
git_strmap_insert2(smcfg, sm->path, sm, old_sm, error);
|
187
|
+
if (error < 0)
|
188
|
+
goto fail;
|
189
|
+
sm->refcount++;
|
190
|
+
}
|
191
|
+
git_buf_free(&name);
|
192
|
+
|
193
|
+
if (old_sm && ((git_submodule *)old_sm) != sm) {
|
194
|
+
/* TODO: log warning about multiple submodules with same path */
|
195
|
+
submodule_release(old_sm, 1);
|
196
|
+
}
|
197
|
+
|
198
|
+
if (is_path)
|
199
|
+
return 0;
|
200
|
+
|
201
|
+
/* copy other properties into submodule entry */
|
202
|
+
if (strcmp(property, "url") == 0) {
|
203
|
+
if (sm->url) {
|
204
|
+
git__free(sm->url);
|
205
|
+
sm->url = NULL;
|
206
|
+
}
|
207
|
+
if ((sm->url = git__strdup(value)) == NULL)
|
208
|
+
goto fail;
|
209
|
+
}
|
210
|
+
else if (strcmp(property, "update") == 0) {
|
211
|
+
int val;
|
212
|
+
if (git_config_lookup_map_value(
|
213
|
+
_sm_update_map, ARRAY_SIZE(_sm_update_map), value, &val) < 0) {
|
214
|
+
giterr_set(GITERR_INVALID,
|
215
|
+
"Invalid value for submodule update property: '%s'", value);
|
216
|
+
goto fail;
|
217
|
+
}
|
218
|
+
sm->update = (git_submodule_update_t)val;
|
219
|
+
}
|
220
|
+
else if (strcmp(property, "fetchRecurseSubmodules") == 0) {
|
221
|
+
if (git__parse_bool(&sm->fetch_recurse, value) < 0) {
|
222
|
+
giterr_set(GITERR_INVALID,
|
223
|
+
"Invalid value for submodule 'fetchRecurseSubmodules' property: '%s'", value);
|
224
|
+
goto fail;
|
225
|
+
}
|
226
|
+
}
|
227
|
+
else if (strcmp(property, "ignore") == 0) {
|
228
|
+
int val;
|
229
|
+
if (git_config_lookup_map_value(
|
230
|
+
_sm_ignore_map, ARRAY_SIZE(_sm_ignore_map), value, &val) < 0) {
|
231
|
+
giterr_set(GITERR_INVALID,
|
232
|
+
"Invalid value for submodule ignore property: '%s'", value);
|
233
|
+
goto fail;
|
234
|
+
}
|
235
|
+
sm->ignore = (git_submodule_ignore_t)val;
|
236
|
+
}
|
237
|
+
/* ignore other unknown submodule properties */
|
238
|
+
|
239
|
+
return 0;
|
240
|
+
|
241
|
+
fail:
|
242
|
+
submodule_release(sm, 0);
|
243
|
+
git_buf_free(&name);
|
244
|
+
return -1;
|
245
|
+
}
|
246
|
+
|
247
|
+
static int load_submodule_config(git_repository *repo)
|
248
|
+
{
|
249
|
+
int error;
|
250
|
+
git_index *index;
|
251
|
+
unsigned int i, max_i;
|
252
|
+
git_oid gitmodules_oid;
|
253
|
+
git_strmap *smcfg;
|
254
|
+
struct git_config_file *mods = NULL;
|
255
|
+
|
256
|
+
if (repo->submodules)
|
257
|
+
return 0;
|
258
|
+
|
259
|
+
/* submodule data is kept in a hashtable with each submodule stored
|
260
|
+
* under both its name and its path. These are usually the same, but
|
261
|
+
* that is not guaranteed.
|
262
|
+
*/
|
263
|
+
smcfg = git_strmap_alloc();
|
264
|
+
GITERR_CHECK_ALLOC(smcfg);
|
265
|
+
|
266
|
+
/* scan index for gitmodules (and .gitmodules entry) */
|
267
|
+
if ((error = git_repository_index__weakptr(&index, repo)) < 0)
|
268
|
+
goto cleanup;
|
269
|
+
memset(&gitmodules_oid, 0, sizeof(gitmodules_oid));
|
270
|
+
max_i = git_index_entrycount(index);
|
271
|
+
|
272
|
+
for (i = 0; i < max_i; i++) {
|
273
|
+
git_index_entry *entry = git_index_get(index, i);
|
274
|
+
if (S_ISGITLINK(entry->mode)) {
|
275
|
+
if ((error = submodule_from_entry(smcfg, entry)) < 0)
|
276
|
+
goto cleanup;
|
277
|
+
}
|
278
|
+
else if (strcmp(entry->path, ".gitmodules") == 0)
|
279
|
+
git_oid_cpy(&gitmodules_oid, &entry->oid);
|
280
|
+
}
|
281
|
+
|
282
|
+
/* load .gitmodules from workdir if it exists */
|
283
|
+
if (git_repository_workdir(repo) != NULL) {
|
284
|
+
/* look in workdir for .gitmodules */
|
285
|
+
git_buf path = GIT_BUF_INIT;
|
286
|
+
if (!git_buf_joinpath(
|
287
|
+
&path, git_repository_workdir(repo), ".gitmodules") &&
|
288
|
+
git_path_isfile(path.ptr))
|
289
|
+
{
|
290
|
+
if (!(error = git_config_file__ondisk(&mods, path.ptr)))
|
291
|
+
error = git_config_file_open(mods);
|
292
|
+
}
|
293
|
+
git_buf_free(&path);
|
294
|
+
}
|
295
|
+
|
296
|
+
/* load .gitmodules from object cache if not in workdir */
|
297
|
+
if (!error && mods == NULL && !git_oid_iszero(&gitmodules_oid)) {
|
298
|
+
/* TODO: is it worth loading gitmodules from object cache? */
|
299
|
+
}
|
300
|
+
|
301
|
+
/* process .gitmodules info */
|
302
|
+
if (!error && mods != NULL)
|
303
|
+
error = git_config_file_foreach(mods, submodule_from_config, smcfg);
|
304
|
+
|
305
|
+
/* store submodule config in repo */
|
306
|
+
if (!error)
|
307
|
+
repo->submodules = smcfg;
|
308
|
+
|
309
|
+
cleanup:
|
310
|
+
if (mods != NULL)
|
311
|
+
git_config_file_free(mods);
|
312
|
+
if (error)
|
313
|
+
git_strmap_free(smcfg);
|
314
|
+
return error;
|
315
|
+
}
|
316
|
+
|
317
|
+
void git_submodule_config_free(git_repository *repo)
|
318
|
+
{
|
319
|
+
git_strmap *smcfg = repo->submodules;
|
320
|
+
git_submodule *sm;
|
321
|
+
|
322
|
+
repo->submodules = NULL;
|
323
|
+
|
324
|
+
if (smcfg == NULL)
|
325
|
+
return;
|
326
|
+
|
327
|
+
git_strmap_foreach_value(smcfg, sm, {
|
328
|
+
submodule_release(sm,1);
|
329
|
+
});
|
330
|
+
git_strmap_free(smcfg);
|
331
|
+
}
|
332
|
+
|
333
|
+
static int submodule_cmp(const void *a, const void *b)
|
334
|
+
{
|
335
|
+
return strcmp(((git_submodule *)a)->name, ((git_submodule *)b)->name);
|
336
|
+
}
|
337
|
+
|
338
|
+
int git_submodule_foreach(
|
339
|
+
git_repository *repo,
|
340
|
+
int (*callback)(const char *name, void *payload),
|
341
|
+
void *payload)
|
342
|
+
{
|
343
|
+
int error;
|
344
|
+
git_submodule *sm;
|
345
|
+
git_vector seen = GIT_VECTOR_INIT;
|
346
|
+
seen._cmp = submodule_cmp;
|
347
|
+
|
348
|
+
if ((error = load_submodule_config(repo)) < 0)
|
349
|
+
return error;
|
350
|
+
|
351
|
+
git_strmap_foreach_value(repo->submodules, sm, {
|
352
|
+
/* usually the following will not come into play */
|
353
|
+
if (sm->refcount > 1) {
|
354
|
+
if (git_vector_bsearch(&seen, sm) != GIT_ENOTFOUND)
|
355
|
+
continue;
|
356
|
+
if ((error = git_vector_insert(&seen, sm)) < 0)
|
357
|
+
break;
|
358
|
+
}
|
359
|
+
|
360
|
+
if ((error = callback(sm->name, payload)) < 0)
|
361
|
+
break;
|
362
|
+
});
|
363
|
+
|
364
|
+
git_vector_free(&seen);
|
365
|
+
|
366
|
+
return error;
|
367
|
+
}
|
368
|
+
|
369
|
+
int git_submodule_lookup(
|
370
|
+
git_submodule **sm_ptr, /* NULL allowed if user only wants to test */
|
371
|
+
git_repository *repo,
|
372
|
+
const char *name) /* trailing slash is allowed */
|
373
|
+
{
|
374
|
+
khiter_t pos;
|
375
|
+
|
376
|
+
if (load_submodule_config(repo) < 0)
|
377
|
+
return -1;
|
378
|
+
|
379
|
+
pos = git_strmap_lookup_index(repo->submodules, name);
|
380
|
+
if (!git_strmap_valid_index(repo->submodules, pos))
|
381
|
+
return GIT_ENOTFOUND;
|
382
|
+
|
383
|
+
if (sm_ptr)
|
384
|
+
*sm_ptr = git_strmap_value_at(repo->submodules, pos);
|
385
|
+
|
386
|
+
return 0;
|
387
|
+
}
|