rugged 0.19.0 → 0.28.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (668) hide show
  1. checksums.yaml +7 -0
  2. data/LICENSE +1 -1
  3. data/README.md +184 -33
  4. data/ext/rugged/extconf.rb +111 -28
  5. data/ext/rugged/rugged.c +327 -89
  6. data/ext/rugged/rugged.h +64 -28
  7. data/ext/rugged/rugged_allocator.c +89 -0
  8. data/ext/rugged/rugged_backend.c +17 -0
  9. data/ext/rugged/rugged_blame.c +278 -0
  10. data/ext/rugged/rugged_blob.c +301 -75
  11. data/ext/rugged/rugged_branch.c +92 -242
  12. data/ext/rugged/rugged_branch_collection.c +388 -0
  13. data/ext/rugged/rugged_commit.c +575 -79
  14. data/ext/rugged/rugged_config.c +129 -36
  15. data/ext/rugged/rugged_cred.c +131 -0
  16. data/ext/rugged/rugged_diff.c +291 -122
  17. data/ext/rugged/rugged_diff_delta.c +16 -22
  18. data/ext/rugged/rugged_diff_hunk.c +35 -51
  19. data/ext/rugged/rugged_diff_line.c +23 -36
  20. data/ext/rugged/rugged_index.c +289 -152
  21. data/ext/rugged/rugged_note.c +50 -60
  22. data/ext/rugged/rugged_object.c +13 -30
  23. data/ext/rugged/rugged_patch.c +400 -0
  24. data/ext/rugged/rugged_rebase.c +397 -0
  25. data/ext/rugged/rugged_reference.c +76 -346
  26. data/ext/rugged/rugged_reference_collection.c +423 -0
  27. data/ext/rugged/rugged_remote.c +438 -461
  28. data/ext/rugged/rugged_remote_collection.c +435 -0
  29. data/ext/rugged/rugged_repo.c +1548 -365
  30. data/ext/rugged/rugged_revwalk.c +378 -99
  31. data/ext/rugged/rugged_settings.c +86 -23
  32. data/ext/rugged/rugged_signature.c +47 -37
  33. data/ext/rugged/rugged_submodule.c +835 -0
  34. data/ext/rugged/rugged_submodule_collection.c +366 -0
  35. data/ext/rugged/rugged_tag.c +88 -210
  36. data/ext/rugged/rugged_tag_collection.c +326 -0
  37. data/ext/rugged/rugged_tree.c +460 -217
  38. data/lib/rugged/attributes.rb +46 -0
  39. data/lib/rugged/blob.rb +33 -0
  40. data/lib/rugged/branch.rb +12 -16
  41. data/lib/rugged/commit.rb +9 -0
  42. data/lib/rugged/console.rb +5 -0
  43. data/lib/rugged/credentials.rb +48 -0
  44. data/lib/rugged/diff/delta.rb +6 -2
  45. data/lib/rugged/diff/hunk.rb +9 -9
  46. data/lib/rugged/diff/line.rb +28 -5
  47. data/lib/rugged/diff.rb +7 -1
  48. data/lib/rugged/index.rb +120 -0
  49. data/lib/rugged/object.rb +5 -0
  50. data/lib/rugged/patch.rb +41 -0
  51. data/lib/rugged/reference.rb +6 -3
  52. data/lib/rugged/remote.rb +5 -9
  53. data/lib/rugged/repository.rb +126 -14
  54. data/lib/rugged/submodule_collection.rb +53 -0
  55. data/lib/rugged/tag.rb +45 -16
  56. data/lib/rugged/tree.rb +163 -1
  57. data/lib/rugged/version.rb +6 -1
  58. data/lib/rugged/walker.rb +5 -0
  59. data/lib/rugged.rb +16 -1
  60. data/vendor/libgit2/AUTHORS +77 -0
  61. data/vendor/libgit2/CMakeLists.txt +317 -0
  62. data/vendor/libgit2/COPYING +993 -0
  63. data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +30 -0
  64. data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +29 -0
  65. data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +96 -0
  66. data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +11 -0
  67. data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +26 -0
  68. data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +324 -0
  69. data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
  70. data/vendor/libgit2/cmake/Modules/FindIconv.cmake +45 -0
  71. data/vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake +28 -0
  72. data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +28 -0
  73. data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +20 -0
  74. data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
  75. data/vendor/libgit2/cmake/Modules/IdeSplitSources.cmake +22 -0
  76. data/vendor/libgit2/deps/http-parser/CMakeLists.txt +5 -0
  77. data/vendor/libgit2/deps/http-parser/COPYING +23 -0
  78. data/vendor/libgit2/deps/http-parser/http_parser.c +5 -2
  79. data/vendor/libgit2/deps/http-parser/http_parser.h +2 -0
  80. data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
  81. data/vendor/libgit2/deps/regex/COPYING +502 -0
  82. data/vendor/libgit2/deps/regex/regex.c +10 -3
  83. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +26 -0
  84. data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
  85. data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
  86. data/vendor/libgit2/deps/winhttp/urlmon.h +45 -0
  87. data/vendor/libgit2/deps/winhttp/winhttp.def +29 -0
  88. data/vendor/libgit2/deps/winhttp/winhttp.h +594 -0
  89. data/vendor/libgit2/deps/winhttp/winhttp64.def +29 -0
  90. data/vendor/libgit2/deps/zlib/CMakeLists.txt +5 -0
  91. data/vendor/libgit2/deps/zlib/COPYING +27 -0
  92. data/vendor/libgit2/deps/zlib/adler32.c +51 -34
  93. data/vendor/libgit2/deps/zlib/crc32.c +61 -61
  94. data/vendor/libgit2/deps/zlib/crc32.h +1 -1
  95. data/vendor/libgit2/deps/zlib/deflate.c +681 -352
  96. data/vendor/libgit2/deps/zlib/deflate.h +25 -18
  97. data/vendor/libgit2/deps/zlib/gzguts.h +218 -0
  98. data/vendor/libgit2/deps/zlib/infback.c +640 -0
  99. data/vendor/libgit2/deps/zlib/inffast.c +36 -53
  100. data/vendor/libgit2/deps/zlib/inffixed.h +3 -3
  101. data/vendor/libgit2/deps/zlib/inflate.c +167 -86
  102. data/vendor/libgit2/deps/zlib/inflate.h +7 -4
  103. data/vendor/libgit2/deps/zlib/inftrees.c +24 -50
  104. data/vendor/libgit2/deps/zlib/trees.c +55 -96
  105. data/vendor/libgit2/deps/zlib/zconf.h +499 -19
  106. data/vendor/libgit2/deps/zlib/zlib.h +526 -227
  107. data/vendor/libgit2/deps/zlib/zutil.c +39 -32
  108. data/vendor/libgit2/deps/zlib/zutil.h +75 -78
  109. data/vendor/libgit2/include/git2/annotated_commit.h +125 -0
  110. data/vendor/libgit2/include/git2/apply.h +129 -0
  111. data/vendor/libgit2/include/git2/attr.h +36 -21
  112. data/vendor/libgit2/include/git2/blame.h +229 -0
  113. data/vendor/libgit2/include/git2/blob.h +81 -44
  114. data/vendor/libgit2/include/git2/branch.h +81 -42
  115. data/vendor/libgit2/include/git2/buffer.h +128 -0
  116. data/vendor/libgit2/include/git2/checkout.h +141 -67
  117. data/vendor/libgit2/include/git2/cherrypick.h +92 -0
  118. data/vendor/libgit2/include/git2/clone.h +157 -58
  119. data/vendor/libgit2/include/git2/commit.h +231 -12
  120. data/vendor/libgit2/include/git2/common.h +216 -30
  121. data/vendor/libgit2/include/git2/config.h +274 -48
  122. data/vendor/libgit2/include/git2/cred_helpers.h +4 -4
  123. data/vendor/libgit2/include/git2/deprecated.h +253 -0
  124. data/vendor/libgit2/include/git2/describe.h +189 -0
  125. data/vendor/libgit2/include/git2/diff.h +985 -575
  126. data/vendor/libgit2/include/git2/errors.h +93 -52
  127. data/vendor/libgit2/include/git2/filter.h +217 -0
  128. data/vendor/libgit2/include/git2/global.h +44 -0
  129. data/vendor/libgit2/include/git2/graph.h +17 -0
  130. data/vendor/libgit2/include/git2/ignore.h +2 -2
  131. data/vendor/libgit2/include/git2/index.h +269 -94
  132. data/vendor/libgit2/include/git2/indexer.h +44 -12
  133. data/vendor/libgit2/include/git2/mailmap.h +115 -0
  134. data/vendor/libgit2/include/git2/merge.h +501 -64
  135. data/vendor/libgit2/include/git2/message.h +52 -17
  136. data/vendor/libgit2/include/git2/net.h +11 -5
  137. data/vendor/libgit2/include/git2/notes.h +120 -16
  138. data/vendor/libgit2/include/git2/object.h +62 -23
  139. data/vendor/libgit2/include/git2/odb.h +140 -24
  140. data/vendor/libgit2/include/git2/odb_backend.h +56 -12
  141. data/vendor/libgit2/include/git2/oid.h +17 -18
  142. data/vendor/libgit2/include/git2/oidarray.h +40 -0
  143. data/vendor/libgit2/include/git2/pack.h +86 -7
  144. data/vendor/libgit2/include/git2/patch.h +274 -0
  145. data/vendor/libgit2/include/git2/pathspec.h +280 -0
  146. data/vendor/libgit2/include/git2/proxy.h +96 -0
  147. data/vendor/libgit2/include/git2/rebase.h +323 -0
  148. data/vendor/libgit2/include/git2/reflog.h +12 -9
  149. data/vendor/libgit2/include/git2/refs.h +241 -46
  150. data/vendor/libgit2/include/git2/refspec.h +20 -4
  151. data/vendor/libgit2/include/git2/remote.h +636 -209
  152. data/vendor/libgit2/include/git2/repository.h +267 -57
  153. data/vendor/libgit2/include/git2/reset.h +36 -6
  154. data/vendor/libgit2/include/git2/revert.h +91 -0
  155. data/vendor/libgit2/include/git2/revparse.h +27 -16
  156. data/vendor/libgit2/include/git2/revwalk.h +78 -35
  157. data/vendor/libgit2/include/git2/signature.h +32 -5
  158. data/vendor/libgit2/include/git2/stash.h +160 -21
  159. data/vendor/libgit2/include/git2/status.h +92 -30
  160. data/vendor/libgit2/include/git2/submodule.h +226 -133
  161. data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
  162. data/vendor/libgit2/include/git2/sys/commit.h +38 -4
  163. data/vendor/libgit2/include/git2/sys/config.h +68 -9
  164. data/vendor/libgit2/include/git2/sys/diff.h +94 -0
  165. data/vendor/libgit2/include/git2/sys/filter.h +332 -0
  166. data/vendor/libgit2/include/git2/sys/hashsig.h +106 -0
  167. data/vendor/libgit2/include/git2/sys/index.h +6 -5
  168. data/vendor/libgit2/include/git2/sys/mempack.h +86 -0
  169. data/vendor/libgit2/include/git2/sys/merge.h +182 -0
  170. data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -28
  171. data/vendor/libgit2/include/git2/sys/openssl.h +38 -0
  172. data/vendor/libgit2/include/git2/sys/path.h +64 -0
  173. data/vendor/libgit2/include/git2/sys/refdb_backend.h +79 -19
  174. data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
  175. data/vendor/libgit2/include/git2/sys/refs.h +13 -2
  176. data/vendor/libgit2/include/git2/sys/repository.h +64 -1
  177. data/vendor/libgit2/include/git2/sys/stream.h +138 -0
  178. data/vendor/libgit2/include/git2/sys/time.h +31 -0
  179. data/vendor/libgit2/include/git2/sys/transport.h +439 -0
  180. data/vendor/libgit2/include/git2/tag.h +11 -2
  181. data/vendor/libgit2/include/git2/trace.h +1 -1
  182. data/vendor/libgit2/include/git2/transaction.h +121 -0
  183. data/vendor/libgit2/include/git2/transport.h +261 -292
  184. data/vendor/libgit2/include/git2/tree.h +111 -21
  185. data/vendor/libgit2/include/git2/types.h +244 -32
  186. data/vendor/libgit2/include/git2/version.h +5 -2
  187. data/vendor/libgit2/include/git2/worktree.h +255 -0
  188. data/vendor/libgit2/include/git2.h +50 -40
  189. data/vendor/libgit2/libgit2.pc.in +13 -0
  190. data/vendor/libgit2/src/CMakeLists.txt +525 -0
  191. data/vendor/libgit2/src/alloc.c +55 -0
  192. data/vendor/libgit2/src/alloc.h +40 -0
  193. data/vendor/libgit2/src/annotated_commit.c +228 -0
  194. data/vendor/libgit2/src/annotated_commit.h +52 -0
  195. data/vendor/libgit2/src/apply.c +855 -0
  196. data/vendor/libgit2/src/apply.h +25 -0
  197. data/vendor/libgit2/src/array.h +74 -16
  198. data/vendor/libgit2/src/attr.c +239 -408
  199. data/vendor/libgit2/src/attr.h +3 -33
  200. data/vendor/libgit2/src/attr_file.c +424 -156
  201. data/vendor/libgit2/src/attr_file.h +95 -23
  202. data/vendor/libgit2/src/attrcache.c +469 -0
  203. data/vendor/libgit2/src/attrcache.h +37 -5
  204. data/vendor/libgit2/src/bitvec.h +75 -0
  205. data/vendor/libgit2/src/blame.c +532 -0
  206. data/vendor/libgit2/src/blame.h +95 -0
  207. data/vendor/libgit2/src/blame_git.c +668 -0
  208. data/vendor/libgit2/src/blame_git.h +22 -0
  209. data/vendor/libgit2/src/blob.c +233 -129
  210. data/vendor/libgit2/src/blob.h +29 -1
  211. data/vendor/libgit2/src/branch.c +295 -197
  212. data/vendor/libgit2/src/branch.h +2 -0
  213. data/vendor/libgit2/src/buf_text.c +52 -27
  214. data/vendor/libgit2/src/buf_text.h +7 -7
  215. data/vendor/libgit2/src/buffer.c +609 -52
  216. data/vendor/libgit2/src/buffer.h +68 -23
  217. data/vendor/libgit2/src/cache.c +48 -51
  218. data/vendor/libgit2/src/cache.h +6 -4
  219. data/vendor/libgit2/src/cc-compat.h +35 -7
  220. data/vendor/libgit2/src/checkout.c +1827 -483
  221. data/vendor/libgit2/src/checkout.h +4 -1
  222. data/vendor/libgit2/src/cherrypick.c +230 -0
  223. data/vendor/libgit2/src/clone.c +338 -258
  224. data/vendor/libgit2/src/{compress.h → clone.h} +5 -5
  225. data/vendor/libgit2/src/commit.c +711 -124
  226. data/vendor/libgit2/src/commit.h +10 -3
  227. data/vendor/libgit2/src/commit_list.c +21 -14
  228. data/vendor/libgit2/src/commit_list.h +9 -3
  229. data/vendor/libgit2/src/common.h +153 -13
  230. data/vendor/libgit2/src/config.c +871 -242
  231. data/vendor/libgit2/src/config.h +58 -14
  232. data/vendor/libgit2/src/config_backend.h +84 -0
  233. data/vendor/libgit2/src/config_cache.c +44 -18
  234. data/vendor/libgit2/src/config_entries.c +259 -0
  235. data/vendor/libgit2/src/config_entries.h +23 -0
  236. data/vendor/libgit2/src/config_file.c +837 -1113
  237. data/vendor/libgit2/src/config_mem.c +224 -0
  238. data/vendor/libgit2/src/config_parse.c +558 -0
  239. data/vendor/libgit2/src/config_parse.h +64 -0
  240. data/vendor/libgit2/src/crlf.c +290 -195
  241. data/vendor/libgit2/src/date.c +35 -7
  242. data/vendor/libgit2/src/delta.c +275 -71
  243. data/vendor/libgit2/src/delta.h +80 -58
  244. data/vendor/libgit2/src/describe.c +893 -0
  245. data/vendor/libgit2/src/diff.c +330 -1128
  246. data/vendor/libgit2/src/diff.h +25 -67
  247. data/vendor/libgit2/src/diff_driver.c +225 -109
  248. data/vendor/libgit2/src/diff_driver.h +5 -2
  249. data/vendor/libgit2/src/diff_file.c +128 -103
  250. data/vendor/libgit2/src/diff_file.h +17 -12
  251. data/vendor/libgit2/src/diff_generate.c +1622 -0
  252. data/vendor/libgit2/src/diff_generate.h +128 -0
  253. data/vendor/libgit2/src/diff_parse.c +108 -0
  254. data/vendor/libgit2/src/diff_parse.h +20 -0
  255. data/vendor/libgit2/src/diff_print.c +578 -218
  256. data/vendor/libgit2/src/diff_stats.c +362 -0
  257. data/vendor/libgit2/src/diff_tform.c +429 -257
  258. data/vendor/libgit2/src/diff_tform.h +25 -0
  259. data/vendor/libgit2/src/diff_xdiff.c +143 -46
  260. data/vendor/libgit2/src/diff_xdiff.h +12 -5
  261. data/vendor/libgit2/src/errors.c +150 -34
  262. data/vendor/libgit2/src/features.h.in +37 -0
  263. data/vendor/libgit2/src/fetch.c +69 -46
  264. data/vendor/libgit2/src/fetch.h +6 -12
  265. data/vendor/libgit2/src/fetchhead.c +40 -33
  266. data/vendor/libgit2/src/fetchhead.h +5 -4
  267. data/vendor/libgit2/src/filebuf.c +163 -61
  268. data/vendor/libgit2/src/filebuf.h +13 -7
  269. data/vendor/libgit2/src/fileops.c +549 -407
  270. data/vendor/libgit2/src/fileops.h +97 -106
  271. data/vendor/libgit2/src/filter.c +989 -46
  272. data/vendor/libgit2/src/filter.h +21 -70
  273. data/vendor/libgit2/src/fnmatch.c +67 -11
  274. data/vendor/libgit2/src/fnmatch.h +27 -7
  275. data/vendor/libgit2/src/global.c +257 -63
  276. data/vendor/libgit2/src/global.h +19 -0
  277. data/vendor/libgit2/src/graph.c +39 -23
  278. data/vendor/libgit2/src/hash/hash_collisiondetect.h +51 -0
  279. data/vendor/libgit2/src/hash/hash_common_crypto.h +61 -0
  280. data/vendor/libgit2/src/hash/hash_generic.c +3 -3
  281. data/vendor/libgit2/src/hash/hash_generic.h +10 -5
  282. data/vendor/libgit2/src/hash/hash_mbedtls.c +38 -0
  283. data/vendor/libgit2/src/hash/hash_mbedtls.h +24 -0
  284. data/vendor/libgit2/src/hash/hash_openssl.h +26 -8
  285. data/vendor/libgit2/src/hash/hash_win32.c +71 -43
  286. data/vendor/libgit2/src/hash/hash_win32.h +4 -3
  287. data/vendor/libgit2/src/hash/sha1dc/sha1.c +1900 -0
  288. data/vendor/libgit2/src/hash/sha1dc/sha1.h +110 -0
  289. data/vendor/libgit2/src/hash/sha1dc/ubc_check.c +372 -0
  290. data/vendor/libgit2/src/hash/sha1dc/ubc_check.h +52 -0
  291. data/vendor/libgit2/src/hash.c +0 -1
  292. data/vendor/libgit2/src/hash.h +13 -6
  293. data/vendor/libgit2/src/hashsig.c +121 -126
  294. data/vendor/libgit2/src/ident.c +129 -0
  295. data/vendor/libgit2/src/idxmap.c +153 -0
  296. data/vendor/libgit2/src/idxmap.h +41 -0
  297. data/vendor/libgit2/src/ignore.c +362 -123
  298. data/vendor/libgit2/src/ignore.h +16 -4
  299. data/vendor/libgit2/src/index.c +2131 -692
  300. data/vendor/libgit2/src/index.h +138 -6
  301. data/vendor/libgit2/src/indexer.c +866 -266
  302. data/vendor/libgit2/src/indexer.h +16 -0
  303. data/vendor/libgit2/src/integer.h +106 -0
  304. data/vendor/libgit2/src/iterator.c +1888 -967
  305. data/vendor/libgit2/src/iterator.h +130 -67
  306. data/vendor/libgit2/src/khash.h +43 -29
  307. data/vendor/libgit2/src/mailmap.c +485 -0
  308. data/vendor/libgit2/src/mailmap.h +35 -0
  309. data/vendor/libgit2/src/map.h +1 -1
  310. data/vendor/libgit2/src/merge.c +1679 -479
  311. data/vendor/libgit2/src/merge.h +89 -22
  312. data/vendor/libgit2/src/merge_driver.c +426 -0
  313. data/vendor/libgit2/src/merge_driver.h +62 -0
  314. data/vendor/libgit2/src/merge_file.c +238 -101
  315. data/vendor/libgit2/src/message.c +4 -28
  316. data/vendor/libgit2/src/message.h +3 -1
  317. data/vendor/libgit2/src/mwindow.c +123 -15
  318. data/vendor/libgit2/src/mwindow.h +10 -1
  319. data/vendor/libgit2/src/netops.c +178 -499
  320. data/vendor/libgit2/src/netops.h +51 -27
  321. data/vendor/libgit2/src/notes.c +251 -94
  322. data/vendor/libgit2/src/notes.h +5 -2
  323. data/vendor/libgit2/src/object.c +253 -67
  324. data/vendor/libgit2/src/object.h +40 -2
  325. data/vendor/libgit2/src/object_api.c +30 -11
  326. data/vendor/libgit2/src/odb.c +765 -201
  327. data/vendor/libgit2/src/odb.h +40 -8
  328. data/vendor/libgit2/src/odb_loose.c +560 -346
  329. data/vendor/libgit2/src/odb_mempack.c +185 -0
  330. data/vendor/libgit2/src/odb_pack.c +117 -73
  331. data/vendor/libgit2/src/offmap.c +113 -0
  332. data/vendor/libgit2/src/offmap.h +32 -42
  333. data/vendor/libgit2/src/oid.c +45 -25
  334. data/vendor/libgit2/src/oid.h +26 -8
  335. data/vendor/libgit2/src/oidarray.c +34 -0
  336. data/vendor/libgit2/src/oidarray.h +20 -0
  337. data/vendor/libgit2/src/oidmap.c +125 -0
  338. data/vendor/libgit2/src/oidmap.h +30 -17
  339. data/vendor/libgit2/src/pack-objects.c +688 -265
  340. data/vendor/libgit2/src/pack-objects.h +27 -13
  341. data/vendor/libgit2/src/pack.c +418 -202
  342. data/vendor/libgit2/src/pack.h +25 -16
  343. data/vendor/libgit2/src/parse.c +124 -0
  344. data/vendor/libgit2/src/parse.h +61 -0
  345. data/vendor/libgit2/src/patch.c +223 -0
  346. data/vendor/libgit2/src/patch.h +68 -0
  347. data/vendor/libgit2/src/patch_generate.c +901 -0
  348. data/vendor/libgit2/src/patch_generate.h +69 -0
  349. data/vendor/libgit2/src/patch_parse.c +1136 -0
  350. data/vendor/libgit2/src/patch_parse.h +51 -0
  351. data/vendor/libgit2/src/path.c +1247 -241
  352. data/vendor/libgit2/src/path.h +353 -57
  353. data/vendor/libgit2/src/pathspec.c +586 -58
  354. data/vendor/libgit2/src/pathspec.h +37 -15
  355. data/vendor/libgit2/src/pool.c +134 -221
  356. data/vendor/libgit2/src/pool.h +38 -50
  357. data/vendor/libgit2/src/posix.c +76 -10
  358. data/vendor/libgit2/src/posix.h +74 -32
  359. data/vendor/libgit2/src/pqueue.c +79 -117
  360. data/vendor/libgit2/src/pqueue.h +38 -82
  361. data/vendor/libgit2/src/proxy.c +39 -0
  362. data/vendor/libgit2/src/proxy.h +17 -0
  363. data/vendor/libgit2/src/push.c +178 -279
  364. data/vendor/libgit2/src/push.h +93 -4
  365. data/vendor/libgit2/src/reader.c +265 -0
  366. data/vendor/libgit2/src/reader.h +107 -0
  367. data/vendor/libgit2/src/rebase.c +1364 -0
  368. data/vendor/libgit2/src/refdb.c +74 -19
  369. data/vendor/libgit2/src/refdb.h +16 -3
  370. data/vendor/libgit2/src/refdb_fs.c +1472 -603
  371. data/vendor/libgit2/src/refdb_fs.h +4 -0
  372. data/vendor/libgit2/src/reflog.c +40 -330
  373. data/vendor/libgit2/src/reflog.h +8 -2
  374. data/vendor/libgit2/src/refs.c +641 -225
  375. data/vendor/libgit2/src/refs.h +53 -6
  376. data/vendor/libgit2/src/refspec.c +175 -62
  377. data/vendor/libgit2/src/refspec.h +10 -25
  378. data/vendor/libgit2/src/remote.c +1741 -723
  379. data/vendor/libgit2/src/remote.h +17 -5
  380. data/vendor/libgit2/src/repository.c +1505 -421
  381. data/vendor/libgit2/src/repository.h +95 -15
  382. data/vendor/libgit2/src/reset.c +63 -26
  383. data/vendor/libgit2/src/revert.c +232 -0
  384. data/vendor/libgit2/src/revparse.c +94 -80
  385. data/vendor/libgit2/src/revwalk.c +427 -194
  386. data/vendor/libgit2/src/revwalk.h +14 -5
  387. data/vendor/libgit2/src/settings.c +290 -0
  388. data/vendor/libgit2/src/sha1_lookup.c +16 -159
  389. data/vendor/libgit2/src/sha1_lookup.h +5 -4
  390. data/vendor/libgit2/src/signature.c +138 -26
  391. data/vendor/libgit2/src/signature.h +5 -0
  392. data/vendor/libgit2/src/sortedcache.c +395 -0
  393. data/vendor/libgit2/src/sortedcache.h +180 -0
  394. data/vendor/libgit2/src/stash.c +629 -168
  395. data/vendor/libgit2/src/status.c +125 -75
  396. data/vendor/libgit2/src/status.h +4 -2
  397. data/vendor/libgit2/src/stdalloc.c +120 -0
  398. data/vendor/libgit2/src/stdalloc.h +17 -0
  399. data/vendor/libgit2/src/stream.h +86 -0
  400. data/vendor/libgit2/src/streams/mbedtls.c +483 -0
  401. data/vendor/libgit2/src/streams/mbedtls.h +23 -0
  402. data/vendor/libgit2/src/streams/openssl.c +789 -0
  403. data/vendor/libgit2/src/streams/openssl.h +23 -0
  404. data/vendor/libgit2/src/streams/registry.c +118 -0
  405. data/vendor/libgit2/src/streams/registry.h +19 -0
  406. data/vendor/libgit2/src/streams/socket.c +235 -0
  407. data/vendor/libgit2/src/streams/socket.h +23 -0
  408. data/vendor/libgit2/src/streams/stransport.c +323 -0
  409. data/vendor/libgit2/src/streams/stransport.h +21 -0
  410. data/vendor/libgit2/src/streams/tls.c +73 -0
  411. data/vendor/libgit2/src/streams/tls.h +31 -0
  412. data/vendor/libgit2/src/strmap.c +147 -0
  413. data/vendor/libgit2/src/strmap.h +46 -51
  414. data/vendor/libgit2/src/strnlen.h +24 -0
  415. data/vendor/libgit2/src/submodule.c +1633 -877
  416. data/vendor/libgit2/src/submodule.h +83 -21
  417. data/vendor/libgit2/src/sysdir.c +355 -0
  418. data/vendor/libgit2/src/sysdir.h +119 -0
  419. data/vendor/libgit2/src/tag.c +87 -62
  420. data/vendor/libgit2/src/tag.h +4 -1
  421. data/vendor/libgit2/src/thread-utils.c +3 -0
  422. data/vendor/libgit2/src/thread-utils.h +71 -35
  423. data/vendor/libgit2/src/trace.c +4 -4
  424. data/vendor/libgit2/src/trace.h +11 -3
  425. data/vendor/libgit2/src/trailer.c +416 -0
  426. data/vendor/libgit2/src/transaction.c +382 -0
  427. data/vendor/libgit2/src/transaction.h +14 -0
  428. data/vendor/libgit2/src/transport.c +133 -67
  429. data/vendor/libgit2/src/transports/auth.c +75 -0
  430. data/vendor/libgit2/src/transports/auth.h +64 -0
  431. data/vendor/libgit2/src/transports/auth_negotiate.c +277 -0
  432. data/vendor/libgit2/src/transports/auth_negotiate.h +27 -0
  433. data/vendor/libgit2/src/transports/cred.c +296 -68
  434. data/vendor/libgit2/src/transports/cred.h +16 -0
  435. data/vendor/libgit2/src/transports/cred_helpers.c +4 -0
  436. data/vendor/libgit2/src/transports/git.c +108 -90
  437. data/vendor/libgit2/src/transports/http.c +803 -258
  438. data/vendor/libgit2/src/transports/http.h +25 -0
  439. data/vendor/libgit2/src/transports/local.c +265 -169
  440. data/vendor/libgit2/src/transports/smart.c +255 -45
  441. data/vendor/libgit2/src/transports/smart.h +42 -22
  442. data/vendor/libgit2/src/transports/smart_pkt.c +250 -159
  443. data/vendor/libgit2/src/transports/smart_protocol.c +414 -196
  444. data/vendor/libgit2/src/transports/ssh.c +645 -236
  445. data/vendor/libgit2/src/transports/ssh.h +14 -0
  446. data/vendor/libgit2/src/transports/winhttp.c +809 -353
  447. data/vendor/libgit2/src/tree-cache.c +138 -52
  448. data/vendor/libgit2/src/tree-cache.h +14 -7
  449. data/vendor/libgit2/src/tree.c +620 -259
  450. data/vendor/libgit2/src/tree.h +12 -19
  451. data/vendor/libgit2/src/tsort.c +3 -2
  452. data/vendor/libgit2/src/unix/map.c +25 -7
  453. data/vendor/libgit2/src/unix/posix.h +77 -12
  454. data/vendor/libgit2/src/unix/pthread.h +56 -0
  455. data/vendor/libgit2/src/unix/realpath.c +12 -8
  456. data/vendor/libgit2/src/userdiff.h +208 -0
  457. data/vendor/libgit2/src/util.c +349 -165
  458. data/vendor/libgit2/src/util.h +167 -85
  459. data/vendor/libgit2/src/varint.c +43 -0
  460. data/vendor/libgit2/src/varint.h +17 -0
  461. data/vendor/libgit2/src/vector.c +156 -33
  462. data/vendor/libgit2/src/vector.h +41 -5
  463. data/vendor/libgit2/src/win32/dir.c +22 -42
  464. data/vendor/libgit2/src/win32/dir.h +7 -5
  465. data/vendor/libgit2/src/win32/error.c +6 -32
  466. data/vendor/libgit2/src/win32/error.h +4 -2
  467. data/vendor/libgit2/src/win32/findfile.c +62 -69
  468. data/vendor/libgit2/src/win32/findfile.h +5 -13
  469. data/vendor/libgit2/src/win32/git2.rc +44 -0
  470. data/vendor/libgit2/src/win32/map.c +39 -11
  471. data/vendor/libgit2/src/win32/mingw-compat.h +10 -11
  472. data/vendor/libgit2/src/win32/msvc-compat.h +10 -33
  473. data/vendor/libgit2/src/win32/path_w32.c +476 -0
  474. data/vendor/libgit2/src/win32/path_w32.h +104 -0
  475. data/vendor/libgit2/src/win32/posix.h +35 -30
  476. data/vendor/libgit2/src/win32/posix_w32.c +659 -327
  477. data/vendor/libgit2/src/win32/precompiled.h +7 -2
  478. data/vendor/libgit2/src/win32/reparse.h +57 -0
  479. data/vendor/libgit2/src/win32/thread.c +258 -0
  480. data/vendor/libgit2/src/win32/thread.h +64 -0
  481. data/vendor/libgit2/src/win32/utf-conv.c +127 -62
  482. data/vendor/libgit2/src/win32/utf-conv.h +47 -6
  483. data/vendor/libgit2/src/win32/version.h +21 -4
  484. data/vendor/libgit2/src/win32/w32_buffer.c +54 -0
  485. data/vendor/libgit2/src/win32/w32_buffer.h +20 -0
  486. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +438 -0
  487. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +129 -0
  488. data/vendor/libgit2/src/win32/w32_stack.c +193 -0
  489. data/vendor/libgit2/src/win32/w32_stack.h +140 -0
  490. data/vendor/libgit2/src/win32/w32_util.c +95 -0
  491. data/vendor/libgit2/src/win32/w32_util.h +170 -0
  492. data/vendor/libgit2/src/win32/win32-compat.h +52 -0
  493. data/vendor/libgit2/src/worktree.c +578 -0
  494. data/vendor/libgit2/src/worktree.h +39 -0
  495. data/vendor/libgit2/src/xdiff/xdiff.h +33 -18
  496. data/vendor/libgit2/src/xdiff/xdiffi.c +578 -88
  497. data/vendor/libgit2/src/xdiff/xdiffi.h +3 -2
  498. data/vendor/libgit2/src/xdiff/xemit.c +106 -45
  499. data/vendor/libgit2/src/xdiff/xemit.h +3 -3
  500. data/vendor/libgit2/src/xdiff/xhistogram.c +5 -4
  501. data/vendor/libgit2/src/xdiff/xinclude.h +3 -2
  502. data/vendor/libgit2/src/xdiff/xmacros.h +2 -2
  503. data/vendor/libgit2/src/xdiff/xmerge.c +167 -48
  504. data/vendor/libgit2/src/xdiff/xpatience.c +42 -10
  505. data/vendor/libgit2/src/xdiff/xprepare.c +14 -14
  506. data/vendor/libgit2/src/xdiff/xprepare.h +2 -2
  507. data/vendor/libgit2/src/xdiff/xtypes.h +2 -2
  508. data/vendor/libgit2/src/xdiff/xutils.c +60 -56
  509. data/vendor/libgit2/src/xdiff/xutils.h +3 -5
  510. data/vendor/libgit2/src/zstream.c +205 -0
  511. data/vendor/libgit2/src/zstream.h +53 -0
  512. metadata +281 -233
  513. data/Rakefile +0 -61
  514. data/ext/rugged/rugged_diff_patch.c +0 -169
  515. data/lib/rugged/diff/patch.rb +0 -28
  516. data/test/blob_test.rb +0 -341
  517. data/test/branch_test.rb +0 -199
  518. data/test/commit_test.rb +0 -104
  519. data/test/config_test.rb +0 -45
  520. data/test/coverage/cover.rb +0 -133
  521. data/test/diff_test.rb +0 -777
  522. data/test/errors_test.rb +0 -34
  523. data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
  524. data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
  525. data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
  526. data/test/fixtures/archive.tar.gz +0 -0
  527. data/test/fixtures/attr/attr0 +0 -1
  528. data/test/fixtures/attr/attr1 +0 -29
  529. data/test/fixtures/attr/attr2 +0 -21
  530. data/test/fixtures/attr/attr3 +0 -4
  531. data/test/fixtures/attr/binfile +0 -1
  532. data/test/fixtures/attr/dir/file +0 -0
  533. data/test/fixtures/attr/file +0 -1
  534. data/test/fixtures/attr/gitattributes +0 -29
  535. data/test/fixtures/attr/gitignore +0 -2
  536. data/test/fixtures/attr/ign +0 -1
  537. data/test/fixtures/attr/macro_bad +0 -1
  538. data/test/fixtures/attr/macro_test +0 -1
  539. data/test/fixtures/attr/root_test1 +0 -1
  540. data/test/fixtures/attr/root_test2 +0 -6
  541. data/test/fixtures/attr/root_test3 +0 -19
  542. data/test/fixtures/attr/root_test4.txt +0 -14
  543. data/test/fixtures/attr/sub/abc +0 -37
  544. data/test/fixtures/attr/sub/dir/file +0 -0
  545. data/test/fixtures/attr/sub/file +0 -1
  546. data/test/fixtures/attr/sub/ign/file +0 -1
  547. data/test/fixtures/attr/sub/ign/sub/file +0 -1
  548. data/test/fixtures/attr/sub/sub/dir +0 -0
  549. data/test/fixtures/attr/sub/sub/file +0 -1
  550. data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
  551. data/test/fixtures/attr/sub/subdir_test1 +0 -2
  552. data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
  553. data/test/fixtures/diff/another.txt +0 -38
  554. data/test/fixtures/diff/readme.txt +0 -36
  555. data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
  556. data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
  557. data/test/fixtures/mergedrepo/one.txt +0 -10
  558. data/test/fixtures/mergedrepo/two.txt +0 -12
  559. data/test/fixtures/status/current_file +0 -1
  560. data/test/fixtures/status/ignored_file +0 -1
  561. data/test/fixtures/status/modified_file +0 -2
  562. data/test/fixtures/status/new_file +0 -1
  563. data/test/fixtures/status/staged_changes +0 -2
  564. data/test/fixtures/status/staged_changes_modified_file +0 -3
  565. data/test/fixtures/status/staged_delete_modified_file +0 -1
  566. data/test/fixtures/status/staged_new_file +0 -1
  567. data/test/fixtures/status/staged_new_file_modified_file +0 -2
  568. data/test/fixtures/status/subdir/current_file +0 -1
  569. data/test/fixtures/status/subdir/modified_file +0 -2
  570. data/test/fixtures/status/subdir/new_file +0 -1
  571. data/test/fixtures/status/subdir.txt +0 -2
  572. data/test/fixtures/status//350/277/231 +0 -1
  573. data/test/fixtures/testrepo.git/HEAD +0 -1
  574. data/test/fixtures/testrepo.git/config +0 -13
  575. data/test/fixtures/testrepo.git/description +0 -1
  576. data/test/fixtures/testrepo.git/index +0 -0
  577. data/test/fixtures/testrepo.git/info/exclude +0 -6
  578. data/test/fixtures/testrepo.git/logs/HEAD +0 -3
  579. data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
  580. data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
  581. data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
  582. data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
  583. data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
  584. data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
  585. data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
  586. data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
  587. data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
  588. data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
  589. data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
  590. data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
  591. data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
  592. data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
  593. data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
  594. data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
  595. data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
  596. data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
  597. data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
  598. data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
  599. data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
  600. data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
  601. data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
  602. data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
  603. data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
  604. data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
  605. data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
  606. data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
  607. data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
  608. data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  609. data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
  610. data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
  611. data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
  612. data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
  613. data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
  614. data/test/fixtures/testrepo.git/packed-refs +0 -2
  615. data/test/fixtures/testrepo.git/refs/heads/master +0 -1
  616. data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
  617. data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
  618. data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
  619. data/test/fixtures/text_file.md +0 -464
  620. data/test/fixtures/unsymlinked.git/HEAD +0 -1
  621. data/test/fixtures/unsymlinked.git/config +0 -6
  622. data/test/fixtures/unsymlinked.git/description +0 -1
  623. data/test/fixtures/unsymlinked.git/info/exclude +0 -2
  624. data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
  625. data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
  626. data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
  627. data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
  628. data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
  629. data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
  630. data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
  631. data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
  632. data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
  633. data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
  634. data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
  635. data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
  636. data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
  637. data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
  638. data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
  639. data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
  640. data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
  641. data/test/index_test.rb +0 -333
  642. data/test/lib_test.rb +0 -127
  643. data/test/note_test.rb +0 -158
  644. data/test/object_test.rb +0 -43
  645. data/test/reference_test.rb +0 -207
  646. data/test/remote_test.rb +0 -324
  647. data/test/repo_pack_test.rb +0 -24
  648. data/test/repo_reset_test.rb +0 -82
  649. data/test/repo_test.rb +0 -402
  650. data/test/tag_test.rb +0 -68
  651. data/test/test_helper.rb +0 -92
  652. data/test/tree_test.rb +0 -91
  653. data/test/walker_test.rb +0 -88
  654. data/vendor/libgit2/Makefile.embed +0 -42
  655. data/vendor/libgit2/include/git2/push.h +0 -131
  656. data/vendor/libgit2/include/git2/threads.h +0 -50
  657. data/vendor/libgit2/src/amiga/map.c +0 -48
  658. data/vendor/libgit2/src/bswap.h +0 -97
  659. data/vendor/libgit2/src/compress.c +0 -53
  660. data/vendor/libgit2/src/config_file.h +0 -60
  661. data/vendor/libgit2/src/delta-apply.c +0 -134
  662. data/vendor/libgit2/src/delta-apply.h +0 -50
  663. data/vendor/libgit2/src/diff_patch.c +0 -995
  664. data/vendor/libgit2/src/diff_patch.h +0 -46
  665. data/vendor/libgit2/src/hashsig.h +0 -72
  666. data/vendor/libgit2/src/merge_file.h +0 -71
  667. data/vendor/libgit2/src/win32/pthread.c +0 -144
  668. data/vendor/libgit2/src/win32/pthread.h +0 -50
