Merge pull request #22 from tesonep/progressInOperations

Adding progress callback support

.project

@@ -0,0 +1,3 @@
+{
+	'srcDirectory' : ''
+}

.properties

@@ -0,0 +1,3 @@
+{
+	#format : #filetree
+}

LibGit-Core.package/LGitCheckoutOptions.class/instance/progressCallback..st

@@ -0,0 +1,5 @@
+accessing
+progressCallback: anIceGitCheckoutProgress 
+
+	progressCallback := anIceGitCheckoutProgress.
+	self prim_progress_cb: anIceGitCheckoutProgress

LibGit-Core.package/LGitCheckoutOptions.class/properties.json

@@ -26,7 +26,9 @@
 		"OFFSET_PRIM_THEIR_LABEL",
 		"OFFSET_PRIM_VERSION"
 	],
-	"instvars" : [ ],
+	"instvars" : [
+		"progressCallback"
+	],
 	"name" : "LGitCheckoutOptions",
 	"type" : "normal"
 }

LibGit-Core.package/LGitCheckoutProgressCallback.class/class/fnSpec.st

@@ -1,3 +1,3 @@
 accessing
 fnSpec
-	^#(void (String path, size_t completed_steps, size_t total_steps, void *payload))
+	^#(void (String* path, size_t completed_steps, size_t total_steps, void* payload))

LibGit-Core.package/LGitIndex.class/instance/addAll..st

@@ -7,5 +7,5 @@ addAll: pathSpecs
 			index_add_all: self
 			pathspec: pathspec
 			flags: 0
-			callback: ExternalAddress null
+			callback: (LGitIndexMatchedPathCallback on: [ :a :b :c | 0 ])
 			payload: ExternalAddress null ]

LibGit-Core.package/LGitIndex.class/instance/index_add_all.pathspec.flags.callback.payload..st

@@ -7,6 +7,6 @@ index_add_all: index pathspec: pathspec flags: flags callback: callback payload:
 				self, 
 				LGitStringArray *pathspec, 
 				uint flags, 
-				void* callback, 
+				LGitIndexMatchedPathCallback callback, 
 				void *payload))
 		options: #(optMayGC optCoerceNilToNull)

LibGit-Core.package/LGitRemote.class/instance/fetchWithCredentials.andProgressCallback..st

@@ -0,0 +1,7 @@
+operations
+fetchWithCredentials: aCredentialsProvider andProgressCallback: progressCallback
+
+	^ self
+		fetchWithCredentials: aCredentialsProvider
+		andProgressCallback: progressCallback
+		refSpec: nil

LibGit-Core.package/LGitRemote.class/instance/fetchWithCredentials.andProgressCallback.refSpec..st

@@ -0,0 +1,17 @@
+operations
+fetchWithCredentials: aCredentialsProvider andProgressCallback: progressCallback refSpec: aRefSpec
+	| refSpecs callbacks |
+	self isReady ifFalse: [ self create ].
+	refSpecs := aRefSpec ifNotNil: [LGitStringArray withAll: { aRefSpec asString }].
+	self withReturnHandlerDo: [ 
+
+		callbacks := LGitRemoteCallbacks withProvider: aCredentialsProvider.
+		progressCallback ifNotNil: [callbacks transferProgress: progressCallback].
+
+		self
+			remote_fetch: self
+			refspecs: refSpecs
+			opts: (LGitFetchOptions defaults
+				callbacks:callbacks;
+				yourself)
+			reflog_message: nil ]

LibGit-Core.package/LGitRemote.class/instance/fetchWithCredentials.refSpec..st

@@ -1,13 +1,4 @@
 operations
 fetchWithCredentials: aCredentialsProvider refSpec: aRefSpec
-	| refSpecs |
-	self isReady ifFalse: [ self create ].
-	refSpecs := aRefSpec ifNotNil: [LGitStringArray withAll: { aRefSpec asString }].
-	self withReturnHandlerDo: [ 
-		self
-			remote_fetch: self
-			refspecs: refSpecs
-			opts: (LGitFetchOptions defaults
-				callbacks:(LGitRemoteCallbacks withProvider: aCredentialsProvider);
-				yourself)
-			reflog_message: nil ]
+
+	^ self fetchWithCredentials: aCredentialsProvider andProgressCallback: nil refSpec: aRefSpec

LibGit-Core.package/LGitRemoteCallbacks.class/instance/pushTransferProgress..st

@@ -0,0 +1,4 @@
+accessing
+pushTransferProgress: aCallback
+	pushTransferProgress := aCallback.
+	self prim_push_transfer_progress: aCallback

LibGit-Core.package/LGitRemoteCallbacks.class/instance/transferProgress..st

@@ -0,0 +1,4 @@
+accessing
+transferProgress: aCallback
+	transferProgressCallback := aCallback.
+	self prim_transfer_progress: aCallback

LibGit-Core.package/LGitRemoteCallbacks.class/properties.json

@@ -21,7 +21,9 @@
 	],
 	"instvars" : [
 		"credentialsCallback",
-		"certificateCheckCallback"
+		"certificateCheckCallback",
+		"transferProgressCallback",
+		"pushTransferProgress"
 	],
 	"name" : "LGitRemoteCallbacks",
 	"type" : "normal"