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.
Files changed (283) hide show
  1. data/README.md +9 -4
  2. data/Rakefile +1 -1
  3. data/ext/rugged/extconf.rb +10 -0
  4. data/ext/rugged/rugged.c +153 -86
  5. data/ext/rugged/rugged.h +44 -33
  6. data/ext/rugged/rugged_blob.c +288 -60
  7. data/ext/rugged/rugged_branch.c +82 -57
  8. data/ext/rugged/rugged_commit.c +83 -86
  9. data/ext/rugged/rugged_config.c +68 -68
  10. data/ext/rugged/rugged_diff.c +509 -0
  11. data/ext/rugged/rugged_diff_delta.c +94 -0
  12. data/ext/rugged/rugged_diff_hunk.c +100 -0
  13. data/ext/rugged/rugged_diff_line.c +79 -0
  14. data/ext/rugged/rugged_diff_patch.c +169 -0
  15. data/ext/rugged/rugged_index.c +539 -8
  16. data/ext/rugged/rugged_note.c +74 -80
  17. data/ext/rugged/rugged_object.c +63 -8
  18. data/ext/rugged/rugged_reference.c +231 -145
  19. data/ext/rugged/rugged_remote.c +509 -53
  20. data/ext/rugged/rugged_repo.c +572 -236
  21. data/ext/rugged/rugged_revwalk.c +59 -36
  22. data/ext/rugged/rugged_settings.c +7 -9
  23. data/ext/rugged/rugged_signature.c +7 -11
  24. data/ext/rugged/rugged_tag.c +93 -39
  25. data/ext/rugged/rugged_tree.c +321 -58
  26. data/lib/rugged.rb +1 -0
  27. data/lib/rugged/commit.rb +16 -1
  28. data/lib/rugged/console.rb +9 -0
  29. data/lib/rugged/diff.rb +19 -0
  30. data/lib/rugged/diff/delta.rb +54 -0
  31. data/lib/rugged/diff/hunk.rb +23 -0
  32. data/lib/rugged/diff/line.rb +29 -0
  33. data/lib/rugged/diff/patch.rb +28 -0
  34. data/lib/rugged/repository.rb +36 -39
  35. data/lib/rugged/version.rb +1 -1
  36. data/test/blob_test.rb +308 -1
  37. data/test/branch_test.rb +7 -0
  38. data/test/commit_test.rb +7 -10
  39. data/test/coverage/cover.rb +9 -1
  40. data/test/diff_test.rb +777 -0
  41. data/test/fixtures/archive.tar.gz +0 -0
  42. data/test/fixtures/attr/attr0 +1 -0
  43. data/test/fixtures/attr/attr1 +29 -0
  44. data/test/fixtures/attr/attr2 +21 -0
  45. data/test/fixtures/attr/attr3 +4 -0
  46. data/test/fixtures/attr/binfile +1 -0
  47. data/test/fixtures/attr/dir/file +0 -0
  48. data/test/fixtures/attr/file +1 -0
  49. data/test/fixtures/attr/gitattributes +29 -0
  50. data/test/fixtures/attr/gitignore +2 -0
  51. data/test/fixtures/attr/ign +1 -0
  52. data/test/fixtures/attr/macro_bad +1 -0
  53. data/test/fixtures/attr/macro_test +1 -0
  54. data/test/fixtures/attr/root_test1 +1 -0
  55. data/test/fixtures/attr/root_test2 +6 -0
  56. data/test/fixtures/attr/root_test3 +19 -0
  57. data/test/fixtures/attr/root_test4.txt +14 -0
  58. data/test/fixtures/attr/sub/abc +37 -0
  59. data/test/fixtures/attr/sub/dir/file +0 -0
  60. data/test/fixtures/attr/sub/file +1 -0
  61. data/test/fixtures/attr/sub/ign/file +1 -0
  62. data/test/fixtures/attr/sub/ign/sub/file +1 -0
  63. data/test/fixtures/attr/sub/sub/dir +0 -0
  64. data/test/fixtures/attr/sub/sub/file +1 -0
  65. data/test/fixtures/attr/sub/sub/subsub.txt +1 -0
  66. data/test/fixtures/attr/sub/subdir_test1 +2 -0
  67. data/test/fixtures/attr/sub/subdir_test2.txt +1 -0
  68. data/test/fixtures/diff/another.txt +38 -0
  69. data/test/fixtures/diff/readme.txt +36 -0
  70. data/test/fixtures/mergedrepo/conflicts-one.txt +5 -0
  71. data/test/fixtures/mergedrepo/conflicts-two.txt +5 -0
  72. data/test/fixtures/mergedrepo/one.txt +10 -0
  73. data/test/fixtures/mergedrepo/two.txt +12 -0
  74. data/test/fixtures/status/current_file +1 -0
  75. data/test/fixtures/status/ignored_file +1 -0
  76. data/test/fixtures/status/modified_file +2 -0
  77. data/test/fixtures/status/new_file +1 -0
  78. data/test/fixtures/status/staged_changes +2 -0
  79. data/test/fixtures/status/staged_changes_modified_file +3 -0
  80. data/test/fixtures/status/staged_delete_modified_file +1 -0
  81. data/test/fixtures/status/staged_new_file +1 -0
  82. data/test/fixtures/status/staged_new_file_modified_file +2 -0
  83. data/test/fixtures/status/subdir.txt +2 -0
  84. data/test/fixtures/status/subdir/current_file +1 -0
  85. data/test/fixtures/status/subdir/modified_file +2 -0
  86. data/test/fixtures/status/subdir/new_file +1 -0
  87. data/test/fixtures/status//350/277/231 +1 -0
  88. data/test/fixtures/testrepo.git/config +5 -0
  89. data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
  90. data/test/fixtures/text_file.md +464 -0
  91. data/test/fixtures/unsymlinked.git/HEAD +1 -0
  92. data/test/fixtures/unsymlinked.git/config +6 -0
  93. data/test/fixtures/unsymlinked.git/description +1 -0
  94. data/test/fixtures/unsymlinked.git/info/exclude +2 -0
  95. data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
  96. data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
  97. data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
  98. data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
  99. data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
  100. data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
  101. data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
  102. data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
  103. data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
  104. data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +2 -0
  105. data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
  106. data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
  107. data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
  108. data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
  109. data/test/fixtures/unsymlinked.git/refs/heads/exe-file +1 -0
  110. data/test/fixtures/unsymlinked.git/refs/heads/master +1 -0
  111. data/test/fixtures/unsymlinked.git/refs/heads/reg-file +1 -0
  112. data/test/index_test.rb +120 -0
  113. data/test/reference_test.rb +38 -3
  114. data/test/remote_test.rb +224 -3
  115. data/test/repo_reset_test.rb +2 -0
  116. data/test/repo_test.rb +147 -10
  117. data/test/test_helper.rb +5 -2
  118. data/vendor/libgit2/include/git2/attr.h +3 -3
  119. data/vendor/libgit2/include/git2/blob.h +11 -17
  120. data/vendor/libgit2/include/git2/branch.h +3 -2
  121. data/vendor/libgit2/include/git2/checkout.h +7 -0
  122. data/vendor/libgit2/include/git2/clone.h +3 -0
  123. data/vendor/libgit2/include/git2/commit.h +61 -66
  124. data/vendor/libgit2/include/git2/common.h +73 -42
  125. data/vendor/libgit2/include/git2/config.h +57 -71
  126. data/vendor/libgit2/include/git2/cred_helpers.h +2 -2
  127. data/vendor/libgit2/include/git2/diff.h +179 -30
  128. data/vendor/libgit2/include/git2/errors.h +3 -3
  129. data/vendor/libgit2/include/git2/index.h +225 -146
  130. data/vendor/libgit2/include/git2/indexer.h +2 -22
  131. data/vendor/libgit2/include/git2/inttypes.h +9 -9
  132. data/vendor/libgit2/include/git2/merge.h +123 -5
  133. data/vendor/libgit2/include/git2/odb.h +59 -38
  134. data/vendor/libgit2/include/git2/odb_backend.h +45 -104
  135. data/vendor/libgit2/include/git2/oid.h +30 -19
  136. data/vendor/libgit2/include/git2/pack.h +21 -3
  137. data/vendor/libgit2/include/git2/refdb.h +0 -35
  138. data/vendor/libgit2/include/git2/refs.h +93 -31
  139. data/vendor/libgit2/include/git2/refspec.h +17 -0
  140. data/vendor/libgit2/include/git2/remote.h +60 -20
  141. data/vendor/libgit2/include/git2/repository.h +48 -70
  142. data/vendor/libgit2/include/git2/reset.h +3 -3
  143. data/vendor/libgit2/include/git2/revparse.h +22 -0
  144. data/vendor/libgit2/include/git2/stash.h +1 -1
  145. data/vendor/libgit2/include/git2/status.h +131 -56
  146. data/vendor/libgit2/include/git2/strarray.h +2 -2
  147. data/vendor/libgit2/include/git2/submodule.h +16 -16
  148. data/vendor/libgit2/include/git2/sys/commit.h +46 -0
  149. data/vendor/libgit2/include/git2/sys/config.h +71 -0
  150. data/vendor/libgit2/include/git2/sys/index.h +179 -0
  151. data/vendor/libgit2/include/git2/sys/odb_backend.h +86 -0
  152. data/vendor/libgit2/include/git2/sys/refdb_backend.h +158 -0
  153. data/vendor/libgit2/include/git2/sys/refs.h +38 -0
  154. data/vendor/libgit2/include/git2/sys/repository.h +106 -0
  155. data/vendor/libgit2/include/git2/tag.h +44 -18
  156. data/vendor/libgit2/include/git2/trace.h +1 -2
  157. data/vendor/libgit2/include/git2/transport.h +74 -0
  158. data/vendor/libgit2/include/git2/tree.h +12 -22
  159. data/vendor/libgit2/include/git2/types.h +33 -0
  160. data/vendor/libgit2/include/git2/version.h +2 -2
  161. data/vendor/libgit2/src/array.h +66 -0
  162. data/vendor/libgit2/src/attr.c +26 -13
  163. data/vendor/libgit2/src/attr_file.c +3 -2
  164. data/vendor/libgit2/src/attr_file.h +3 -3
  165. data/vendor/libgit2/src/attrcache.h +4 -4
  166. data/vendor/libgit2/src/blob.c +13 -9
  167. data/vendor/libgit2/src/blob.h +2 -2
  168. data/vendor/libgit2/src/branch.c +67 -49
  169. data/vendor/libgit2/src/cache.c +224 -54
  170. data/vendor/libgit2/src/cache.h +33 -20
  171. data/vendor/libgit2/src/checkout.c +145 -85
  172. data/vendor/libgit2/src/clone.c +62 -50
  173. data/vendor/libgit2/src/commit.c +74 -40
  174. data/vendor/libgit2/src/commit.h +2 -3
  175. data/vendor/libgit2/src/commit_list.c +14 -8
  176. data/vendor/libgit2/src/config.c +119 -36
  177. data/vendor/libgit2/src/config.h +3 -0
  178. data/vendor/libgit2/src/config_cache.c +24 -7
  179. data/vendor/libgit2/src/config_file.c +9 -6
  180. data/vendor/libgit2/src/crlf.c +4 -2
  181. data/vendor/libgit2/src/date.c +3 -3
  182. data/vendor/libgit2/src/delta.c +1 -1
  183. data/vendor/libgit2/src/diff.c +681 -303
  184. data/vendor/libgit2/src/diff.h +34 -2
  185. data/vendor/libgit2/src/diff_driver.c +405 -0
  186. data/vendor/libgit2/src/diff_driver.h +49 -0
  187. data/vendor/libgit2/src/diff_file.c +447 -0
  188. data/vendor/libgit2/src/diff_file.h +58 -0
  189. data/vendor/libgit2/src/diff_patch.c +995 -0
  190. data/vendor/libgit2/src/diff_patch.h +46 -0
  191. data/vendor/libgit2/src/diff_print.c +430 -0
  192. data/vendor/libgit2/src/diff_tform.c +464 -203
  193. data/vendor/libgit2/src/diff_xdiff.c +166 -0
  194. data/vendor/libgit2/src/diff_xdiff.h +28 -0
  195. data/vendor/libgit2/src/fetch.c +11 -4
  196. data/vendor/libgit2/src/fileops.c +85 -61
  197. data/vendor/libgit2/src/fileops.h +4 -0
  198. data/vendor/libgit2/src/global.c +10 -2
  199. data/vendor/libgit2/src/global.h +0 -8
  200. data/vendor/libgit2/src/hash/hash_generic.h +3 -3
  201. data/vendor/libgit2/src/hash/hash_win32.h +4 -4
  202. data/vendor/libgit2/src/hashsig.c +0 -1
  203. data/vendor/libgit2/src/ignore.c +68 -28
  204. data/vendor/libgit2/src/ignore.h +10 -1
  205. data/vendor/libgit2/src/index.c +666 -84
  206. data/vendor/libgit2/src/index.h +6 -0
  207. data/vendor/libgit2/src/indexer.c +10 -28
  208. data/vendor/libgit2/src/iterator.c +427 -283
  209. data/vendor/libgit2/src/iterator.h +58 -4
  210. data/vendor/libgit2/src/merge.c +1892 -32
  211. data/vendor/libgit2/src/merge.h +132 -5
  212. data/vendor/libgit2/src/merge_file.c +174 -0
  213. data/vendor/libgit2/src/merge_file.h +71 -0
  214. data/vendor/libgit2/src/mwindow.c +1 -1
  215. data/vendor/libgit2/src/notes.c +45 -48
  216. data/vendor/libgit2/src/object.c +89 -127
  217. data/vendor/libgit2/src/object.h +0 -1
  218. data/vendor/libgit2/src/object_api.c +129 -0
  219. data/vendor/libgit2/src/odb.c +156 -59
  220. data/vendor/libgit2/src/odb.h +5 -2
  221. data/vendor/libgit2/src/odb_loose.c +31 -17
  222. data/vendor/libgit2/src/odb_pack.c +39 -43
  223. data/vendor/libgit2/src/oid.c +62 -27
  224. data/vendor/libgit2/src/oid.h +33 -0
  225. data/vendor/libgit2/src/oidmap.h +4 -6
  226. data/vendor/libgit2/src/pack-objects.c +54 -22
  227. data/vendor/libgit2/src/pack.c +98 -56
  228. data/vendor/libgit2/src/pack.h +3 -1
  229. data/vendor/libgit2/src/pathspec.c +26 -1
  230. data/vendor/libgit2/src/pathspec.h +14 -0
  231. data/vendor/libgit2/src/pool.c +5 -0
  232. data/vendor/libgit2/src/posix.c +2 -2
  233. data/vendor/libgit2/src/posix.h +3 -0
  234. data/vendor/libgit2/src/push.c +13 -10
  235. data/vendor/libgit2/src/refdb.c +82 -62
  236. data/vendor/libgit2/src/refdb.h +16 -16
  237. data/vendor/libgit2/src/refdb_fs.c +386 -133
  238. data/vendor/libgit2/src/reflog.c +3 -1
  239. data/vendor/libgit2/src/refs.c +247 -221
  240. data/vendor/libgit2/src/refs.h +2 -1
  241. data/vendor/libgit2/src/refspec.c +18 -1
  242. data/vendor/libgit2/src/refspec.h +3 -1
  243. data/vendor/libgit2/src/remote.c +434 -253
  244. data/vendor/libgit2/src/remote.h +5 -3
  245. data/vendor/libgit2/src/repository.c +197 -111
  246. data/vendor/libgit2/src/repository.h +26 -5
  247. data/vendor/libgit2/src/reset.c +1 -1
  248. data/vendor/libgit2/src/revparse.c +84 -79
  249. data/vendor/libgit2/src/revwalk.c +1 -1
  250. data/vendor/libgit2/src/signature.c +22 -10
  251. data/vendor/libgit2/src/stash.c +5 -2
  252. data/vendor/libgit2/src/status.c +311 -107
  253. data/vendor/libgit2/src/status.h +23 -0
  254. data/vendor/libgit2/src/submodule.c +21 -13
  255. data/vendor/libgit2/src/tag.c +42 -31
  256. data/vendor/libgit2/src/tag.h +2 -3
  257. data/vendor/libgit2/src/thread-utils.h +105 -3
  258. data/vendor/libgit2/src/trace.c +1 -2
  259. data/vendor/libgit2/src/trace.h +3 -3
  260. data/vendor/libgit2/src/transport.c +18 -6
  261. data/vendor/libgit2/src/transports/cred.c +103 -1
  262. data/vendor/libgit2/src/transports/local.c +19 -9
  263. data/vendor/libgit2/src/transports/smart_protocol.c +32 -12
  264. data/vendor/libgit2/src/transports/ssh.c +519 -0
  265. data/vendor/libgit2/src/transports/winhttp.c +3 -1
  266. data/vendor/libgit2/src/tree.c +26 -28
  267. data/vendor/libgit2/src/tree.h +3 -3
  268. data/vendor/libgit2/src/unix/posix.h +2 -0
  269. data/vendor/libgit2/src/util.c +43 -6
  270. data/vendor/libgit2/src/util.h +40 -12
  271. data/vendor/libgit2/src/vector.c +3 -5
  272. data/vendor/libgit2/src/vector.h +9 -0
  273. data/vendor/libgit2/src/win32/dir.c +1 -1
  274. data/vendor/libgit2/src/win32/error.c +2 -0
  275. data/vendor/libgit2/src/win32/findfile.c +3 -6
  276. data/vendor/libgit2/src/win32/posix_w32.c +85 -59
  277. data/vendor/libgit2/src/win32/pthread.c +16 -8
  278. data/vendor/libgit2/src/win32/pthread.h +7 -4
  279. metadata +407 -306
  280. data/test/coverage/HEAD.json +0 -1
  281. data/vendor/libgit2/include/git2/refdb_backend.h +0 -109
  282. data/vendor/libgit2/src/diff_output.c +0 -1819
  283. data/vendor/libgit2/src/diff_output.h +0 -93