@@ -0,0 +1,578 @@
1
+ /*
2
+ * Copyright (C) the libgit2 contributors. All rights reserved.
3
+ *
4
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
5
+ * a Linking Exception. For full terms see the included COPYING file.
6
+ */
7
+
8
+ #include "worktree.h"
9
+
10
+ #include "git2/branch.h"
11
+ #include "git2/commit.h"
12
+ #include "git2/worktree.h"
13
+
14
+ #include "repository.h"
15
+
16
+ static bool is_worktree_dir(const char *dir)
17
+ {
18
+ git_buf buf = GIT_BUF_INIT;
19
+ int error;
20
+
21
+ if (git_buf_sets(&buf, dir) < 0)
22
+ return -1;
23
+
24
+ error = git_path_contains_file(&buf, "commondir")
25
+ && git_path_contains_file(&buf, "gitdir")
26
+ && git_path_contains_file(&buf, "HEAD");
27
+
28
+ git_buf_dispose(&buf);
29
+ return error;
30
+ }
31
+
32
+ int git_worktree_list(git_strarray *wts, git_repository *repo)
33
+ {
34
+ git_vector worktrees = GIT_VECTOR_INIT;
35
+ git_buf path = GIT_BUF_INIT;
36
+ char *worktree;
37
+ unsigned i, len;
38
+ int error;
39
+
40
+ assert(wts && repo);
41
+
42
+ wts->count = 0;
43
+ wts->strings = NULL;
44
+
45
+ if ((error = git_buf_printf(&path, "%s/worktrees/", repo->commondir)) < 0)
46
+ goto exit;
47
+ if (!git_path_exists(path.ptr) || git_path_is_empty_dir(path.ptr))
48
+ goto exit;
49
+ if ((error = git_path_dirload(&worktrees, path.ptr, path.size, 0x0)) < 0)
50
+ goto exit;
51
+
52
+ len = path.size;
53
+
54
+ git_vector_foreach(&worktrees, i, worktree) {
55
+ git_buf_truncate(&path, len);
56
+ git_buf_puts(&path, worktree);
57
+
58
+ if (!is_worktree_dir(path.ptr)) {
59
+ git_vector_remove(&worktrees, i);
60
+ git__free(worktree);
61
+ }
62
+ }
63
+
64
+ wts->strings = (char **)git_vector_detach(&wts->count, NULL, &worktrees);
65
+
66
+ exit:
67
+ git_buf_dispose(&path);
68
+
69
+ return error;
70
+ }
71
+
72
+ char *git_worktree__read_link(const char *base, const char *file)
73
+ {
74
+ git_buf path = GIT_BUF_INIT, buf = GIT_BUF_INIT;
75
+
76
+ assert(base && file);
77
+
78
+ if (git_buf_joinpath(&path, base, file) < 0)
79
+ goto err;
80
+ if (git_futils_readbuffer(&buf, path.ptr) < 0)
81
+ goto err;
82
+ git_buf_dispose(&path);
83
+
84
+ git_buf_rtrim(&buf);
85
+
86
+ if (!git_path_is_relative(buf.ptr))
87
+ return git_buf_detach(&buf);
88
+
89
+ if (git_buf_sets(&path, base) < 0)
90
+ goto err;
91
+ if (git_path_apply_relative(&path, buf.ptr) < 0)
92
+ goto err;
93
+ git_buf_dispose(&buf);
94
+
95
+ return git_buf_detach(&path);
96
+
97
+ err:
98
+ git_buf_dispose(&buf);
99
+ git_buf_dispose(&path);
100
+
101
+ return NULL;
102
+ }
103
+
104
+ static int write_wtfile(const char *base, const char *file, const git_buf *buf)
105
+ {
106
+ git_buf path = GIT_BUF_INIT;
107
+ int err;
108
+
109
+ assert(base && file && buf);
110
+
111
+ if ((err = git_buf_joinpath(&path, base, file)) < 0)
112
+ goto out;
113
+
114
+ if ((err = git_futils_writebuffer(buf, path.ptr, O_CREAT|O_EXCL|O_WRONLY, 0644)) < 0)
115
+ goto out;
116
+
117
+ out:
118
+ git_buf_dispose(&path);
119
+
120
+ return err;
121
+ }
122
+
123
+ static int open_worktree_dir(git_worktree **out, const char *parent, const char *dir, const char *name)
124
+ {
125
+ git_buf gitdir = GIT_BUF_INIT;
126
+ git_worktree *wt = NULL;
127
+ int error = 0;
128
+
129
+ if (!is_worktree_dir(dir)) {
130
+ error = -1;
131
+ goto out;
132
+ }
133
+
134
+ if ((wt = git__calloc(1, sizeof(*wt))) == NULL) {
135
+ error = -1;
136
+ goto out;
137
+ }
138
+
139
+ if ((wt->name = git__strdup(name)) == NULL
140
+ || (wt->commondir_path = git_worktree__read_link(dir, "commondir")) == NULL
141
+ || (wt->gitlink_path = git_worktree__read_link(dir, "gitdir")) == NULL
142
+ || (parent && (wt->parent_path = git__strdup(parent)) == NULL)
143
+ || (wt->worktree_path = git_path_dirname(wt->gitlink_path)) == NULL) {
144
+ error = -1;
145
+ goto out;
146
+ }
147
+
148
+ if ((error = git_path_prettify_dir(&gitdir, dir, NULL)) < 0)
149
+ goto out;
150
+ wt->gitdir_path = git_buf_detach(&gitdir);
151
+
152
+ wt->locked = !!git_worktree_is_locked(NULL, wt);
153
+
154
+ *out = wt;
155
+
156
+ out:
157
+ if (error)
158
+ git_worktree_free(wt);
159
+ git_buf_dispose(&gitdir);
160
+
161
+ return error;
162
+ }
163
+
164
+ int git_worktree_lookup(git_worktree **out, git_repository *repo, const char *name)
165
+ {
166
+ git_buf path = GIT_BUF_INIT;
167
+ git_worktree *wt = NULL;
168
+ int error;
169
+
170
+ assert(repo && name);
171
+
172
+ *out = NULL;
173
+
174
+ if ((error = git_buf_printf(&path, "%s/worktrees/%s", repo->commondir, name)) < 0)
175
+ goto out;
176
+
177
+ if ((error = (open_worktree_dir(out, git_repository_workdir(repo), path.ptr, name))) < 0)
178
+ goto out;
179
+
180
+ out:
181
+ git_buf_dispose(&path);
182
+
183
+ if (error)
184
+ git_worktree_free(wt);
185
+
186
+ return error;
187
+ }
188
+
189
+ int git_worktree_open_from_repository(git_worktree **out, git_repository *repo)
190
+ {
191
+ git_buf parent = GIT_BUF_INIT;
192
+ const char *gitdir, *commondir;
193
+ char *name = NULL;
194
+ int error = 0;
195
+
196
+ if (!git_repository_is_worktree(repo)) {
197
+ git_error_set(GIT_ERROR_WORKTREE, "cannot open worktree of a non-worktree repo");
198
+ error = -1;
199
+ goto out;
200
+ }
201
+
202
+ gitdir = git_repository_path(repo);
203
+ commondir = git_repository_commondir(repo);
204
+
205
+ if ((error = git_path_prettify_dir(&parent, "..", commondir)) < 0)
206
+ goto out;
207
+
208
+ /* The name is defined by the last component in '.git/worktree/%s' */
209
+ name = git_path_basename(gitdir);
210
+
211
+ if ((error = open_worktree_dir(out, parent.ptr, gitdir, name)) < 0)
212
+ goto out;
213
+
214
+ out:
215
+ git__free(name);
216
+ git_buf_dispose(&parent);
217
+
218
+ return error;
219
+ }
220
+
221
+ void git_worktree_free(git_worktree *wt)
222
+ {
223
+ if (!wt)
224
+ return;
225
+
226
+ git__free(wt->commondir_path);
227
+ git__free(wt->worktree_path);
228
+ git__free(wt->gitlink_path);
229
+ git__free(wt->gitdir_path);
230
+ git__free(wt->parent_path);
231
+ git__free(wt->name);
232
+ git__free(wt);
233
+ }
234
+
235
+ int git_worktree_validate(const git_worktree *wt)
236
+ {
237
+ assert(wt);
238
+
239
+ if (!is_worktree_dir(wt->gitdir_path)) {
240
+ git_error_set(GIT_ERROR_WORKTREE,
241
+ "Worktree gitdir ('%s') is not valid",
242
+ wt->gitlink_path);
243
+ return GIT_ERROR;
244
+ }
245
+
246
+ if (wt->parent_path && !git_path_exists(wt->parent_path)) {
247
+ git_error_set(GIT_ERROR_WORKTREE,
248
+ "Worktree parent directory ('%s') does not exist ",
249
+ wt->parent_path);
250
+ return GIT_ERROR;
251
+ }
252
+
253
+ if (!git_path_exists(wt->commondir_path)) {
254
+ git_error_set(GIT_ERROR_WORKTREE,
255
+ "Worktree common directory ('%s') does not exist ",
256
+ wt->commondir_path);
257
+ return GIT_ERROR;
258
+ }
259
+
260
+ return 0;
261
+ }
262
+
263
+ int git_worktree_add_init_options(git_worktree_add_options *opts,
264
+ unsigned int version)
265
+ {
266
+ GIT_INIT_STRUCTURE_FROM_TEMPLATE(opts, version,
267
+ git_worktree_add_options, GIT_WORKTREE_ADD_OPTIONS_INIT);
268
+ return 0;
269
+ }
270
+
271
+ int git_worktree_add(git_worktree **out, git_repository *repo,
272
+ const char *name, const char *worktree,
273
+ const git_worktree_add_options *opts)
274
+ {
275
+ git_buf gitdir = GIT_BUF_INIT, wddir = GIT_BUF_INIT, buf = GIT_BUF_INIT;
276
+ git_reference *ref = NULL, *head = NULL;
277
+ git_commit *commit = NULL;
278
+ git_repository *wt = NULL;
279
+ git_checkout_options coopts = GIT_CHECKOUT_OPTIONS_INIT;
280
+ git_worktree_add_options wtopts = GIT_WORKTREE_ADD_OPTIONS_INIT;
281
+ int err;
282
+
283
+ GIT_ERROR_CHECK_VERSION(
284
+ opts, GIT_WORKTREE_ADD_OPTIONS_VERSION, "git_worktree_add_options");
285
+
286
+ if (opts)
287
+ memcpy(&wtopts, opts, sizeof(wtopts));
288
+
289
+ assert(out && repo && name && worktree);
290
+
291
+ *out = NULL;
292
+
293
+ /* Create gitdir directory ".git/worktrees/<name>" */
294
+ if ((err = git_buf_joinpath(&gitdir, repo->commondir, "worktrees")) < 0)
295
+ goto out;
296
+ if (!git_path_exists(gitdir.ptr))
297
+ if ((err = git_futils_mkdir(gitdir.ptr, 0755, GIT_MKDIR_EXCL)) < 0)
298
+ goto out;
299
+ if ((err = git_buf_joinpath(&gitdir, gitdir.ptr, name)) < 0)
300
+ goto out;
301
+ if ((err = git_futils_mkdir(gitdir.ptr, 0755, GIT_MKDIR_EXCL)) < 0)
302
+ goto out;
303
+ if ((err = git_path_prettify_dir(&gitdir, gitdir.ptr, NULL)) < 0)
304
+ goto out;
305
+
306
+ /* Create worktree work dir */
307
+ if ((err = git_futils_mkdir(worktree, 0755, GIT_MKDIR_EXCL)) < 0)
308
+ goto out;
309
+ if ((err = git_path_prettify_dir(&wddir, worktree, NULL)) < 0)
310
+ goto out;
311
+
312
+ if (wtopts.lock) {
313
+ int fd;
314
+
315
+ if ((err = git_buf_joinpath(&buf, gitdir.ptr, "locked")) < 0)
316
+ goto out;
317
+
318
+ if ((fd = p_creat(buf.ptr, 0644)) < 0) {
319
+ err = fd;
320
+ goto out;
321
+ }
322
+
323
+ p_close(fd);
324
+ git_buf_clear(&buf);
325
+ }
326
+
327
+ /* Create worktree .git file */
328
+ if ((err = git_buf_printf(&buf, "gitdir: %s\n", gitdir.ptr)) < 0)
329
+ goto out;
330
+ if ((err = write_wtfile(wddir.ptr, ".git", &buf)) < 0)
331
+ goto out;
332
+
333
+ /* Create gitdir files */
334
+ if ((err = git_path_prettify_dir(&buf, repo->commondir, NULL) < 0)
335
+ || (err = git_buf_putc(&buf, '\n')) < 0
336
+ || (err = write_wtfile(gitdir.ptr, "commondir", &buf)) < 0)
337
+ goto out;
338
+ if ((err = git_buf_joinpath(&buf, wddir.ptr, ".git")) < 0
339
+ || (err = git_buf_putc(&buf, '\n')) < 0
340
+ || (err = write_wtfile(gitdir.ptr, "gitdir", &buf)) < 0)
341
+ goto out;
342
+
343
+ /* Set up worktree reference */
344
+ if (wtopts.ref) {
345
+ if (!git_reference_is_branch(wtopts.ref)) {
346
+ git_error_set(GIT_ERROR_WORKTREE, "reference is not a branch");
347
+ err = -1;
348
+ goto out;
349
+ }
350
+
351
+ if (git_branch_is_checked_out(wtopts.ref)) {
352
+ git_error_set(GIT_ERROR_WORKTREE, "reference is already checked out");
353
+ err = -1;
354
+ goto out;
355
+ }
356
+
357
+ if ((err = git_reference_dup(&ref, wtopts.ref)) < 0)
358
+ goto out;
359
+ } else {
360
+ if ((err = git_repository_head(&head, repo)) < 0)
361
+ goto out;
362
+ if ((err = git_commit_lookup(&commit, repo, &head->target.oid)) < 0)
363
+ goto out;
364
+ if ((err = git_branch_create(&ref, repo, name, commit, false)) < 0)
365
+ goto out;
366
+ }
367
+
368
+ /* Set worktree's HEAD */
369
+ if ((err = git_repository_create_head(gitdir.ptr, git_reference_name(ref))) < 0)
370
+ goto out;
371
+ if ((err = git_repository_open(&wt, wddir.ptr)) < 0)
372
+ goto out;
373
+
374
+ /* Checkout worktree's HEAD */
375
+ coopts.checkout_strategy = GIT_CHECKOUT_FORCE;
376
+ if ((err = git_checkout_head(wt, &coopts)) < 0)
377
+ goto out;
378
+
379
+ /* Load result */
380
+ if ((err = git_worktree_lookup(out, repo, name)) < 0)
381
+ goto out;
382
+
383
+ out:
384
+ git_buf_dispose(&gitdir);
385
+ git_buf_dispose(&wddir);
386
+ git_buf_dispose(&buf);
387
+ git_reference_free(ref);
388
+ git_reference_free(head);
389
+ git_commit_free(commit);
390
+ git_repository_free(wt);
391
+
392
+ return err;
393
+ }
394
+
395
+ int git_worktree_lock(git_worktree *wt, const char *reason)
396
+ {
397
+ git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
398
+ int err;
399
+
400
+ assert(wt);
401
+
402
+ if ((err = git_worktree_is_locked(NULL, wt)) < 0)
403
+ goto out;
404
+
405
+ if ((err = git_buf_joinpath(&path, wt->gitdir_path, "locked")) < 0)
406
+ goto out;
407
+
408
+ if (reason)
409
+ git_buf_attach_notowned(&buf, reason, strlen(reason));
410
+
411
+ if ((err = git_futils_writebuffer(&buf, path.ptr, O_CREAT|O_EXCL|O_WRONLY, 0644)) < 0)
412
+ goto out;
413
+
414
+ wt->locked = 1;
415
+
416
+ out:
417
+ git_buf_dispose(&path);
418
+
419
+ return err;
420
+ }
421
+
422
+ int git_worktree_unlock(git_worktree *wt)
423
+ {
424
+ git_buf path = GIT_BUF_INIT;
425
+
426
+ assert(wt);
427
+
428
+ if (!git_worktree_is_locked(NULL, wt))
429
+ return 1;
430
+
431
+ if (git_buf_joinpath(&path, wt->gitdir_path, "locked") < 0)
432
+ return -1;
433
+
434
+ if (p_unlink(path.ptr) != 0) {
435
+ git_buf_dispose(&path);
436
+ return -1;
437
+ }
438
+
439
+ wt->locked = 0;
440
+
441
+ git_buf_dispose(&path);
442
+
443
+ return 0;
444
+ }
445
+
446
+ int git_worktree_is_locked(git_buf *reason, const git_worktree *wt)
447
+ {
448
+ git_buf path = GIT_BUF_INIT;
449
+ int ret;
450
+
451
+ assert(wt);
452
+
453
+ if (reason)
454
+ git_buf_clear(reason);
455
+
456
+ if ((ret = git_buf_joinpath(&path, wt->gitdir_path, "locked")) < 0)
457
+ goto out;
458
+ if ((ret = git_path_exists(path.ptr)) && reason)
459
+ git_futils_readbuffer(reason, path.ptr);
460
+
461
+ out:
462
+ git_buf_dispose(&path);
463
+
464
+ return ret;
465
+ }
466
+
467
+ const char *git_worktree_name(const git_worktree *wt)
468
+ {
469
+ assert(wt);
470
+ return wt->name;
471
+ }
472
+
473
+ const char *git_worktree_path(const git_worktree *wt)
474
+ {
475
+ assert(wt);
476
+ return wt->worktree_path;
477
+ }
478
+
479
+ int git_worktree_prune_init_options(
480
+ git_worktree_prune_options *opts,
481
+ unsigned int version)
482
+ {
483
+ GIT_INIT_STRUCTURE_FROM_TEMPLATE(opts, version,
484
+ git_worktree_prune_options, GIT_WORKTREE_PRUNE_OPTIONS_INIT);
485
+ return 0;
486
+ }
487
+
488
+ int git_worktree_is_prunable(git_worktree *wt,
489
+ git_worktree_prune_options *opts)
490
+ {
491
+ git_buf reason = GIT_BUF_INIT;
492
+ git_worktree_prune_options popts = GIT_WORKTREE_PRUNE_OPTIONS_INIT;
493
+
494
+ GIT_ERROR_CHECK_VERSION(
495
+ opts, GIT_WORKTREE_PRUNE_OPTIONS_VERSION,
496
+ "git_worktree_prune_options");
497
+
498
+ if (opts)
499
+ memcpy(&popts, opts, sizeof(popts));
500
+
501
+ if ((popts.flags & GIT_WORKTREE_PRUNE_LOCKED) == 0 &&
502
+ git_worktree_is_locked(&reason, wt))
503
+ {
504
+ if (!reason.size)
505
+ git_buf_attach_notowned(&reason, "no reason given", 15);
506
+ git_error_set(GIT_ERROR_WORKTREE, "Not pruning locked working tree: '%s'", reason.ptr);
507
+ git_buf_dispose(&reason);
508
+
509
+ return 0;
510
+ }
511
+
512
+ if ((popts.flags & GIT_WORKTREE_PRUNE_VALID) == 0 &&
513
+ git_worktree_validate(wt) == 0)
514
+ {
515
+ git_error_set(GIT_ERROR_WORKTREE, "Not pruning valid working tree");
516
+ return 0;
517
+ }
518
+
519
+ return 1;
520
+ }
521
+
522
+ int git_worktree_prune(git_worktree *wt,
523
+ git_worktree_prune_options *opts)
524
+ {
525
+ git_worktree_prune_options popts = GIT_WORKTREE_PRUNE_OPTIONS_INIT;
526
+ git_buf path = GIT_BUF_INIT;
527
+ char *wtpath;
528
+ int err;
529
+
530
+ GIT_ERROR_CHECK_VERSION(
531
+ opts, GIT_WORKTREE_PRUNE_OPTIONS_VERSION,
532
+ "git_worktree_prune_options");
533
+
534
+ if (opts)
535
+ memcpy(&popts, opts, sizeof(popts));
536
+
537
+ if (!git_worktree_is_prunable(wt, &popts)) {
538
+ err = -1;
539
+ goto out;
540
+ }
541
+
542
+ /* Delete gitdir in parent repository */
543
+ if ((err = git_buf_printf(&path, "%s/worktrees/%s", wt->commondir_path, wt->name)) < 0)
544
+ goto out;
545
+ if (!git_path_exists(path.ptr))
546
+ {
547
+ git_error_set(GIT_ERROR_WORKTREE, "Worktree gitdir '%s' does not exist", path.ptr);
548
+ err = -1;
549
+ goto out;
550
+ }
551
+ if ((err = git_futils_rmdir_r(path.ptr, NULL, GIT_RMDIR_REMOVE_FILES)) < 0)
552
+ goto out;
553
+
554
+ /* Skip deletion of the actual working tree if it does
555
+ * not exist or deletion was not requested */
556
+ if ((popts.flags & GIT_WORKTREE_PRUNE_WORKING_TREE) == 0 ||
557
+ !git_path_exists(wt->gitlink_path))
558
+ {
559
+ goto out;
560
+ }
561
+
562
+ if ((wtpath = git_path_dirname(wt->gitlink_path)) == NULL)
563
+ goto out;
564
+ git_buf_attach(&path, wtpath, 0);
565
+ if (!git_path_exists(path.ptr))
566
+ {
567
+ git_error_set(GIT_ERROR_WORKTREE, "Working tree '%s' does not exist", path.ptr);
568
+ err = -1;
569
+ goto out;
570
+ }
571
+ if ((err = git_futils_rmdir_r(path.ptr, NULL, GIT_RMDIR_REMOVE_FILES)) < 0)
572
+ goto out;
573
+
574
+ out:
575
+ git_buf_dispose(&path);
576
+
577
+ return err;
578
+ }
@@ -0,0 +1,39 @@
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_worktree_h__
8
+ #define INCLUDE_worktree_h__
9
+
10
+ #include "common.h"
11
+
12
+ #include "git2/common.h"
13
+ #include "git2/worktree.h"
14
+
15
+ struct git_worktree {
16
+ /* Name of the working tree. This is the name of the
17
+ * containing directory in the `$PARENT/.git/worktrees/`
18
+ * directory. */
19
+ char *name;
20
+
21
+ /* Path to the where the worktree lives in the filesystem */
22
+ char *worktree_path;
23
+ /* Path to the .git file in the working tree's repository */
24
+ char *gitlink_path;
25
+ /* Path to the .git directory inside the parent's
26
+ * worktrees directory */
27
+ char *gitdir_path;
28
+ /* Path to the common directory contained in the parent
29
+ * repository */
30
+ char *commondir_path;
31
+ /* Path to the parent's working directory */
32
+ char *parent_path;
33
+
34
+ int locked:1;
35
+ };
36
+
37
+ char *git_worktree__read_link(const char *base, const char *file);
38
+
39
+ #endif
@@ -13,8 +13,8 @@
13
13
  * Lesser General Public License for more details.
