rugged 0.24.6.1 → 0.25.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (213) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +1 -1
  3. data/ext/rugged/extconf.rb +9 -2
  4. data/ext/rugged/rugged.c +85 -21
  5. data/ext/rugged/rugged.h +7 -21
  6. data/ext/rugged/rugged_backend.c +3 -20
  7. data/ext/rugged/rugged_blame.c +7 -24
  8. data/ext/rugged/rugged_blob.c +136 -59
  9. data/ext/rugged/rugged_branch.c +3 -20
  10. data/ext/rugged/rugged_branch_collection.c +3 -20
  11. data/ext/rugged/rugged_commit.c +251 -101
  12. data/ext/rugged/rugged_config.c +3 -20
  13. data/ext/rugged/rugged_cred.c +3 -20
  14. data/ext/rugged/rugged_diff.c +3 -20
  15. data/ext/rugged/rugged_diff_delta.c +3 -20
  16. data/ext/rugged/rugged_diff_hunk.c +3 -20
  17. data/ext/rugged/rugged_diff_line.c +3 -20
  18. data/ext/rugged/rugged_index.c +46 -229
  19. data/ext/rugged/rugged_note.c +3 -20
  20. data/ext/rugged/rugged_object.c +3 -20
  21. data/ext/rugged/rugged_patch.c +192 -34
  22. data/ext/rugged/rugged_rebase.c +90 -48
  23. data/ext/rugged/rugged_reference.c +4 -21
  24. data/ext/rugged/rugged_reference_collection.c +3 -20
  25. data/ext/rugged/rugged_remote.c +70 -42
  26. data/ext/rugged/rugged_remote_collection.c +3 -20
  27. data/ext/rugged/rugged_repo.c +50 -59
  28. data/ext/rugged/rugged_revwalk.c +4 -21
  29. data/ext/rugged/rugged_settings.c +3 -20
  30. data/ext/rugged/rugged_signature.c +3 -20
  31. data/ext/rugged/rugged_submodule.c +4 -21
  32. data/ext/rugged/rugged_submodule_collection.c +3 -20
  33. data/ext/rugged/rugged_tag.c +3 -20
  34. data/ext/rugged/rugged_tag_collection.c +3 -20
  35. data/ext/rugged/rugged_tree.c +189 -184
  36. data/lib/rugged/attributes.rb +5 -0
  37. data/lib/rugged/blob.rb +5 -0
  38. data/lib/rugged/branch.rb +6 -1
  39. data/lib/rugged/commit.rb +5 -0
  40. data/lib/rugged/console.rb +5 -0
  41. data/lib/rugged/credentials.rb +5 -0
  42. data/lib/rugged/diff/delta.rb +5 -0
  43. data/lib/rugged/diff/hunk.rb +5 -0
  44. data/lib/rugged/diff/line.rb +5 -0
  45. data/lib/rugged/diff.rb +5 -0
  46. data/lib/rugged/index.rb +120 -0
  47. data/lib/rugged/object.rb +5 -0
  48. data/lib/rugged/patch.rb +5 -0
  49. data/lib/rugged/reference.rb +5 -0
  50. data/lib/rugged/remote.rb +5 -0
  51. data/lib/rugged/repository.rb +9 -4
  52. data/lib/rugged/submodule_collection.rb +5 -0
  53. data/lib/rugged/tag.rb +5 -0
  54. data/lib/rugged/tree.rb +156 -1
  55. data/lib/rugged/version.rb +6 -1
  56. data/lib/rugged/walker.rb +5 -0
  57. data/lib/rugged.rb +5 -0
  58. data/vendor/libgit2/CMakeLists.txt +12 -2
  59. data/vendor/libgit2/include/git2/blob.h +39 -28
  60. data/vendor/libgit2/include/git2/commit.h +76 -0
  61. data/vendor/libgit2/include/git2/common.h +21 -1
  62. data/vendor/libgit2/include/git2/describe.h +5 -2
  63. data/vendor/libgit2/include/git2/diff.h +62 -7
  64. data/vendor/libgit2/include/git2/errors.h +2 -1
  65. data/vendor/libgit2/include/git2/index.h +25 -0
  66. data/vendor/libgit2/include/git2/merge.h +10 -1
  67. data/vendor/libgit2/include/git2/odb.h +47 -1
  68. data/vendor/libgit2/include/git2/pack.h +4 -4
  69. data/vendor/libgit2/include/git2/patch.h +1 -1
  70. data/vendor/libgit2/include/git2/proxy.h +92 -0
  71. data/vendor/libgit2/include/git2/refs.h +11 -0
  72. data/vendor/libgit2/include/git2/remote.h +21 -8
  73. data/vendor/libgit2/include/git2/repository.h +20 -1
  74. data/vendor/libgit2/include/git2/revwalk.h +4 -6
  75. data/vendor/libgit2/include/git2/signature.h +13 -0
  76. data/vendor/libgit2/include/git2/submodule.h +11 -3
  77. data/vendor/libgit2/include/git2/sys/merge.h +177 -0
  78. data/vendor/libgit2/include/git2/sys/odb_backend.h +11 -0
  79. data/vendor/libgit2/include/git2/sys/remote.h +16 -0
  80. data/vendor/libgit2/include/git2/sys/stream.h +2 -1
  81. data/vendor/libgit2/include/git2/sys/time.h +31 -0
  82. data/vendor/libgit2/include/git2/sys/transport.h +3 -1
  83. data/vendor/libgit2/include/git2/tag.h +9 -0
  84. data/vendor/libgit2/include/git2/transaction.h +9 -0
  85. data/vendor/libgit2/include/git2/tree.h +55 -0
  86. data/vendor/libgit2/include/git2/version.h +4 -4
  87. data/vendor/libgit2/include/git2.h +1 -0
  88. data/vendor/libgit2/src/annotated_commit.c +99 -80
  89. data/vendor/libgit2/src/annotated_commit.h +5 -2
  90. data/vendor/libgit2/src/apply.c +377 -0
  91. data/vendor/libgit2/src/apply.h +21 -0
  92. data/vendor/libgit2/src/array.h +0 -1
  93. data/vendor/libgit2/src/blob.c +71 -39
  94. data/vendor/libgit2/src/branch.c +7 -5
  95. data/vendor/libgit2/src/buffer.c +252 -20
  96. data/vendor/libgit2/src/buffer.h +8 -0
  97. data/vendor/libgit2/src/checkout.c +69 -42
  98. data/vendor/libgit2/src/clone.c +0 -8
  99. data/vendor/libgit2/src/commit.c +193 -49
  100. data/vendor/libgit2/src/commit_list.c +8 -3
  101. data/vendor/libgit2/src/commit_list.h +1 -0
  102. data/vendor/libgit2/src/common.h +2 -1
  103. data/vendor/libgit2/src/config.c +3 -3
  104. data/vendor/libgit2/src/config_file.c +20 -10
  105. data/vendor/libgit2/src/crlf.c +1 -0
  106. data/vendor/libgit2/src/curl_stream.c +106 -6
  107. data/vendor/libgit2/src/delta.c +238 -62
  108. data/vendor/libgit2/src/delta.h +79 -58
  109. data/vendor/libgit2/src/describe.c +1 -1
  110. data/vendor/libgit2/src/diff.c +32 -1554
  111. data/vendor/libgit2/src/diff.h +14 -122
  112. data/vendor/libgit2/src/diff_driver.c +4 -6
  113. data/vendor/libgit2/src/diff_file.c +3 -0
  114. data/vendor/libgit2/src/diff_generate.c +1613 -0
  115. data/vendor/libgit2/src/diff_generate.h +123 -0
  116. data/vendor/libgit2/src/diff_parse.c +101 -0
  117. data/vendor/libgit2/src/diff_parse.h +18 -0
  118. data/vendor/libgit2/src/diff_print.c +263 -144
  119. data/vendor/libgit2/src/diff_stats.c +21 -12
  120. data/vendor/libgit2/src/diff_tform.c +1 -0
  121. data/vendor/libgit2/src/diff_tform.h +22 -0
  122. data/vendor/libgit2/src/diff_xdiff.c +9 -9
  123. data/vendor/libgit2/src/diff_xdiff.h +5 -5
  124. data/vendor/libgit2/src/fetchhead.c +8 -8
  125. data/vendor/libgit2/src/filebuf.c +6 -1
  126. data/vendor/libgit2/src/filebuf.h +1 -0
  127. data/vendor/libgit2/src/fileops.c +22 -1
  128. data/vendor/libgit2/src/fileops.h +8 -2
  129. data/vendor/libgit2/src/fnmatch.c +18 -5
  130. data/vendor/libgit2/src/global.c +21 -4
  131. data/vendor/libgit2/src/global.h +6 -0
  132. data/vendor/libgit2/src/graph.c +1 -1
  133. data/vendor/libgit2/src/index.c +159 -46
  134. data/vendor/libgit2/src/index.h +2 -0
  135. data/vendor/libgit2/src/iterator.c +1573 -1468
  136. data/vendor/libgit2/src/iterator.h +52 -69
  137. data/vendor/libgit2/src/merge.c +163 -64
  138. data/vendor/libgit2/src/merge.h +61 -2
  139. data/vendor/libgit2/src/merge_driver.c +397 -0
  140. data/vendor/libgit2/src/merge_driver.h +60 -0
  141. data/vendor/libgit2/src/merge_file.c +11 -49
  142. data/vendor/libgit2/src/netops.c +12 -10
  143. data/vendor/libgit2/src/object_api.c +19 -1
  144. data/vendor/libgit2/src/odb.c +228 -52
  145. data/vendor/libgit2/src/odb_loose.c +19 -1
  146. data/vendor/libgit2/src/odb_mempack.c +1 -1
  147. data/vendor/libgit2/src/odb_pack.c +27 -1
  148. data/vendor/libgit2/src/openssl_stream.c +4 -5
  149. data/vendor/libgit2/src/pack-objects.c +105 -76
  150. data/vendor/libgit2/src/pack-objects.h +13 -12
  151. data/vendor/libgit2/src/pack.c +16 -10
  152. data/vendor/libgit2/src/pack.h +2 -0
  153. data/vendor/libgit2/src/patch.c +216 -0
  154. data/vendor/libgit2/src/patch.h +66 -0
  155. data/vendor/libgit2/src/{diff_patch.c → patch_generate.c} +203 -376
  156. data/vendor/libgit2/src/patch_generate.h +68 -0
  157. data/vendor/libgit2/src/patch_parse.c +1159 -0
  158. data/vendor/libgit2/src/patch_parse.h +56 -0
  159. data/vendor/libgit2/src/path.c +38 -2
  160. data/vendor/libgit2/src/path.h +18 -0
  161. data/vendor/libgit2/src/pathspec.c +1 -1
  162. data/vendor/libgit2/src/pool.h +5 -0
  163. data/vendor/libgit2/src/pqueue.c +12 -5
  164. data/vendor/libgit2/src/pqueue.h +1 -0
  165. data/vendor/libgit2/src/proxy.c +32 -0
  166. data/vendor/libgit2/src/proxy.h +14 -0
  167. data/vendor/libgit2/src/push.c +1 -1
  168. data/vendor/libgit2/src/rebase.c +63 -36
  169. data/vendor/libgit2/src/refdb.c +4 -2
  170. data/vendor/libgit2/src/refdb_fs.c +82 -54
  171. data/vendor/libgit2/src/refs.c +13 -1
  172. data/vendor/libgit2/src/remote.c +20 -81
  173. data/vendor/libgit2/src/repository.c +212 -29
  174. data/vendor/libgit2/src/reset.c +1 -1
  175. data/vendor/libgit2/src/revparse.c +1 -1
  176. data/vendor/libgit2/src/revwalk.c +260 -184
  177. data/vendor/libgit2/src/settings.c +11 -3
  178. data/vendor/libgit2/src/signature.c +27 -2
  179. data/vendor/libgit2/src/sortedcache.c +14 -5
  180. data/vendor/libgit2/src/stash.c +1 -0
  181. data/vendor/libgit2/src/status.c +1 -0
  182. data/vendor/libgit2/src/stransport_stream.c +4 -2
  183. data/vendor/libgit2/src/stream.h +2 -2
  184. data/vendor/libgit2/src/submodule.c +16 -4
  185. data/vendor/libgit2/src/sysdir.c +1 -1
  186. data/vendor/libgit2/src/transport.c +3 -5
  187. data/vendor/libgit2/src/transports/http.c +38 -13
  188. data/vendor/libgit2/src/transports/local.c +4 -1
  189. data/vendor/libgit2/src/transports/smart.c +6 -0
  190. data/vendor/libgit2/src/transports/smart.h +1 -0
  191. data/vendor/libgit2/src/transports/smart_pkt.c +5 -13
  192. data/vendor/libgit2/src/transports/smart_protocol.c +22 -7
  193. data/vendor/libgit2/src/transports/winhttp.c +144 -11
  194. data/vendor/libgit2/src/tree.c +267 -2
  195. data/vendor/libgit2/src/unix/posix.h +10 -0
  196. data/vendor/libgit2/src/unix/pthread.h +2 -0
  197. data/vendor/libgit2/src/util.c +25 -2
  198. data/vendor/libgit2/src/util.h +10 -0
  199. data/vendor/libgit2/src/varint.c +44 -0
  200. data/vendor/libgit2/src/varint.h +15 -0
  201. data/vendor/libgit2/src/vector.c +58 -0
  202. data/vendor/libgit2/src/vector.h +8 -0
  203. data/vendor/libgit2/src/win32/posix.h +3 -0
  204. data/vendor/libgit2/src/win32/thread.c +18 -0
  205. data/vendor/libgit2/src/win32/thread.h +2 -0
  206. data/vendor/libgit2/src/win32/w32_util.h +1 -1
  207. data/vendor/libgit2/src/zstream.c +37 -8
  208. data/vendor/libgit2/src/zstream.h +8 -1
  209. metadata +100 -82
  210. data/vendor/libgit2/Makefile.embed +0 -60
  211. data/vendor/libgit2/src/delta-apply.c +0 -166
  212. data/vendor/libgit2/src/delta-apply.h +0 -62
  213. data/vendor/libgit2/src/diff_patch.h +0 -83
