[remote] WIP: push

Author: chobie

example/push.php

@@ -0,0 +1,30 @@
+<?php
+
+$payload = array();
+$repo    = git_repository_open(".");
+$remote  = git_remote_load($repo, "origin");
+$remote_callbacks = [
+    "credentials" => function($url, $username_from_url, $allowed_types, &$payload) {
+        // NOTE(chobie): you need to build with LibSSH2 when communicating with ssh protocol. */
+        if ($allowed_types & GIT_CREDTYPE_USERPASS_PLAINTEXT) {
+            return git_cred_userpass_plaintext_new("chobie", getenv("GITHUB_TOKEN"));
+        } else {
+            error_log("not supported allowed types");
+        }
+}];
+
+git_remote_set_callbacks($remote, $remote_callbacks);
+if (git_remote_connect($remote, GIT_DIRECTION_PUSH)) {
+    $push = git_push_new($remote);
+
+    git_push_add_refspec($push, "refs/heads/master:refs/heads/master");
+    git_push_finish($push);
+    git_push_unpack_ok($push);
+
+    git_push_status_foreach($push, function($ref, $name, &$payload){
+        var_dump($ref, $name, $payload);
+    }, $payload);
+
+    git_push_update_tips($push);
+    git_remote_disconnect($remote);
+}

example/reflog.php

@@ -0,0 +1,9 @@
+<?php
+$repo = git_repository_open("../");
+$reflog = git_reflog_read($repo, "HEAD");
+
+$count = git_reflog_entrycount($reflog);
+for ($i = 0; $i < $count; $i++) {
+    $entry = git_reflog_entry_byindex($reflog, $i);
+    var_dump(git_reflog_entry_committer($entry));
+}

php_git2.c

@@ -310,6 +310,12 @@ PHP_FUNCTION(git_checkout_opts_new)
 	RETURN_ZVAL(tmp, 0, 1);
 }
 
