diff options
author | Vicent Marti <vicent@github.com> | 2014-04-25 02:10:19 -0700 |
---|---|---|
committer | Vicent Marti <vicent@github.com> | 2014-04-25 02:10:19 -0700 |
commit | 8443ed6c1d1237e203474a772fb4281c382df6ac (patch) | |
tree | 3e892ab6b4432bc091a91db3d6c0441a95373c54 /include/git2 | |
parent | 332e4f20273a424efcea06ca1550146c816f4404 (diff) | |
parent | f70cfd34f5c20c447feb19c2e616315764ea7260 (diff) | |
download | libgit2-8443ed6c1d1237e203474a772fb4281c382df6ac.tar.gz |
Merge pull request #2284 from jacquesg/push-progress-callback
Fire progress and update tips callbacks also for pushes.
Diffstat (limited to 'include/git2')
-rw-r--r-- | include/git2/indexer.h | 2 | ||||
-rw-r--r-- | include/git2/odb.h | 2 | ||||
-rw-r--r-- | include/git2/pack.h | 2 | ||||
-rw-r--r-- | include/git2/remote.h | 6 | ||||
-rw-r--r-- | include/git2/sys/odb_backend.h | 2 | ||||
-rw-r--r-- | include/git2/transport.h | 2 | ||||
-rw-r--r-- | include/git2/types.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/include/git2/indexer.h b/include/git2/indexer.h index e4c03ad06..d2d315e47 100644 --- a/include/git2/indexer.h +++ b/include/git2/indexer.h @@ -32,7 +32,7 @@ GIT_EXTERN(int) git_indexer_new( const char *path, unsigned int mode, git_odb *odb, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_cb_payload); /** diff --git a/include/git2/odb.h b/include/git2/odb.h index c71e30648..114f6b317 100644 --- a/include/git2/odb.h +++ b/include/git2/odb.h @@ -338,7 +338,7 @@ GIT_EXTERN(int) git_odb_open_rstream(git_odb_stream **out, git_odb *db, const gi GIT_EXTERN(int) git_odb_write_pack( git_odb_writepack **out, git_odb *db, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload); /** diff --git a/include/git2/pack.h b/include/git2/pack.h index 29c926c65..e7f060d12 100644 --- a/include/git2/pack.h +++ b/include/git2/pack.h @@ -140,7 +140,7 @@ GIT_EXTERN(int) git_packbuilder_write( git_packbuilder *pb, const char *path, unsigned int mode, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_cb_payload); /** diff --git a/include/git2/remote.h b/include/git2/remote.h index ddde3e85e..11e1e26d0 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -457,7 +457,7 @@ struct git_remote_callbacks { * progress side-band will be passed to this function (this is * the 'counting objects' output. */ - int (*progress)(const char *str, int len, void *data); + git_transport_message_cb sideband_progress; /** * Completion is called when different parts of the download @@ -472,14 +472,14 @@ struct git_remote_callbacks { * Returning GIT_PASSTHROUGH will make libgit2 behave as * though this field isn't set. */ - int (*credentials)(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *data); + git_cred_acquire_cb credentials; /** * During the download of new data, this will be regularly * called with the current count of progress done by the * indexer. */ - int (*transfer_progress)(const git_transfer_progress *stats, void *data); + git_transfer_progress_cb transfer_progress; /** * Each time a reference is updated locally, this function diff --git a/include/git2/sys/odb_backend.h b/include/git2/sys/odb_backend.h index 81bb082e6..77fe0dd31 100644 --- a/include/git2/sys/odb_backend.h +++ b/include/git2/sys/odb_backend.h @@ -81,7 +81,7 @@ struct git_odb_backend { int (* writepack)( git_odb_writepack **, git_odb_backend *, git_odb *odb, - git_transfer_progress_callback progress_cb, void *progress_payload); + git_transfer_progress_cb progress_cb, void *progress_payload); void (* free)(git_odb_backend *); }; diff --git a/include/git2/transport.h b/include/git2/transport.h index 1665f97b3..a33146ca8 100644 --- a/include/git2/transport.h +++ b/include/git2/transport.h @@ -287,7 +287,7 @@ struct git_transport { git_transport *transport, git_repository *repo, git_transfer_progress *stats, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload); /* Checks to see if the transport is connected */ diff --git a/include/git2/types.h b/include/git2/types.h index 9db59b16b..1b6f4cca1 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -241,7 +241,7 @@ typedef struct git_transfer_progress { * @param stats Structure containing information about the state of the transfer * @param payload Payload provided by caller */ -typedef int (*git_transfer_progress_callback)(const git_transfer_progress *stats, void *payload); +typedef int (*git_transfer_progress_cb)(const git_transfer_progress *stats, void *payload); /** * Opaque structure representing a submodule. |