@@ -0,0 +1,216 @@
1
+ #include "git2/patch.h"
2
+ #include "diff.h"
3
+ #include "patch.h"
4
+
5
+
6
+ int git_patch__invoke_callbacks(
7
+ git_patch *patch,
8
+ git_diff_file_cb file_cb,
9
+ git_diff_binary_cb binary_cb,
10
+ git_diff_hunk_cb hunk_cb,
11
+ git_diff_line_cb line_cb,
12
+ void *payload)
13
+ {
14
+ int error = 0;
15
+ uint32_t i, j;
16
+
17
+ if (file_cb)
18
+ error = file_cb(patch->delta, 0, payload);
19
+
20
+ if (error)
21
+ return error;
22
+
23
+ if ((patch->delta->flags & GIT_DIFF_FLAG_BINARY) != 0) {
24
+ if (binary_cb)
25
+ error = binary_cb(patch->delta, &patch->binary, payload);
26
+
27
+ return error;
28
+ }
29
+
30
+ if (!hunk_cb && !line_cb)
31
+ return error;
32
+
33
+ for (i = 0; !error && i < git_array_size(patch->hunks); ++i) {
34
+ git_patch_hunk *h = git_array_get(patch->hunks, i);
35
+
36
+ if (hunk_cb)
37
+ error = hunk_cb(patch->delta, &h->hunk, payload);
38
+
39
+ if (!line_cb)
40
+ continue;
41
+
42
+ for (j = 0; !error && j < h->line_count; ++j) {
43
+ git_diff_line *l =
44
+ git_array_get(patch->lines, h->line_start + j);
45
+
46
+ error = line_cb(patch->delta, &h->hunk, l, payload);
47
+ }
48
+ }
49
+
50
+ return error;
51
+ }
52
+
53
+ size_t git_patch_size(
54
+ git_patch *patch,
55
+ int include_context,
56
+ int include_hunk_headers,
57
+ int include_file_headers)
58
+ {
59
+ size_t out;
60
+
61
+ assert(patch);
62
+
63
+ out = patch->content_size;
64
+
65
+ if (!include_context)
66
+ out -= patch->context_size;
67
+
68
+ if (include_hunk_headers)
69
+ out += patch->header_size;
70
+
71
+ if (include_file_headers) {
72
+ git_buf file_header = GIT_BUF_INIT;
73
+
74
+ if (git_diff_delta__format_file_header(
75
+ &file_header, patch->delta, NULL, NULL, 0) < 0)
76
+ giterr_clear();
77
+ else
78
+ out += git_buf_len(&file_header);
79
+
80
+ git_buf_free(&file_header);
81
+ }
82
+
83
+ return out;
84
+ }
85
+
86
+ int git_patch_line_stats(
87
+ size_t *total_ctxt,
88
+ size_t *total_adds,
89
+ size_t *total_dels,
90
+ const git_patch *patch)
91
+ {
92
+ size_t totals[3], idx;
93
+
94
+ memset(totals, 0, sizeof(totals));
95
+
96
+ for (idx = 0; idx < git_array_size(patch->lines); ++idx) {
97
+ git_diff_line *line = git_array_get(patch->lines, idx);
98
+ if (!line)
99
+ continue;
100
+
101
+ switch (line->origin) {
102
+ case GIT_DIFF_LINE_CONTEXT: totals[0]++; break;
103
+ case GIT_DIFF_LINE_ADDITION: totals[1]++; break;
104
+ case GIT_DIFF_LINE_DELETION: totals[2]++; break;
105
+ default:
106
+ /* diff --stat and --numstat don't count EOFNL marks because
107
+ * they will always be paired with a ADDITION or DELETION line.
108
+ */
109
+ break;
110
+ }
111
+ }
112
+
113
+ if (total_ctxt)
114
+ *total_ctxt = totals[0];
115
+ if (total_adds)
116
+ *total_adds = totals[1];
117
+ if (total_dels)
118
+ *total_dels = totals[2];
119
+
120
+ return 0;
121
+ }
122
+
123
+ const git_diff_delta *git_patch_get_delta(const git_patch *patch)
124
+ {
125
+ assert(patch);
126
+ return patch->delta;
127
+ }
128
+
129
+ size_t git_patch_num_hunks(const git_patch *patch)
130
+ {
131
+ assert(patch);
132
+ return git_array_size(patch->hunks);
133
+ }
134
+
135
+ static int patch_error_outofrange(const char *thing)
136
+ {
137
+ giterr_set(GITERR_INVALID, "patch %s index out of range", thing);
138
+ return GIT_ENOTFOUND;
139
+ }
140
+
141
+ int git_patch_get_hunk(
142
+ const git_diff_hunk **out,
143
+ size_t *lines_in_hunk,
144
+ git_patch *patch,
145
+ size_t hunk_idx)
146
+ {
147
+ git_patch_hunk *hunk;
148
+ assert(patch);
149
+
150
+ hunk = git_array_get(patch->hunks, hunk_idx);
151
+
152
+ if (!hunk) {
153
+ if (out) *out = NULL;
154
+ if (lines_in_hunk) *lines_in_hunk = 0;
155
+ return patch_error_outofrange("hunk");
156
+ }
157
+
158
+ if (out) *out = &hunk->hunk;
159
+ if (lines_in_hunk) *lines_in_hunk = hunk->line_count;
160
+ return 0;
161
+ }
162
+
163
+ int git_patch_num_lines_in_hunk(const git_patch *patch, size_t hunk_idx)
164
+ {
165
+ git_patch_hunk *hunk;
166
+ assert(patch);
167
+
168
+ if (!(hunk = git_array_get(patch->hunks, hunk_idx)))
169
+ return patch_error_outofrange("hunk");
170
+ return (int)hunk->line_count;
171
+ }
172
+
173
+ int git_patch_get_line_in_hunk(
174
+ const git_diff_line **out,
175
+ git_patch *patch,
176
+ size_t hunk_idx,
177
+ size_t line_of_hunk)
178
+ {
179
+ git_patch_hunk *hunk;
180
+ git_diff_line *line;
181
+
182
+ assert(patch);
183
+
184
+ if (!(hunk = git_array_get(patch->hunks, hunk_idx))) {
185
+ if (out) *out = NULL;
186
+ return patch_error_outofrange("hunk");
187
+ }
188
+
189
+ if (line_of_hunk >= hunk->line_count ||
190
+ !(line = git_array_get(
191
+ patch->lines, hunk->line_start + line_of_hunk))) {
192
+ if (out) *out = NULL;
193
+ return patch_error_outofrange("line");
194
+ }
195
+
196
+ if (out) *out = line;
197
+ return 0;
198
+ }
199
+
200
+ int git_patch_from_diff(git_patch **out, git_diff *diff, size_t idx)
201
+ {
202
+ assert(out && diff && diff->patch_fn);
203
+ return diff->patch_fn(out, diff, idx);
204
+ }
205
+
206
+ static void git_patch__free(git_patch *patch)
207
+ {
208
+ if (patch->free_fn)
209
+ patch->free_fn(patch);
210
+ }
211
+
212
+ void git_patch_free(git_patch *patch)
213
+ {
214
+ if (patch)
215
+ GIT_REFCOUNT_DEC(patch, git_patch__free);
216
+ }
@@ -0,0 +1,66 @@
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_patch_h__
8
+ #define INCLUDE_patch_h__
9
+
10
+ #include "git2/patch.h"
11
+ #include "array.h"
12
+
13
+ /* cached information about a hunk in a patch */
14
+ typedef struct git_patch_hunk {
15
+ git_diff_hunk hunk;
16
+ size_t line_start;
17
+ size_t line_count;
18
+ } git_patch_hunk;
19
+
20
+ struct git_patch {
21
+ git_refcount rc;
22
+
23
+ git_repository *repo; /* may be null */
24
+
25
+ git_diff_options diff_opts;
26
+
27
+ git_diff_delta *delta;
28
+ git_diff_binary binary;
29
+ git_array_t(git_patch_hunk) hunks;
30
+ git_array_t(git_diff_line) lines;
31
+
32
+ size_t header_size;
33
+ size_t content_size;
34
+ size_t context_size;
35
+
36
+ void (*free_fn)(git_patch *patch);
37
+ };
38
+
39
+ extern int git_patch__invoke_callbacks(
40
+ git_patch *patch,
41
+ git_diff_file_cb file_cb,
42
+ git_diff_binary_cb binary_cb,
43
+ git_diff_hunk_cb hunk_cb,
44
+ git_diff_line_cb line_cb,
45
+ void *payload);
46
+
47
+ extern int git_patch_line_stats(
48
+ size_t *total_ctxt,
49
+ size_t *total_adds,
50
+ size_t *total_dels,
51
+ const git_patch *patch);
52
+
53
+ /** Options for parsing patch files. */
54
+ typedef struct {
55
+ /**
56
+ * The length of the prefix (in path segments) for the filenames.
57
+ * This prefix will be removed when looking for files. The default is 1.
58
+ */
59
+ uint32_t prefix_len;
60
+ } git_patch_options;
61
+
62
+ #define GIT_PATCH_OPTIONS_INIT { 1 }
63
+
64
+ extern void git_patch_free(git_patch *patch);
65
+
66
+ #endif