14
14
  *
15
15
  * You should have received a copy of the GNU Lesser General Public
16
- * License along with this library; if not, write to the Free Software
17
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
+ * License along with this library; if not, see
17
+ * <http://www.gnu.org/licenses/>.
18
18
  *
19
19
  * Davide Libenzi <davidel@xmailserver.org>
20
20
  *
@@ -27,22 +27,29 @@
27
27
  extern "C" {
28
28
  #endif /* #ifdef __cplusplus */
29
29
 
30
+ /* xpparm_t.flags */
31
+ #define XDF_NEED_MINIMAL (1 << 0)
30
32
 
31
- #define XDF_NEED_MINIMAL (1 << 1)
32
- #define XDF_IGNORE_WHITESPACE (1 << 2)
33
- #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
34
- #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
35
- #define XDF_PATIENCE_DIFF (1 << 5)
36
- #define XDF_HISTOGRAM_DIFF (1 << 6)
37
- #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
33
+ #define XDF_IGNORE_WHITESPACE (1 << 1)
34
+ #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
35
+ #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
36
+ #define XDF_IGNORE_CR_AT_EOL (1 << 4)
37
+ #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
38
+ XDF_IGNORE_WHITESPACE_CHANGE | \
39
+ XDF_IGNORE_WHITESPACE_AT_EOL | \
40
+ XDF_IGNORE_CR_AT_EOL)
38
41
 
