diff options
| author | Jameson Miller <jamill@microsoft.com> | 2013-10-02 13:45:32 -0400 |
|---|---|---|
| committer | Jameson Miller <jamill@microsoft.com> | 2013-10-02 15:12:44 -0400 |
| commit | 5b1882254551cc9031d919c2f31c05153a665762 (patch) | |
| tree | a5a4b2fab8622f11bd70bd4388f14bc6557d07a1 /include/git2/pack.h | |
| parent | 5bfead1dba919f6b47f52da675ea94407e8baf49 (diff) | |
| download | libgit2-5b1882254551cc9031d919c2f31c05153a665762.tar.gz | |
Support cancellation in push operation
This commit adds cancellation for the push operation. This work consists of:
1) Support cancellation during push operation
- During object counting phase
- During network transfer phase
- Propagate GIT_EUSER error code out to caller
2) Improve cancellation support during fetch
- Handle cancellation request during network transfer phase
- Clear error string when cancelled during indexing
3) Fix error handling in git_smart__download_pack
Cancellation during push is still only handled in the pack building and
network transfer stages of push (and not during packbuilding).
Diffstat (limited to 'include/git2/pack.h')
| -rw-r--r-- | include/git2/pack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/pack.h b/include/git2/pack.h index 7ebdd5cf3..748817666 100644 --- a/include/git2/pack.h +++ b/include/git2/pack.h @@ -158,7 +158,7 @@ GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); GIT_EXTERN(uint32_t) git_packbuilder_written(git_packbuilder *pb); /** Packbuilder progress notification function */ -typedef void (*git_packbuilder_progress)( +typedef int (*git_packbuilder_progress)( int stage, unsigned int current, unsigned int total, |