rugged 0.17.0b2 → 0.17.0.b6
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +10 -11
- data/ext/rugged/extconf.rb +5 -13
- data/ext/rugged/rugged_commit.c +2 -5
- data/ext/rugged/rugged_reference.c +29 -28
- data/ext/rugged/rugged_remote.c +1 -1
- data/ext/rugged/rugged_repo.c +4 -1
- data/ext/rugged/rugged_tree.c +20 -19
- data/lib/rugged/commit.rb +5 -1
- data/lib/rugged/repository.rb +6 -4
- data/lib/rugged/version.rb +1 -1
- data/test/config_test.rb +1 -1
- data/test/index_test.rb +4 -2
- data/test/object_test.rb +3 -3
- data/test/reference_test.rb +66 -1
- data/test/repo_test.rb +4 -4
- data/test/tree_test.rb +1 -1
- data/test/walker_test.rb +1 -1
- data/vendor/libgit2/Makefile.embed +42 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/http-parser/http_parser.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/http-parser/http_parser.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/config.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/regcomp.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/regex.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/regex.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/regex_internal.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/regex_internal.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/regex/regexec.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/adler32.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/crc32.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/crc32.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/deflate.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/deflate.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inffast.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inffast.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inffixed.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inflate.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inflate.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inftrees.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/inftrees.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/trees.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/trees.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/zconf.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/zlib.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/zutil.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/deps/zlib/zutil.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2.h +6 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/attr.h +35 -20
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/blob.h +1 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/branch.h +62 -24
- data/vendor/libgit2/include/git2/checkout.h +66 -0
- data/vendor/libgit2/include/git2/clone.h +59 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/commit.h +22 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/common.h +27 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/config.h +22 -4
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/diff.h +20 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/errors.h +2 -37
- data/vendor/libgit2/include/git2/ignore.h +74 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/index.h +37 -5
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/indexer.h +2 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/inttypes.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/merge.h +10 -0
- data/vendor/libgit2/include/git2/message.h +43 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/net.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/notes.h +24 -20
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/object.h +18 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/odb.h +16 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/odb_backend.h +8 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/oid.h +26 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/reflog.h +39 -9
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/refs.h +55 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/refspec.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/remote.h +68 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/repository.h +39 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/reset.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/revparse.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/revwalk.h +2 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/signature.h +3 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/status.h +5 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/stdint.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/submodule.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/tag.h +3 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/threads.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/tree.h +77 -20
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/types.h +14 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/version.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/windows.h +0 -0
- data/vendor/libgit2/src/amiga/map.c +51 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/attr.c +39 -6
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/attr.h +1 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/attr_file.c +2 -16
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/attr_file.h +4 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/blob.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/blob.h +0 -0
- data/vendor/libgit2/src/branch.c +294 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/bswap.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/buffer.c +40 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/buffer.h +22 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/cache.c +1 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/cache.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/cc-compat.h +0 -0
- data/vendor/libgit2/src/checkout.c +230 -0
- data/vendor/libgit2/src/clone.c +254 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/commit.c +42 -16
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/commit.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/common.h +3 -9
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/compat/fnmatch.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/compat/fnmatch.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/config.c +15 -5
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/config.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/config_cache.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/config_file.c +86 -19
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/config_file.h +16 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/crlf.c +92 -4
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/date.c +20 -20
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/delta-apply.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/delta-apply.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/diff.c +45 -18
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/diff.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/diff_output.c +63 -46
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/errors.c +0 -0
- data/vendor/libgit2/src/fetch.c +380 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/fetch.h +1 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/filebuf.c +7 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/filebuf.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/fileops.c +16 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/fileops.h +10 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/filter.c +38 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/filter.h +15 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/global.c +5 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/global.h +2 -6
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/hash.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/hash.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/ignore.c +50 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/ignore.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/index.c +95 -28
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/index.h +5 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/indexer.c +27 -25
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/iterator.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/iterator.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/khash.h +6 -4
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/map.h +4 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/message.c +27 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/message.h +2 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/mwindow.c +54 -10
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/mwindow.h +1 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/netops.c +48 -38
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/netops.h +7 -4
- data/vendor/libgit2/src/notes.c +610 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/notes.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/object.c +73 -2
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/odb.c +20 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/odb.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/odb_loose.c +89 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/odb_pack.c +61 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/oid.c +1 -6
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/oidmap.h +1 -6
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pack.c +49 -4
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pack.h +5 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/path.c +144 -21
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/path.h +46 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pkt.c +30 -8
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pkt.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pool.c +7 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pool.h +7 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/posix.c +92 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/posix.h +36 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/ppc/sha1.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/ppc/sha1.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pqueue.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/pqueue.h +0 -0
- data/vendor/libgit2/src/protocol.c +88 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/protocol.h +3 -9
- data/vendor/libgit2/src/reflog.c +489 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/reflog.h +3 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/refs.c +95 -52
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/refs.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/refspec.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/refspec.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/remote.c +130 -8
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/remote.h +6 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/repository.c +167 -42
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/repository.h +7 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/reset.c +1 -1
- data/vendor/libgit2/src/revparse.c +830 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/revwalk.c +83 -15
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/sha1.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/sha1.h +5 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/sha1_lookup.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/sha1_lookup.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/signature.c +19 -5
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/signature.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/status.c +24 -18
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/strmap.h +1 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/submodule.c +3 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tag.c +2 -9
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tag.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/thread-utils.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/thread-utils.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/transport.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/transport.h +13 -9
- data/vendor/libgit2/src/transports/git.c +245 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/transports/http.c +93 -336
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/transports/local.c +35 -32
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tree-cache.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tree-cache.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tree.c +214 -124
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tree.h +7 -3
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/tsort.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/unix/map.c +2 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/unix/posix.h +2 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/util.c +30 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/util.h +13 -6
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/vector.c +1 -1
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/vector.h +5 -5
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/dir.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/dir.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/map.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/mingw-compat.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/msvc-compat.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/posix.h +1 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/posix_w32.c +17 -1
- data/vendor/libgit2/src/win32/precompiled.c +1 -0
- data/vendor/libgit2/src/win32/precompiled.h +19 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/pthread.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/pthread.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/utf-conv.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/win32/utf-conv.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xdiff.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xdiffi.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xdiffi.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xemit.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xemit.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xhistogram.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xinclude.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xmacros.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xmerge.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xpatience.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xprepare.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xprepare.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xtypes.h +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xutils.c +0 -0
- data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/src/xdiff/xutils.h +0 -0
- metadata +265 -348
- data/ext/rugged/vendor/libgit2-dist.tar.gz +0 -0
- data/ext/rugged/vendor/libgit2-dist/examples/diff.c +0 -238
- data/ext/rugged/vendor/libgit2-dist/examples/general.c +0 -451
- data/ext/rugged/vendor/libgit2-dist/examples/network/common.h +0 -14
- data/ext/rugged/vendor/libgit2-dist/examples/network/fetch.c +0 -113
- data/ext/rugged/vendor/libgit2-dist/examples/network/git2.c +0 -62
- data/ext/rugged/vendor/libgit2-dist/examples/network/index-pack.c +0 -102
- data/ext/rugged/vendor/libgit2-dist/examples/network/ls-remote.c +0 -76
- data/ext/rugged/vendor/libgit2-dist/examples/showindex.c +0 -43
- data/ext/rugged/vendor/libgit2-dist/src/branch.c +0 -208
- data/ext/rugged/vendor/libgit2-dist/src/branch.h +0 -17
- data/ext/rugged/vendor/libgit2-dist/src/fetch.c +0 -200
- data/ext/rugged/vendor/libgit2-dist/src/notes.c +0 -548
- data/ext/rugged/vendor/libgit2-dist/src/protocol.c +0 -58
- data/ext/rugged/vendor/libgit2-dist/src/reflog.c +0 -340
- data/ext/rugged/vendor/libgit2-dist/src/revparse.c +0 -748
- data/ext/rugged/vendor/libgit2-dist/src/transports/git.c +0 -477
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/attr_expect.h +0 -43
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/file.c +0 -226
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/flags.c +0 -108
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/lookup.c +0 -262
- data/ext/rugged/vendor/libgit2-dist/tests-clar/attr/repo.c +0 -273
- data/ext/rugged/vendor/libgit2-dist/tests-clar/buf/basic.c +0 -29
- data/ext/rugged/vendor/libgit2-dist/tests-clar/clar_helpers.c +0 -181
- data/ext/rugged/vendor/libgit2-dist/tests-clar/clar_libgit2.h +0 -55
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/commit.c +0 -44
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/parse.c +0 -350
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/signature.c +0 -65
- data/ext/rugged/vendor/libgit2-dist/tests-clar/commit/write.c +0 -140
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/add.c +0 -37
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/multivar.c +0 -151
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/new.c +0 -36
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/read.c +0 -221
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/stress.c +0 -61
- data/ext/rugged/vendor/libgit2-dist/tests-clar/config/write.c +0 -92
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/buffer.c +0 -613
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/dirent.c +0 -235
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/env.c +0 -115
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/errors.c +0 -60
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/filebuf.c +0 -92
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/hex.c +0 -22
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/oid.c +0 -18
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/path.c +0 -420
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/pool.c +0 -85
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/rmdir.c +0 -68
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/string.c +0 -28
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/strmap.c +0 -102
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/strtol.c +0 -37
- data/ext/rugged/vendor/libgit2-dist/tests-clar/core/vector.c +0 -191
- data/ext/rugged/vendor/libgit2-dist/tests-clar/date/date.c +0 -15
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/blob.c +0 -254
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/diff_helpers.c +0 -104
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/diff_helpers.h +0 -47
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/index.c +0 -92
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/iterator.c +0 -572
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/patch.c +0 -99
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/tree.c +0 -210
- data/ext/rugged/vendor/libgit2-dist/tests-clar/diff/workdir.c +0 -543
- data/ext/rugged/vendor/libgit2-dist/tests-clar/index/read_tree.c +0 -46
- data/ext/rugged/vendor/libgit2-dist/tests-clar/index/rename.c +0 -50
- data/ext/rugged/vendor/libgit2-dist/tests-clar/index/tests.c +0 -246
- data/ext/rugged/vendor/libgit2-dist/tests-clar/network/createremotethenload.c +0 -33
- data/ext/rugged/vendor/libgit2-dist/tests-clar/network/remotelocal.c +0 -137
- data/ext/rugged/vendor/libgit2-dist/tests-clar/network/remotes.c +0 -183
- data/ext/rugged/vendor/libgit2-dist/tests-clar/notes/notes.c +0 -133
- data/ext/rugged/vendor/libgit2-dist/tests-clar/notes/notesref.c +0 -57
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/blob/filter.c +0 -125
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/blob/fromchunks.c +0 -87
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/blob/write.c +0 -69
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/commit/commitstagedfile.c +0 -126
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/lookup.c +0 -63
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/message.c +0 -171
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/chars.c +0 -41
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/compare.c +0 -124
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/convert.c +0 -75
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/data.h +0 -323
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/fromstr.c +0 -30
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/hash.c +0 -166
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/short.c +0 -94
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/size.c +0 -13
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/type2string.c +0 -54
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/raw/write.c +0 -455
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tag/peel.c +0 -56
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tag/read.c +0 -130
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tag/write.c +0 -192
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tree/frompath.c +0 -81
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tree/read.c +0 -75
- data/ext/rugged/vendor/libgit2-dist/tests-clar/object/tree/write.c +0 -84
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/loose.c +0 -84
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/loose_data.h +0 -522
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/mixed.c +0 -24
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/pack_data.h +0 -151
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/packed.c +0 -78
- data/ext/rugged/vendor/libgit2-dist/tests-clar/odb/sorting.c +0 -71
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/create.c +0 -113
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/delete.c +0 -91
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/listall.c +0 -78
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/branches/move.c +0 -72
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/crashes.c +0 -17
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/create.c +0 -149
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/delete.c +0 -85
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/list.c +0 -53
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/listall.c +0 -36
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/lookup.c +0 -42
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/normalize.c +0 -200
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/overwrite.c +0 -136
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/pack.c +0 -67
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/read.c +0 -194
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/reflog.c +0 -123
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/rename.c +0 -339
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/revparse.c +0 -174
- data/ext/rugged/vendor/libgit2-dist/tests-clar/refs/unicode.c +0 -42
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/discover.c +0 -142
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/getters.c +0 -86
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/init.c +0 -249
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/open.c +0 -282
- data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/setters.c +0 -80
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/mixed.c +0 -47
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/reset_helpers.c +0 -10
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/reset_helpers.h +0 -6
- data/ext/rugged/vendor/libgit2-dist/tests-clar/reset/soft.c +0 -102
- data/ext/rugged/vendor/libgit2-dist/tests-clar/revwalk/basic.c +0 -181
- data/ext/rugged/vendor/libgit2-dist/tests-clar/revwalk/mergebase.c +0 -148
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/ignore.c +0 -147
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/single.c +0 -29
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/status_data.h +0 -202
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/status_helpers.c +0 -49
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/status_helpers.h +0 -33
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/submodules.c +0 -112
- data/ext/rugged/vendor/libgit2-dist/tests-clar/status/worktree.c +0 -649
- data/ext/rugged/vendor/libgit2-dist/tests-clar/threads/basic.c +0 -20
@@ -1,15 +0,0 @@
|
|
1
|
-
#include "clar_libgit2.h"
|
2
|
-
|
3
|
-
#include "util.h"
|
4
|
-
|
5
|
-
void test_date_date__overflow(void)
|
6
|
-
{
|
7
|
-
#ifdef __LP64__
|
8
|
-
git_time_t d2038, d2039;
|
9
|
-
|
10
|
-
/* This is expected to fail on a 32-bit machine. */
|
11
|
-
cl_git_pass(git__date_parse(&d2038, "2038-1-1"));
|
12
|
-
cl_git_pass(git__date_parse(&d2039, "2039-1-1"));
|
13
|
-
cl_assert(d2038 < d2039);
|
14
|
-
#endif
|
15
|
-
}
|
@@ -1,254 +0,0 @@
|
|
1
|
-
#include "clar_libgit2.h"
|
2
|
-
#include "diff_helpers.h"
|
3
|
-
|
4
|
-
static git_repository *g_repo = NULL;
|
5
|
-
static diff_expects expected;
|
6
|
-
static git_diff_options opts;
|
7
|
-
static git_blob *d, *alien;
|
8
|
-
|
9
|
-
void test_diff_blob__initialize(void)
|
10
|
-
{
|
11
|
-
git_oid oid;
|
12
|
-
|
13
|
-
g_repo = cl_git_sandbox_init("attr");
|
14
|
-
|
15
|
-
memset(&opts, 0, sizeof(opts));
|
16
|
-
opts.context_lines = 1;
|
17
|
-
opts.interhunk_lines = 1;
|
18
|
-
|
19
|
-
memset(&expected, 0, sizeof(expected));
|
20
|
-
|
21
|
-
/* tests/resources/attr/root_test4.txt */
|
22
|
-
cl_git_pass(git_oid_fromstrn(&oid, "fe773770c5a6", 12));
|
23
|
-
cl_git_pass(git_blob_lookup_prefix(&d, g_repo, &oid, 6));
|
24
|
-
|
25
|
-
/* alien.png */
|
26
|
-
cl_git_pass(git_oid_fromstrn(&oid, "edf3dcee", 8));
|
27
|
-
cl_git_pass(git_blob_lookup_prefix(&alien, g_repo, &oid, 4));
|
28
|
-
}
|
29
|
-
|
30
|
-
void test_diff_blob__cleanup(void)
|
31
|
-
{
|
32
|
-
git_blob_free(d);
|
33
|
-
git_blob_free(alien);
|
34
|
-
|
35
|
-
cl_git_sandbox_cleanup();
|
36
|
-
}
|
37
|
-
|
38
|
-
void test_diff_blob__can_compare_text_blobs(void)
|
39
|
-
{
|
40
|
-
git_blob *a, *b, *c;
|
41
|
-
git_oid a_oid, b_oid, c_oid;
|
42
|
-
|
43
|
-
/* tests/resources/attr/root_test1 */
|
44
|
-
cl_git_pass(git_oid_fromstrn(&a_oid, "45141a79", 8));
|
45
|
-
cl_git_pass(git_blob_lookup_prefix(&a, g_repo, &a_oid, 4));
|
46
|
-
|
47
|
-
/* tests/resources/attr/root_test2 */
|
48
|
-
cl_git_pass(git_oid_fromstrn(&b_oid, "4d713dc4", 8));
|
49
|
-
cl_git_pass(git_blob_lookup_prefix(&b, g_repo, &b_oid, 4));
|
50
|
-
|
51
|
-
/* tests/resources/attr/root_test3 */
|
52
|
-
cl_git_pass(git_oid_fromstrn(&c_oid, "c96bbb2c2557a832", 16));
|
53
|
-
cl_git_pass(git_blob_lookup_prefix(&c, g_repo, &c_oid, 8));
|
54
|
-
|
55
|
-
/* Doing the equivalent of a `git diff -U1` on these files */
|
56
|
-
|
57
|
-
cl_git_pass(git_diff_blobs(
|
58
|
-
a, b, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
59
|
-
|
60
|
-
cl_assert(expected.files == 1);
|
61
|
-
cl_assert(expected.file_mods == 1);
|
62
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
63
|
-
|
64
|
-
cl_assert(expected.hunks == 1);
|
65
|
-
cl_assert(expected.lines == 6);
|
66
|
-
cl_assert(expected.line_ctxt == 1);
|
67
|
-
cl_assert(expected.line_adds == 5);
|
68
|
-
cl_assert(expected.line_dels == 0);
|
69
|
-
|
70
|
-
memset(&expected, 0, sizeof(expected));
|
71
|
-
cl_git_pass(git_diff_blobs(
|
72
|
-
b, c, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
73
|
-
|
74
|
-
cl_assert(expected.files == 1);
|
75
|
-
cl_assert(expected.file_mods == 1);
|
76
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
77
|
-
|
78
|
-
cl_assert(expected.hunks == 1);
|
79
|
-
cl_assert(expected.lines == 15);
|
80
|
-
cl_assert(expected.line_ctxt == 3);
|
81
|
-
cl_assert(expected.line_adds == 9);
|
82
|
-
cl_assert(expected.line_dels == 3);
|
83
|
-
|
84
|
-
memset(&expected, 0, sizeof(expected));
|
85
|
-
cl_git_pass(git_diff_blobs(
|
86
|
-
a, c, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
87
|
-
|
88
|
-
cl_assert(expected.files == 1);
|
89
|
-
cl_assert(expected.file_mods == 1);
|
90
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
91
|
-
|
92
|
-
cl_assert(expected.hunks == 1);
|
93
|
-
cl_assert(expected.lines == 13);
|
94
|
-
cl_assert(expected.line_ctxt == 0);
|
95
|
-
cl_assert(expected.line_adds == 12);
|
96
|
-
cl_assert(expected.line_dels == 1);
|
97
|
-
|
98
|
-
opts.context_lines = 1;
|
99
|
-
|
100
|
-
memset(&expected, 0, sizeof(expected));
|
101
|
-
cl_git_pass(git_diff_blobs(
|
102
|
-
c, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
103
|
-
|
104
|
-
cl_assert(expected.files == 1);
|
105
|
-
cl_assert(expected.file_mods == 1);
|
106
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
107
|
-
|
108
|
-
cl_assert(expected.hunks == 2);
|
109
|
-
cl_assert(expected.lines == 14);
|
110
|
-
cl_assert(expected.line_ctxt == 4);
|
111
|
-
cl_assert(expected.line_adds == 6);
|
112
|
-
cl_assert(expected.line_dels == 4);
|
113
|
-
|
114
|
-
git_blob_free(a);
|
115
|
-
git_blob_free(b);
|
116
|
-
git_blob_free(c);
|
117
|
-
}
|
118
|
-
|
119
|
-
void test_diff_blob__can_compare_against_null_blobs(void)
|
120
|
-
{
|
121
|
-
git_blob *e = NULL;
|
122
|
-
|
123
|
-
cl_git_pass(git_diff_blobs(
|
124
|
-
d, e, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
125
|
-
|
126
|
-
cl_assert(expected.files == 1);
|
127
|
-
cl_assert(expected.file_dels == 1);
|
128
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
129
|
-
|
130
|
-
cl_assert(expected.hunks == 1);
|
131
|
-
cl_assert(expected.hunk_old_lines == 14);
|
132
|
-
cl_assert(expected.lines == 14);
|
133
|
-
cl_assert(expected.line_dels == 14);
|
134
|
-
|
135
|
-
opts.flags |= GIT_DIFF_REVERSE;
|
136
|
-
memset(&expected, 0, sizeof(expected));
|
137
|
-
|
138
|
-
cl_git_pass(git_diff_blobs(
|
139
|
-
d, e, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
140
|
-
|
141
|
-
cl_assert(expected.files == 1);
|
142
|
-
cl_assert(expected.file_adds == 1);
|
143
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
144
|
-
|
145
|
-
cl_assert(expected.hunks == 1);
|
146
|
-
cl_assert(expected.hunk_new_lines == 14);
|
147
|
-
cl_assert(expected.lines == 14);
|
148
|
-
cl_assert(expected.line_adds == 14);
|
149
|
-
|
150
|
-
opts.flags ^= GIT_DIFF_REVERSE;
|
151
|
-
memset(&expected, 0, sizeof(expected));
|
152
|
-
|
153
|
-
cl_git_pass(git_diff_blobs(
|
154
|
-
alien, NULL, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
155
|
-
|
156
|
-
cl_assert(expected.at_least_one_of_them_is_binary == true);
|
157
|
-
|
158
|
-
cl_assert(expected.files == 1);
|
159
|
-
cl_assert(expected.file_dels == 1);
|
160
|
-
cl_assert(expected.hunks == 0);
|
161
|
-
cl_assert(expected.lines == 0);
|
162
|
-
|
163
|
-
memset(&expected, 0, sizeof(expected));
|
164
|
-
|
165
|
-
cl_git_pass(git_diff_blobs(
|
166
|
-
NULL, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
167
|
-
|
168
|
-
cl_assert(expected.at_least_one_of_them_is_binary == true);
|
169
|
-
|
170
|
-
cl_assert(expected.files == 1);
|
171
|
-
cl_assert(expected.file_adds == 1);
|
172
|
-
cl_assert(expected.hunks == 0);
|
173
|
-
cl_assert(expected.lines == 0);
|
174
|
-
}
|
175
|
-
|
176
|
-
static void assert_identical_blobs_comparison(diff_expects expected)
|
177
|
-
{
|
178
|
-
cl_assert(expected.files == 1);
|
179
|
-
cl_assert(expected.file_unmodified == 1);
|
180
|
-
cl_assert(expected.hunks == 0);
|
181
|
-
cl_assert(expected.lines == 0);
|
182
|
-
}
|
183
|
-
|
184
|
-
void test_diff_blob__can_compare_identical_blobs(void)
|
185
|
-
{
|
186
|
-
cl_git_pass(git_diff_blobs(
|
187
|
-
d, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
188
|
-
|
189
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
190
|
-
assert_identical_blobs_comparison(expected);
|
191
|
-
|
192
|
-
memset(&expected, 0, sizeof(expected));
|
193
|
-
cl_git_pass(git_diff_blobs(
|
194
|
-
NULL, NULL, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
195
|
-
|
196
|
-
cl_assert(expected.at_least_one_of_them_is_binary == false);
|
197
|
-
assert_identical_blobs_comparison(expected);
|
198
|
-
|
199
|
-
memset(&expected, 0, sizeof(expected));
|
200
|
-
cl_git_pass(git_diff_blobs(
|
201
|
-
alien, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
202
|
-
|
203
|
-
cl_assert(expected.at_least_one_of_them_is_binary == true);
|
204
|
-
assert_identical_blobs_comparison(expected);
|
205
|
-
}
|
206
|
-
|
207
|
-
static void assert_binary_blobs_comparison(diff_expects expected)
|
208
|
-
{
|
209
|
-
cl_assert(expected.at_least_one_of_them_is_binary == true);
|
210
|
-
|
211
|
-
cl_assert(expected.files == 1);
|
212
|
-
cl_assert(expected.file_mods == 1);
|
213
|
-
cl_assert(expected.hunks == 0);
|
214
|
-
cl_assert(expected.lines == 0);
|
215
|
-
}
|
216
|
-
|
217
|
-
void test_diff_blob__can_compare_two_binary_blobs(void)
|
218
|
-
{
|
219
|
-
git_blob *heart;
|
220
|
-
git_oid h_oid;
|
221
|
-
|
222
|
-
/* heart.png */
|
223
|
-
cl_git_pass(git_oid_fromstrn(&h_oid, "de863bff", 8));
|
224
|
-
cl_git_pass(git_blob_lookup_prefix(&heart, g_repo, &h_oid, 4));
|
225
|
-
|
226
|
-
cl_git_pass(git_diff_blobs(
|
227
|
-
alien, heart, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
228
|
-
|
229
|
-
assert_binary_blobs_comparison(expected);
|
230
|
-
|
231
|
-
memset(&expected, 0, sizeof(expected));
|
232
|
-
|
233
|
-
cl_git_pass(git_diff_blobs(
|
234
|
-
heart, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
235
|
-
|
236
|
-
assert_binary_blobs_comparison(expected);
|
237
|
-
|
238
|
-
git_blob_free(heart);
|
239
|
-
}
|
240
|
-
|
241
|
-
void test_diff_blob__can_compare_a_binary_blob_and_a_text_blob(void)
|
242
|
-
{
|
243
|
-
cl_git_pass(git_diff_blobs(
|
244
|
-
alien, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
245
|
-
|
246
|
-
assert_binary_blobs_comparison(expected);
|
247
|
-
|
248
|
-
memset(&expected, 0, sizeof(expected));
|
249
|
-
|
250
|
-
cl_git_pass(git_diff_blobs(
|
251
|
-
d, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
252
|
-
|
253
|
-
assert_binary_blobs_comparison(expected);
|
254
|
-
}
|
@@ -1,104 +0,0 @@
|
|
1
|
-
#include "clar_libgit2.h"
|
2
|
-
#include "diff_helpers.h"
|
3
|
-
|
4
|
-
git_tree *resolve_commit_oid_to_tree(
|
5
|
-
git_repository *repo,
|
6
|
-
const char *partial_oid)
|
7
|
-
{
|
8
|
-
unsigned int len = (unsigned int)strlen(partial_oid);
|
9
|
-
git_oid oid;
|
10
|
-
git_object *obj = NULL;
|
11
|
-
git_tree *tree = NULL;
|
12
|
-
|
13
|
-
if (git_oid_fromstrn(&oid, partial_oid, len) == 0)
|
14
|
-
git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY);
|
15
|
-
cl_assert(obj);
|
16
|
-
if (git_object_type(obj) == GIT_OBJ_TREE)
|
17
|
-
return (git_tree *)obj;
|
18
|
-
cl_assert(git_object_type(obj) == GIT_OBJ_COMMIT);
|
19
|
-
cl_git_pass(git_commit_tree(&tree, (git_commit *)obj));
|
20
|
-
git_object_free(obj);
|
21
|
-
return tree;
|
22
|
-
}
|
23
|
-
|
24
|
-
int diff_file_fn(
|
25
|
-
void *cb_data,
|
26
|
-
git_diff_delta *delta,
|
27
|
-
float progress)
|
28
|
-
{
|
29
|
-
diff_expects *e = cb_data;
|
30
|
-
|
31
|
-
GIT_UNUSED(progress);
|
32
|
-
|
33
|
-
e-> at_least_one_of_them_is_binary = delta->binary;
|
34
|
-
|
35
|
-
e->files++;
|
36
|
-
switch (delta->status) {
|
37
|
-
case GIT_DELTA_ADDED: e->file_adds++; break;
|
38
|
-
case GIT_DELTA_DELETED: e->file_dels++; break;
|
39
|
-
case GIT_DELTA_MODIFIED: e->file_mods++; break;
|
40
|
-
case GIT_DELTA_IGNORED: e->file_ignored++; break;
|
41
|
-
case GIT_DELTA_UNTRACKED: e->file_untracked++; break;
|
42
|
-
case GIT_DELTA_UNMODIFIED: e->file_unmodified++; break;
|
43
|
-
default: break;
|
44
|
-
}
|
45
|
-
return 0;
|
46
|
-
}
|
47
|
-
|
48
|
-
int diff_hunk_fn(
|
49
|
-
void *cb_data,
|
50
|
-
git_diff_delta *delta,
|
51
|
-
git_diff_range *range,
|
52
|
-
const char *header,
|
53
|
-
size_t header_len)
|
54
|
-
{
|
55
|
-
diff_expects *e = cb_data;
|
56
|
-
|
57
|
-
GIT_UNUSED(delta);
|
58
|
-
GIT_UNUSED(header);
|
59
|
-
GIT_UNUSED(header_len);
|
60
|
-
|
61
|
-
e->hunks++;
|
62
|
-
e->hunk_old_lines += range->old_lines;
|
63
|
-
e->hunk_new_lines += range->new_lines;
|
64
|
-
return 0;
|
65
|
-
}
|
66
|
-
|
67
|
-
int diff_line_fn(
|
68
|
-
void *cb_data,
|
69
|
-
git_diff_delta *delta,
|
70
|
-
git_diff_range *range,
|
71
|
-
char line_origin,
|
72
|
-
const char *content,
|
73
|
-
size_t content_len)
|
74
|
-
{
|
75
|
-
diff_expects *e = cb_data;
|
76
|
-
|
77
|
-
GIT_UNUSED(delta);
|
78
|
-
GIT_UNUSED(range);
|
79
|
-
GIT_UNUSED(content);
|
80
|
-
GIT_UNUSED(content_len);
|
81
|
-
|
82
|
-
e->lines++;
|
83
|
-
switch (line_origin) {
|
84
|
-
case GIT_DIFF_LINE_CONTEXT:
|
85
|
-
e->line_ctxt++;
|
86
|
-
break;
|
87
|
-
case GIT_DIFF_LINE_ADDITION:
|
88
|
-
e->line_adds++;
|
89
|
-
break;
|
90
|
-
case GIT_DIFF_LINE_ADD_EOFNL:
|
91
|
-
assert(0);
|
92
|
-
break;
|
93
|
-
case GIT_DIFF_LINE_DELETION:
|
94
|
-
e->line_dels++;
|
95
|
-
break;
|
96
|
-
case GIT_DIFF_LINE_DEL_EOFNL:
|
97
|
-
/* technically not a line delete, but we'll count it as such */
|
98
|
-
e->line_dels++;
|
99
|
-
break;
|
100
|
-
default:
|
101
|
-
break;
|
102
|
-
}
|
103
|
-
return 0;
|
104
|
-
}
|
@@ -1,47 +0,0 @@
|
|
1
|
-
#include "fileops.h"
|
2
|
-
#include "git2/diff.h"
|
3
|
-
|
4
|
-
extern git_tree *resolve_commit_oid_to_tree(
|
5
|
-
git_repository *repo, const char *partial_oid);
|
6
|
-
|
7
|
-
typedef struct {
|
8
|
-
int files;
|
9
|
-
int file_adds;
|
10
|
-
int file_dels;
|
11
|
-
int file_mods;
|
12
|
-
int file_ignored;
|
13
|
-
int file_untracked;
|
14
|
-
int file_unmodified;
|
15
|
-
|
16
|
-
int hunks;
|
17
|
-
int hunk_new_lines;
|
18
|
-
int hunk_old_lines;
|
19
|
-
|
20
|
-
int lines;
|
21
|
-
int line_ctxt;
|
22
|
-
int line_adds;
|
23
|
-
int line_dels;
|
24
|
-
|
25
|
-
bool at_least_one_of_them_is_binary;
|
26
|
-
} diff_expects;
|
27
|
-
|
28
|
-
extern int diff_file_fn(
|
29
|
-
void *cb_data,
|
30
|
-
git_diff_delta *delta,
|
31
|
-
float progress);
|
32
|
-
|
33
|
-
extern int diff_hunk_fn(
|
34
|
-
void *cb_data,
|
35
|
-
git_diff_delta *delta,
|
36
|
-
git_diff_range *range,
|
37
|
-
const char *header,
|
38
|
-
size_t header_len);
|
39
|
-
|
40
|
-
extern int diff_line_fn(
|
41
|
-
void *cb_data,
|
42
|
-
git_diff_delta *delta,
|
43
|
-
git_diff_range *range,
|
44
|
-
char line_origin,
|
45
|
-
const char *content,
|
46
|
-
size_t content_len);
|
47
|
-
|
@@ -1,92 +0,0 @@
|
|
1
|
-
#include "clar_libgit2.h"
|
2
|
-
#include "diff_helpers.h"
|
3
|
-
|
4
|
-
static git_repository *g_repo = NULL;
|
5
|
-
|
6
|
-
void test_diff_index__initialize(void)
|
7
|
-
{
|
8
|
-
g_repo = cl_git_sandbox_init("status");
|
9
|
-
}
|
10
|
-
|
11
|
-
void test_diff_index__cleanup(void)
|
12
|
-
{
|
13
|
-
cl_git_sandbox_cleanup();
|
14
|
-
}
|
15
|
-
|
16
|
-
void test_diff_index__0(void)
|
17
|
-
{
|
18
|
-
/* grabbed a couple of commit oids from the history of the attr repo */
|
19
|
-
const char *a_commit = "26a125ee1bf"; /* the current HEAD */
|
20
|
-
const char *b_commit = "0017bd4ab1ec3"; /* the start */
|
21
|
-
git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit);
|
22
|
-
git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit);
|
23
|
-
git_diff_options opts = {0};
|
24
|
-
git_diff_list *diff = NULL;
|
25
|
-
diff_expects exp;
|
26
|
-
|
27
|
-
cl_assert(a);
|
28
|
-
cl_assert(b);
|
29
|
-
|
30
|
-
opts.context_lines = 1;
|
31
|
-
opts.interhunk_lines = 1;
|
32
|
-
|
33
|
-
memset(&exp, 0, sizeof(exp));
|
34
|
-
|
35
|
-
cl_git_pass(git_diff_index_to_tree(g_repo, &opts, a, &diff));
|
36
|
-
|
37
|
-
cl_git_pass(git_diff_foreach(
|
38
|
-
diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
39
|
-
|
40
|
-
/* to generate these values:
|
41
|
-
* - cd to tests/resources/status,
|
42
|
-
* - mv .gitted .git
|
43
|
-
* - git diff --name-status --cached 26a125ee1bf
|
44
|
-
* - git diff -U1 --cached 26a125ee1bf
|
45
|
-
* - mv .git .gitted
|
46
|
-
*/
|
47
|
-
cl_assert(exp.files == 8);
|
48
|
-
cl_assert(exp.file_adds == 3);
|
49
|
-
cl_assert(exp.file_dels == 2);
|
50
|
-
cl_assert(exp.file_mods == 3);
|
51
|
-
|
52
|
-
cl_assert(exp.hunks == 8);
|
53
|
-
|
54
|
-
cl_assert(exp.lines == 11);
|
55
|
-
cl_assert(exp.line_ctxt == 3);
|
56
|
-
cl_assert(exp.line_adds == 6);
|
57
|
-
cl_assert(exp.line_dels == 2);
|
58
|
-
|
59
|
-
git_diff_list_free(diff);
|
60
|
-
diff = NULL;
|
61
|
-
memset(&exp, 0, sizeof(exp));
|
62
|
-
|
63
|
-
cl_git_pass(git_diff_index_to_tree(g_repo, &opts, b, &diff));
|
64
|
-
|
65
|
-
cl_git_pass(git_diff_foreach(
|
66
|
-
diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
|
67
|
-
|
68
|
-
/* to generate these values:
|
69
|
-
* - cd to tests/resources/status,
|
70
|
-
* - mv .gitted .git
|
71
|
-
* - git diff --name-status --cached 0017bd4ab1ec3
|
72
|
-
* - git diff -U1 --cached 0017bd4ab1ec3
|
73
|
-
* - mv .git .gitted
|
74
|
-
*/
|
75
|
-
cl_assert(exp.files == 12);
|
76
|
-
cl_assert(exp.file_adds == 7);
|
77
|
-
cl_assert(exp.file_dels == 2);
|
78
|
-
cl_assert(exp.file_mods == 3);
|
79
|
-
|
80
|
-
cl_assert(exp.hunks == 12);
|
81
|
-
|
82
|
-
cl_assert(exp.lines == 16);
|
83
|
-
cl_assert(exp.line_ctxt == 3);
|
84
|
-
cl_assert(exp.line_adds == 11);
|
85
|
-
cl_assert(exp.line_dels == 2);
|
86
|
-
|
87
|
-
git_diff_list_free(diff);
|
88
|
-
diff = NULL;
|
89
|
-
|
90
|
-
git_tree_free(a);
|
91
|
-
git_tree_free(b);
|
92
|
-
}
|