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,419 @@
|
|
1
|
+
/*
|
2
|
+
* LibXDiff by Davide Libenzi ( File Differential Library )
|
3
|
+
* Copyright (C) 2003 Davide Libenzi
|
4
|
+
*
|
5
|
+
* This library is free software; you can redistribute it and/or
|
6
|
+
* modify it under the terms of the GNU Lesser General Public
|
7
|
+
* License as published by the Free Software Foundation; either
|
8
|
+
* version 2.1 of the License, or (at your option) any later version.
|
9
|
+
*
|
10
|
+
* This library is distributed in the hope that it will be useful,
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
13
|
+
* Lesser General Public License for more details.
|
14
|
+
*
|
15
|
+
* You should have received a copy of the GNU Lesser General Public
|
16
|
+
* License along with this library; if not, write to the Free Software
|
17
|
+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
18
|
+
*
|
19
|
+
* Davide Libenzi <davidel@xmailserver.org>
|
20
|
+
*
|
21
|
+
*/
|
22
|
+
|
23
|
+
#include "xinclude.h"
|
24
|
+
|
25
|
+
|
26
|
+
|
27
|
+
|
28
|
+
long xdl_bogosqrt(long n) {
|
29
|
+
long i;
|
30
|
+
|
31
|
+
/*
|
32
|
+
* Classical integer square root approximation using shifts.
|
33
|
+
*/
|
34
|
+
for (i = 1; n > 0; n >>= 2)
|
35
|
+
i <<= 1;
|
36
|
+
|
37
|
+
return i;
|
38
|
+
}
|
39
|
+
|
40
|
+
|
41
|
+
int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
|
42
|
+
xdemitcb_t *ecb) {
|
43
|
+
int i = 2;
|
44
|
+
mmbuffer_t mb[3];
|
45
|
+
|
46
|
+
mb[0].ptr = (char *) pre;
|
47
|
+
mb[0].size = psize;
|
48
|
+
mb[1].ptr = (char *) rec;
|
49
|
+
mb[1].size = size;
|
50
|
+
if (size > 0 && rec[size - 1] != '\n') {
|
51
|
+
mb[2].ptr = (char *) "\n\\n";
|
52
|
+
mb[2].size = strlen(mb[2].ptr);
|
53
|
+
i++;
|
54
|
+
}
|
55
|
+
if (ecb->outf(ecb->priv, mb, i) < 0) {
|
56
|
+
|
57
|
+
return -1;
|
58
|
+
}
|
59
|
+
|
60
|
+
return 0;
|
61
|
+
}
|
62
|
+
|
63
|
+
void *xdl_mmfile_first(mmfile_t *mmf, long *size)
|
64
|
+
{
|
65
|
+
*size = (long)mmf->size;
|
66
|
+
return mmf->ptr;
|
67
|
+
}
|
68
|
+
|
69
|
+
|
70
|
+
long xdl_mmfile_size(mmfile_t *mmf)
|
71
|
+
{
|
72
|
+
return (long)mmf->size;
|
73
|
+
}
|
74
|
+
|
75
|
+
|
76
|
+
int xdl_cha_init(chastore_t *cha, long isize, long icount) {
|
77
|
+
|
78
|
+
cha->head = cha->tail = NULL;
|
79
|
+
cha->isize = isize;
|
80
|
+
cha->nsize = icount * isize;
|
81
|
+
cha->ancur = cha->sncur = NULL;
|
82
|
+
cha->scurr = 0;
|
83
|
+
|
84
|
+
return 0;
|
85
|
+
}
|
86
|
+
|
87
|
+
|
88
|
+
void xdl_cha_free(chastore_t *cha) {
|
89
|
+
chanode_t *cur, *tmp;
|
90
|
+
|
91
|
+
for (cur = cha->head; (tmp = cur) != NULL;) {
|
92
|
+
cur = cur->next;
|
93
|
+
xdl_free(tmp);
|
94
|
+
}
|
95
|
+
}
|
96
|
+
|
97
|
+
|
98
|
+
void *xdl_cha_alloc(chastore_t *cha) {
|
99
|
+
chanode_t *ancur;
|
100
|
+
void *data;
|
101
|
+
|
102
|
+
if (!(ancur = cha->ancur) || ancur->icurr == cha->nsize) {
|
103
|
+
if (!(ancur = (chanode_t *) xdl_malloc(sizeof(chanode_t) + cha->nsize))) {
|
104
|
+
|
105
|
+
return NULL;
|
106
|
+
}
|
107
|
+
ancur->icurr = 0;
|
108
|
+
ancur->next = NULL;
|
109
|
+
if (cha->tail)
|
110
|
+
cha->tail->next = ancur;
|
111
|
+
if (!cha->head)
|
112
|
+
cha->head = ancur;
|
113
|
+
cha->tail = ancur;
|
114
|
+
cha->ancur = ancur;
|
115
|
+
}
|
116
|
+
|
117
|
+
data = (char *) ancur + sizeof(chanode_t) + ancur->icurr;
|
118
|
+
ancur->icurr += cha->isize;
|
119
|
+
|
120
|
+
return data;
|
121
|
+
}
|
122
|
+
|
123
|
+
|
124
|
+
void *xdl_cha_first(chastore_t *cha) {
|
125
|
+
chanode_t *sncur;
|
126
|
+
|
127
|
+
if (!(cha->sncur = sncur = cha->head))
|
128
|
+
return NULL;
|
129
|
+
|
130
|
+
cha->scurr = 0;
|
131
|
+
|
132
|
+
return (char *) sncur + sizeof(chanode_t) + cha->scurr;
|
133
|
+
}
|
134
|
+
|
135
|
+
|
136
|
+
void *xdl_cha_next(chastore_t *cha) {
|
137
|
+
chanode_t *sncur;
|
138
|
+
|
139
|
+
if (!(sncur = cha->sncur))
|
140
|
+
return NULL;
|
141
|
+
cha->scurr += cha->isize;
|
142
|
+
if (cha->scurr == sncur->icurr) {
|
143
|
+
if (!(sncur = cha->sncur = sncur->next))
|
144
|
+
return NULL;
|
145
|
+
cha->scurr = 0;
|
146
|
+
}
|
147
|
+
|
148
|
+
return (char *) sncur + sizeof(chanode_t) + cha->scurr;
|
149
|
+
}
|
150
|
+
|
151
|
+
|
152
|
+
long xdl_guess_lines(mmfile_t *mf, long sample) {
|
153
|
+
long nl = 0, size, tsize = 0;
|
154
|
+
char const *data, *cur, *top;
|
155
|
+
|
156
|
+
if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) {
|
157
|
+
for (top = data + size; nl < sample && cur < top; ) {
|
158
|
+
nl++;
|
159
|
+
if (!(cur = memchr(cur, '\n', top - cur)))
|
160
|
+
cur = top;
|
161
|
+
else
|
162
|
+
cur++;
|
163
|
+
}
|
164
|
+
tsize += (long) (cur - data);
|
165
|
+
}
|
166
|
+
|
167
|
+
if (nl && tsize)
|
168
|
+
nl = xdl_mmfile_size(mf) / (tsize / nl);
|
169
|
+
|
170
|
+
return nl + 1;
|
171
|
+
}
|
172
|
+
|
173
|
+
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
|
174
|
+
{
|
175
|
+
int i1, i2;
|
176
|
+
|
177
|
+
if (s1 == s2 && !memcmp(l1, l2, s1))
|
178
|
+
return 1;
|
179
|
+
if (!(flags & XDF_WHITESPACE_FLAGS))
|
180
|
+
return 0;
|
181
|
+
|
182
|
+
i1 = 0;
|
183
|
+
i2 = 0;
|
184
|
+
|
185
|
+
/*
|
186
|
+
* -w matches everything that matches with -b, and -b in turn
|
187
|
+
* matches everything that matches with --ignore-space-at-eol.
|
188
|
+
*
|
189
|
+
* Each flavor of ignoring needs different logic to skip whitespaces
|
190
|
+
* while we have both sides to compare.
|
191
|
+
*/
|
192
|
+
if (flags & XDF_IGNORE_WHITESPACE) {
|
193
|
+
goto skip_ws;
|
194
|
+
while (i1 < s1 && i2 < s2) {
|
195
|
+
if (l1[i1++] != l2[i2++])
|
196
|
+
return 0;
|
197
|
+
skip_ws:
|
198
|
+
while (i1 < s1 && XDL_ISSPACE(l1[i1]))
|
199
|
+
i1++;
|
200
|
+
while (i2 < s2 && XDL_ISSPACE(l2[i2]))
|
201
|
+
i2++;
|
202
|
+
}
|
203
|
+
} else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
|
204
|
+
while (i1 < s1 && i2 < s2) {
|
205
|
+
if (XDL_ISSPACE(l1[i1]) && XDL_ISSPACE(l2[i2])) {
|
206
|
+
/* Skip matching spaces and try again */
|
207
|
+
while (i1 < s1 && XDL_ISSPACE(l1[i1]))
|
208
|
+
i1++;
|
209
|
+
while (i2 < s2 && XDL_ISSPACE(l2[i2]))
|
210
|
+
i2++;
|
211
|
+
continue;
|
212
|
+
}
|
213
|
+
if (l1[i1++] != l2[i2++])
|
214
|
+
return 0;
|
215
|
+
}
|
216
|
+
} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
|
217
|
+
while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])
|
218
|
+
; /* keep going */
|
219
|
+
}
|
220
|
+
|
221
|
+
/*
|
222
|
+
* After running out of one side, the remaining side must have
|
223
|
+
* nothing but whitespace for the lines to match. Note that
|
224
|
+
* ignore-whitespace-at-eol case may break out of the loop
|
225
|
+
* while there still are characters remaining on both lines.
|
226
|
+
*/
|
227
|
+
if (i1 < s1) {
|
228
|
+
while (i1 < s1 && XDL_ISSPACE(l1[i1]))
|
229
|
+
i1++;
|
230
|
+
if (s1 != i1)
|
231
|
+
return 0;
|
232
|
+
}
|
233
|
+
if (i2 < s2) {
|
234
|
+
while (i2 < s2 && XDL_ISSPACE(l2[i2]))
|
235
|
+
i2++;
|
236
|
+
return (s2 == i2);
|
237
|
+
}
|
238
|
+
return 1;
|
239
|
+
}
|
240
|
+
|
241
|
+
static unsigned long xdl_hash_record_with_whitespace(char const **data,
|
242
|
+
char const *top, long flags) {
|
243
|
+
unsigned long ha = 5381;
|
244
|
+
char const *ptr = *data;
|
245
|
+
|
246
|
+
for (; ptr < top && *ptr != '\n'; ptr++) {
|
247
|
+
if (XDL_ISSPACE(*ptr)) {
|
248
|
+
const char *ptr2 = ptr;
|
249
|
+
int at_eol;
|
250
|
+
while (ptr + 1 < top && XDL_ISSPACE(ptr[1])
|
251
|
+
&& ptr[1] != '\n')
|
252
|
+
ptr++;
|
253
|
+
at_eol = (top <= ptr + 1 || ptr[1] == '\n');
|
254
|
+
if (flags & XDF_IGNORE_WHITESPACE)
|
255
|
+
; /* already handled */
|
256
|
+
else if (flags & XDF_IGNORE_WHITESPACE_CHANGE
|
257
|
+
&& !at_eol) {
|
258
|
+
ha += (ha << 5);
|
259
|
+
ha ^= (unsigned long) ' ';
|
260
|
+
}
|
261
|
+
else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL
|
262
|
+
&& !at_eol) {
|
263
|
+
while (ptr2 != ptr + 1) {
|
264
|
+
ha += (ha << 5);
|
265
|
+
ha ^= (unsigned long) *ptr2;
|
266
|
+
ptr2++;
|
267
|
+
}
|
268
|
+
}
|
269
|
+
continue;
|
270
|
+
}
|
271
|
+
ha += (ha << 5);
|
272
|
+
ha ^= (unsigned long) *ptr;
|
273
|
+
}
|
274
|
+
*data = ptr < top ? ptr + 1: ptr;
|
275
|
+
|
276
|
+
return ha;
|
277
|
+
}
|
278
|
+
|
279
|
+
|
280
|
+
unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
|
281
|
+
unsigned long ha = 5381;
|
282
|
+
char const *ptr = *data;
|
283
|
+
|
284
|
+
if (flags & XDF_WHITESPACE_FLAGS)
|
285
|
+
return xdl_hash_record_with_whitespace(data, top, flags);
|
286
|
+
|
287
|
+
for (; ptr < top && *ptr != '\n'; ptr++) {
|
288
|
+
ha += (ha << 5);
|
289
|
+
ha ^= (unsigned long) *ptr;
|
290
|
+
}
|
291
|
+
*data = ptr < top ? ptr + 1: ptr;
|
292
|
+
|
293
|
+
return ha;
|
294
|
+
}
|
295
|
+
|
296
|
+
|
297
|
+
unsigned int xdl_hashbits(unsigned int size) {
|
298
|
+
unsigned int val = 1, bits = 0;
|
299
|
+
|
300
|
+
for (; val < size && bits < CHAR_BIT * sizeof(unsigned int); val <<= 1, bits++);
|
301
|
+
return bits ? bits: 1;
|
302
|
+
}
|
303
|
+
|
304
|
+
|
305
|
+
int xdl_num_out(char *out, long val) {
|
306
|
+
char *ptr, *str = out;
|
307
|
+
char buf[32];
|
308
|
+
|
309
|
+
ptr = buf + sizeof(buf) - 1;
|
310
|
+
*ptr = '\0';
|
311
|
+
if (val < 0) {
|
312
|
+
*--ptr = '-';
|
313
|
+
val = -val;
|
314
|
+
}
|
315
|
+
for (; val && ptr > buf; val /= 10)
|
316
|
+
*--ptr = "0123456789"[val % 10];
|
317
|
+
if (*ptr)
|
318
|
+
for (; *ptr; ptr++, str++)
|
319
|
+
*str = *ptr;
|
320
|
+
else
|
321
|
+
*str++ = '0';
|
322
|
+
*str = '\0';
|
323
|
+
|
324
|
+
return (int)(str - out);
|
325
|
+
}
|
326
|
+
|
327
|
+
|
328
|
+
long xdl_atol(char const *str, char const **next) {
|
329
|
+
long val, base;
|
330
|
+
char const *top;
|
331
|
+
|
332
|
+
for (top = str; XDL_ISDIGIT(*top); top++);
|
333
|
+
if (next)
|
334
|
+
*next = top;
|
335
|
+
for (val = 0, base = 1, top--; top >= str; top--, base *= 10)
|
336
|
+
val += base * (long)(*top - '0');
|
337
|
+
return val;
|
338
|
+
}
|
339
|
+
|
340
|
+
|
341
|
+
int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
|
342
|
+
const char *func, long funclen, xdemitcb_t *ecb) {
|
343
|
+
int nb = 0;
|
344
|
+
mmbuffer_t mb;
|
345
|
+
char buf[128];
|
346
|
+
|
347
|
+
memcpy(buf, "@@ -", 4);
|
348
|
+
nb += 4;
|
349
|
+
|
350
|
+
nb += xdl_num_out(buf + nb, c1 ? s1: s1 - 1);
|
351
|
+
|
352
|
+
if (c1 != 1) {
|
353
|
+
memcpy(buf + nb, ",", 1);
|
354
|
+
nb += 1;
|
355
|
+
|
356
|
+
nb += xdl_num_out(buf + nb, c1);
|
357
|
+
}
|
358
|
+
|
359
|
+
memcpy(buf + nb, " +", 2);
|
360
|
+
nb += 2;
|
361
|
+
|
362
|
+
nb += xdl_num_out(buf + nb, c2 ? s2: s2 - 1);
|
363
|
+
|
364
|
+
if (c2 != 1) {
|
365
|
+
memcpy(buf + nb, ",", 1);
|
366
|
+
nb += 1;
|
367
|
+
|
368
|
+
nb += xdl_num_out(buf + nb, c2);
|
369
|
+
}
|
370
|
+
|
371
|
+
memcpy(buf + nb, " @@", 3);
|
372
|
+
nb += 3;
|
373
|
+
if (func && funclen) {
|
374
|
+
buf[nb++] = ' ';
|
375
|
+
if (funclen > (long)sizeof(buf) - nb - 1)
|
376
|
+
funclen = (long)sizeof(buf) - nb - 1;
|
377
|
+
memcpy(buf + nb, func, funclen);
|
378
|
+
nb += funclen;
|
379
|
+
}
|
380
|
+
buf[nb++] = '\n';
|
381
|
+
|
382
|
+
mb.ptr = buf;
|
383
|
+
mb.size = nb;
|
384
|
+
if (ecb->outf(ecb->priv, &mb, 1) < 0)
|
385
|
+
return -1;
|
386
|
+
|
387
|
+
return 0;
|
388
|
+
}
|
389
|
+
|
390
|
+
int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
|
391
|
+
int line1, int count1, int line2, int count2)
|
392
|
+
{
|
393
|
+
/*
|
394
|
+
* This probably does not work outside Git, since
|
395
|
+
* we have a very simple mmfile structure.
|
396
|
+
*
|
397
|
+
* Note: ideally, we would reuse the prepared environment, but
|
398
|
+
* the libxdiff interface does not (yet) allow for diffing only
|
399
|
+
* ranges of lines instead of the whole files.
|
400
|
+
*/
|
401
|
+
mmfile_t subfile1, subfile2;
|
402
|
+
xdfenv_t env;
|
403
|
+
|
404
|
+
subfile1.ptr = (char *)diff_env->xdf1.recs[line1 - 1]->ptr;
|
405
|
+
subfile1.size = diff_env->xdf1.recs[line1 + count1 - 2]->ptr +
|
406
|
+
diff_env->xdf1.recs[line1 + count1 - 2]->size - subfile1.ptr;
|
407
|
+
subfile2.ptr = (char *)diff_env->xdf2.recs[line2 - 1]->ptr;
|
408
|
+
subfile2.size = diff_env->xdf2.recs[line2 + count2 - 2]->ptr +
|
409
|
+
diff_env->xdf2.recs[line2 + count2 - 2]->size - subfile2.ptr;
|
410
|
+
if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0)
|
411
|
+
return -1;
|
412
|
+
|
413
|
+
memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1);
|
414
|
+
memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2);
|
415
|
+
|
416
|
+
xdl_free_env(&env);
|
417
|
+
|
418
|
+
return 0;
|
419
|
+
}
|
@@ -0,0 +1,49 @@
|
|
1
|
+
/*
|
2
|
+
* LibXDiff by Davide Libenzi ( File Differential Library )
|
3
|
+
* Copyright (C) 2003 Davide Libenzi
|
4
|
+
*
|
5
|
+
* This library is free software; you can redistribute it and/or
|
6
|
+
* modify it under the terms of the GNU Lesser General Public
|
7
|
+
* License as published by the Free Software Foundation; either
|
8
|
+
* version 2.1 of the License, or (at your option) any later version.
|
9
|
+
*
|
10
|
+
* This library is distributed in the hope that it will be useful,
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
13
|
+
* Lesser General Public License for more details.
|
14
|
+
*
|
15
|
+
* You should have received a copy of the GNU Lesser General Public
|
16
|
+
* License along with this library; if not, write to the Free Software
|
17
|
+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
18
|
+
*
|
19
|
+
* Davide Libenzi <davidel@xmailserver.org>
|
20
|
+
*
|
21
|
+
*/
|
22
|
+
|
23
|
+
#if !defined(XUTILS_H)
|
24
|
+
#define XUTILS_H
|
25
|
+
|
26
|
+
|
27
|
+
|
28
|
+
long xdl_bogosqrt(long n);
|
29
|
+
int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
|
30
|
+
xdemitcb_t *ecb);
|
31
|
+
int xdl_cha_init(chastore_t *cha, long isize, long icount);
|
32
|
+
void xdl_cha_free(chastore_t *cha);
|
33
|
+
void *xdl_cha_alloc(chastore_t *cha);
|
34
|
+
void *xdl_cha_first(chastore_t *cha);
|
35
|
+
void *xdl_cha_next(chastore_t *cha);
|
36
|
+
long xdl_guess_lines(mmfile_t *mf, long sample);
|
37
|
+
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags);
|
38
|
+
unsigned long xdl_hash_record(char const **data, char const *top, long flags);
|
39
|
+
unsigned int xdl_hashbits(unsigned int size);
|
40
|
+
int xdl_num_out(char *out, long val);
|
41
|
+
long xdl_atol(char const *str, char const **next);
|
42
|
+
int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
|
43
|
+
const char *func, long funclen, xdemitcb_t *ecb);
|
44
|
+
int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
|
45
|
+
int line1, int count1, int line2, int count2);
|
46
|
+
|
47
|
+
|
48
|
+
|
49
|
+
#endif /* #if !defined(XUTILS_H) */
|
@@ -0,0 +1,43 @@
|
|
1
|
+
#ifndef __CLAR_TEST_ATTR_EXPECT__
|
2
|
+
#define __CLAR_TEST_ATTR_EXPECT__
|
3
|
+
|
4
|
+
enum attr_expect_t {
|
5
|
+
EXPECT_FALSE,
|
6
|
+
EXPECT_TRUE,
|
7
|
+
EXPECT_UNDEFINED,
|
8
|
+
EXPECT_STRING
|
9
|
+
};
|
10
|
+
|
11
|
+
struct attr_expected {
|
12
|
+
const char *path;
|
13
|
+
const char *attr;
|
14
|
+
enum attr_expect_t expected;
|
15
|
+
const char *expected_str;
|
16
|
+
};
|
17
|
+
|
18
|
+
GIT_INLINE(void) attr_check_expected(
|
19
|
+
enum attr_expect_t expected,
|
20
|
+
const char *expected_str,
|
21
|
+
const char *name,
|
22
|
+
const char *value)
|
23
|
+
{
|
24
|
+
switch (expected) {
|
25
|
+
case EXPECT_TRUE:
|
26
|
+
cl_assert_(GIT_ATTR_TRUE(value), name);
|
27
|
+
break;
|
28
|
+
|
29
|
+
case EXPECT_FALSE:
|
30
|
+
cl_assert_(GIT_ATTR_FALSE(value), name);
|
31
|
+
break;
|
32
|
+
|
33
|
+
case EXPECT_UNDEFINED:
|
34
|
+
cl_assert_(GIT_ATTR_UNSPECIFIED(value), name);
|
35
|
+
break;
|
36
|
+
|
37
|
+
case EXPECT_STRING:
|
38
|
+
cl_assert_equal_s(expected_str, value);
|
39
|
+
break;
|
40
|
+
}
|
41
|
+
}
|
42
|
+
|
43
|
+
#endif
|