39
- #define XDL_PATCH_NORMAL '-'
40
- #define XDL_PATCH_REVERSE '+'
41
- #define XDL_PATCH_MODEMASK ((1 << 8) - 1)
42
- #define XDL_PATCH_IGNOREBSPACE (1 << 8)
42
+ #define XDF_IGNORE_BLANK_LINES (1 << 7)
43
43
 
44
+ #define XDF_PATIENCE_DIFF (1 << 14)
45
+ #define XDF_HISTOGRAM_DIFF (1 << 15)
46
+ #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
47
+ #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
48
+
49
+ #define XDF_INDENT_HEURISTIC (1 << 23)
50
+
51
+ /* xdemitconf_t.flags */
44
52
  #define XDL_EMIT_FUNCNAMES (1 << 0)
45
- #define XDL_EMIT_COMMON (1 << 1)
46
53
  #define XDL_EMIT_FUNCCONTEXT (1 << 2)
47
54
 
48
55
  #define XDL_MMB_READONLY (1 << 0)
@@ -79,6 +86,10 @@ typedef struct s_mmbuffer {
79
86
 
80
87
  typedef struct s_xpparam {
81
88
  unsigned long flags;
89
+
90
+ /* See Documentation/diff-options.txt. */
91
+ char **anchors;
92
+ size_t anchors_nr;
82
93
  } xpparam_t;
83
94
 
84
95
  typedef struct s_xdemitcb {
@@ -88,13 +99,17 @@ typedef struct s_xdemitcb {
88
99
 
89
100
  typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
90
101
 
102
+ typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
103
+ long start_b, long count_b,
104
+ void *cb_data);
105
+
91
106
  typedef struct s_xdemitconf {
92
107
  long ctxlen;
93
108
  long interhunkctxlen;
94
109
  unsigned long flags;
95
110
  find_func_t find_func;
96
111
  void *find_func_priv;
97
- void (*emit_func)(void);
112
+ xdl_emit_hunk_consume_func_t hunk_func;
98
113
  } xdemitconf_t;
99
114
 
100
115
  typedef struct s_bdiffparam {
@@ -102,9 +117,9 @@ typedef struct s_bdiffparam {
102
117
  } bdiffparam_t;
103
118
 
104
119
 
105
- #define xdl_malloc(x) malloc(x)
106
- #define xdl_free(ptr) free(ptr)
107
- #define xdl_realloc(ptr,x) realloc(ptr,x)
120
+ #define xdl_malloc(x) git__malloc(x)
121
+ #define xdl_free(ptr) git__free(ptr)
122
+ #define xdl_realloc(ptr,x) git__realloc(ptr,x)
108
123
 
109
124
  void *xdl_mmfile_first(mmfile_t *mmf, long *size);
110
125
  long xdl_mmfile_size(mmfile_t *mmf);