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,483 @@
|
|
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
|
+
#define XDL_KPDIS_RUN 4
|
27
|
+
#define XDL_MAX_EQLIMIT 1024
|
28
|
+
#define XDL_SIMSCAN_WINDOW 100
|
29
|
+
#define XDL_GUESS_NLINES1 256
|
30
|
+
#define XDL_GUESS_NLINES2 20
|
31
|
+
|
32
|
+
|
33
|
+
typedef struct s_xdlclass {
|
34
|
+
struct s_xdlclass *next;
|
35
|
+
unsigned long ha;
|
36
|
+
char const *line;
|
37
|
+
long size;
|
38
|
+
long idx;
|
39
|
+
long len1, len2;
|
40
|
+
} xdlclass_t;
|
41
|
+
|
42
|
+
typedef struct s_xdlclassifier {
|
43
|
+
unsigned int hbits;
|
44
|
+
long hsize;
|
45
|
+
xdlclass_t **rchash;
|
46
|
+
chastore_t ncha;
|
47
|
+
xdlclass_t **rcrecs;
|
48
|
+
long alloc;
|
49
|
+
long count;
|
50
|
+
long flags;
|
51
|
+
} xdlclassifier_t;
|
52
|
+
|
53
|
+
|
54
|
+
|
55
|
+
|
56
|
+
static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags);
|
57
|
+
static void xdl_free_classifier(xdlclassifier_t *cf);
|
58
|
+
static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
|
59
|
+
unsigned int hbits, xrecord_t *rec);
|
60
|
+
static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp,
|
61
|
+
xdlclassifier_t *cf, xdfile_t *xdf);
|
62
|
+
static void xdl_free_ctx(xdfile_t *xdf);
|
63
|
+
static int xdl_clean_mmatch(char const *dis, long i, long s, long e);
|
64
|
+
static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2);
|
65
|
+
static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2);
|
66
|
+
static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2);
|
67
|
+
|
68
|
+
|
69
|
+
|
70
|
+
|
71
|
+
static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags) {
|
72
|
+
cf->flags = flags;
|
73
|
+
|
74
|
+
cf->hbits = xdl_hashbits((unsigned int) size);
|
75
|
+
cf->hsize = 1 << cf->hbits;
|
76
|
+
|
77
|
+
if (xdl_cha_init(&cf->ncha, sizeof(xdlclass_t), size / 4 + 1) < 0) {
|
78
|
+
|
79
|
+
return -1;
|
80
|
+
}
|
81
|
+
if (!(cf->rchash = (xdlclass_t **) xdl_malloc(cf->hsize * sizeof(xdlclass_t *)))) {
|
82
|
+
|
83
|
+
xdl_cha_free(&cf->ncha);
|
84
|
+
return -1;
|
85
|
+
}
|
86
|
+
memset(cf->rchash, 0, cf->hsize * sizeof(xdlclass_t *));
|
87
|
+
|
88
|
+
cf->alloc = size;
|
89
|
+
if (!(cf->rcrecs = (xdlclass_t **) xdl_malloc(cf->alloc * sizeof(xdlclass_t *)))) {
|
90
|
+
|
91
|
+
xdl_free(cf->rchash);
|
92
|
+
xdl_cha_free(&cf->ncha);
|
93
|
+
return -1;
|
94
|
+
}
|
95
|
+
|
96
|
+
cf->count = 0;
|
97
|
+
|
98
|
+
return 0;
|
99
|
+
}
|
100
|
+
|
101
|
+
|
102
|
+
static void xdl_free_classifier(xdlclassifier_t *cf) {
|
103
|
+
|
104
|
+
xdl_free(cf->rcrecs);
|
105
|
+
xdl_free(cf->rchash);
|
106
|
+
xdl_cha_free(&cf->ncha);
|
107
|
+
}
|
108
|
+
|
109
|
+
|
110
|
+
static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
|
111
|
+
unsigned int hbits, xrecord_t *rec) {
|
112
|
+
long hi;
|
113
|
+
char const *line;
|
114
|
+
xdlclass_t *rcrec;
|
115
|
+
xdlclass_t **rcrecs;
|
116
|
+
|
117
|
+
line = rec->ptr;
|
118
|
+
hi = (long) XDL_HASHLONG(rec->ha, cf->hbits);
|
119
|
+
for (rcrec = cf->rchash[hi]; rcrec; rcrec = rcrec->next)
|
120
|
+
if (rcrec->ha == rec->ha &&
|
121
|
+
xdl_recmatch(rcrec->line, rcrec->size,
|
122
|
+
rec->ptr, rec->size, cf->flags))
|
123
|
+
break;
|
124
|
+
|
125
|
+
if (!rcrec) {
|
126
|
+
if (!(rcrec = xdl_cha_alloc(&cf->ncha))) {
|
127
|
+
|
128
|
+
return -1;
|
129
|
+
}
|
130
|
+
rcrec->idx = cf->count++;
|
131
|
+
if (cf->count > cf->alloc) {
|
132
|
+
cf->alloc *= 2;
|
133
|
+
if (!(rcrecs = (xdlclass_t **) xdl_realloc(cf->rcrecs, cf->alloc * sizeof(xdlclass_t *)))) {
|
134
|
+
|
135
|
+
return -1;
|
136
|
+
}
|
137
|
+
cf->rcrecs = rcrecs;
|
138
|
+
}
|
139
|
+
cf->rcrecs[rcrec->idx] = rcrec;
|
140
|
+
rcrec->line = line;
|
141
|
+
rcrec->size = rec->size;
|
142
|
+
rcrec->ha = rec->ha;
|
143
|
+
rcrec->len1 = rcrec->len2 = 0;
|
144
|
+
rcrec->next = cf->rchash[hi];
|
145
|
+
cf->rchash[hi] = rcrec;
|
146
|
+
}
|
147
|
+
|
148
|
+
(pass == 1) ? rcrec->len1++ : rcrec->len2++;
|
149
|
+
|
150
|
+
rec->ha = (unsigned long) rcrec->idx;
|
151
|
+
|
152
|
+
hi = (long) XDL_HASHLONG(rec->ha, hbits);
|
153
|
+
rec->next = rhash[hi];
|
154
|
+
rhash[hi] = rec;
|
155
|
+
|
156
|
+
return 0;
|
157
|
+
}
|
158
|
+
|
159
|
+
|
160
|
+
static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp,
|
161
|
+
xdlclassifier_t *cf, xdfile_t *xdf) {
|
162
|
+
unsigned int hbits;
|
163
|
+
long nrec, hsize, bsize;
|
164
|
+
unsigned long hav;
|
165
|
+
char const *blk, *cur, *top, *prev;
|
166
|
+
xrecord_t *crec;
|
167
|
+
xrecord_t **recs, **rrecs;
|
168
|
+
xrecord_t **rhash;
|
169
|
+
unsigned long *ha;
|
170
|
+
char *rchg;
|
171
|
+
long *rindex;
|
172
|
+
|
173
|
+
ha = NULL;
|
174
|
+
rindex = NULL;
|
175
|
+
rchg = NULL;
|
176
|
+
rhash = NULL;
|
177
|
+
recs = NULL;
|
178
|
+
|
179
|
+
if (xdl_cha_init(&xdf->rcha, sizeof(xrecord_t), narec / 4 + 1) < 0)
|
180
|
+
goto abort;
|
181
|
+
if (!(recs = (xrecord_t **) xdl_malloc(narec * sizeof(xrecord_t *))))
|
182
|
+
goto abort;
|
183
|
+
|
184
|
+
if (xpp->flags & XDF_HISTOGRAM_DIFF)
|
185
|
+
hbits = hsize = 0;
|
186
|
+
else {
|
187
|
+
hbits = xdl_hashbits((unsigned int) narec);
|
188
|
+
hsize = 1 << hbits;
|
189
|
+
if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
|
190
|
+
goto abort;
|
191
|
+
memset(rhash, 0, hsize * sizeof(xrecord_t *));
|
192
|
+
}
|
193
|
+
|
194
|
+
nrec = 0;
|
195
|
+
if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
|
196
|
+
for (top = blk + bsize; cur < top; ) {
|
197
|
+
prev = cur;
|
198
|
+
hav = xdl_hash_record(&cur, top, xpp->flags);
|
199
|
+
if (nrec >= narec) {
|
200
|
+
narec *= 2;
|
201
|
+
if (!(rrecs = (xrecord_t **) xdl_realloc(recs, narec * sizeof(xrecord_t *))))
|
202
|
+
goto abort;
|
203
|
+
recs = rrecs;
|
204
|
+
}
|
205
|
+
if (!(crec = xdl_cha_alloc(&xdf->rcha)))
|
206
|
+
goto abort;
|
207
|
+
crec->ptr = prev;
|
208
|
+
crec->size = (long) (cur - prev);
|
209
|
+
crec->ha = hav;
|
210
|
+
recs[nrec++] = crec;
|
211
|
+
|
212
|
+
if (!(xpp->flags & XDF_HISTOGRAM_DIFF) &&
|
213
|
+
xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
|
214
|
+
goto abort;
|
215
|
+
}
|
216
|
+
}
|
217
|
+
|
218
|
+
if (!(rchg = (char *) xdl_malloc((nrec + 2) * sizeof(char))))
|
219
|
+
goto abort;
|
220
|
+
memset(rchg, 0, (nrec + 2) * sizeof(char));
|
221
|
+
|
222
|
+
if (!(rindex = (long *) xdl_malloc((nrec + 1) * sizeof(long))))
|
223
|
+
goto abort;
|
224
|
+
if (!(ha = (unsigned long *) xdl_malloc((nrec + 1) * sizeof(unsigned long))))
|
225
|
+
goto abort;
|
226
|
+
|
227
|
+
xdf->nrec = nrec;
|
228
|
+
xdf->recs = recs;
|
229
|
+
xdf->hbits = hbits;
|
230
|
+
xdf->rhash = rhash;
|
231
|
+
xdf->rchg = rchg + 1;
|
232
|
+
xdf->rindex = rindex;
|
233
|
+
xdf->nreff = 0;
|
234
|
+
xdf->ha = ha;
|
235
|
+
xdf->dstart = 0;
|
236
|
+
xdf->dend = nrec - 1;
|
237
|
+
|
238
|
+
return 0;
|
239
|
+
|
240
|
+
abort:
|
241
|
+
xdl_free(ha);
|
242
|
+
xdl_free(rindex);
|
243
|
+
xdl_free(rchg);
|
244
|
+
xdl_free(rhash);
|
245
|
+
xdl_free(recs);
|
246
|
+
xdl_cha_free(&xdf->rcha);
|
247
|
+
return -1;
|
248
|
+
}
|
249
|
+
|
250
|
+
|
251
|
+
static void xdl_free_ctx(xdfile_t *xdf) {
|
252
|
+
|
253
|
+
xdl_free(xdf->rhash);
|
254
|
+
xdl_free(xdf->rindex);
|
255
|
+
xdl_free(xdf->rchg - 1);
|
256
|
+
xdl_free(xdf->ha);
|
257
|
+
xdl_free(xdf->recs);
|
258
|
+
xdl_cha_free(&xdf->rcha);
|
259
|
+
}
|
260
|
+
|
261
|
+
|
262
|
+
int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
|
263
|
+
xdfenv_t *xe) {
|
264
|
+
long enl1, enl2, sample;
|
265
|
+
xdlclassifier_t cf;
|
266
|
+
|
267
|
+
memset(&cf, 0, sizeof(cf));
|
268
|
+
|
269
|
+
/*
|
270
|
+
* For histogram diff, we can afford a smaller sample size and
|
271
|
+
* thus a poorer estimate of the number of lines, as the hash
|
272
|
+
* table (rhash) won't be filled up/grown. The number of lines
|
273
|
+
* (nrecs) will be updated correctly anyway by
|
274
|
+
* xdl_prepare_ctx().
|
275
|
+
*/
|
276
|
+
sample = xpp->flags & XDF_HISTOGRAM_DIFF ? XDL_GUESS_NLINES2 : XDL_GUESS_NLINES1;
|
277
|
+
|
278
|
+
enl1 = xdl_guess_lines(mf1, sample) + 1;
|
279
|
+
enl2 = xdl_guess_lines(mf2, sample) + 1;
|
280
|
+
|
281
|
+
if (!(xpp->flags & XDF_HISTOGRAM_DIFF) &&
|
282
|
+
xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0) {
|
283
|
+
|
284
|
+
return -1;
|
285
|
+
}
|
286
|
+
|
287
|
+
if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
|
288
|
+
|
289
|
+
xdl_free_classifier(&cf);
|
290
|
+
return -1;
|
291
|
+
}
|
292
|
+
if (xdl_prepare_ctx(2, mf2, enl2, xpp, &cf, &xe->xdf2) < 0) {
|
293
|
+
|
294
|
+
xdl_free_ctx(&xe->xdf1);
|
295
|
+
xdl_free_classifier(&cf);
|
296
|
+
return -1;
|
297
|
+
}
|
298
|
+
|
299
|
+
if (!(xpp->flags & XDF_PATIENCE_DIFF) &&
|
300
|
+
!(xpp->flags & XDF_HISTOGRAM_DIFF) &&
|
301
|
+
xdl_optimize_ctxs(&cf, &xe->xdf1, &xe->xdf2) < 0) {
|
302
|
+
|
303
|
+
xdl_free_ctx(&xe->xdf2);
|
304
|
+
xdl_free_ctx(&xe->xdf1);
|
305
|
+
return -1;
|
306
|
+
}
|
307
|
+
|
308
|
+
if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
|
309
|
+
xdl_free_classifier(&cf);
|
310
|
+
|
311
|
+
return 0;
|
312
|
+
}
|
313
|
+
|
314
|
+
|
315
|
+
void xdl_free_env(xdfenv_t *xe) {
|
316
|
+
|
317
|
+
xdl_free_ctx(&xe->xdf2);
|
318
|
+
xdl_free_ctx(&xe->xdf1);
|
319
|
+
}
|
320
|
+
|
321
|
+
|
322
|
+
static int xdl_clean_mmatch(char const *dis, long i, long s, long e) {
|
323
|
+
long r, rdis0, rpdis0, rdis1, rpdis1;
|
324
|
+
|
325
|
+
/*
|
326
|
+
* Limits the window the is examined during the similar-lines
|
327
|
+
* scan. The loops below stops when dis[i - r] == 1 (line that
|
328
|
+
* has no match), but there are corner cases where the loop
|
329
|
+
* proceed all the way to the extremities by causing huge
|
330
|
+
* performance penalties in case of big files.
|
331
|
+
*/
|
332
|
+
if (i - s > XDL_SIMSCAN_WINDOW)
|
333
|
+
s = i - XDL_SIMSCAN_WINDOW;
|
334
|
+
if (e - i > XDL_SIMSCAN_WINDOW)
|
335
|
+
e = i + XDL_SIMSCAN_WINDOW;
|
336
|
+
|
337
|
+
/*
|
338
|
+
* Scans the lines before 'i' to find a run of lines that either
|
339
|
+
* have no match (dis[j] == 0) or have multiple matches (dis[j] > 1).
|
340
|
+
* Note that we always call this function with dis[i] > 1, so the
|
341
|
+
* current line (i) is already a multimatch line.
|
342
|
+
*/
|
343
|
+
for (r = 1, rdis0 = 0, rpdis0 = 1; (i - r) >= s; r++) {
|
344
|
+
if (!dis[i - r])
|
345
|
+
rdis0++;
|
346
|
+
else if (dis[i - r] == 2)
|
347
|
+
rpdis0++;
|
348
|
+
else
|
349
|
+
break;
|
350
|
+
}
|
351
|
+
/*
|
352
|
+
* If the run before the line 'i' found only multimatch lines, we
|
353
|
+
* return 0 and hence we don't make the current line (i) discarded.
|
354
|
+
* We want to discard multimatch lines only when they appear in the
|
355
|
+
* middle of runs with nomatch lines (dis[j] == 0).
|
356
|
+
*/
|
357
|
+
if (rdis0 == 0)
|
358
|
+
return 0;
|
359
|
+
for (r = 1, rdis1 = 0, rpdis1 = 1; (i + r) <= e; r++) {
|
360
|
+
if (!dis[i + r])
|
361
|
+
rdis1++;
|
362
|
+
else if (dis[i + r] == 2)
|
363
|
+
rpdis1++;
|
364
|
+
else
|
365
|
+
break;
|
366
|
+
}
|
367
|
+
/*
|
368
|
+
* If the run after the line 'i' found only multimatch lines, we
|
369
|
+
* return 0 and hence we don't make the current line (i) discarded.
|
370
|
+
*/
|
371
|
+
if (rdis1 == 0)
|
372
|
+
return 0;
|
373
|
+
rdis1 += rdis0;
|
374
|
+
rpdis1 += rpdis0;
|
375
|
+
|
376
|
+
return rpdis1 * XDL_KPDIS_RUN < (rpdis1 + rdis1);
|
377
|
+
}
|
378
|
+
|
379
|
+
|
380
|
+
/*
|
381
|
+
* Try to reduce the problem complexity, discard records that have no
|
382
|
+
* matches on the other file. Also, lines that have multiple matches
|
383
|
+
* might be potentially discarded if they happear in a run of discardable.
|
384
|
+
*/
|
385
|
+
static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
|
386
|
+
long i, nm, nreff, mlim;
|
387
|
+
xrecord_t **recs;
|
388
|
+
xdlclass_t *rcrec;
|
389
|
+
char *dis, *dis1, *dis2;
|
390
|
+
|
391
|
+
if (!(dis = (char *) xdl_malloc(xdf1->nrec + xdf2->nrec + 2))) {
|
392
|
+
|
393
|
+
return -1;
|
394
|
+
}
|
395
|
+
memset(dis, 0, xdf1->nrec + xdf2->nrec + 2);
|
396
|
+
dis1 = dis;
|
397
|
+
dis2 = dis1 + xdf1->nrec + 1;
|
398
|
+
|
399
|
+
if ((mlim = xdl_bogosqrt(xdf1->nrec)) > XDL_MAX_EQLIMIT)
|
400
|
+
mlim = XDL_MAX_EQLIMIT;
|
401
|
+
for (i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; i <= xdf1->dend; i++, recs++) {
|
402
|
+
rcrec = cf->rcrecs[(*recs)->ha];
|
403
|
+
nm = rcrec ? rcrec->len2 : 0;
|
404
|
+
dis1[i] = (nm == 0) ? 0: (nm >= mlim) ? 2: 1;
|
405
|
+
}
|
406
|
+
|
407
|
+
if ((mlim = xdl_bogosqrt(xdf2->nrec)) > XDL_MAX_EQLIMIT)
|
408
|
+
mlim = XDL_MAX_EQLIMIT;
|
409
|
+
for (i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; i <= xdf2->dend; i++, recs++) {
|
410
|
+
rcrec = cf->rcrecs[(*recs)->ha];
|
411
|
+
nm = rcrec ? rcrec->len1 : 0;
|
412
|
+
dis2[i] = (nm == 0) ? 0: (nm >= mlim) ? 2: 1;
|
413
|
+
}
|
414
|
+
|
415
|
+
for (nreff = 0, i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart];
|
416
|
+
i <= xdf1->dend; i++, recs++) {
|
417
|
+
if (dis1[i] == 1 ||
|
418
|
+
(dis1[i] == 2 && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) {
|
419
|
+
xdf1->rindex[nreff] = i;
|
420
|
+
xdf1->ha[nreff] = (*recs)->ha;
|
421
|
+
nreff++;
|
422
|
+
} else
|
423
|
+
xdf1->rchg[i] = 1;
|
424
|
+
}
|
425
|
+
xdf1->nreff = nreff;
|
426
|
+
|
427
|
+
for (nreff = 0, i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart];
|
428
|
+
i <= xdf2->dend; i++, recs++) {
|
429
|
+
if (dis2[i] == 1 ||
|
430
|
+
(dis2[i] == 2 && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) {
|
431
|
+
xdf2->rindex[nreff] = i;
|
432
|
+
xdf2->ha[nreff] = (*recs)->ha;
|
433
|
+
nreff++;
|
434
|
+
} else
|
435
|
+
xdf2->rchg[i] = 1;
|
436
|
+
}
|
437
|
+
xdf2->nreff = nreff;
|
438
|
+
|
439
|
+
xdl_free(dis);
|
440
|
+
|
441
|
+
return 0;
|
442
|
+
}
|
443
|
+
|
444
|
+
|
445
|
+
/*
|
446
|
+
* Early trim initial and terminal matching records.
|
447
|
+
*/
|
448
|
+
static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2) {
|
449
|
+
long i, lim;
|
450
|
+
xrecord_t **recs1, **recs2;
|
451
|
+
|
452
|
+
recs1 = xdf1->recs;
|
453
|
+
recs2 = xdf2->recs;
|
454
|
+
for (i = 0, lim = XDL_MIN(xdf1->nrec, xdf2->nrec); i < lim;
|
455
|
+
i++, recs1++, recs2++)
|
456
|
+
if ((*recs1)->ha != (*recs2)->ha)
|
457
|
+
break;
|
458
|
+
|
459
|
+
xdf1->dstart = xdf2->dstart = i;
|
460
|
+
|
461
|
+
recs1 = xdf1->recs + xdf1->nrec - 1;
|
462
|
+
recs2 = xdf2->recs + xdf2->nrec - 1;
|
463
|
+
for (lim -= i, i = 0; i < lim; i++, recs1--, recs2--)
|
464
|
+
if ((*recs1)->ha != (*recs2)->ha)
|
465
|
+
break;
|
466
|
+
|
467
|
+
xdf1->dend = xdf1->nrec - i - 1;
|
468
|
+
xdf2->dend = xdf2->nrec - i - 1;
|
469
|
+
|
470
|
+
return 0;
|
471
|
+
}
|
472
|
+
|
473
|
+
|
474
|
+
static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
|
475
|
+
|
476
|
+
if (xdl_trim_ends(xdf1, xdf2) < 0 ||
|
477
|
+
xdl_cleanup_records(cf, xdf1, xdf2) < 0) {
|
478
|
+
|
479
|
+
return -1;
|
480
|
+
}
|
481
|
+
|
482
|
+
return 0;
|
483
|
+
}
|
@@ -0,0 +1,34 @@
|
|
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(XPREPARE_H)
|
24
|
+
#define XPREPARE_H
|
25
|
+
|
26
|
+
|
27
|
+
|
28
|
+
int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
|
29
|
+
xdfenv_t *xe);
|
30
|
+
void xdl_free_env(xdfenv_t *xe);
|
31
|
+
|
32
|
+
|
33
|
+
|
34
|
+
#endif /* #if !defined(XPREPARE_H) */
|
@@ -0,0 +1,67 @@
|
|
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(XTYPES_H)
|
24
|
+
#define XTYPES_H
|
25
|
+
|
26
|
+
|
27
|
+
|
28
|
+
typedef struct s_chanode {
|
29
|
+
struct s_chanode *next;
|
30
|
+
long icurr;
|
31
|
+
} chanode_t;
|
32
|
+
|
33
|
+
typedef struct s_chastore {
|
34
|
+
chanode_t *head, *tail;
|
35
|
+
long isize, nsize;
|
36
|
+
chanode_t *ancur;
|
37
|
+
chanode_t *sncur;
|
38
|
+
long scurr;
|
39
|
+
} chastore_t;
|
40
|
+
|
41
|
+
typedef struct s_xrecord {
|
42
|
+
struct s_xrecord *next;
|
43
|
+
char const *ptr;
|
44
|
+
long size;
|
45
|
+
unsigned long ha;
|
46
|
+
} xrecord_t;
|
47
|
+
|
48
|
+
typedef struct s_xdfile {
|
49
|
+
chastore_t rcha;
|
50
|
+
long nrec;
|
51
|
+
unsigned int hbits;
|
52
|
+
xrecord_t **rhash;
|
53
|
+
long dstart, dend;
|
54
|
+
xrecord_t **recs;
|
55
|
+
char *rchg;
|
56
|
+
long *rindex;
|
57
|
+
long nreff;
|
58
|
+
unsigned long *ha;
|
59
|
+
} xdfile_t;
|
60
|
+
|
61
|
+
typedef struct s_xdfenv {
|
62
|
+
xdfile_t xdf1, xdf2;
|
63
|
+
} xdfenv_t;
|
64
|
+
|
65
|
+
|
66
|
+
|
67
|
+
#endif /* #if !defined(XTYPES_H) */
|