rugged 0.18.0.gh.de28323 → 0.19.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +9 -4
- data/Rakefile +1 -1
- data/ext/rugged/extconf.rb +10 -0
- data/ext/rugged/rugged.c +153 -86
- data/ext/rugged/rugged.h +44 -33
- data/ext/rugged/rugged_blob.c +288 -60
- data/ext/rugged/rugged_branch.c +82 -57
- data/ext/rugged/rugged_commit.c +83 -86
- data/ext/rugged/rugged_config.c +68 -68
- data/ext/rugged/rugged_diff.c +509 -0
- data/ext/rugged/rugged_diff_delta.c +94 -0
- data/ext/rugged/rugged_diff_hunk.c +100 -0
- data/ext/rugged/rugged_diff_line.c +79 -0
- data/ext/rugged/rugged_diff_patch.c +169 -0
- data/ext/rugged/rugged_index.c +539 -8
- data/ext/rugged/rugged_note.c +74 -80
- data/ext/rugged/rugged_object.c +63 -8
- data/ext/rugged/rugged_reference.c +231 -145
- data/ext/rugged/rugged_remote.c +509 -53
- data/ext/rugged/rugged_repo.c +572 -236
- data/ext/rugged/rugged_revwalk.c +59 -36
- data/ext/rugged/rugged_settings.c +7 -9
- data/ext/rugged/rugged_signature.c +7 -11
- data/ext/rugged/rugged_tag.c +93 -39
- data/ext/rugged/rugged_tree.c +321 -58
- data/lib/rugged.rb +1 -0
- data/lib/rugged/commit.rb +16 -1
- data/lib/rugged/console.rb +9 -0
- data/lib/rugged/diff.rb +19 -0
- data/lib/rugged/diff/delta.rb +54 -0
- data/lib/rugged/diff/hunk.rb +23 -0
- data/lib/rugged/diff/line.rb +29 -0
- data/lib/rugged/diff/patch.rb +28 -0
- data/lib/rugged/repository.rb +36 -39
- data/lib/rugged/version.rb +1 -1
- data/test/blob_test.rb +308 -1
- data/test/branch_test.rb +7 -0
- data/test/commit_test.rb +7 -10
- data/test/coverage/cover.rb +9 -1
- data/test/diff_test.rb +777 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +1 -0
- data/test/fixtures/attr/attr1 +29 -0
- data/test/fixtures/attr/attr2 +21 -0
- data/test/fixtures/attr/attr3 +4 -0
- data/test/fixtures/attr/binfile +1 -0
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +1 -0
- data/test/fixtures/attr/gitattributes +29 -0
- data/test/fixtures/attr/gitignore +2 -0
- data/test/fixtures/attr/ign +1 -0
- data/test/fixtures/attr/macro_bad +1 -0
- data/test/fixtures/attr/macro_test +1 -0
- data/test/fixtures/attr/root_test1 +1 -0
- data/test/fixtures/attr/root_test2 +6 -0
- data/test/fixtures/attr/root_test3 +19 -0
- data/test/fixtures/attr/root_test4.txt +14 -0
- data/test/fixtures/attr/sub/abc +37 -0
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +1 -0
- data/test/fixtures/attr/sub/ign/file +1 -0
- data/test/fixtures/attr/sub/ign/sub/file +1 -0
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +1 -0
- data/test/fixtures/attr/sub/sub/subsub.txt +1 -0
- data/test/fixtures/attr/sub/subdir_test1 +2 -0
- data/test/fixtures/attr/sub/subdir_test2.txt +1 -0
- data/test/fixtures/diff/another.txt +38 -0
- data/test/fixtures/diff/readme.txt +36 -0
- data/test/fixtures/mergedrepo/conflicts-one.txt +5 -0
- data/test/fixtures/mergedrepo/conflicts-two.txt +5 -0
- data/test/fixtures/mergedrepo/one.txt +10 -0
- data/test/fixtures/mergedrepo/two.txt +12 -0
- data/test/fixtures/status/current_file +1 -0
- data/test/fixtures/status/ignored_file +1 -0
- data/test/fixtures/status/modified_file +2 -0
- data/test/fixtures/status/new_file +1 -0
- data/test/fixtures/status/staged_changes +2 -0
- data/test/fixtures/status/staged_changes_modified_file +3 -0
- data/test/fixtures/status/staged_delete_modified_file +1 -0
- data/test/fixtures/status/staged_new_file +1 -0
- data/test/fixtures/status/staged_new_file_modified_file +2 -0
- data/test/fixtures/status/subdir.txt +2 -0
- data/test/fixtures/status/subdir/current_file +1 -0
- data/test/fixtures/status/subdir/modified_file +2 -0
- data/test/fixtures/status/subdir/new_file +1 -0
- data/test/fixtures/status//350/277/231 +1 -0
- data/test/fixtures/testrepo.git/config +5 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/text_file.md +464 -0
- data/test/fixtures/unsymlinked.git/HEAD +1 -0
- data/test/fixtures/unsymlinked.git/config +6 -0
- data/test/fixtures/unsymlinked.git/description +1 -0
- data/test/fixtures/unsymlinked.git/info/exclude +2 -0
- 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 +2 -0
- 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 +1 -0
- data/test/fixtures/unsymlinked.git/refs/heads/master +1 -0
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +1 -0
- data/test/index_test.rb +120 -0
- data/test/reference_test.rb +38 -3
- data/test/remote_test.rb +224 -3
- data/test/repo_reset_test.rb +2 -0
- data/test/repo_test.rb +147 -10
- data/test/test_helper.rb +5 -2
- data/vendor/libgit2/include/git2/attr.h +3 -3
- data/vendor/libgit2/include/git2/blob.h +11 -17
- data/vendor/libgit2/include/git2/branch.h +3 -2
- data/vendor/libgit2/include/git2/checkout.h +7 -0
- data/vendor/libgit2/include/git2/clone.h +3 -0
- data/vendor/libgit2/include/git2/commit.h +61 -66
- data/vendor/libgit2/include/git2/common.h +73 -42
- data/vendor/libgit2/include/git2/config.h +57 -71
- data/vendor/libgit2/include/git2/cred_helpers.h +2 -2
- data/vendor/libgit2/include/git2/diff.h +179 -30
- data/vendor/libgit2/include/git2/errors.h +3 -3
- data/vendor/libgit2/include/git2/index.h +225 -146
- data/vendor/libgit2/include/git2/indexer.h +2 -22
- data/vendor/libgit2/include/git2/inttypes.h +9 -9
- data/vendor/libgit2/include/git2/merge.h +123 -5
- data/vendor/libgit2/include/git2/odb.h +59 -38
- data/vendor/libgit2/include/git2/odb_backend.h +45 -104
- data/vendor/libgit2/include/git2/oid.h +30 -19
- data/vendor/libgit2/include/git2/pack.h +21 -3
- data/vendor/libgit2/include/git2/refdb.h +0 -35
- data/vendor/libgit2/include/git2/refs.h +93 -31
- data/vendor/libgit2/include/git2/refspec.h +17 -0
- data/vendor/libgit2/include/git2/remote.h +60 -20
- data/vendor/libgit2/include/git2/repository.h +48 -70
- data/vendor/libgit2/include/git2/reset.h +3 -3
- data/vendor/libgit2/include/git2/revparse.h +22 -0
- data/vendor/libgit2/include/git2/stash.h +1 -1
- data/vendor/libgit2/include/git2/status.h +131 -56
- data/vendor/libgit2/include/git2/strarray.h +2 -2
- data/vendor/libgit2/include/git2/submodule.h +16 -16
- data/vendor/libgit2/include/git2/sys/commit.h +46 -0
- data/vendor/libgit2/include/git2/sys/config.h +71 -0
- data/vendor/libgit2/include/git2/sys/index.h +179 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +86 -0
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +158 -0
- data/vendor/libgit2/include/git2/sys/refs.h +38 -0
- data/vendor/libgit2/include/git2/sys/repository.h +106 -0
- data/vendor/libgit2/include/git2/tag.h +44 -18
- data/vendor/libgit2/include/git2/trace.h +1 -2
- data/vendor/libgit2/include/git2/transport.h +74 -0
- data/vendor/libgit2/include/git2/tree.h +12 -22
- data/vendor/libgit2/include/git2/types.h +33 -0
- data/vendor/libgit2/include/git2/version.h +2 -2
- data/vendor/libgit2/src/array.h +66 -0
- data/vendor/libgit2/src/attr.c +26 -13
- data/vendor/libgit2/src/attr_file.c +3 -2
- data/vendor/libgit2/src/attr_file.h +3 -3
- data/vendor/libgit2/src/attrcache.h +4 -4
- data/vendor/libgit2/src/blob.c +13 -9
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +67 -49
- data/vendor/libgit2/src/cache.c +224 -54
- data/vendor/libgit2/src/cache.h +33 -20
- data/vendor/libgit2/src/checkout.c +145 -85
- data/vendor/libgit2/src/clone.c +62 -50
- data/vendor/libgit2/src/commit.c +74 -40
- data/vendor/libgit2/src/commit.h +2 -3
- data/vendor/libgit2/src/commit_list.c +14 -8
- data/vendor/libgit2/src/config.c +119 -36
- data/vendor/libgit2/src/config.h +3 -0
- data/vendor/libgit2/src/config_cache.c +24 -7
- data/vendor/libgit2/src/config_file.c +9 -6
- data/vendor/libgit2/src/crlf.c +4 -2
- data/vendor/libgit2/src/date.c +3 -3
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +681 -303
- data/vendor/libgit2/src/diff.h +34 -2
- data/vendor/libgit2/src/diff_driver.c +405 -0
- data/vendor/libgit2/src/diff_driver.h +49 -0
- data/vendor/libgit2/src/diff_file.c +447 -0
- data/vendor/libgit2/src/diff_file.h +58 -0
- data/vendor/libgit2/src/diff_patch.c +995 -0
- data/vendor/libgit2/src/diff_patch.h +46 -0
- data/vendor/libgit2/src/diff_print.c +430 -0
- data/vendor/libgit2/src/diff_tform.c +464 -203
- data/vendor/libgit2/src/diff_xdiff.c +166 -0
- data/vendor/libgit2/src/diff_xdiff.h +28 -0
- data/vendor/libgit2/src/fetch.c +11 -4
- data/vendor/libgit2/src/fileops.c +85 -61
- data/vendor/libgit2/src/fileops.h +4 -0
- data/vendor/libgit2/src/global.c +10 -2
- data/vendor/libgit2/src/global.h +0 -8
- data/vendor/libgit2/src/hash/hash_generic.h +3 -3
- data/vendor/libgit2/src/hash/hash_win32.h +4 -4
- data/vendor/libgit2/src/hashsig.c +0 -1
- data/vendor/libgit2/src/ignore.c +68 -28
- data/vendor/libgit2/src/ignore.h +10 -1
- data/vendor/libgit2/src/index.c +666 -84
- data/vendor/libgit2/src/index.h +6 -0
- data/vendor/libgit2/src/indexer.c +10 -28
- data/vendor/libgit2/src/iterator.c +427 -283
- data/vendor/libgit2/src/iterator.h +58 -4
- data/vendor/libgit2/src/merge.c +1892 -32
- data/vendor/libgit2/src/merge.h +132 -5
- data/vendor/libgit2/src/merge_file.c +174 -0
- data/vendor/libgit2/src/merge_file.h +71 -0
- data/vendor/libgit2/src/mwindow.c +1 -1
- data/vendor/libgit2/src/notes.c +45 -48
- data/vendor/libgit2/src/object.c +89 -127
- data/vendor/libgit2/src/object.h +0 -1
- data/vendor/libgit2/src/object_api.c +129 -0
- data/vendor/libgit2/src/odb.c +156 -59
- data/vendor/libgit2/src/odb.h +5 -2
- data/vendor/libgit2/src/odb_loose.c +31 -17
- data/vendor/libgit2/src/odb_pack.c +39 -43
- data/vendor/libgit2/src/oid.c +62 -27
- data/vendor/libgit2/src/oid.h +33 -0
- data/vendor/libgit2/src/oidmap.h +4 -6
- data/vendor/libgit2/src/pack-objects.c +54 -22
- data/vendor/libgit2/src/pack.c +98 -56
- data/vendor/libgit2/src/pack.h +3 -1
- data/vendor/libgit2/src/pathspec.c +26 -1
- data/vendor/libgit2/src/pathspec.h +14 -0
- data/vendor/libgit2/src/pool.c +5 -0
- data/vendor/libgit2/src/posix.c +2 -2
- data/vendor/libgit2/src/posix.h +3 -0
- data/vendor/libgit2/src/push.c +13 -10
- data/vendor/libgit2/src/refdb.c +82 -62
- data/vendor/libgit2/src/refdb.h +16 -16
- data/vendor/libgit2/src/refdb_fs.c +386 -133
- data/vendor/libgit2/src/reflog.c +3 -1
- data/vendor/libgit2/src/refs.c +247 -221
- data/vendor/libgit2/src/refs.h +2 -1
- data/vendor/libgit2/src/refspec.c +18 -1
- data/vendor/libgit2/src/refspec.h +3 -1
- data/vendor/libgit2/src/remote.c +434 -253
- data/vendor/libgit2/src/remote.h +5 -3
- data/vendor/libgit2/src/repository.c +197 -111
- data/vendor/libgit2/src/repository.h +26 -5
- data/vendor/libgit2/src/reset.c +1 -1
- data/vendor/libgit2/src/revparse.c +84 -79
- data/vendor/libgit2/src/revwalk.c +1 -1
- data/vendor/libgit2/src/signature.c +22 -10
- data/vendor/libgit2/src/stash.c +5 -2
- data/vendor/libgit2/src/status.c +311 -107
- data/vendor/libgit2/src/status.h +23 -0
- data/vendor/libgit2/src/submodule.c +21 -13
- data/vendor/libgit2/src/tag.c +42 -31
- data/vendor/libgit2/src/tag.h +2 -3
- data/vendor/libgit2/src/thread-utils.h +105 -3
- data/vendor/libgit2/src/trace.c +1 -2
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/transport.c +18 -6
- data/vendor/libgit2/src/transports/cred.c +103 -1
- data/vendor/libgit2/src/transports/local.c +19 -9
- data/vendor/libgit2/src/transports/smart_protocol.c +32 -12
- data/vendor/libgit2/src/transports/ssh.c +519 -0
- data/vendor/libgit2/src/transports/winhttp.c +3 -1
- data/vendor/libgit2/src/tree.c +26 -28
- data/vendor/libgit2/src/tree.h +3 -3
- data/vendor/libgit2/src/unix/posix.h +2 -0
- data/vendor/libgit2/src/util.c +43 -6
- data/vendor/libgit2/src/util.h +40 -12
- data/vendor/libgit2/src/vector.c +3 -5
- data/vendor/libgit2/src/vector.h +9 -0
- data/vendor/libgit2/src/win32/dir.c +1 -1
- data/vendor/libgit2/src/win32/error.c +2 -0
- data/vendor/libgit2/src/win32/findfile.c +3 -6
- data/vendor/libgit2/src/win32/posix_w32.c +85 -59
- data/vendor/libgit2/src/win32/pthread.c +16 -8
- data/vendor/libgit2/src/win32/pthread.h +7 -4
- metadata +407 -306
- data/test/coverage/HEAD.json +0 -1
- data/vendor/libgit2/include/git2/refdb_backend.h +0 -109
- data/vendor/libgit2/src/diff_output.c +0 -1819
- data/vendor/libgit2/src/diff_output.h +0 -93
@@ -0,0 +1,58 @@
|
|
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
|
+
#ifndef INCLUDE_diff_file_h__
|
8
|
+
#define INCLUDE_diff_file_h__
|
9
|
+
|
10
|
+
#include "common.h"
|
11
|
+
#include "diff.h"
|
12
|
+
#include "diff_driver.h"
|
13
|
+
#include "map.h"
|
14
|
+
|
15
|
+
/* expanded information for one side of a delta */
|
16
|
+
typedef struct {
|
17
|
+
git_repository *repo;
|
18
|
+
git_diff_file *file;
|
19
|
+
git_diff_driver *driver;
|
20
|
+
uint32_t flags;
|
21
|
+
uint32_t opts_flags;
|
22
|
+
git_off_t opts_max_size;
|
23
|
+
git_iterator_type_t src;
|
24
|
+
const git_blob *blob;
|
25
|
+
git_map map;
|
26
|
+
} git_diff_file_content;
|
27
|
+
|
28
|
+
extern int git_diff_file_content__init_from_diff(
|
29
|
+
git_diff_file_content *fc,
|
30
|
+
git_diff_list *diff,
|
31
|
+
size_t delta_index,
|
32
|
+
bool use_old);
|
33
|
+
|
34
|
+
extern int git_diff_file_content__init_from_blob(
|
35
|
+
git_diff_file_content *fc,
|
36
|
+
git_repository *repo,
|
37
|
+
const git_diff_options *opts,
|
38
|
+
const git_blob *blob,
|
39
|
+
git_diff_file *as_file);
|
40
|
+
|
41
|
+
extern int git_diff_file_content__init_from_raw(
|
42
|
+
git_diff_file_content *fc,
|
43
|
+
git_repository *repo,
|
44
|
+
const git_diff_options *opts,
|
45
|
+
const char *buf,
|
46
|
+
size_t buflen,
|
47
|
+
git_diff_file *as_file);
|
48
|
+
|
49
|
+
/* this loads the blob/file-on-disk as needed */
|
50
|
+
extern int git_diff_file_content__load(git_diff_file_content *fc);
|
51
|
+
|
52
|
+
/* this releases the blob/file-in-memory */
|
53
|
+
extern void git_diff_file_content__unload(git_diff_file_content *fc);
|
54
|
+
|
55
|
+
/* this unloads and also releases any other resources */
|
56
|
+
extern void git_diff_file_content__clear(git_diff_file_content *fc);
|
57
|
+
|
58
|
+
#endif
|
@@ -0,0 +1,995 @@
|
|
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
|
+
#include "common.h"
|
8
|
+
#include "diff.h"
|
9
|
+
#include "diff_file.h"
|
10
|
+
#include "diff_driver.h"
|
11
|
+
#include "diff_patch.h"
|
12
|
+
#include "diff_xdiff.h"
|
13
|
+
#include "fileops.h"
|
14
|
+
|
15
|
+
/* cached information about a single span in a diff */
|
16
|
+
typedef struct diff_patch_line diff_patch_line;
|
17
|
+
struct diff_patch_line {
|
18
|
+
const char *ptr;
|
19
|
+
size_t len;
|
20
|
+
size_t lines, oldno, newno;
|
21
|
+
char origin;
|
22
|
+
};
|
23
|
+
|
24
|
+
/* cached information about a hunk in a diff */
|
25
|
+
typedef struct diff_patch_hunk diff_patch_hunk;
|
26
|
+
struct diff_patch_hunk {
|
27
|
+
git_diff_range range;
|
28
|
+
char header[128];
|
29
|
+
size_t header_len;
|
30
|
+
size_t line_start;
|
31
|
+
size_t line_count;
|
32
|
+
};
|
33
|
+
|
34
|
+
struct git_diff_patch {
|
35
|
+
git_refcount rc;
|
36
|
+
git_diff_list *diff; /* for refcount purposes, maybe NULL for blob diffs */
|
37
|
+
git_diff_delta *delta;
|
38
|
+
size_t delta_index;
|
39
|
+
git_diff_file_content ofile;
|
40
|
+
git_diff_file_content nfile;
|
41
|
+
uint32_t flags;
|
42
|
+
git_array_t(diff_patch_hunk) hunks;
|
43
|
+
git_array_t(diff_patch_line) lines;
|
44
|
+
size_t oldno, newno;
|
45
|
+
size_t content_size;
|
46
|
+
git_pool flattened;
|
47
|
+
};
|
48
|
+
|
49
|
+
enum {
|
50
|
+
GIT_DIFF_PATCH_ALLOCATED = (1 << 0),
|
51
|
+
GIT_DIFF_PATCH_INITIALIZED = (1 << 1),
|
52
|
+
GIT_DIFF_PATCH_LOADED = (1 << 2),
|
53
|
+
GIT_DIFF_PATCH_DIFFABLE = (1 << 3),
|
54
|
+
GIT_DIFF_PATCH_DIFFED = (1 << 4),
|
55
|
+
GIT_DIFF_PATCH_FLATTENED = (1 << 5),
|
56
|
+
};
|
57
|
+
|
58
|
+
static void diff_output_init(git_diff_output*, const git_diff_options*,
|
59
|
+
git_diff_file_cb, git_diff_hunk_cb, git_diff_data_cb, void*);
|
60
|
+
|
61
|
+
static void diff_output_to_patch(git_diff_output *, git_diff_patch *);
|
62
|
+
|
63
|
+
static void diff_patch_update_binary(git_diff_patch *patch)
|
64
|
+
{
|
65
|
+
if ((patch->delta->flags & DIFF_FLAGS_KNOWN_BINARY) != 0)
|
66
|
+
return;
|
67
|
+
|
68
|
+
if ((patch->ofile.file->flags & GIT_DIFF_FLAG_BINARY) != 0 ||
|
69
|
+
(patch->nfile.file->flags & GIT_DIFF_FLAG_BINARY) != 0)
|
70
|
+
patch->delta->flags |= GIT_DIFF_FLAG_BINARY;
|
71
|
+
|
72
|
+
else if ((patch->ofile.file->flags & DIFF_FLAGS_NOT_BINARY) != 0 &&
|
73
|
+
(patch->nfile.file->flags & DIFF_FLAGS_NOT_BINARY) != 0)
|
74
|
+
patch->delta->flags |= GIT_DIFF_FLAG_NOT_BINARY;
|
75
|
+
}
|
76
|
+
|
77
|
+
static void diff_patch_init_common(git_diff_patch *patch)
|
78
|
+
{
|
79
|
+
diff_patch_update_binary(patch);
|
80
|
+
|
81
|
+
if ((patch->delta->flags & GIT_DIFF_FLAG_BINARY) != 0)
|
82
|
+
patch->flags |= GIT_DIFF_PATCH_LOADED; /* set LOADED but not DIFFABLE */
|
83
|
+
|
84
|
+
patch->flags |= GIT_DIFF_PATCH_INITIALIZED;
|
85
|
+
|
86
|
+
if (patch->diff)
|
87
|
+
git_diff_list_addref(patch->diff);
|
88
|
+
}
|
89
|
+
|
90
|
+
static int diff_patch_init_from_diff(
|
91
|
+
git_diff_patch *patch, git_diff_list *diff, size_t delta_index)
|
92
|
+
{
|
93
|
+
int error = 0;
|
94
|
+
|
95
|
+
memset(patch, 0, sizeof(*patch));
|
96
|
+
patch->diff = diff;
|
97
|
+
patch->delta = git_vector_get(&diff->deltas, delta_index);
|
98
|
+
patch->delta_index = delta_index;
|
99
|
+
|
100
|
+
if ((error = git_diff_file_content__init_from_diff(
|
101
|
+
&patch->ofile, diff, delta_index, true)) < 0 ||
|
102
|
+
(error = git_diff_file_content__init_from_diff(
|
103
|
+
&patch->nfile, diff, delta_index, false)) < 0)
|
104
|
+
return error;
|
105
|
+
|
106
|
+
diff_patch_init_common(patch);
|
107
|
+
|
108
|
+
return 0;
|
109
|
+
}
|
110
|
+
|
111
|
+
static int diff_patch_alloc_from_diff(
|
112
|
+
git_diff_patch **out,
|
113
|
+
git_diff_list *diff,
|
114
|
+
size_t delta_index)
|
115
|
+
{
|
116
|
+
int error;
|
117
|
+
git_diff_patch *patch = git__calloc(1, sizeof(git_diff_patch));
|
118
|
+
GITERR_CHECK_ALLOC(patch);
|
119
|
+
|
120
|
+
if (!(error = diff_patch_init_from_diff(patch, diff, delta_index))) {
|
121
|
+
patch->flags |= GIT_DIFF_PATCH_ALLOCATED;
|
122
|
+
GIT_REFCOUNT_INC(patch);
|
123
|
+
} else {
|
124
|
+
git__free(patch);
|
125
|
+
patch = NULL;
|
126
|
+
}
|
127
|
+
|
128
|
+
*out = patch;
|
129
|
+
return error;
|
130
|
+
}
|
131
|
+
|
132
|
+
static int diff_patch_load(git_diff_patch *patch, git_diff_output *output)
|
133
|
+
{
|
134
|
+
int error = 0;
|
135
|
+
bool incomplete_data;
|
136
|
+
|
137
|
+
if ((patch->flags & GIT_DIFF_PATCH_LOADED) != 0)
|
138
|
+
return 0;
|
139
|
+
|
140
|
+
/* if no hunk and data callbacks and user doesn't care if data looks
|
141
|
+
* binary, then there is no need to actually load the data
|
142
|
+
*/
|
143
|
+
if ((patch->ofile.opts_flags & GIT_DIFF_SKIP_BINARY_CHECK) != 0 &&
|
144
|
+
output && !output->hunk_cb && !output->data_cb)
|
145
|
+
return 0;
|
146
|
+
|
147
|
+
incomplete_data =
|
148
|
+
(((patch->ofile.flags & GIT_DIFF_FLAG__NO_DATA) != 0 ||
|
149
|
+
(patch->ofile.file->flags & GIT_DIFF_FLAG_VALID_OID) != 0) &&
|
150
|
+
((patch->nfile.flags & GIT_DIFF_FLAG__NO_DATA) != 0 ||
|
151
|
+
(patch->nfile.file->flags & GIT_DIFF_FLAG_VALID_OID) != 0));
|
152
|
+
|
153
|
+
/* always try to load workdir content first because filtering may
|
154
|
+
* need 2x data size and this minimizes peak memory footprint
|
155
|
+
*/
|
156
|
+
if (patch->ofile.src == GIT_ITERATOR_TYPE_WORKDIR) {
|
157
|
+
if ((error = git_diff_file_content__load(&patch->ofile)) < 0 ||
|
158
|
+
(patch->ofile.file->flags & GIT_DIFF_FLAG_BINARY) != 0)
|
159
|
+
goto cleanup;
|
160
|
+
}
|
161
|
+
if (patch->nfile.src == GIT_ITERATOR_TYPE_WORKDIR) {
|
162
|
+
if ((error = git_diff_file_content__load(&patch->nfile)) < 0 ||
|
163
|
+
(patch->nfile.file->flags & GIT_DIFF_FLAG_BINARY) != 0)
|
164
|
+
goto cleanup;
|
165
|
+
}
|
166
|
+
|
167
|
+
/* once workdir has been tried, load other data as needed */
|
168
|
+
if (patch->ofile.src != GIT_ITERATOR_TYPE_WORKDIR) {
|
169
|
+
if ((error = git_diff_file_content__load(&patch->ofile)) < 0 ||
|
170
|
+
(patch->ofile.file->flags & GIT_DIFF_FLAG_BINARY) != 0)
|
171
|
+
goto cleanup;
|
172
|
+
}
|
173
|
+
if (patch->nfile.src != GIT_ITERATOR_TYPE_WORKDIR) {
|
174
|
+
if ((error = git_diff_file_content__load(&patch->nfile)) < 0 ||
|
175
|
+
(patch->nfile.file->flags & GIT_DIFF_FLAG_BINARY) != 0)
|
176
|
+
goto cleanup;
|
177
|
+
}
|
178
|
+
|
179
|
+
/* if previously missing an oid, and now that we have it the two sides
|
180
|
+
* are the same (and not submodules), update MODIFIED -> UNMODIFIED
|
181
|
+
*/
|
182
|
+
if (incomplete_data &&
|
183
|
+
patch->ofile.file->mode == patch->nfile.file->mode &&
|
184
|
+
patch->ofile.file->mode != GIT_FILEMODE_COMMIT &&
|
185
|
+
git_oid_equal(&patch->ofile.file->oid, &patch->nfile.file->oid) &&
|
186
|
+
patch->delta->status == GIT_DELTA_MODIFIED) /* not RENAMED/COPIED! */
|
187
|
+
patch->delta->status = GIT_DELTA_UNMODIFIED;
|
188
|
+
|
189
|
+
cleanup:
|
190
|
+
diff_patch_update_binary(patch);
|
191
|
+
|
192
|
+
if (!error) {
|
193
|
+
/* patch is diffable only for non-binary, modified files where
|
194
|
+
* at least one side has data and the data actually changed
|
195
|
+
*/
|
196
|
+
if ((patch->delta->flags & GIT_DIFF_FLAG_BINARY) == 0 &&
|
197
|
+
patch->delta->status != GIT_DELTA_UNMODIFIED &&
|
198
|
+
(patch->ofile.map.len || patch->nfile.map.len) &&
|
199
|
+
(patch->ofile.map.len != patch->nfile.map.len ||
|
200
|
+
!git_oid_equal(&patch->ofile.file->oid, &patch->nfile.file->oid)))
|
201
|
+
patch->flags |= GIT_DIFF_PATCH_DIFFABLE;
|
202
|
+
|
203
|
+
patch->flags |= GIT_DIFF_PATCH_LOADED;
|
204
|
+
}
|
205
|
+
|
206
|
+
return error;
|
207
|
+
}
|
208
|
+
|
209
|
+
static int diff_patch_file_callback(
|
210
|
+
git_diff_patch *patch, git_diff_output *output)
|
211
|
+
{
|
212
|
+
float progress;
|
213
|
+
|
214
|
+
if (!output->file_cb)
|
215
|
+
return 0;
|
216
|
+
|
217
|
+
progress = patch->diff ?
|
218
|
+
((float)patch->delta_index / patch->diff->deltas.length) : 1.0f;
|
219
|
+
|
220
|
+
if (output->file_cb(patch->delta, progress, output->payload) != 0)
|
221
|
+
output->error = GIT_EUSER;
|
222
|
+
|
223
|
+
return output->error;
|
224
|
+
}
|
225
|
+
|
226
|
+
static int diff_patch_generate(git_diff_patch *patch, git_diff_output *output)
|
227
|
+
{
|
228
|
+
int error = 0;
|
229
|
+
|
230
|
+
if ((patch->flags & GIT_DIFF_PATCH_DIFFED) != 0)
|
231
|
+
return 0;
|
232
|
+
|
233
|
+
if ((patch->flags & GIT_DIFF_PATCH_LOADED) == 0 &&
|
234
|
+
(error = diff_patch_load(patch, output)) < 0)
|
235
|
+
return error;
|
236
|
+
|
237
|
+
if ((patch->flags & GIT_DIFF_PATCH_DIFFABLE) == 0)
|
238
|
+
return 0;
|
239
|
+
|
240
|
+
if (output->diff_cb != NULL &&
|
241
|
+
!(error = output->diff_cb(output, patch)))
|
242
|
+
patch->flags |= GIT_DIFF_PATCH_DIFFED;
|
243
|
+
|
244
|
+
return error;
|
245
|
+
}
|
246
|
+
|
247
|
+
static void diff_patch_free(git_diff_patch *patch)
|
248
|
+
{
|
249
|
+
git_diff_file_content__clear(&patch->ofile);
|
250
|
+
git_diff_file_content__clear(&patch->nfile);
|
251
|
+
|
252
|
+
git_array_clear(patch->lines);
|
253
|
+
git_array_clear(patch->hunks);
|
254
|
+
|
255
|
+
git_diff_list_free(patch->diff); /* decrements refcount */
|
256
|
+
patch->diff = NULL;
|
257
|
+
|
258
|
+
git_pool_clear(&patch->flattened);
|
259
|
+
|
260
|
+
if (patch->flags & GIT_DIFF_PATCH_ALLOCATED)
|
261
|
+
git__free(patch);
|
262
|
+
}
|
263
|
+
|
264
|
+
static int diff_required(git_diff_list *diff, const char *action)
|
265
|
+
{
|
266
|
+
if (diff)
|
267
|
+
return 0;
|
268
|
+
giterr_set(GITERR_INVALID, "Must provide valid diff to %s", action);
|
269
|
+
return -1;
|
270
|
+
}
|
271
|
+
|
272
|
+
int git_diff_foreach(
|
273
|
+
git_diff_list *diff,
|
274
|
+
git_diff_file_cb file_cb,
|
275
|
+
git_diff_hunk_cb hunk_cb,
|
276
|
+
git_diff_data_cb data_cb,
|
277
|
+
void *payload)
|
278
|
+
{
|
279
|
+
int error = 0;
|
280
|
+
git_xdiff_output xo;
|
281
|
+
size_t idx;
|
282
|
+
git_diff_patch patch;
|
283
|
+
|
284
|
+
if (diff_required(diff, "git_diff_foreach") < 0)
|
285
|
+
return -1;
|
286
|
+
|
287
|
+
diff_output_init((git_diff_output *)&xo,
|
288
|
+
&diff->opts, file_cb, hunk_cb, data_cb, payload);
|
289
|
+
git_xdiff_init(&xo, &diff->opts);
|
290
|
+
|
291
|
+
git_vector_foreach(&diff->deltas, idx, patch.delta) {
|
292
|
+
|
293
|
+
/* check flags against patch status */
|
294
|
+
if (git_diff_delta__should_skip(&diff->opts, patch.delta))
|
295
|
+
continue;
|
296
|
+
|
297
|
+
if (!(error = diff_patch_init_from_diff(&patch, diff, idx))) {
|
298
|
+
|
299
|
+
error = diff_patch_file_callback(&patch, (git_diff_output *)&xo);
|
300
|
+
|
301
|
+
if (!error)
|
302
|
+
error = diff_patch_generate(&patch, (git_diff_output *)&xo);
|
303
|
+
|
304
|
+
git_diff_patch_free(&patch);
|
305
|
+
}
|
306
|
+
|
307
|
+
if (error < 0)
|
308
|
+
break;
|
309
|
+
}
|
310
|
+
|
311
|
+
if (error == GIT_EUSER)
|
312
|
+
giterr_clear(); /* don't leave error message set invalidly */
|
313
|
+
return error;
|
314
|
+
}
|
315
|
+
|
316
|
+
typedef struct {
|
317
|
+
git_diff_patch patch;
|
318
|
+
git_diff_delta delta;
|
319
|
+
char paths[GIT_FLEX_ARRAY];
|
320
|
+
} diff_patch_with_delta;
|
321
|
+
|
322
|
+
static int diff_single_generate(diff_patch_with_delta *pd, git_xdiff_output *xo)
|
323
|
+
{
|
324
|
+
int error = 0;
|
325
|
+
git_diff_patch *patch = &pd->patch;
|
326
|
+
bool has_old = ((patch->ofile.flags & GIT_DIFF_FLAG__NO_DATA) == 0);
|
327
|
+
bool has_new = ((patch->nfile.flags & GIT_DIFF_FLAG__NO_DATA) == 0);
|
328
|
+
|
329
|
+
pd->delta.status = has_new ?
|
330
|
+
(has_old ? GIT_DELTA_MODIFIED : GIT_DELTA_ADDED) :
|
331
|
+
(has_old ? GIT_DELTA_DELETED : GIT_DELTA_UNTRACKED);
|
332
|
+
|
333
|
+
if (git_oid_equal(&patch->nfile.file->oid, &patch->ofile.file->oid))
|
334
|
+
pd->delta.status = GIT_DELTA_UNMODIFIED;
|
335
|
+
|
336
|
+
patch->delta = &pd->delta;
|
337
|
+
|
338
|
+
diff_patch_init_common(patch);
|
339
|
+
|
340
|
+
if (pd->delta.status == GIT_DELTA_UNMODIFIED &&
|
341
|
+
!(patch->ofile.opts_flags & GIT_DIFF_INCLUDE_UNMODIFIED))
|
342
|
+
return error;
|
343
|
+
|
344
|
+
error = diff_patch_file_callback(patch, (git_diff_output *)xo);
|
345
|
+
|
346
|
+
if (!error)
|
347
|
+
error = diff_patch_generate(patch, (git_diff_output *)xo);
|
348
|
+
|
349
|
+
if (error == GIT_EUSER)
|
350
|
+
giterr_clear(); /* don't leave error message set invalidly */
|
351
|
+
|
352
|
+
return error;
|
353
|
+
}
|
354
|
+
|
355
|
+
static int diff_patch_from_blobs(
|
356
|
+
diff_patch_with_delta *pd,
|
357
|
+
git_xdiff_output *xo,
|
358
|
+
const git_blob *old_blob,
|
359
|
+
const char *old_path,
|
360
|
+
const git_blob *new_blob,
|
361
|
+
const char *new_path,
|
362
|
+
const git_diff_options *opts)
|
363
|
+
{
|
364
|
+
int error = 0;
|
365
|
+
git_repository *repo =
|
366
|
+
new_blob ? git_object_owner((const git_object *)new_blob) :
|
367
|
+
old_blob ? git_object_owner((const git_object *)old_blob) : NULL;
|
368
|
+
|
369
|
+
GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options");
|
370
|
+
|
371
|
+
if (opts && (opts->flags & GIT_DIFF_REVERSE) != 0) {
|
372
|
+
const git_blob *tmp_blob;
|
373
|
+
const char *tmp_path;
|
374
|
+
tmp_blob = old_blob; old_blob = new_blob; new_blob = tmp_blob;
|
375
|
+
tmp_path = old_path; old_path = new_path; new_path = tmp_path;
|
376
|
+
}
|
377
|
+
|
378
|
+
pd->patch.delta = &pd->delta;
|
379
|
+
|
380
|
+
pd->delta.old_file.path = old_path;
|
381
|
+
pd->delta.new_file.path = new_path;
|
382
|
+
|
383
|
+
if ((error = git_diff_file_content__init_from_blob(
|
384
|
+
&pd->patch.ofile, repo, opts, old_blob, &pd->delta.old_file)) < 0 ||
|
385
|
+
(error = git_diff_file_content__init_from_blob(
|
386
|
+
&pd->patch.nfile, repo, opts, new_blob, &pd->delta.new_file)) < 0)
|
387
|
+
return error;
|
388
|
+
|
389
|
+
return diff_single_generate(pd, xo);
|
390
|
+
}
|
391
|
+
|
392
|
+
static int diff_patch_with_delta_alloc(
|
393
|
+
diff_patch_with_delta **out,
|
394
|
+
const char **old_path,
|
395
|
+
const char **new_path)
|
396
|
+
{
|
397
|
+
diff_patch_with_delta *pd;
|
398
|
+
size_t old_len = *old_path ? strlen(*old_path) : 0;
|
399
|
+
size_t new_len = *new_path ? strlen(*new_path) : 0;
|
400
|
+
|
401
|
+
*out = pd = git__calloc(1, sizeof(*pd) + old_len + new_len + 2);
|
402
|
+
GITERR_CHECK_ALLOC(pd);
|
403
|
+
|
404
|
+
pd->patch.flags = GIT_DIFF_PATCH_ALLOCATED;
|
405
|
+
|
406
|
+
if (*old_path) {
|
407
|
+
memcpy(&pd->paths[0], *old_path, old_len);
|
408
|
+
*old_path = &pd->paths[0];
|
409
|
+
} else if (*new_path)
|
410
|
+
*old_path = &pd->paths[old_len + 1];
|
411
|
+
|
412
|
+
if (*new_path) {
|
413
|
+
memcpy(&pd->paths[old_len + 1], *new_path, new_len);
|
414
|
+
*new_path = &pd->paths[old_len + 1];
|
415
|
+
} else if (*old_path)
|
416
|
+
*new_path = &pd->paths[0];
|
417
|
+
|
418
|
+
return 0;
|
419
|
+
}
|
420
|
+
|
421
|
+
int git_diff_blobs(
|
422
|
+
const git_blob *old_blob,
|
423
|
+
const char *old_path,
|
424
|
+
const git_blob *new_blob,
|
425
|
+
const char *new_path,
|
426
|
+
const git_diff_options *opts,
|
427
|
+
git_diff_file_cb file_cb,
|
428
|
+
git_diff_hunk_cb hunk_cb,
|
429
|
+
git_diff_data_cb data_cb,
|
430
|
+
void *payload)
|
431
|
+
{
|
432
|
+
int error = 0;
|
433
|
+
diff_patch_with_delta pd;
|
434
|
+
git_xdiff_output xo;
|
435
|
+
|
436
|
+
memset(&pd, 0, sizeof(pd));
|
437
|
+
memset(&xo, 0, sizeof(xo));
|
438
|
+
|
439
|
+
diff_output_init(
|
440
|
+
(git_diff_output *)&xo, opts, file_cb, hunk_cb, data_cb, payload);
|
441
|
+
git_xdiff_init(&xo, opts);
|
442
|
+
|
443
|
+
if (!old_path && new_path)
|
444
|
+
old_path = new_path;
|
445
|
+
else if (!new_path && old_path)
|
446
|
+
new_path = old_path;
|
447
|
+
|
448
|
+
error = diff_patch_from_blobs(
|
449
|
+
&pd, &xo, old_blob, old_path, new_blob, new_path, opts);
|
450
|
+
|
451
|
+
git_diff_patch_free((git_diff_patch *)&pd);
|
452
|
+
|
453
|
+
return error;
|
454
|
+
}
|
455
|
+
|
456
|
+
int git_diff_patch_from_blobs(
|
457
|
+
git_diff_patch **out,
|
458
|
+
const git_blob *old_blob,
|
459
|
+
const char *old_path,
|
460
|
+
const git_blob *new_blob,
|
461
|
+
const char *new_path,
|
462
|
+
const git_diff_options *opts)
|
463
|
+
{
|
464
|
+
int error = 0;
|
465
|
+
diff_patch_with_delta *pd;
|
466
|
+
git_xdiff_output xo;
|
467
|
+
|
468
|
+
assert(out);
|
469
|
+
*out = NULL;
|
470
|
+
|
471
|
+
if (diff_patch_with_delta_alloc(&pd, &old_path, &new_path) < 0)
|
472
|
+
return -1;
|
473
|
+
|
474
|
+
memset(&xo, 0, sizeof(xo));
|
475
|
+
|
476
|
+
diff_output_to_patch((git_diff_output *)&xo, &pd->patch);
|
477
|
+
git_xdiff_init(&xo, opts);
|
478
|
+
|
479
|
+
error = diff_patch_from_blobs(
|
480
|
+
pd, &xo, old_blob, old_path, new_blob, new_path, opts);
|
481
|
+
|
482
|
+
if (!error)
|
483
|
+
*out = (git_diff_patch *)pd;
|
484
|
+
else
|
485
|
+
git_diff_patch_free((git_diff_patch *)pd);
|
486
|
+
|
487
|
+
return error;
|
488
|
+
}
|
489
|
+
|
490
|
+
static int diff_patch_from_blob_and_buffer(
|
491
|
+
diff_patch_with_delta *pd,
|
492
|
+
git_xdiff_output *xo,
|
493
|
+
const git_blob *old_blob,
|
494
|
+
const char *old_path,
|
495
|
+
const char *buf,
|
496
|
+
size_t buflen,
|
497
|
+
const char *buf_path,
|
498
|
+
const git_diff_options *opts)
|
499
|
+
{
|
500
|
+
int error = 0;
|
501
|
+
git_repository *repo =
|
502
|
+
old_blob ? git_object_owner((const git_object *)old_blob) : NULL;
|
503
|
+
|
504
|
+
GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options");
|
505
|
+
|
506
|
+
pd->patch.delta = &pd->delta;
|
507
|
+
|
508
|
+
if (opts && (opts->flags & GIT_DIFF_REVERSE) != 0) {
|
509
|
+
pd->delta.old_file.path = buf_path;
|
510
|
+
pd->delta.new_file.path = old_path;
|
511
|
+
|
512
|
+
if (!(error = git_diff_file_content__init_from_raw(
|
513
|
+
&pd->patch.ofile, repo, opts, buf, buflen, &pd->delta.old_file)))
|
514
|
+
error = git_diff_file_content__init_from_blob(
|
515
|
+
&pd->patch.nfile, repo, opts, old_blob, &pd->delta.new_file);
|
516
|
+
} else {
|
517
|
+
pd->delta.old_file.path = old_path;
|
518
|
+
pd->delta.new_file.path = buf_path;
|
519
|
+
|
520
|
+
if (!(error = git_diff_file_content__init_from_blob(
|
521
|
+
&pd->patch.ofile, repo, opts, old_blob, &pd->delta.old_file)))
|
522
|
+
error = git_diff_file_content__init_from_raw(
|
523
|
+
&pd->patch.nfile, repo, opts, buf, buflen, &pd->delta.new_file);
|
524
|
+
}
|
525
|
+
|
526
|
+
if (error < 0)
|
527
|
+
return error;
|
528
|
+
|
529
|
+
return diff_single_generate(pd, xo);
|
530
|
+
}
|
531
|
+
|
532
|
+
int git_diff_blob_to_buffer(
|
533
|
+
const git_blob *old_blob,
|
534
|
+
const char *old_path,
|
535
|
+
const char *buf,
|
536
|
+
size_t buflen,
|
537
|
+
const char *buf_path,
|
538
|
+
const git_diff_options *opts,
|
539
|
+
git_diff_file_cb file_cb,
|
540
|
+
git_diff_hunk_cb hunk_cb,
|
541
|
+
git_diff_data_cb data_cb,
|
542
|
+
void *payload)
|
543
|
+
{
|
544
|
+
int error = 0;
|
545
|
+
diff_patch_with_delta pd;
|
546
|
+
git_xdiff_output xo;
|
547
|
+
|
548
|
+
memset(&pd, 0, sizeof(pd));
|
549
|
+
memset(&xo, 0, sizeof(xo));
|
550
|
+
|
551
|
+
diff_output_init(
|
552
|
+
(git_diff_output *)&xo, opts, file_cb, hunk_cb, data_cb, payload);
|
553
|
+
git_xdiff_init(&xo, opts);
|
554
|
+
|
555
|
+
if (!old_path && buf_path)
|
556
|
+
old_path = buf_path;
|
557
|
+
else if (!buf_path && old_path)
|
558
|
+
buf_path = old_path;
|
559
|
+
|
560
|
+
error = diff_patch_from_blob_and_buffer(
|
561
|
+
&pd, &xo, old_blob, old_path, buf, buflen, buf_path, opts);
|
562
|
+
|
563
|
+
git_diff_patch_free((git_diff_patch *)&pd);
|
564
|
+
|
565
|
+
return error;
|
566
|
+
}
|
567
|
+
|
568
|
+
int git_diff_patch_from_blob_and_buffer(
|
569
|
+
git_diff_patch **out,
|
570
|
+
const git_blob *old_blob,
|
571
|
+
const char *old_path,
|
572
|
+
const char *buf,
|
573
|
+
size_t buflen,
|
574
|
+
const char *buf_path,
|
575
|
+
const git_diff_options *opts)
|
576
|
+
{
|
577
|
+
int error = 0;
|
578
|
+
diff_patch_with_delta *pd;
|
579
|
+
git_xdiff_output xo;
|
580
|
+
|
581
|
+
assert(out);
|
582
|
+
*out = NULL;
|
583
|
+
|
584
|
+
if (diff_patch_with_delta_alloc(&pd, &old_path, &buf_path) < 0)
|
585
|
+
return -1;
|
586
|
+
|
587
|
+
memset(&xo, 0, sizeof(xo));
|
588
|
+
|
589
|
+
diff_output_to_patch((git_diff_output *)&xo, &pd->patch);
|
590
|
+
git_xdiff_init(&xo, opts);
|
591
|
+
|
592
|
+
error = diff_patch_from_blob_and_buffer(
|
593
|
+
pd, &xo, old_blob, old_path, buf, buflen, buf_path, opts);
|
594
|
+
|
595
|
+
if (!error)
|
596
|
+
*out = (git_diff_patch *)pd;
|
597
|
+
else
|
598
|
+
git_diff_patch_free((git_diff_patch *)pd);
|
599
|
+
|
600
|
+
return error;
|
601
|
+
}
|
602
|
+
|
603
|
+
int git_diff_get_patch(
|
604
|
+
git_diff_patch **patch_ptr,
|
605
|
+
const git_diff_delta **delta_ptr,
|
606
|
+
git_diff_list *diff,
|
607
|
+
size_t idx)
|
608
|
+
{
|
609
|
+
int error = 0;
|
610
|
+
git_xdiff_output xo;
|
611
|
+
git_diff_delta *delta = NULL;
|
612
|
+
git_diff_patch *patch = NULL;
|
613
|
+
|
614
|
+
if (patch_ptr) *patch_ptr = NULL;
|
615
|
+
if (delta_ptr) *delta_ptr = NULL;
|
616
|
+
|
617
|
+
if (diff_required(diff, "git_diff_get_patch") < 0)
|
618
|
+
return -1;
|
619
|
+
|
620
|
+
delta = git_vector_get(&diff->deltas, idx);
|
621
|
+
if (!delta) {
|
622
|
+
giterr_set(GITERR_INVALID, "Index out of range for delta in diff");
|
623
|
+
return GIT_ENOTFOUND;
|
624
|
+
}
|
625
|
+
|
626
|
+
if (delta_ptr)
|
627
|
+
*delta_ptr = delta;
|
628
|
+
|
629
|
+
if (git_diff_delta__should_skip(&diff->opts, delta))
|
630
|
+
return 0;
|
631
|
+
|
632
|
+
/* don't load the patch data unless we need it for binary check */
|
633
|
+
if (!patch_ptr &&
|
634
|
+
((delta->flags & DIFF_FLAGS_KNOWN_BINARY) != 0 ||
|
635
|
+
(diff->opts.flags & GIT_DIFF_SKIP_BINARY_CHECK) != 0))
|
636
|
+
return 0;
|
637
|
+
|
638
|
+
if ((error = diff_patch_alloc_from_diff(&patch, diff, idx)) < 0)
|
639
|
+
return error;
|
640
|
+
|
641
|
+
diff_output_to_patch((git_diff_output *)&xo, patch);
|
642
|
+
git_xdiff_init(&xo, &diff->opts);
|
643
|
+
|
644
|
+
error = diff_patch_file_callback(patch, (git_diff_output *)&xo);
|
645
|
+
|
646
|
+
if (!error)
|
647
|
+
error = diff_patch_generate(patch, (git_diff_output *)&xo);
|
648
|
+
|
649
|
+
if (!error) {
|
650
|
+
/* if cumulative diff size is < 0.5 total size, flatten the patch */
|
651
|
+
/* unload the file content */
|
652
|
+
}
|
653
|
+
|
654
|
+
if (error || !patch_ptr)
|
655
|
+
git_diff_patch_free(patch);
|
656
|
+
else
|
657
|
+
*patch_ptr = patch;
|
658
|
+
|
659
|
+
if (error == GIT_EUSER)
|
660
|
+
giterr_clear(); /* don't leave error message set invalidly */
|
661
|
+
return error;
|
662
|
+
}
|
663
|
+
|
664
|
+
void git_diff_patch_free(git_diff_patch *patch)
|
665
|
+
{
|
666
|
+
if (patch)
|
667
|
+
GIT_REFCOUNT_DEC(patch, diff_patch_free);
|
668
|
+
}
|
669
|
+
|
670
|
+
const git_diff_delta *git_diff_patch_delta(git_diff_patch *patch)
|
671
|
+
{
|
672
|
+
assert(patch);
|
673
|
+
return patch->delta;
|
674
|
+
}
|
675
|
+
|
676
|
+
size_t git_diff_patch_num_hunks(git_diff_patch *patch)
|
677
|
+
{
|
678
|
+
assert(patch);
|
679
|
+
return git_array_size(patch->hunks);
|
680
|
+
}
|
681
|
+
|
682
|
+
int git_diff_patch_line_stats(
|
683
|
+
size_t *total_ctxt,
|
684
|
+
size_t *total_adds,
|
685
|
+
size_t *total_dels,
|
686
|
+
const git_diff_patch *patch)
|
687
|
+
{
|
688
|
+
size_t totals[3], idx;
|
689
|
+
|
690
|
+
memset(totals, 0, sizeof(totals));
|
691
|
+
|
692
|
+
for (idx = 0; idx < git_array_size(patch->lines); ++idx) {
|
693
|
+
diff_patch_line *line = git_array_get(patch->lines, idx);
|
694
|
+
if (!line)
|
695
|
+
continue;
|
696
|
+
|
697
|
+
switch (line->origin) {
|
698
|
+
case GIT_DIFF_LINE_CONTEXT: totals[0]++; break;
|
699
|
+
case GIT_DIFF_LINE_ADDITION: totals[1]++; break;
|
700
|
+
case GIT_DIFF_LINE_DELETION: totals[2]++; break;
|
701
|
+
default:
|
702
|
+
/* diff --stat and --numstat don't count EOFNL marks because
|
703
|
+
* they will always be paired with a ADDITION or DELETION line.
|
704
|
+
*/
|
705
|
+
break;
|
706
|
+
}
|
707
|
+
}
|
708
|
+
|
709
|
+
if (total_ctxt)
|
710
|
+
*total_ctxt = totals[0];
|
711
|
+
if (total_adds)
|
712
|
+
*total_adds = totals[1];
|
713
|
+
if (total_dels)
|
714
|
+
*total_dels = totals[2];
|
715
|
+
|
716
|
+
return 0;
|
717
|
+
}
|
718
|
+
|
719
|
+
static int diff_error_outofrange(const char *thing)
|
720
|
+
{
|
721
|
+
giterr_set(GITERR_INVALID, "Diff patch %s index out of range", thing);
|
722
|
+
return GIT_ENOTFOUND;
|
723
|
+
}
|
724
|
+
|
725
|
+
int git_diff_patch_get_hunk(
|
726
|
+
const git_diff_range **range,
|
727
|
+
const char **header,
|
728
|
+
size_t *header_len,
|
729
|
+
size_t *lines_in_hunk,
|
730
|
+
git_diff_patch *patch,
|
731
|
+
size_t hunk_idx)
|
732
|
+
{
|
733
|
+
diff_patch_hunk *hunk;
|
734
|
+
assert(patch);
|
735
|
+
|
736
|
+
hunk = git_array_get(patch->hunks, hunk_idx);
|
737
|
+
|
738
|
+
if (!hunk) {
|
739
|
+
if (range) *range = NULL;
|
740
|
+
if (header) *header = NULL;
|
741
|
+
if (header_len) *header_len = 0;
|
742
|
+
if (lines_in_hunk) *lines_in_hunk = 0;
|
743
|
+
return diff_error_outofrange("hunk");
|
744
|
+
}
|
745
|
+
|
746
|
+
if (range) *range = &hunk->range;
|
747
|
+
if (header) *header = hunk->header;
|
748
|
+
if (header_len) *header_len = hunk->header_len;
|
749
|
+
if (lines_in_hunk) *lines_in_hunk = hunk->line_count;
|
750
|
+
return 0;
|
751
|
+
}
|
752
|
+
|
753
|
+
int git_diff_patch_num_lines_in_hunk(git_diff_patch *patch, size_t hunk_idx)
|
754
|
+
{
|
755
|
+
diff_patch_hunk *hunk;
|
756
|
+
assert(patch);
|
757
|
+
|
758
|
+
if (!(hunk = git_array_get(patch->hunks, hunk_idx)))
|
759
|
+
return diff_error_outofrange("hunk");
|
760
|
+
return (int)hunk->line_count;
|
761
|
+
}
|
762
|
+
|
763
|
+
int git_diff_patch_get_line_in_hunk(
|
764
|
+
char *line_origin,
|
765
|
+
const char **content,
|
766
|
+
size_t *content_len,
|
767
|
+
int *old_lineno,
|
768
|
+
int *new_lineno,
|
769
|
+
git_diff_patch *patch,
|
770
|
+
size_t hunk_idx,
|
771
|
+
size_t line_of_hunk)
|
772
|
+
{
|
773
|
+
diff_patch_hunk *hunk;
|
774
|
+
diff_patch_line *line;
|
775
|
+
const char *thing;
|
776
|
+
|
777
|
+
assert(patch);
|
778
|
+
|
779
|
+
if (!(hunk = git_array_get(patch->hunks, hunk_idx))) {
|
780
|
+
thing = "hunk";
|
781
|
+
goto notfound;
|
782
|
+
}
|
783
|
+
|
784
|
+
if (line_of_hunk >= hunk->line_count ||
|
785
|
+
!(line = git_array_get(
|
786
|
+
patch->lines, hunk->line_start + line_of_hunk))) {
|
787
|
+
thing = "line";
|
788
|
+
goto notfound;
|
789
|
+
}
|
790
|
+
|
791
|
+
if (line_origin) *line_origin = line->origin;
|
792
|
+
if (content) *content = line->ptr;
|
793
|
+
if (content_len) *content_len = line->len;
|
794
|
+
if (old_lineno) *old_lineno = (int)line->oldno;
|
795
|
+
if (new_lineno) *new_lineno = (int)line->newno;
|
796
|
+
|
797
|
+
return 0;
|
798
|
+
|
799
|
+
notfound:
|
800
|
+
if (line_origin) *line_origin = GIT_DIFF_LINE_CONTEXT;
|
801
|
+
if (content) *content = NULL;
|
802
|
+
if (content_len) *content_len = 0;
|
803
|
+
if (old_lineno) *old_lineno = -1;
|
804
|
+
if (new_lineno) *new_lineno = -1;
|
805
|
+
|
806
|
+
return diff_error_outofrange(thing);
|
807
|
+
}
|
808
|
+
|
809
|
+
git_diff_list *git_diff_patch__diff(git_diff_patch *patch)
|
810
|
+
{
|
811
|
+
return patch->diff;
|
812
|
+
}
|
813
|
+
|
814
|
+
git_diff_driver *git_diff_patch__driver(git_diff_patch *patch)
|
815
|
+
{
|
816
|
+
/* ofile driver is representative for whole patch */
|
817
|
+
return patch->ofile.driver;
|
818
|
+
}
|
819
|
+
|
820
|
+
void git_diff_patch__old_data(
|
821
|
+
char **ptr, size_t *len, git_diff_patch *patch)
|
822
|
+
{
|
823
|
+
*ptr = patch->ofile.map.data;
|
824
|
+
*len = patch->ofile.map.len;
|
825
|
+
}
|
826
|
+
|
827
|
+
void git_diff_patch__new_data(
|
828
|
+
char **ptr, size_t *len, git_diff_patch *patch)
|
829
|
+
{
|
830
|
+
*ptr = patch->nfile.map.data;
|
831
|
+
*len = patch->nfile.map.len;
|
832
|
+
}
|
833
|
+
|
834
|
+
int git_diff_patch__invoke_callbacks(
|
835
|
+
git_diff_patch *patch,
|
836
|
+
git_diff_file_cb file_cb,
|
837
|
+
git_diff_hunk_cb hunk_cb,
|
838
|
+
git_diff_data_cb line_cb,
|
839
|
+
void *payload)
|
840
|
+
{
|
841
|
+
int error = 0;
|
842
|
+
uint32_t i, j;
|
843
|
+
|
844
|
+
if (file_cb)
|
845
|
+
error = file_cb(patch->delta, 0, payload);
|
846
|
+
|
847
|
+
if (!hunk_cb && !line_cb)
|
848
|
+
return error;
|
849
|
+
|
850
|
+
for (i = 0; !error && i < git_array_size(patch->hunks); ++i) {
|
851
|
+
diff_patch_hunk *h = git_array_get(patch->hunks, i);
|
852
|
+
|
853
|
+
error = hunk_cb(
|
854
|
+
patch->delta, &h->range, h->header, h->header_len, payload);
|
855
|
+
|
856
|
+
if (!line_cb)
|
857
|
+
continue;
|
858
|
+
|
859
|
+
for (j = 0; !error && j < h->line_count; ++j) {
|
860
|
+
diff_patch_line *l =
|
861
|
+
git_array_get(patch->lines, h->line_start + j);
|
862
|
+
|
863
|
+
error = line_cb(
|
864
|
+
patch->delta, &h->range, l->origin, l->ptr, l->len, payload);
|
865
|
+
}
|
866
|
+
}
|
867
|
+
|
868
|
+
return error;
|
869
|
+
}
|
870
|
+
|
871
|
+
|
872
|
+
static int diff_patch_file_cb(
|
873
|
+
const git_diff_delta *delta,
|
874
|
+
float progress,
|
875
|
+
void *payload)
|
876
|
+
{
|
877
|
+
GIT_UNUSED(delta); GIT_UNUSED(progress); GIT_UNUSED(payload);
|
878
|
+
return 0;
|
879
|
+
}
|
880
|
+
|
881
|
+
static int diff_patch_hunk_cb(
|
882
|
+
const git_diff_delta *delta,
|
883
|
+
const git_diff_range *range,
|
884
|
+
const char *header,
|
885
|
+
size_t header_len,
|
886
|
+
void *payload)
|
887
|
+
{
|
888
|
+
git_diff_patch *patch = payload;
|
889
|
+
diff_patch_hunk *hunk;
|
890
|
+
|
891
|
+
GIT_UNUSED(delta);
|
892
|
+
|
893
|
+
hunk = git_array_alloc(patch->hunks);
|
894
|
+
GITERR_CHECK_ALLOC(hunk);
|
895
|
+
|
896
|
+
memcpy(&hunk->range, range, sizeof(hunk->range));
|
897
|
+
|
898
|
+
assert(header_len + 1 < sizeof(hunk->header));
|
899
|
+
memcpy(&hunk->header, header, header_len);
|
900
|
+
hunk->header[header_len] = '\0';
|
901
|
+
hunk->header_len = header_len;
|
902
|
+
|
903
|
+
hunk->line_start = git_array_size(patch->lines);
|
904
|
+
hunk->line_count = 0;
|
905
|
+
|
906
|
+
patch->oldno = range->old_start;
|
907
|
+
patch->newno = range->new_start;
|
908
|
+
|
909
|
+
return 0;
|
910
|
+
}
|
911
|
+
|
912
|
+
static int diff_patch_line_cb(
|
913
|
+
const git_diff_delta *delta,
|
914
|
+
const git_diff_range *range,
|
915
|
+
char line_origin,
|
916
|
+
const char *content,
|
917
|
+
size_t content_len,
|
918
|
+
void *payload)
|
919
|
+
{
|
920
|
+
git_diff_patch *patch = payload;
|
921
|
+
diff_patch_hunk *hunk;
|
922
|
+
diff_patch_line *line;
|
923
|
+
|
924
|
+
GIT_UNUSED(delta);
|
925
|
+
GIT_UNUSED(range);
|
926
|
+
|
927
|
+
hunk = git_array_last(patch->hunks);
|
928
|
+
GITERR_CHECK_ALLOC(hunk);
|
929
|
+
|
930
|
+
line = git_array_alloc(patch->lines);
|
931
|
+
GITERR_CHECK_ALLOC(line);
|
932
|
+
|
933
|
+
line->ptr = content;
|
934
|
+
line->len = content_len;
|
935
|
+
line->origin = line_origin;
|
936
|
+
|
937
|
+
patch->content_size += content_len;
|
938
|
+
|
939
|
+
/* do some bookkeeping so we can provide old/new line numbers */
|
940
|
+
|
941
|
+
for (line->lines = 0; content_len > 0; --content_len) {
|
942
|
+
if (*content++ == '\n')
|
943
|
+
++line->lines;
|
944
|
+
}
|
945
|
+
|
946
|
+
switch (line_origin) {
|
947
|
+
case GIT_DIFF_LINE_ADDITION:
|
948
|
+
case GIT_DIFF_LINE_DEL_EOFNL:
|
949
|
+
line->oldno = -1;
|
950
|
+
line->newno = patch->newno;
|
951
|
+
patch->newno += line->lines;
|
952
|
+
break;
|
953
|
+
case GIT_DIFF_LINE_DELETION:
|
954
|
+
case GIT_DIFF_LINE_ADD_EOFNL:
|
955
|
+
line->oldno = patch->oldno;
|
956
|
+
line->newno = -1;
|
957
|
+
patch->oldno += line->lines;
|
958
|
+
break;
|
959
|
+
default:
|
960
|
+
line->oldno = patch->oldno;
|
961
|
+
line->newno = patch->newno;
|
962
|
+
patch->oldno += line->lines;
|
963
|
+
patch->newno += line->lines;
|
964
|
+
break;
|
965
|
+
}
|
966
|
+
|
967
|
+
hunk->line_count++;
|
968
|
+
|
969
|
+
return 0;
|
970
|
+
}
|
971
|
+
|
972
|
+
static void diff_output_init(
|
973
|
+
git_diff_output *out,
|
974
|
+
const git_diff_options *opts,
|
975
|
+
git_diff_file_cb file_cb,
|
976
|
+
git_diff_hunk_cb hunk_cb,
|
977
|
+
git_diff_data_cb data_cb,
|
978
|
+
void *payload)
|
979
|
+
{
|
980
|
+
GIT_UNUSED(opts);
|
981
|
+
|
982
|
+
memset(out, 0, sizeof(*out));
|
983
|
+
|
984
|
+
out->file_cb = file_cb;
|
985
|
+
out->hunk_cb = hunk_cb;
|
986
|
+
out->data_cb = data_cb;
|
987
|
+
out->payload = payload;
|
988
|
+
}
|
989
|
+
|
990
|
+
static void diff_output_to_patch(git_diff_output *out, git_diff_patch *patch)
|
991
|
+
{
|
992
|
+
diff_output_init(
|
993
|
+
out, NULL,
|
994
|
+
diff_patch_file_cb, diff_patch_hunk_cb, diff_patch_line_cb, patch);
|
995
|
+
}
|