@@ -0,0 +1,46 @@
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_patch_h__
8
+ #define INCLUDE_diff_patch_h__
9
+
10
+ #include "common.h"
11
+ #include "diff.h"
12
+ #include "diff_file.h"
13
+ #include "array.h"
14
+
15
+ extern git_diff_list *git_diff_patch__diff(git_diff_patch *);
16
+
17
+ extern git_diff_driver *git_diff_patch__driver(git_diff_patch *);
18
+
19
+ extern void git_diff_patch__old_data(char **, size_t *, git_diff_patch *);
20
+ extern void git_diff_patch__new_data(char **, size_t *, git_diff_patch *);
21
+
22
+ extern int git_diff_patch__invoke_callbacks(
23
+ git_diff_patch *patch,
24
+ git_diff_file_cb file_cb,
25
+ git_diff_hunk_cb hunk_cb,
26
+ git_diff_data_cb line_cb,
27
+ void *payload);
28
+
29
+ typedef struct git_diff_output git_diff_output;
30
+ struct git_diff_output {
31
+ /* these callbacks are issued with the diff data */
32
+ git_diff_file_cb file_cb;
33
+ git_diff_hunk_cb hunk_cb;
34
+ git_diff_data_cb data_cb;
35
+ void *payload;
36
+
37
+ /* this records the actual error in cases where it may be obscured */
38
+ int error;
39
+
40
+ /* this callback is used to do the diff and drive the other callbacks.
41
+ * see diff_xdiff.h for how to use this in practice for now.
42
+ */
43
+ int (*diff_cb)(git_diff_output *output, git_diff_patch *patch);
44
+ };
45
+
46
+ #endif
@@ -0,0 +1,430 @@
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_patch.h"
10
+ #include "buffer.h"
11
+
12
+ typedef struct {
13
+ git_diff_list *diff;
14
+ git_diff_data_cb print_cb;
15
+ void *payload;
16
+ git_buf *buf;
17
+ int oid_strlen;
18
+ } diff_print_info;
19
+
20
+ static int diff_print_info_init(
21
+ diff_print_info *pi,
22
+ git_buf *out, git_diff_list *diff, git_diff_data_cb cb, void *payload)
23
+ {
24
+ pi->diff = diff;
25
+ pi->print_cb = cb;
26
+ pi->payload = payload;
27
+ pi->buf = out;
28
+
29
+ if (!diff || !diff->repo)
30
+ pi->oid_strlen = GIT_ABBREV_DEFAULT;
31
+ else if (git_repository__cvar(
32
+ &pi->oid_strlen, diff->repo, GIT_CVAR_ABBREV) < 0)
33
+ return -1;
34
+
35
+ pi->oid_strlen += 1; /* for NUL byte */
36
+
37
+ if (pi->oid_strlen < 2)
38
+ pi->oid_strlen = 2;
39
+ else if (pi->oid_strlen > GIT_OID_HEXSZ + 1)
40
+ pi->oid_strlen = GIT_OID_HEXSZ + 1;
41
+
42
+ return 0;
43
+ }
44
+
45
+ static char diff_pick_suffix(int mode)
46
+ {
47
+ if (S_ISDIR(mode))
48
+ return '/';
49
+ else if (mode & 0100) /* -V536 */
50
+ /* in git, modes are very regular, so we must have 0100755 mode */
51
+ return '*';
52
+ else
53
+ return ' ';
54
+ }
55
+
56
+ char git_diff_status_char(git_delta_t status)
57
+ {
58
+ char code;
59
+
60
+ switch (status) {
61
+ case GIT_DELTA_ADDED: code = 'A'; break;
62
+ case GIT_DELTA_DELETED: code = 'D'; break;
63
+ case GIT_DELTA_MODIFIED: code = 'M'; break;
64
+ case GIT_DELTA_RENAMED: code = 'R'; break;
65
+ case GIT_DELTA_COPIED: code = 'C'; break;
66
+ case GIT_DELTA_IGNORED: code = 'I'; break;
67
+ case GIT_DELTA_UNTRACKED: code = '?'; break;
68
+ default: code = ' '; break;
69
+ }
70
+
71
+ return code;
72
+ }
73
+
74
+ static int callback_error(void)
75
+ {
76
+ giterr_clear();
77
+ return GIT_EUSER;
78
+ }
79
+
80
+ static int diff_print_one_compact(
81
+ const git_diff_delta *delta, float progress, void *data)
82
+ {
83
+ diff_print_info *pi = data;
84
+ git_buf *out = pi->buf;
85
+ char old_suffix, new_suffix, code = git_diff_status_char(delta->status);
86
+ int (*strcomp)(const char *, const char *) =
87
+ pi->diff ? pi->diff->strcomp : git__strcmp;
88
+
89
+ GIT_UNUSED(progress);
90
+
91
+ if (code == ' ')
92
+ return 0;
93
+
94
+ old_suffix = diff_pick_suffix(delta->old_file.mode);
95
+ new_suffix = diff_pick_suffix(delta->new_file.mode);
96
+
97
+ git_buf_clear(out);
98
+
99
+ if (delta->old_file.path != delta->new_file.path &&
100
+ strcomp(delta->old_file.path,delta->new_file.path) != 0)
101
+ git_buf_printf(out, "%c\t%s%c -> %s%c\n", code,
102
+ delta->old_file.path, old_suffix, delta->new_file.path, new_suffix);
103
+ else if (delta->old_file.mode != delta->new_file.mode &&
104
+ delta->old_file.mode != 0 && delta->new_file.mode != 0)
105
+ git_buf_printf(out, "%c\t%s%c (%o -> %o)\n", code,
106
+ delta->old_file.path, new_suffix, delta->old_file.mode, delta->new_file.mode);
107
+ else if (old_suffix != ' ')
108
+ git_buf_printf(out, "%c\t%s%c\n", code, delta->old_file.path, old_suffix);
109
+ else
110
+ git_buf_printf(out, "%c\t%s\n", code, delta->old_file.path);
111
+
112
+ if (git_buf_oom(out))
113
+ return -1;
114
+
115
+ if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR,
116
+ git_buf_cstr(out), git_buf_len(out), pi->payload))
117
+ return callback_error();
118
+
119
+ return 0;
120
+ }
121
+
122
+ /* print a git_diff_list to a print callback in compact format */
123
+ int git_diff_print_compact(
124
+ git_diff_list *diff,
125
+ git_diff_data_cb print_cb,
126
+ void *payload)
127
+ {
128
+ int error;
129
+ git_buf buf = GIT_BUF_INIT;
130
+ diff_print_info pi;
131
+
132
+ if (!(error = diff_print_info_init(&pi, &buf, diff, print_cb, payload)))
133
+ error = git_diff_foreach(diff, diff_print_one_compact, NULL, NULL, &pi);
134
+
135
+ git_buf_free(&buf);
136
+
137
+ return error;
138
+ }
139
+
140
+ static int diff_print_one_raw(
141
+ const git_diff_delta *delta, float progress, void *data)
142
+ {
143
+ diff_print_info *pi = data;
144
+ git_buf *out = pi->buf;
145
+ char code = git_diff_status_char(delta->status);
146
+ char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
147
+
148
+ GIT_UNUSED(progress);
149
+
150
+ if (code == ' ')
151
+ return 0;
152
+
153
+ git_buf_clear(out);
154
+
155
+ git_oid_tostr(start_oid, pi->oid_strlen, &delta->old_file.oid);
156
+ git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.oid);
157
+
158
+ git_buf_printf(
159
+ out, ":%06o %06o %s... %s... %c",
160
+ delta->old_file.mode, delta->new_file.mode, start_oid, end_oid, code);
161
+
162
+ if (delta->similarity > 0)
163
+ git_buf_printf(out, "%03u", delta->similarity);
164
+
165
+ if (delta->old_file.path != delta->new_file.path)
166
+ git_buf_printf(
167
+ out, "\t%s %s\n", delta->old_file.path, delta->new_file.path);
168
+ else
169
+ git_buf_printf(
170
+ out, "\t%s\n", delta->old_file.path ?
171
+ delta->old_file.path : delta->new_file.path);
172
+
173
+ if (git_buf_oom(out))
174
+ return -1;
175
+
176
+ if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR,
177
+ git_buf_cstr(out), git_buf_len(out), pi->payload))
178
+ return callback_error();
179
+
180
+ return 0;
181
+ }
182
+
183
+ /* print a git_diff_list to a print callback in raw output format */
184
+ int git_diff_print_raw(
185
+ git_diff_list *diff,
186
+ git_diff_data_cb print_cb,
187
+ void *payload)
188
+ {
189
+ int error;
190
+ git_buf buf = GIT_BUF_INIT;
191
+ diff_print_info pi;
192
+
193
+ if (!(error = diff_print_info_init(&pi, &buf, diff, print_cb, payload)))
194
+ error = git_diff_foreach(diff, diff_print_one_raw, NULL, NULL, &pi);
195
+
196
+ git_buf_free(&buf);
197
+
198
+ return error;
199
+ }
200
+
201
+ static int diff_print_oid_range(diff_print_info *pi, const git_diff_delta *delta)
202
+ {
203
+ git_buf *out = pi->buf;
204
+ char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
205
+
206
+ git_oid_tostr(start_oid, pi->oid_strlen, &delta->old_file.oid);
207
+ git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.oid);
208
+
209
+ /* TODO: Match git diff more closely */
210
+ if (delta->old_file.mode == delta->new_file.mode) {
211
+ git_buf_printf(out, "index %s..%s %o\n",
212
+ start_oid, end_oid, delta->old_file.mode);
213
+ } else {
214
+ if (delta->old_file.mode == 0) {
215
+ git_buf_printf(out, "new file mode %o\n", delta->new_file.mode);
216
+ } else if (delta->new_file.mode == 0) {
217
+ git_buf_printf(out, "deleted file mode %o\n", delta->old_file.mode);
218
+ } else {
219
+ git_buf_printf(out, "old mode %o\n", delta->old_file.mode);
220
+ git_buf_printf(out, "new mode %o\n", delta->new_file.mode);
221
+ }
222
+ git_buf_printf(out, "index %s..%s\n", start_oid, end_oid);
223
+ }
224
+
225
+ if (git_buf_oom(out))
226
+ return -1;
227
+
228
+ return 0;
229
+ }
230
+
231
+ static int diff_print_patch_file(
232
+ const git_diff_delta *delta, float progress, void *data)
233
+ {
234
+ diff_print_info *pi = data;
235
+ const char *oldpfx = pi->diff ? pi->diff->opts.old_prefix : NULL;
236
+ const char *oldpath = delta->old_file.path;
237
+ const char *newpfx = pi->diff ? pi->diff->opts.new_prefix : NULL;
238
+ const char *newpath = delta->new_file.path;
239
+ uint32_t opts_flags = pi->diff ? pi->diff->opts.flags : GIT_DIFF_NORMAL;
240
+
241
+ GIT_UNUSED(progress);
242
+
243
+ if (S_ISDIR(delta->new_file.mode) ||
244
+ delta->status == GIT_DELTA_UNMODIFIED ||
245
+ delta->status == GIT_DELTA_IGNORED ||
246
+ (delta->status == GIT_DELTA_UNTRACKED &&
247
+ (opts_flags & GIT_DIFF_INCLUDE_UNTRACKED_CONTENT) == 0))
248
+ return 0;
249
+
250
+ if (!oldpfx)
251
+ oldpfx = DIFF_OLD_PREFIX_DEFAULT;
252
+ if (!newpfx)
253
+ newpfx = DIFF_NEW_PREFIX_DEFAULT;
254
+
255
+ git_buf_clear(pi->buf);
256
+ git_buf_printf(pi->buf, "diff --git %s%s %s%s\n",
257
+ oldpfx, delta->old_file.path, newpfx, delta->new_file.path);
258
+
259
+ if (diff_print_oid_range(pi, delta) < 0)
260
+ return -1;
261
+
262
+ if (git_oid_iszero(&delta->old_file.oid)) {
263
+ oldpfx = "";
264
+ oldpath = "/dev/null";
265
+ }
266
+ if (git_oid_iszero(&delta->new_file.oid)) {
267
+ newpfx = "";
268
+ newpath = "/dev/null";
269
+ }
270
+
271
+ if ((delta->flags & GIT_DIFF_FLAG_BINARY) == 0) {
272
+ git_buf_printf(pi->buf, "--- %s%s\n", oldpfx, oldpath);
273
+ git_buf_printf(pi->buf, "+++ %s%s\n", newpfx, newpath);
274
+ }
275
+
276
+ if (git_buf_oom(pi->buf))
277
+ return -1;
278
+
279
+ if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR,
280
+ git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
281
+ return callback_error();
282
+
283
+ if ((delta->flags & GIT_DIFF_FLAG_BINARY) == 0)
284
+ return 0;
285
+
286
+ git_buf_clear(pi->buf);
287
+ git_buf_printf(
288
+ pi->buf, "Binary files %s%s and %s%s differ\n",
289
+ oldpfx, oldpath, newpfx, newpath);
290
+ if (git_buf_oom(pi->buf))
291
+ return -1;
292
+
293
+ if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_BINARY,
294
+ git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
295
+ return callback_error();
296
+
297
+ return 0;
298
+ }
299
+
300
+ static int diff_print_patch_hunk(
301
+ const git_diff_delta *d,
302
+ const git_diff_range *r,
303
+ const char *header,
304
+ size_t header_len,
305
+ void *data)
306
+ {
307
+ diff_print_info *pi = data;
308
+
309
+ if (S_ISDIR(d->new_file.mode))
310
+ return 0;
311
+
312
+ git_buf_clear(pi->buf);
313
+ if (git_buf_printf(pi->buf, "%.*s", (int)header_len, header) < 0)
314
+ return -1;
315
+
316
+ if (pi->print_cb(d, r, GIT_DIFF_LINE_HUNK_HDR,
317
+ git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
318
+ return callback_error();
319
+
320
+ return 0;
321
+ }
322
+
323
+ static int diff_print_patch_line(
324
+ const git_diff_delta *delta,
325
+ const git_diff_range *range,
326
+ char line_origin, /* GIT_DIFF_LINE value from above */
327
+ const char *content,
328
+ size_t content_len,
329
+ void *data)
330
+ {
331
+ diff_print_info *pi = data;
332
+
333
+ if (S_ISDIR(delta->new_file.mode))
334
+ return 0;
335
+
336
+ git_buf_clear(pi->buf);
337
+
338
+ if (line_origin == GIT_DIFF_LINE_ADDITION ||
339
+ line_origin == GIT_DIFF_LINE_DELETION ||
340
+ line_origin == GIT_DIFF_LINE_CONTEXT)
341
+ git_buf_printf(pi->buf, "%c%.*s", line_origin, (int)content_len, content);
342
+ else if (content_len > 0)
343
+ git_buf_printf(pi->buf, "%.*s", (int)content_len, content);
344
+
345
+ if (git_buf_oom(pi->buf))
346
+ return -1;
347
+
348
+ if (pi->print_cb(delta, range, line_origin,
349
+ git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
350
+ return callback_error();
351
+
352
+ return 0;
353
+ }
354
+
355
+ /* print a git_diff_list to an output callback in patch format */
356
+ int git_diff_print_patch(
357
+ git_diff_list *diff,
358
+ git_diff_data_cb print_cb,
359
+ void *payload)
360
+ {
361
+ int error;
362
+ git_buf buf = GIT_BUF_INIT;
363
+ diff_print_info pi;
364
+
365
+ if (!(error = diff_print_info_init(&pi, &buf, diff, print_cb, payload)))
366
+ error = git_diff_foreach(
367
+ diff, diff_print_patch_file, diff_print_patch_hunk,
368
+ diff_print_patch_line, &pi);
369
+
370
+ git_buf_free(&buf);
371
+
372
+ return error;
373
+ }
374
+
375
+ /* print a git_diff_patch to an output callback */
376
+ int git_diff_patch_print(
377
+ git_diff_patch *patch,
378
+ git_diff_data_cb print_cb,
379
+ void *payload)
380
+ {
381
+ int error;
382
+ git_buf temp = GIT_BUF_INIT;
383
+ diff_print_info pi;
384
+
385
+ assert(patch && print_cb);
386
+
387
+ if (!(error = diff_print_info_init(
388
+ &pi, &temp, git_diff_patch__diff(patch), print_cb, payload)))
389
+ error = git_diff_patch__invoke_callbacks(
390
+ patch, diff_print_patch_file, diff_print_patch_hunk,
391
+ diff_print_patch_line, &pi);
392
+
393
+ git_buf_free(&temp);
394
+
395
+ return error;
396
+ }
397
+
398
+ static int diff_print_to_buffer_cb(
399
+ const git_diff_delta *delta,
400
+ const git_diff_range *range,
401
+ char line_origin,
402
+ const char *content,
403
+ size_t content_len,
404
+ void *payload)
405
+ {
406
+ git_buf *output = payload;
407
+ GIT_UNUSED(delta); GIT_UNUSED(range); GIT_UNUSED(line_origin);
408
+ return git_buf_put(output, content, content_len);
409
+ }
410
+
411
+ /* print a git_diff_patch to a string buffer */
412
+ int git_diff_patch_to_str(
413
+ char **string,
414
+ git_diff_patch *patch)
415
+ {
416
+ int error;
417
+ git_buf output = GIT_BUF_INIT;
418
+
419
+ error = git_diff_patch_print(patch, diff_print_to_buffer_cb, &output);
420
+
421
+ /* GIT_EUSER means git_buf_put in print_to_buffer_cb returned -1,
422
+ * meaning a memory allocation failure, so just map to -1...
423
+ */
424
+ if (error == GIT_EUSER)
425
+ error = -1;
426
+
427
+ *string = git_buf_detach(&output);
428
+
429
+ return error;
430
+ }