+PHP_FUNCTION(git_libgit2_capabilities)
+{
+	RETURN_LONG(git_libgit2_capabilities());
+}
+
+
 static zend_function_entry php_git2_functions[] = {
 	/* repository */
 	PHP_FE(git_repository_new, arginfo_git_repository_new)
@@ -914,6 +920,7 @@ static zend_function_entry php_git2_functions[] = {
 
 	/* misc */
 	PHP_FE(git_resource_type, arginfo_git_resource_type)
+	PHP_FE(git_libgit2_capabilities, NULL)
 	PHP_FE_END
 };
 

push.c

@@ -4,9 +4,34 @@
 
 static int php_git2_push_status_foreach_cb(const char *ref, const char *msg, void *data)
 {
-	fprintf(stderr, "ref: %s\n", ref);
-	fprintf(stderr, "msg: %s\n", msg);
-	return 0;
+	php_git2_t *result;
+	zval *param_ref, *param_msg, *retval_ptr = NULL;
+	php_git2_cb_t *p = (php_git2_cb_t*)data;
+	int i = 0;
+	int retval = 0;
+	GIT2_TSRMLS_SET(p->tsrm_ls)
+
+	Z_ADDREF_P(p->payload);
+	MAKE_STD_ZVAL(param_ref);
+	MAKE_STD_ZVAL(param_msg);
+	ZVAL_NULL(param_ref);
+	ZVAL_NULL(param_msg);
+
+	if (ref != NULL) {
+		ZVAL_STRING(param_ref, ref, 1);
+	}
+	if (msg != NULL) {
+		ZVAL_STRING(param_msg, msg, 1);
+	}
+
+	if (php_git2_call_function_v(p->fci, p->fcc TSRMLS_CC, &retval_ptr, 3, &param_ref, &param_msg, &p->payload)) {
+		zend_list_delete(result->resource_id);
+		return GIT_EUSER;
+	}
+
+	retval = Z_LVAL_P(retval_ptr);
+	zval_ptr_dtor(&retval_ptr);
+	return retval;
 }
 
 /* {{{ proto resource git_push_new(resource $remote)

push.h

@@ -60,12 +60,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_git_push_unpack_ok, 0, 0, 1)
 	ZEND_ARG_INFO(0, push)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_git_push_status_foreach, 0, 0, 5)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_git_push_status_foreach, 0, 0, 3)
 	ZEND_ARG_INFO(0, push)
-	ZEND_ARG_INFO(0, ref)
-	ZEND_ARG_INFO(0, msg)
-	ZEND_ARG_INFO(0, data)
-	ZEND_ARG_INFO(0, data)
+	ZEND_ARG_INFO(0, callback)
+	ZEND_ARG_INFO(1, data)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_git_push_free, 0, 0, 1)

remote.c

@@ -753,40 +753,94 @@ PHP_FUNCTION(git_remote_set_transport)
 }
 /* }}} */
 
-static int cred_cb(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *data)
-{
-	fprintf(stderr, "url: %s\n", url);
-	fprintf(stderr, "name: %s\n", username_from_url);
-	fprintf(stderr, "types: %d\n", allowed_types);
-
-	return 0;
-}
 
 typedef struct php_git2_fcall_t {
 	zend_fcall_info fci;
 	zend_fcall_info_cache fcc;
+	zval *value;
 } php_git2_fcall_t;
+
 typedef struct php_git2_remote_cb_t {
 	php_git2_fcall_t callbacks[4];
 	zval *payload;
+	GIT2_TSRMLS_DECL
 } php_git2_remote_cb_t;
 
+static int cred_cb(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *data)
+{
+	php_git2_t *result;
+	zval *param_url = NULL, *param_username_from_url = NULL, *param_allowed_types = NULL, *retval_ptr;
+	php_git2_remote_cb_t *cb = (php_git2_remote_cb_t*)data;
+	GIT2_TSRMLS_SET(cb->tsrm_ls);
+	int retval = 1;
+
+	if (cb != NULL) {
+		MAKE_STD_ZVAL(param_url);
+		MAKE_STD_ZVAL(param_username_from_url);
+		MAKE_STD_ZVAL(param_allowed_types);
+		ZVAL_NULL(param_url);
+		ZVAL_NULL(param_username_from_url);
+
+		if (url != NULL) {
+			ZVAL_STRING(param_url, url, 1);
+		}
+		if (username_from_url != NULL) {
+			ZVAL_STRING(param_username_from_url, username_from_url, 1);
+		}
+		ZVAL_LONG(param_allowed_types, allowed_types);
+		Z_ADDREF_P(cb->payload);
+		SEPARATE_ZVAL_TO_MAKE_IS_REF(&cb->payload);
+
+		if (php_git2_call_function_v(&cb->callbacks[0].fci, &cb->callbacks[0].fcc TSRMLS_CC, &retval_ptr, 4,
+			&param_url, &param_username_from_url, &param_allowed_types, &cb->payload)) {
+				fprintf(stderr, "CALL FUNCTION ERROR");
+		}
+	}
+
+	if (retval_ptr && Z_TYPE_P(retval_ptr) == IS_RESOURCE) {
+		ZEND_FETCH_RESOURCE_NO_RETURN(result, php_git2_t*, &retval_ptr, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
+		*cred = PHP_GIT2_V(result, cred);
+		zval_ptr_dtor(&retval_ptr);
+	}
+	return retval;
+}
+
 /* {{{ proto long git_remote_set_callbacks(remote, callbacks)
 */
 PHP_FUNCTION(git_remote_set_callbacks)
 {
 	zval *remote;
 	php_git2_t *_remote;
-	zval *callbacks;
+	zval *callbacks, *credentials_cb = NULL;
 	php_git2_t *_callbacks;
 	struct git_remote_callbacks cb = GIT_REMOTE_CALLBACKS_INIT;
+	php_git2_remote_cb_t *_payload = NULL, payload = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"ra", &remote, &callbacks) == FAILURE) {
 		return;
 	}
 
+	/* TODO(chobie): support other callbacks */
 	cb.credentials = cred_cb;
+	credentials_cb = php_git2_read_arrval(callbacks, ZEND_STRS("credentials") TSRMLS_CC);
+
+	/* TODO(chobie): can we free payload? */
+	_payload = emalloc(sizeof(php_git2_remote_cb_t));
+	MAKE_STD_ZVAL(_payload->payload);
+	GIT2_TSRMLS_SET2(_payload, TSRMLS_C);
+
+	if (credentials_cb != NULL) {
+		char *is_callable_error;
+
+		if(zend_fcall_info_init(credentials_cb, 0, &(_payload->callbacks[0].fci), &(_payload->callbacks[0].fci), NULL, &is_callable_error TSRMLS_CC) == SUCCESS) {
+			if (is_callable_error) {
+				efree(is_callable_error);
+			}
+		}
+		Z_ADDREF_P(credentials_cb);
+	}
+	cb.payload = _payload;
 
 	ZEND_FETCH_RESOURCE(_remote, php_git2_t*, &remote, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
 	git_remote_set_callbacks(PHP_GIT2_V(_remote, remote), &cb);