More diff functionality #629

Merged
mbfr merged 24 commits from feature-diff-extra into master 2020-08-18 08:14:03 -05:00

24 Commits

Author SHA1 Message Date
lhchavez c64de36901 Fix the tests
Pro tip: run tests before pushing.
2020-08-18 06:10:40 -07:00
lhchavez 03e0cb481d Added docstrings and fixed a golint violation
I missed this during the review u_u.
2020-08-18 06:06:36 -07:00
lhchavez d48f93d653 Merge branch 'master', remote-tracking branch 'origin' into feature-diff-extra 2020-08-18 05:49:04 -07:00
Michael Boulton 05a41f164c
Move os thread lock to outer scope in defaultapplyoptions 2020-08-18 08:16:29 +01:00
Michael Boulton 633f7639db
Hardcode version in apply options which should never change 2020-08-18 08:14:20 +01:00
Michael Boulton 6dc7641069
Make apply callback types have more conssitent names 2020-08-18 08:11:15 +01:00
Michael Boulton 37e56c28a8
Remove C wrapper for initialising apply opptions 2020-08-17 08:36:12 +01:00
michael boulton d1d3dccd8a
Update diff_test.go
Make test naming consistent

Co-authored-by: lhchavez <lhchavez@lhchavez.com>
2020-08-17 08:21:39 +01:00
Michael Boulton 7f3d112fbe
Make it possible to use a git2go error as a return value from a diff callback and have it propagate 2020-08-17 08:20:41 +01:00
Michael Boulton fff6c9d8ae
Store pointer to apply options instead of copying the struct 2020-08-17 08:17:58 +01:00
Michael Boulton d8f155f971
Convert diff contents to CBuffer and free it instead of using a CString 2020-08-17 08:15:56 +01:00
michael boulton 2edef4dbea
Update wrapper.c
Fix spaces->tabs

Co-authored-by: lhchavez <lhchavez@lhchavez.com>
2020-08-17 08:08:06 +01:00
Michael Boulton 97267d3f6e
Remove uneeded locking of os thread in calling local C function 2020-08-17 08:07:06 +01:00
Michael Boulton 067989fe99
Fix some missing keepalives 2020-08-17 08:05:44 +01:00
Michael Boulton ad65e109e4
Do not embed callbacks in struct and give them more appropriate type names 2020-08-17 08:02:18 +01:00
lhchavez bbaf9746f9 Add two more GitHub Actions workflows
This change adds:

* `tag.yml`: Creates a new tag every time the master or a release branch
  is pushed.
* `backport.yml`: Creates a cherry-pick in older release branches to
  keep them up to date with little cost.
2020-08-16 06:53:23 -07:00
Michael Boulton 87433ff8a8
Remove changed fixed in other branch 2020-08-14 11:12:33 +01:00
Michael Boulton 315a4855f1
Add more tests and deduplicate some test code 2020-08-14 10:54:58 +01:00
Michael Boulton adfb859419
Fix nuill pointer dereference 2020-08-14 10:27:32 +01:00
Michael Boulton c5985ee1a3
fix tests 2020-08-14 10:27:20 +01:00
Michael Boulton 887d2d9eeb
Fix missing extern 2020-08-14 09:18:48 +01:00
Michael Boulton 1352980b36
Add support for callback on hunks/apply 2020-08-14 09:17:13 +01:00
Michael Boulton 9bbbbb4a52
Fix missing func 2020-08-14 08:36:40 +01:00
Michael Boulton de24abbdae
Add functionality for converting Diff objects to a buffer and back 2020-08-14 08:30:14 +01:00