rugged 0.19.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +151 -25
- data/ext/rugged/extconf.rb +48 -27
- data/ext/rugged/rugged.c +107 -35
- data/ext/rugged/rugged.h +44 -8
- data/ext/rugged/rugged_blame.c +292 -0
- data/ext/rugged/rugged_blob.c +84 -31
- data/ext/rugged/rugged_branch.c +90 -223
- data/ext/rugged/rugged_branch_collection.c +445 -0
- data/ext/rugged/rugged_commit.c +190 -9
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_cred.c +125 -0
- data/ext/rugged/rugged_diff.c +267 -94
- data/ext/rugged/rugged_diff_delta.c +14 -3
- data/ext/rugged/rugged_diff_hunk.c +31 -28
- data/ext/rugged/rugged_diff_line.c +21 -17
- data/ext/rugged/rugged_index.c +326 -6
- data/ext/rugged/rugged_note.c +39 -34
- data/ext/rugged/rugged_object.c +9 -9
- data/ext/rugged/rugged_patch.c +245 -0
- data/ext/rugged/rugged_reference.c +67 -332
- data/ext/rugged/rugged_reference_collection.c +490 -0
- data/ext/rugged/rugged_remote.c +447 -351
- data/ext/rugged/rugged_remote_collection.c +285 -0
- data/ext/rugged/rugged_repo.c +752 -203
- data/ext/rugged/rugged_revwalk.c +119 -27
- data/ext/rugged/rugged_settings.c +48 -1
- data/ext/rugged/rugged_signature.c +30 -16
- data/ext/rugged/rugged_tag.c +86 -191
- data/ext/rugged/rugged_tag_collection.c +279 -0
- data/ext/rugged/rugged_tree.c +159 -22
- data/lib/rugged/branch.rb +8 -17
- data/lib/rugged/credentials.rb +43 -0
- data/lib/rugged/diff/delta.rb +1 -2
- data/lib/rugged/diff/hunk.rb +4 -9
- data/lib/rugged/diff/line.rb +23 -3
- data/lib/rugged/diff.rb +3 -1
- data/lib/rugged/patch.rb +26 -0
- data/lib/rugged/reference.rb +1 -3
- data/lib/rugged/remote.rb +0 -9
- data/lib/rugged/repository.rb +70 -13
- data/lib/rugged/tag.rb +23 -18
- data/lib/rugged/tree.rb +7 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +8 -1
- data/vendor/libgit2/AUTHORS +75 -0
- data/vendor/libgit2/CMakeLists.txt +490 -0
- data/vendor/libgit2/COPYING +920 -0
- data/vendor/libgit2/Makefile.embed +25 -7
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +16 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +43 -0
- data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake +44 -0
- data/vendor/libgit2/deps/http-parser/LICENSE-MIT +23 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/include/git2/attr.h +2 -1
- data/vendor/libgit2/include/git2/blame.h +213 -0
- data/vendor/libgit2/include/git2/blob.h +57 -29
- data/vendor/libgit2/include/git2/branch.h +56 -44
- data/vendor/libgit2/include/git2/buffer.h +112 -0
- data/vendor/libgit2/include/git2/checkout.h +72 -37
- data/vendor/libgit2/include/git2/cherrypick.h +87 -0
- data/vendor/libgit2/include/git2/clone.h +153 -56
- data/vendor/libgit2/include/git2/commit.h +82 -12
- data/vendor/libgit2/include/git2/common.h +31 -19
- data/vendor/libgit2/include/git2/config.h +124 -19
- data/vendor/libgit2/include/git2/cred_helpers.h +1 -1
- data/vendor/libgit2/include/git2/diff.h +636 -494
- data/vendor/libgit2/include/git2/errors.h +48 -15
- data/vendor/libgit2/include/git2/filter.h +149 -0
- data/vendor/libgit2/include/git2/graph.h +14 -0
- data/vendor/libgit2/include/git2/index.h +95 -54
- data/vendor/libgit2/include/git2/indexer.h +15 -9
- data/vendor/libgit2/include/git2/merge.h +402 -39
- data/vendor/libgit2/include/git2/message.h +9 -14
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +6 -6
- data/vendor/libgit2/include/git2/object.h +34 -2
- data/vendor/libgit2/include/git2/odb.h +77 -14
- data/vendor/libgit2/include/git2/odb_backend.h +50 -6
- data/vendor/libgit2/include/git2/oid.h +4 -8
- data/vendor/libgit2/include/git2/pack.h +58 -4
- data/vendor/libgit2/include/git2/patch.h +277 -0
- data/vendor/libgit2/include/git2/pathspec.h +263 -0
- data/vendor/libgit2/include/git2/push.h +55 -5
- data/vendor/libgit2/include/git2/reflog.h +11 -8
- data/vendor/libgit2/include/git2/refs.h +219 -33
- data/vendor/libgit2/include/git2/refspec.h +3 -4
- data/vendor/libgit2/include/git2/remote.h +216 -76
- data/vendor/libgit2/include/git2/repository.h +85 -40
- data/vendor/libgit2/include/git2/reset.h +15 -4
- data/vendor/libgit2/include/git2/revert.h +86 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +44 -6
- data/vendor/libgit2/include/git2/signature.h +17 -3
- data/vendor/libgit2/include/git2/stash.h +8 -12
- data/vendor/libgit2/include/git2/status.h +67 -18
- data/vendor/libgit2/include/git2/submodule.h +100 -85
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +44 -3
- data/vendor/libgit2/include/git2/sys/diff.h +91 -0
- data/vendor/libgit2/include/git2/sys/filter.h +301 -0
- data/vendor/libgit2/include/git2/sys/index.h +0 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +85 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +33 -11
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +51 -5
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +2 -2
- data/vendor/libgit2/include/git2/sys/repository.h +19 -1
- data/vendor/libgit2/include/git2/transport.h +216 -75
- data/vendor/libgit2/include/git2/tree.h +32 -11
- data/vendor/libgit2/include/git2/types.h +124 -10
- data/vendor/libgit2/include/git2/version.h +4 -2
- data/vendor/libgit2/include/git2.h +41 -40
- data/vendor/libgit2/libgit2.pc.in +10 -0
- data/vendor/libgit2/src/array.h +16 -8
- data/vendor/libgit2/src/attr.c +140 -402
- data/vendor/libgit2/src/attr.h +1 -33
- data/vendor/libgit2/src/attr_file.c +298 -135
- data/vendor/libgit2/src/attr_file.h +61 -22
- data/vendor/libgit2/src/attrcache.c +449 -0
- data/vendor/libgit2/src/attrcache.h +38 -6
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +488 -0
- data/vendor/libgit2/src/blame.h +93 -0
- data/vendor/libgit2/src/blame_git.c +624 -0
- data/vendor/libgit2/src/blame_git.h +20 -0
- data/vendor/libgit2/src/blob.c +137 -92
- data/vendor/libgit2/src/blob.h +9 -0
- data/vendor/libgit2/src/branch.c +175 -156
- data/vendor/libgit2/src/buf_text.c +29 -14
- data/vendor/libgit2/src/buf_text.h +5 -4
- data/vendor/libgit2/src/buffer.c +158 -15
- data/vendor/libgit2/src/buffer.h +33 -20
- data/vendor/libgit2/src/cc-compat.h +8 -2
- data/vendor/libgit2/src/checkout.c +1081 -287
- data/vendor/libgit2/src/checkout.h +1 -1
- data/vendor/libgit2/src/cherrypick.c +226 -0
- data/vendor/libgit2/src/clone.c +297 -245
- data/vendor/libgit2/src/{compress.h → clone.h} +4 -8
- data/vendor/libgit2/src/commit.c +313 -101
- data/vendor/libgit2/src/commit.h +6 -3
- data/vendor/libgit2/src/commit_list.c +3 -3
- data/vendor/libgit2/src/commit_list.h +1 -1
- data/vendor/libgit2/src/common.h +74 -1
- data/vendor/libgit2/src/config.c +570 -145
- data/vendor/libgit2/src/config.h +39 -6
- data/vendor/libgit2/src/config_cache.c +32 -18
- data/vendor/libgit2/src/config_file.c +711 -424
- data/vendor/libgit2/src/config_file.h +4 -3
- data/vendor/libgit2/src/crlf.c +149 -109
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +719 -414
- data/vendor/libgit2/src/diff.h +52 -7
- data/vendor/libgit2/src/diff_driver.c +183 -85
- data/vendor/libgit2/src/diff_driver.h +1 -1
- data/vendor/libgit2/src/diff_file.c +65 -84
- data/vendor/libgit2/src/diff_file.h +12 -10
- data/vendor/libgit2/src/diff_patch.c +274 -333
- data/vendor/libgit2/src/diff_patch.h +10 -9
- data/vendor/libgit2/src/diff_print.c +381 -179
- data/vendor/libgit2/src/diff_stats.c +336 -0
- data/vendor/libgit2/src/diff_tform.c +393 -215
- data/vendor/libgit2/src/diff_xdiff.c +117 -42
- data/vendor/libgit2/src/errors.c +59 -4
- data/vendor/libgit2/src/fetch.c +40 -34
- data/vendor/libgit2/src/fetch.h +2 -5
- data/vendor/libgit2/src/fetchhead.c +14 -7
- data/vendor/libgit2/src/filebuf.c +13 -24
- data/vendor/libgit2/src/filebuf.h +3 -3
- data/vendor/libgit2/src/fileops.c +104 -296
- data/vendor/libgit2/src/fileops.h +23 -94
- data/vendor/libgit2/src/filter.c +642 -43
- data/vendor/libgit2/src/filter.h +7 -66
- data/vendor/libgit2/src/fnmatch.c +46 -3
- data/vendor/libgit2/src/fnmatch.h +24 -3
- data/vendor/libgit2/src/global.c +158 -42
- data/vendor/libgit2/src/global.h +9 -0
- data/vendor/libgit2/src/graph.c +34 -20
- data/vendor/libgit2/src/hash/hash_generic.h +0 -1
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -1
- data/vendor/libgit2/src/hash/hash_win32.c +14 -29
- data/vendor/libgit2/src/hash.h +0 -2
- data/vendor/libgit2/src/hashsig.c +97 -117
- data/vendor/libgit2/src/ident.c +125 -0
- data/vendor/libgit2/src/ignore.c +159 -110
- data/vendor/libgit2/src/ignore.h +13 -3
- data/vendor/libgit2/src/index.c +803 -445
- data/vendor/libgit2/src/index.h +43 -6
- data/vendor/libgit2/src/indexer.c +475 -157
- data/vendor/libgit2/src/iterator.c +198 -55
- data/vendor/libgit2/src/iterator.h +28 -4
- data/vendor/libgit2/src/map.h +1 -0
- data/vendor/libgit2/src/merge.c +849 -142
- data/vendor/libgit2/src/merge.h +11 -4
- data/vendor/libgit2/src/merge_file.c +183 -78
- data/vendor/libgit2/src/merge_file.h +0 -57
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/mwindow.c +117 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +164 -59
- data/vendor/libgit2/src/netops.h +37 -1
- data/vendor/libgit2/src/notes.c +9 -18
- data/vendor/libgit2/src/notes.h +1 -1
- data/vendor/libgit2/src/object.c +78 -2
- data/vendor/libgit2/src/odb.c +191 -59
- data/vendor/libgit2/src/odb.h +2 -1
- data/vendor/libgit2/src/odb_loose.c +66 -51
- data/vendor/libgit2/src/odb_mempack.c +182 -0
- data/vendor/libgit2/src/odb_pack.c +151 -61
- data/vendor/libgit2/src/oid.c +30 -19
- data/vendor/libgit2/src/oid.h +13 -10
- data/vendor/libgit2/src/pack-objects.c +198 -147
- data/vendor/libgit2/src/pack-objects.h +7 -0
- data/vendor/libgit2/src/pack.c +272 -101
- data/vendor/libgit2/src/pack.h +15 -1
- data/vendor/libgit2/src/path.c +359 -117
- data/vendor/libgit2/src/path.h +110 -20
- data/vendor/libgit2/src/pathspec.c +583 -57
- data/vendor/libgit2/src/pathspec.h +36 -15
- data/vendor/libgit2/src/pool.c +4 -5
- data/vendor/libgit2/src/posix.c +45 -2
- data/vendor/libgit2/src/posix.h +13 -5
- data/vendor/libgit2/src/pqueue.c +73 -119
- data/vendor/libgit2/src/pqueue.h +35 -82
- data/vendor/libgit2/src/push.c +116 -48
- data/vendor/libgit2/src/push.h +5 -0
- data/vendor/libgit2/src/refdb.c +45 -6
- data/vendor/libgit2/src/refdb.h +13 -3
- data/vendor/libgit2/src/refdb_fs.c +1130 -551
- data/vendor/libgit2/src/reflog.c +36 -327
- data/vendor/libgit2/src/reflog.h +6 -1
- data/vendor/libgit2/src/refs.c +345 -142
- data/vendor/libgit2/src/refs.h +9 -2
- data/vendor/libgit2/src/refspec.c +90 -62
- data/vendor/libgit2/src/refspec.h +7 -24
- data/vendor/libgit2/src/remote.c +815 -415
- data/vendor/libgit2/src/remote.h +3 -4
- data/vendor/libgit2/src/repository.c +360 -207
- data/vendor/libgit2/src/repository.h +16 -10
- data/vendor/libgit2/src/reset.c +28 -13
- data/vendor/libgit2/src/revert.c +228 -0
- data/vendor/libgit2/src/revparse.c +29 -30
- data/vendor/libgit2/src/revwalk.c +141 -96
- data/vendor/libgit2/src/revwalk.h +6 -1
- data/vendor/libgit2/src/settings.c +140 -0
- data/vendor/libgit2/src/sha1_lookup.c +71 -0
- data/vendor/libgit2/src/sha1_lookup.h +5 -0
- data/vendor/libgit2/src/signature.c +38 -10
- data/vendor/libgit2/src/sortedcache.c +378 -0
- data/vendor/libgit2/src/sortedcache.h +178 -0
- data/vendor/libgit2/src/stash.c +98 -116
- data/vendor/libgit2/src/status.c +88 -60
- data/vendor/libgit2/src/status.h +2 -2
- data/vendor/libgit2/src/strmap.c +32 -0
- data/vendor/libgit2/src/strmap.h +14 -1
- data/vendor/libgit2/src/strnlen.h +23 -0
- data/vendor/libgit2/src/submodule.c +1073 -615
- data/vendor/libgit2/src/submodule.h +89 -21
- data/vendor/libgit2/src/sysdir.c +252 -0
- data/vendor/libgit2/src/sysdir.h +101 -0
- data/vendor/libgit2/src/tag.c +31 -20
- data/vendor/libgit2/src/thread-utils.h +98 -17
- data/vendor/libgit2/src/trace.h +0 -2
- data/vendor/libgit2/src/transport.c +76 -6
- data/vendor/libgit2/src/transports/cred.c +164 -61
- data/vendor/libgit2/src/transports/git.c +41 -48
- data/vendor/libgit2/src/transports/http.c +65 -109
- data/vendor/libgit2/src/transports/local.c +88 -65
- data/vendor/libgit2/src/transports/smart.c +91 -19
- data/vendor/libgit2/src/transports/smart.h +13 -5
- data/vendor/libgit2/src/transports/smart_pkt.c +24 -14
- data/vendor/libgit2/src/transports/smart_protocol.c +268 -113
- data/vendor/libgit2/src/transports/ssh.c +284 -186
- data/vendor/libgit2/src/transports/winhttp.c +279 -198
- data/vendor/libgit2/src/tree-cache.c +21 -23
- data/vendor/libgit2/src/tree-cache.h +1 -0
- data/vendor/libgit2/src/tree.c +109 -92
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +7 -1
- data/vendor/libgit2/src/unix/posix.h +0 -1
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +16 -112
- data/vendor/libgit2/src/util.h +107 -3
- data/vendor/libgit2/src/vector.c +72 -17
- data/vendor/libgit2/src/vector.h +32 -5
- data/vendor/libgit2/src/win32/dir.c +15 -40
- data/vendor/libgit2/src/win32/dir.h +3 -2
- data/vendor/libgit2/src/win32/error.c +5 -31
- data/vendor/libgit2/src/win32/findfile.c +47 -66
- data/vendor/libgit2/src/win32/findfile.h +1 -12
- data/vendor/libgit2/src/win32/git2.rc +40 -0
- data/vendor/libgit2/src/win32/map.c +7 -1
- data/vendor/libgit2/src/win32/mingw-compat.h +3 -0
- data/vendor/libgit2/src/win32/posix.h +17 -11
- data/vendor/libgit2/src/win32/posix_w32.c +424 -292
- data/vendor/libgit2/src/win32/precompiled.h +6 -2
- data/vendor/libgit2/src/win32/pthread.c +141 -18
- data/vendor/libgit2/src/win32/pthread.h +50 -8
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/utf-conv.c +117 -60
- data/vendor/libgit2/src/win32/utf-conv.h +81 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_util.c +139 -0
- data/vendor/libgit2/src/win32/w32_util.h +54 -0
- data/vendor/libgit2/src/zstream.c +156 -0
- data/vendor/libgit2/src/zstream.h +39 -0
- metadata +84 -167
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/compress.c +0 -53
data/vendor/libgit2/src/stash.c
CHANGED
@@ -27,7 +27,7 @@ static int retrieve_head(git_reference **out, git_repository *repo)
|
|
27
27
|
{
|
28
28
|
int error = git_repository_head(out, repo);
|
29
29
|
|
30
|
-
if (error ==
|
30
|
+
if (error == GIT_EUNBORNBRANCH)
|
31
31
|
return create_error(error, "You do not have the initial commit yet.");
|
32
32
|
|
33
33
|
return error;
|
@@ -117,7 +117,7 @@ static int build_tree_from_index(git_tree **out, git_index *index)
|
|
117
117
|
static int commit_index(
|
118
118
|
git_commit **i_commit,
|
119
119
|
git_index *index,
|
120
|
-
git_signature *stasher,
|
120
|
+
const git_signature *stasher,
|
121
121
|
const char *message,
|
122
122
|
const git_commit *parent)
|
123
123
|
{
|
@@ -153,65 +153,62 @@ cleanup:
|
|
153
153
|
return error;
|
154
154
|
}
|
155
155
|
|
156
|
-
struct
|
157
|
-
git_index *index;
|
158
|
-
|
159
|
-
int error;
|
160
|
-
|
156
|
+
struct stash_update_rules {
|
161
157
|
bool include_changed;
|
162
158
|
bool include_untracked;
|
163
159
|
bool include_ignored;
|
164
160
|
};
|
165
161
|
|
166
|
-
static int
|
167
|
-
|
168
|
-
|
169
|
-
|
162
|
+
static int stash_update_index_from_diff(
|
163
|
+
git_index *index,
|
164
|
+
const git_diff *diff,
|
165
|
+
struct stash_update_rules *data)
|
170
166
|
{
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
if (!data->include_changed)
|
167
|
+
int error = 0;
|
168
|
+
size_t d, max_d = git_diff_num_deltas(diff);
|
169
|
+
|
170
|
+
for (d = 0; !error && d < max_d; ++d) {
|
171
|
+
const char *add_path = NULL;
|
172
|
+
const git_diff_delta *delta = git_diff_get_delta(diff, d);
|
173
|
+
|
174
|
+
switch (delta->status) {
|
175
|
+
case GIT_DELTA_IGNORED:
|
176
|
+
if (data->include_ignored)
|
177
|
+
add_path = delta->new_file.path;
|
178
|
+
break;
|
179
|
+
|
180
|
+
case GIT_DELTA_UNTRACKED:
|
181
|
+
if (data->include_untracked &&
|
182
|
+
delta->new_file.mode != GIT_FILEMODE_TREE)
|
183
|
+
add_path = delta->new_file.path;
|
184
|
+
break;
|
185
|
+
|
186
|
+
case GIT_DELTA_ADDED:
|
187
|
+
case GIT_DELTA_MODIFIED:
|
188
|
+
if (data->include_changed)
|
189
|
+
add_path = delta->new_file.path;
|
195
190
|
break;
|
196
|
-
if (git_index_find(NULL, data->index, delta->old_file.path) == 0)
|
197
|
-
data->error = git_index_remove(
|
198
|
-
data->index, delta->old_file.path, 0);
|
199
|
-
break;
|
200
|
-
|
201
|
-
default:
|
202
|
-
/* Unimplemented */
|
203
|
-
giterr_set(
|
204
|
-
GITERR_INVALID,
|
205
|
-
"Cannot update index. Unimplemented status (%d)",
|
206
|
-
delta->status);
|
207
|
-
data->error = -1;
|
208
|
-
break;
|
209
|
-
}
|
210
191
|
|
211
|
-
|
212
|
-
|
192
|
+
case GIT_DELTA_DELETED:
|
193
|
+
if (data->include_changed &&
|
194
|
+
!git_index_find(NULL, index, delta->old_file.path))
|
195
|
+
error = git_index_remove(index, delta->old_file.path, 0);
|
196
|
+
break;
|
197
|
+
|
198
|
+
default:
|
199
|
+
/* Unimplemented */
|
200
|
+
giterr_set(
|
201
|
+
GITERR_INVALID,
|
202
|
+
"Cannot update index. Unimplemented status (%d)",
|
203
|
+
delta->status);
|
204
|
+
return -1;
|
205
|
+
}
|
213
206
|
|
214
|
-
|
207
|
+
if (add_path != NULL)
|
208
|
+
error = git_index_add_bypath(index, add_path);
|
209
|
+
}
|
210
|
+
|
211
|
+
return error;
|
215
212
|
}
|
216
213
|
|
217
214
|
static int build_untracked_tree(
|
@@ -221,15 +218,13 @@ static int build_untracked_tree(
|
|
221
218
|
uint32_t flags)
|
222
219
|
{
|
223
220
|
git_tree *i_tree = NULL;
|
224
|
-
|
221
|
+
git_diff *diff = NULL;
|
225
222
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
226
|
-
struct
|
223
|
+
struct stash_update_rules data = {0};
|
227
224
|
int error;
|
228
225
|
|
229
226
|
git_index_clear(index);
|
230
227
|
|
231
|
-
data.index = index;
|
232
|
-
|
233
228
|
if (flags & GIT_STASH_INCLUDE_UNTRACKED) {
|
234
229
|
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED |
|
235
230
|
GIT_DIFF_RECURSE_UNTRACKED_DIRS;
|
@@ -248,18 +243,13 @@ static int build_untracked_tree(
|
|
248
243
|
&diff, git_index_owner(index), i_tree, &opts)) < 0)
|
249
244
|
goto cleanup;
|
250
245
|
|
251
|
-
if ((error =
|
252
|
-
diff, update_index_cb, NULL, NULL, &data)) < 0)
|
253
|
-
{
|
254
|
-
if (error == GIT_EUSER)
|
255
|
-
error = data.error;
|
246
|
+
if ((error = stash_update_index_from_diff(index, diff, &data)) < 0)
|
256
247
|
goto cleanup;
|
257
|
-
}
|
258
248
|
|
259
249
|
error = build_tree_from_index(tree_out, index);
|
260
250
|
|
261
251
|
cleanup:
|
262
|
-
|
252
|
+
git_diff_free(diff);
|
263
253
|
git_tree_free(i_tree);
|
264
254
|
return error;
|
265
255
|
}
|
@@ -267,7 +257,7 @@ cleanup:
|
|
267
257
|
static int commit_untracked(
|
268
258
|
git_commit **u_commit,
|
269
259
|
git_index *index,
|
270
|
-
git_signature *stasher,
|
260
|
+
const git_signature *stasher,
|
271
261
|
const char *message,
|
272
262
|
git_commit *i_commit,
|
273
263
|
uint32_t flags)
|
@@ -311,41 +301,29 @@ static int build_workdir_tree(
|
|
311
301
|
{
|
312
302
|
git_repository *repo = git_index_owner(index);
|
313
303
|
git_tree *b_tree = NULL;
|
314
|
-
|
304
|
+
git_diff *diff = NULL;
|
315
305
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
316
|
-
struct
|
306
|
+
struct stash_update_rules data = {0};
|
317
307
|
int error;
|
318
308
|
|
319
|
-
|
320
|
-
goto cleanup;
|
321
|
-
|
322
|
-
if ((error = git_diff_tree_to_index(&diff, repo, b_tree, NULL, &opts)) < 0)
|
323
|
-
goto cleanup;
|
309
|
+
opts.flags = GIT_DIFF_IGNORE_SUBMODULES;
|
324
310
|
|
325
|
-
if ((error =
|
311
|
+
if ((error = git_commit_tree(&b_tree, b_commit)) < 0)
|
326
312
|
goto cleanup;
|
327
313
|
|
328
|
-
if ((error =
|
314
|
+
if ((error = git_diff_tree_to_workdir_with_index(
|
315
|
+
&diff, repo, b_tree, &opts)) < 0)
|
329
316
|
goto cleanup;
|
330
317
|
|
331
|
-
data.index = index;
|
332
318
|
data.include_changed = true;
|
333
319
|
|
334
|
-
if ((error =
|
335
|
-
diff, update_index_cb, NULL, NULL, &data)) < 0)
|
336
|
-
{
|
337
|
-
if (error == GIT_EUSER)
|
338
|
-
error = data.error;
|
320
|
+
if ((error = stash_update_index_from_diff(index, diff, &data)) < 0)
|
339
321
|
goto cleanup;
|
340
|
-
}
|
341
|
-
|
342
322
|
|
343
|
-
|
344
|
-
goto cleanup;
|
323
|
+
error = build_tree_from_index(tree_out, index);
|
345
324
|
|
346
325
|
cleanup:
|
347
|
-
|
348
|
-
git_diff_list_free(diff2);
|
326
|
+
git_diff_free(diff);
|
349
327
|
git_tree_free(b_tree);
|
350
328
|
|
351
329
|
return error;
|
@@ -354,7 +332,7 @@ cleanup:
|
|
354
332
|
static int commit_worktree(
|
355
333
|
git_oid *w_commit_oid,
|
356
334
|
git_index *index,
|
357
|
-
git_signature *stasher,
|
335
|
+
const git_signature *stasher,
|
358
336
|
const char *message,
|
359
337
|
git_commit *i_commit,
|
360
338
|
git_commit *b_commit,
|
@@ -431,28 +409,19 @@ cleanup:
|
|
431
409
|
static int update_reflog(
|
432
410
|
git_oid *w_commit_oid,
|
433
411
|
git_repository *repo,
|
434
|
-
git_signature *stasher,
|
412
|
+
const git_signature *stasher,
|
435
413
|
const char *message)
|
436
414
|
{
|
437
|
-
git_reference *stash
|
438
|
-
git_reflog *reflog = NULL;
|
415
|
+
git_reference *stash;
|
439
416
|
int error;
|
440
417
|
|
441
|
-
if ((error =
|
442
|
-
|
443
|
-
|
444
|
-
if ((error = git_reflog_read(&reflog, stash)) < 0)
|
445
|
-
goto cleanup;
|
418
|
+
if ((error = git_reference_ensure_log(repo, GIT_REFS_STASH_FILE)) < 0)
|
419
|
+
return error;
|
446
420
|
|
447
|
-
|
448
|
-
goto cleanup;
|
421
|
+
error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, w_commit_oid, 1, stasher, message);
|
449
422
|
|
450
|
-
if ((error = git_reflog_write(reflog)) < 0)
|
451
|
-
goto cleanup;
|
452
|
-
|
453
|
-
cleanup:
|
454
423
|
git_reference_free(stash);
|
455
|
-
|
424
|
+
|
456
425
|
return error;
|
457
426
|
}
|
458
427
|
|
@@ -462,7 +431,7 @@ static int is_dirty_cb(const char *path, unsigned int status, void *payload)
|
|
462
431
|
GIT_UNUSED(status);
|
463
432
|
GIT_UNUSED(payload);
|
464
433
|
|
465
|
-
return
|
434
|
+
return GIT_PASSTHROUGH;
|
466
435
|
}
|
467
436
|
|
468
437
|
static int ensure_there_are_changes_to_stash(
|
@@ -474,16 +443,18 @@ static int ensure_there_are_changes_to_stash(
|
|
474
443
|
git_status_options opts = GIT_STATUS_OPTIONS_INIT;
|
475
444
|
|
476
445
|
opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
|
446
|
+
opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
|
447
|
+
|
477
448
|
if (include_untracked_files)
|
478
|
-
opts.flags
|
449
|
+
opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
|
479
450
|
GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
|
480
451
|
|
481
452
|
if (include_ignored_files)
|
482
|
-
opts.flags
|
453
|
+
opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED;
|
483
454
|
|
484
455
|
error = git_status_foreach_ext(repo, &opts, is_dirty_cb, NULL);
|
485
456
|
|
486
|
-
if (error ==
|
457
|
+
if (error == GIT_PASSTHROUGH)
|
487
458
|
return 0;
|
488
459
|
|
489
460
|
if (!error)
|
@@ -495,22 +466,26 @@ static int ensure_there_are_changes_to_stash(
|
|
495
466
|
static int reset_index_and_workdir(
|
496
467
|
git_repository *repo,
|
497
468
|
git_commit *commit,
|
498
|
-
bool remove_untracked
|
469
|
+
bool remove_untracked,
|
470
|
+
bool remove_ignored)
|
499
471
|
{
|
500
|
-
|
472
|
+
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
|
501
473
|
|
502
474
|
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
|
503
475
|
|
504
476
|
if (remove_untracked)
|
505
477
|
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
|
506
478
|
|
479
|
+
if (remove_ignored)
|
480
|
+
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
|
481
|
+
|
507
482
|
return git_checkout_tree(repo, (git_object *)commit, &opts);
|
508
483
|
}
|
509
484
|
|
510
485
|
int git_stash_save(
|
511
486
|
git_oid *out,
|
512
487
|
git_repository *repo,
|
513
|
-
git_signature *stasher,
|
488
|
+
const git_signature *stasher,
|
514
489
|
const char *message,
|
515
490
|
uint32_t flags)
|
516
491
|
{
|
@@ -562,7 +537,8 @@ int git_stash_save(
|
|
562
537
|
if ((error = reset_index_and_workdir(
|
563
538
|
repo,
|
564
539
|
((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
|
565
|
-
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0
|
540
|
+
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
|
541
|
+
(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
|
566
542
|
goto cleanup;
|
567
543
|
|
568
544
|
cleanup:
|
@@ -595,19 +571,21 @@ int git_stash_foreach(
|
|
595
571
|
if (error < 0)
|
596
572
|
goto cleanup;
|
597
573
|
|
598
|
-
if ((error = git_reflog_read(&reflog,
|
574
|
+
if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0)
|
599
575
|
goto cleanup;
|
600
576
|
|
601
577
|
max = git_reflog_entrycount(reflog);
|
602
578
|
for (i = 0; i < max; i++) {
|
603
579
|
entry = git_reflog_entry_byindex(reflog, i);
|
604
580
|
|
605
|
-
|
581
|
+
error = callback(i,
|
606
582
|
git_reflog_entry_message(entry),
|
607
583
|
git_reflog_entry_id_new(entry),
|
608
|
-
payload)
|
609
|
-
|
610
|
-
|
584
|
+
payload);
|
585
|
+
|
586
|
+
if (error) {
|
587
|
+
giterr_set_after_callback(error);
|
588
|
+
break;
|
611
589
|
}
|
612
590
|
}
|
613
591
|
|
@@ -629,7 +607,7 @@ int git_stash_drop(
|
|
629
607
|
if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0)
|
630
608
|
return error;
|
631
609
|
|
632
|
-
if ((error = git_reflog_read(&reflog,
|
610
|
+
if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0)
|
633
611
|
goto cleanup;
|
634
612
|
|
635
613
|
max = git_reflog_entrycount(reflog);
|
@@ -656,7 +634,11 @@ int git_stash_drop(
|
|
656
634
|
entry = git_reflog_entry_byindex(reflog, 0);
|
657
635
|
|
658
636
|
git_reference_free(stash);
|
659
|
-
error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1)
|
637
|
+
if ((error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1, NULL, NULL) < 0))
|
638
|
+
goto cleanup;
|
639
|
+
|
640
|
+
/* We need to undo the writing that we just did */
|
641
|
+
error = git_reflog_write(reflog);
|
660
642
|
}
|
661
643
|
|
662
644
|
cleanup:
|
data/vendor/libgit2/src/status.c
CHANGED
@@ -38,7 +38,7 @@ static unsigned int index_delta2status(const git_diff_delta *head2idx)
|
|
38
38
|
case GIT_DELTA_RENAMED:
|
39
39
|
st = GIT_STATUS_INDEX_RENAMED;
|
40
40
|
|
41
|
-
if (!git_oid_equal(&head2idx->old_file.
|
41
|
+
if (!git_oid_equal(&head2idx->old_file.id, &head2idx->new_file.id))
|
42
42
|
st |= GIT_STATUS_INDEX_MODIFIED;
|
43
43
|
break;
|
44
44
|
case GIT_DELTA_TYPECHANGE:
|
@@ -52,7 +52,7 @@ static unsigned int index_delta2status(const git_diff_delta *head2idx)
|
|
52
52
|
}
|
53
53
|
|
54
54
|
static unsigned int workdir_delta2status(
|
55
|
-
|
55
|
+
git_diff *diff, git_diff_delta *idx2wd)
|
56
56
|
{
|
57
57
|
git_status_t st = GIT_STATUS_CURRENT;
|
58
58
|
|
@@ -74,25 +74,25 @@ static unsigned int workdir_delta2status(
|
|
74
74
|
case GIT_DELTA_RENAMED:
|
75
75
|
st = GIT_STATUS_WT_RENAMED;
|
76
76
|
|
77
|
-
if (!git_oid_equal(&idx2wd->old_file.
|
77
|
+
if (!git_oid_equal(&idx2wd->old_file.id, &idx2wd->new_file.id)) {
|
78
78
|
/* if OIDs don't match, we might need to calculate them now to
|
79
79
|
* discern between RENAMED vs RENAMED+MODIFED
|
80
80
|
*/
|
81
|
-
if (git_oid_iszero(&idx2wd->old_file.
|
81
|
+
if (git_oid_iszero(&idx2wd->old_file.id) &&
|
82
82
|
diff->old_src == GIT_ITERATOR_TYPE_WORKDIR &&
|
83
83
|
!git_diff__oid_for_file(
|
84
|
-
|
85
|
-
idx2wd->old_file.
|
86
|
-
idx2wd->old_file.flags |=
|
84
|
+
&idx2wd->old_file.id, diff, idx2wd->old_file.path,
|
85
|
+
idx2wd->old_file.mode, idx2wd->old_file.size))
|
86
|
+
idx2wd->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
|
87
87
|
|
88
|
-
if (git_oid_iszero(&idx2wd->new_file.
|
88
|
+
if (git_oid_iszero(&idx2wd->new_file.id) &&
|
89
89
|
diff->new_src == GIT_ITERATOR_TYPE_WORKDIR &&
|
90
90
|
!git_diff__oid_for_file(
|
91
|
-
|
92
|
-
idx2wd->new_file.
|
93
|
-
idx2wd->new_file.flags |=
|
91
|
+
&idx2wd->new_file.id, diff, idx2wd->new_file.path,
|
92
|
+
idx2wd->new_file.mode, idx2wd->new_file.size))
|
93
|
+
idx2wd->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
|
94
94
|
|
95
|
-
if (!git_oid_equal(&idx2wd->old_file.
|
95
|
+
if (!git_oid_equal(&idx2wd->old_file.id, &idx2wd->new_file.id))
|
96
96
|
st |= GIT_STATUS_WT_MODIFIED;
|
97
97
|
}
|
98
98
|
break;
|
@@ -225,23 +225,27 @@ static git_status_list *git_status_list_alloc(git_index *index)
|
|
225
225
|
return status;
|
226
226
|
}
|
227
227
|
|
228
|
-
|
229
|
-
static int newfile_cmp(const void *a, const void *b)
|
228
|
+
static int status_validate_options(const git_status_options *opts)
|
230
229
|
{
|
231
|
-
|
232
|
-
|
230
|
+
if (!opts)
|
231
|
+
return 0;
|
233
232
|
|
234
|
-
|
235
|
-
}
|
233
|
+
GITERR_CHECK_VERSION(opts, GIT_STATUS_OPTIONS_VERSION, "git_status_options");
|
236
234
|
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
235
|
+
if (opts->show > GIT_STATUS_SHOW_WORKDIR_ONLY) {
|
236
|
+
giterr_set(GITERR_INVALID, "Unknown status 'show' option");
|
237
|
+
return -1;
|
238
|
+
}
|
239
|
+
|
240
|
+
if ((opts->flags & GIT_STATUS_OPT_NO_REFRESH) != 0 &&
|
241
|
+
(opts->flags & GIT_STATUS_OPT_UPDATE_INDEX) != 0) {
|
242
|
+
giterr_set(GITERR_INVALID, "Updating index from status "
|
243
|
+
"is not allowed when index refresh is disabled");
|
244
|
+
return -1;
|
245
|
+
}
|
241
246
|
|
242
|
-
return
|
247
|
+
return 0;
|
243
248
|
}
|
244
|
-
*/
|
245
249
|
|
246
250
|
int git_status_list_new(
|
247
251
|
git_status_list **out,
|
@@ -251,30 +255,34 @@ int git_status_list_new(
|
|
251
255
|
git_index *index = NULL;
|
252
256
|
git_status_list *status = NULL;
|
253
257
|
git_diff_options diffopt = GIT_DIFF_OPTIONS_INIT;
|
254
|
-
git_diff_find_options
|
258
|
+
git_diff_find_options findopt = GIT_DIFF_FIND_OPTIONS_INIT;
|
255
259
|
git_tree *head = NULL;
|
256
260
|
git_status_show_t show =
|
257
261
|
opts ? opts->show : GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
|
258
262
|
int error = 0;
|
259
263
|
unsigned int flags = opts ? opts->flags : GIT_STATUS_OPT_DEFAULTS;
|
260
264
|
|
261
|
-
assert(show <= GIT_STATUS_SHOW_INDEX_THEN_WORKDIR);
|
262
|
-
|
263
265
|
*out = NULL;
|
264
266
|
|
265
|
-
|
267
|
+
if (status_validate_options(opts) < 0)
|
268
|
+
return -1;
|
266
269
|
|
267
270
|
if ((error = git_repository__ensure_not_bare(repo, "status")) < 0 ||
|
268
271
|
(error = git_repository_index(&index, repo)) < 0)
|
269
272
|
return error;
|
270
273
|
|
271
274
|
/* if there is no HEAD, that's okay - we'll make an empty iterator */
|
272
|
-
if ((
|
273
|
-
error != GIT_ENOTFOUND && error !=
|
274
|
-
|
275
|
-
|
275
|
+
if ((error = git_repository_head_tree(&head, repo)) < 0) {
|
276
|
+
if (error != GIT_ENOTFOUND && error != GIT_EUNBORNBRANCH)
|
277
|
+
goto done;
|
278
|
+
giterr_clear();
|
276
279
|
}
|
277
280
|
|
281
|
+
/* refresh index from disk unless prevented */
|
282
|
+
if ((flags & GIT_STATUS_OPT_NO_REFRESH) == 0 &&
|
283
|
+
git_index_read(index, false) < 0)
|
284
|
+
giterr_clear();
|
285
|
+
|
278
286
|
status = git_status_list_alloc(index);
|
279
287
|
GITERR_CHECK_ALLOC(status);
|
280
288
|
|
@@ -284,6 +292,7 @@ int git_status_list_new(
|
|
284
292
|
}
|
285
293
|
|
286
294
|
diffopt.flags = GIT_DIFF_INCLUDE_TYPECHANGE;
|
295
|
+
findopt.flags = GIT_DIFF_FIND_FOR_UNTRACKED;
|
287
296
|
|
288
297
|
if ((flags & GIT_STATUS_OPT_INCLUDE_UNTRACKED) != 0)
|
289
298
|
diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNTRACKED;
|
@@ -299,40 +308,38 @@ int git_status_list_new(
|
|
299
308
|
diffopt.flags = diffopt.flags | GIT_DIFF_RECURSE_IGNORED_DIRS;
|
300
309
|
if ((flags & GIT_STATUS_OPT_EXCLUDE_SUBMODULES) != 0)
|
301
310
|
diffopt.flags = diffopt.flags | GIT_DIFF_IGNORE_SUBMODULES;
|
311
|
+
if ((flags & GIT_STATUS_OPT_UPDATE_INDEX) != 0)
|
312
|
+
diffopt.flags = diffopt.flags | GIT_DIFF_UPDATE_INDEX;
|
302
313
|
|
303
|
-
|
314
|
+
if ((flags & GIT_STATUS_OPT_RENAMES_FROM_REWRITES) != 0)
|
315
|
+
findopt.flags = findopt.flags |
|
316
|
+
GIT_DIFF_FIND_AND_BREAK_REWRITES |
|
317
|
+
GIT_DIFF_FIND_RENAMES_FROM_REWRITES |
|
318
|
+
GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY;
|
304
319
|
|
305
320
|
if (show != GIT_STATUS_SHOW_WORKDIR_ONLY) {
|
306
321
|
if ((error = git_diff_tree_to_index(
|
307
|
-
&status->head2idx, repo, head,
|
322
|
+
&status->head2idx, repo, head, index, &diffopt)) < 0)
|
308
323
|
goto done;
|
309
324
|
|
310
325
|
if ((flags & GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX) != 0 &&
|
311
|
-
(error = git_diff_find_similar(status->head2idx,
|
326
|
+
(error = git_diff_find_similar(status->head2idx, &findopt)) < 0)
|
312
327
|
goto done;
|
313
328
|
}
|
314
329
|
|
315
330
|
if (show != GIT_STATUS_SHOW_INDEX_ONLY) {
|
316
331
|
if ((error = git_diff_index_to_workdir(
|
317
|
-
&status->idx2wd, repo,
|
332
|
+
&status->idx2wd, repo, index, &diffopt)) < 0)
|
318
333
|
goto done;
|
319
334
|
|
320
335
|
if ((flags & GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR) != 0 &&
|
321
|
-
(error = git_diff_find_similar(status->idx2wd, &
|
322
|
-
goto done;
|
323
|
-
}
|
324
|
-
|
325
|
-
if (show == GIT_STATUS_SHOW_INDEX_THEN_WORKDIR) {
|
326
|
-
if ((error = git_diff__paired_foreach(
|
327
|
-
status->head2idx, NULL, status_collect, status)) < 0)
|
336
|
+
(error = git_diff_find_similar(status->idx2wd, &findopt)) < 0)
|
328
337
|
goto done;
|
329
|
-
|
330
|
-
git_diff_list_free(status->head2idx);
|
331
|
-
status->head2idx = NULL;
|
332
338
|
}
|
333
339
|
|
334
|
-
|
335
|
-
|
340
|
+
error = git_diff__paired_foreach(
|
341
|
+
status->head2idx, status->idx2wd, status_collect, status);
|
342
|
+
if (error < 0)
|
336
343
|
goto done;
|
337
344
|
|
338
345
|
if (flags & GIT_STATUS_OPT_SORT_CASE_SENSITIVELY)
|
@@ -377,19 +384,13 @@ const git_status_entry *git_status_byindex(git_status_list *status, size_t i)
|
|
377
384
|
|
378
385
|
void git_status_list_free(git_status_list *status)
|
379
386
|
{
|
380
|
-
git_status_entry *status_entry;
|
381
|
-
size_t i;
|
382
|
-
|
383
387
|
if (status == NULL)
|
384
388
|
return;
|
385
389
|
|
386
|
-
|
387
|
-
|
390
|
+
git_diff_free(status->head2idx);
|
391
|
+
git_diff_free(status->idx2wd);
|
388
392
|
|
389
|
-
|
390
|
-
git__free(status_entry);
|
391
|
-
|
392
|
-
git_vector_free(&status->paired);
|
393
|
+
git_vector_free_deep(&status->paired);
|
393
394
|
|
394
395
|
git__memzero(status, sizeof(*status));
|
395
396
|
git__free(status);
|
@@ -414,9 +415,8 @@ int git_status_foreach_ext(
|
|
414
415
|
status_entry->head_to_index->old_file.path :
|
415
416
|
status_entry->index_to_workdir->old_file.path;
|
416
417
|
|
417
|
-
if (cb(path, status_entry->status, payload) != 0) {
|
418
|
-
error
|
419
|
-
giterr_clear();
|
418
|
+
if ((error = cb(path, status_entry->status, payload)) != 0) {
|
419
|
+
giterr_set_after_callback(error);
|
420
420
|
break;
|
421
421
|
}
|
422
422
|
}
|
@@ -518,3 +518,31 @@ int git_status_should_ignore(
|
|
518
518
|
return git_ignore_path_is_ignored(ignored, repo, path);
|
519
519
|
}
|
520
520
|
|
521
|
+
int git_status_init_options(git_status_options *opts, unsigned int version)
|
522
|
+
{
|
523
|
+
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
524
|
+
opts, version, git_status_options, GIT_STATUS_OPTIONS_INIT);
|
525
|
+
return 0;
|
526
|
+
}
|
527
|
+
|
528
|
+
int git_status_list_get_perfdata(
|
529
|
+
git_diff_perfdata *out, const git_status_list *status)
|
530
|
+
{
|
531
|
+
assert(out);
|
532
|
+
GITERR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata");
|
533
|
+
|
534
|
+
out->stat_calls = 0;
|
535
|
+
out->oid_calculations = 0;
|
536
|
+
|
537
|
+
if (status->head2idx) {
|
538
|
+
out->stat_calls += status->head2idx->perf.stat_calls;
|
539
|
+
out->oid_calculations += status->head2idx->perf.oid_calculations;
|
540
|
+
}
|
541
|
+
if (status->idx2wd) {
|
542
|
+
out->stat_calls += status->idx2wd->perf.stat_calls;
|
543
|
+
out->oid_calculations += status->idx2wd->perf.oid_calculations;
|
544
|
+
}
|
545
|
+
|
546
|
+
return 0;
|
547
|
+
}
|
548
|
+
|
data/vendor/libgit2/src/status.h
CHANGED
@@ -0,0 +1,32 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#include "strmap.h"
|
9
|
+
|
10
|
+
int git_strmap_next(
|
11
|
+
void **data,
|
12
|
+
git_strmap_iter* iter,
|
13
|
+
git_strmap *map)
|
14
|
+
{
|
15
|
+
if (!map)
|
16
|
+
return GIT_ERROR;
|
17
|
+
|
18
|
+
while (*iter != git_strmap_end(map)) {
|
19
|
+
if (!(git_strmap_has_data(map, *iter))) {
|
20
|
+
++(*iter);
|
21
|
+
continue;
|
22
|
+
}
|
23
|
+
|
24
|
+
*data = git_strmap_value_at(map, *iter);
|
25
|
+
|
26
|
+
++(*iter);
|
27
|
+
|
28
|
+
return GIT_OK;
|
29
|
+
}
|
30
|
+
|
31
|
+
return GIT_ITEROVER;
|
32
|
+
}
|