Commit Graph

17 Commits

Author SHA1 Message Date
lhchavez 05f743a30f
More callback refactoring (#713) (#719)
This change:

* Gets rid of the `.toC()` functions for Options objects, since they
  were redundant with the `populateXxxOptions()`.
* Adds support for `errorTarget` to the `RemoteOptions`, since they are
  used in the same stack for some functions (like `Fetch()`). Now for
  those cases, the error returned by the callback will be preserved
  as-is.

(cherry picked from commit 10c67474a8)
2020-12-13 11:08:38 -08:00
lhchavez 37d110dbf0
Refactor all callbacks (#700) (#705)
This change is a preparation for another change that makes all callback
types return a Go error instead of an error code / an integer. That is
going to make make things a lot more idiomatic.

The reason this change is split is threefold:

a) This change is mostly mechanical and should contain no semantic
   changes.
b) This change is backwards-compatible (in the Go API compatibility
   sense of the word), and thus can be backported to all other releases.
c) It makes the other change a bit smaller and more focused on just one
   thing.

Concretely, this change makes all callbacks populate a Go error when
they fail. If the callback is invoked from the same stack as the
function to which it was passed (e.g. for `Tree.Walk`), it will preserve
the error object directly into a struct that also holds the callback
function. Otherwise if the callback is pased to one func and will be
invoked when run from another one (e.g. for `Repository.InitRebase`),
the error string is saved into the libgit2 thread-local storage and then
re-created as a `GitError`.

(cherry picked from commit 5d8eaf7e65)
2020-12-05 17:10:18 -08:00
lhchavez 5f0640baed
Mark some symbols to be deprecated #minor (#698) (#702)
This change introduces the file deprecated.go, which contains any
constants, functions, and types that are slated to be deprecated in the
next major release.

These symbols are deprecated because they refer to old spellings in
pre-1.0 libgit2. This also makes the build be done with the
`-DDEPRECATE_HARD` flag to avoid regressions.

This, together with
[gorelease](https://godoc.org/golang.org/x/exp/cmd/gorelease)[1] should
make releases safer going forward.

1: More information about how that works at
   https://go.googlesource.com/exp/+/refs/heads/master/apidiff/README.md
(cherry picked from commit 137c05e802)
2020-12-05 13:12:04 -08:00
Carlos Martín Nieto 7b1c424572 Merge pull request #420 from josharian/rebase-operation-type-stringer
Add RebaseOperationReword, and make RebaseOperationType a stringer

(cherry picked from commit 7ae106611c)
2020-08-16 07:19:09 -07:00
Harsimran Singh Maan 3452fe984d Fix typo in the error message 2017-10-01 21:04:08 -07:00
Carlos Martín Nieto b98b0e7640 rebase: correct the return values for CurrentOperationIndex
We were incorectly reporting `C.GIT_REBASE_NO_OPERATION` as an error code when
it is none. We should instead return it as the value. The compiler doesn't seem
to actually look at the sizes so instead we must recreate the value ourselves
with `^uint(0)`.

The error return is kept for API compatibility but should go away eventually.
2017-07-08 21:34:10 +02:00
Carlos Martín Nieto 55a1096141 Third round of keep-alive aditions 2017-07-08 16:07:51 +02:00
ezwiebel 6118c9ba37 LockOSThread in CurrentOperationIndex for git error creation 2016-11-23 17:10:59 +11:00
ezwiebel a671e67ee8 Took @carlosmn PR review into account 2016-11-01 10:59:32 +11:00
ezwiebel 03e10c5639 Fix reference bug introduced with RebaseOptions implementation 2016-09-14 14:42:58 +10:00
ezwiebel adc3a4bd89 Add DefaultRebaseOptions() [git_rebase_init_options(GIT_REBASE_OPTIONS_VERSION)] service to wrapper 2016-09-13 16:03:16 +10:00
ezwiebel e00b0831aa Add RebaseOpen() service to wrapper 2016-09-12 15:58:53 +10:00
ezwiebel b2d71f4fbc Fix Free() service in Rebase wrapper 2016-08-08 10:49:40 +10:00
ezwiebel 193b21398b Add CurrentOperationIndex() and OperationAt(index uint) services to wrapper 2016-08-07 18:09:33 +10:00
ezwiebel e1f0949740 Add Abort() service to wrapper 2016-08-07 17:48:18 +10:00
ezwiebel a62a8c3b92 Add operation OperationCount() service and enrich UTs 2016-08-07 17:48:18 +10:00
ezwiebel b1a9de8037 Initial rebase wrapper version 2016-08-07 17:48:18 +10:00