From 8a1a658b42860336eb6a58f494e61940ce430a1f Mon Sep 17 00:00:00 2001 From: Christophe Robin Date: Thu, 8 Aug 2013 14:55:49 +0900 Subject: [PATCH 1/2] Updated libgit2 reference to 0.19.0 --- .gitignore | 1 + libgit2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a0c67a7fdc..312104bff7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ tests/*.log tests/*.diff tests/*.exp tests/*.out +tests/mock # ignore phpized files Makefile.global diff --git a/libgit2 b/libgit2 index d18713fb4a..eddc1f1ed7 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit d18713fb4ad1ba3d18a75272e1c1c3eb45715aba +Subproject commit eddc1f1ed78898a4ca41480045b1d0d5b075e773 From 1c691c4f4bdc25eb25be2bcca991be22fa13e1cd Mon Sep 17 00:00:00 2001 From: Christophe Robin Date: Thu, 8 Aug 2013 16:37:14 +0900 Subject: [PATCH 2/2] Ported library to libgit 0.19.0 --- config.c | 2 +- php_git2.h | 1 + reference.c | 19 +++++++++---------- remote.c | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config.c b/config.c index 09d0eae601..d4e625d60e 100644 --- a/config.c +++ b/config.c @@ -430,7 +430,7 @@ PHP_METHOD(git2_config, delete) } m_config = PHP_GIT2_GET_OBJECT(php_git2_config, getThis()); - git_config_delete(m_config->config, key); + git_config_delete_entry(m_config->config, key); php_git2_config_reload(getThis(), 0 TSRMLS_CC); } /* }}} */ diff --git a/php_git2.h b/php_git2.h index cb82c99080..589caa1417 100644 --- a/php_git2.h +++ b/php_git2.h @@ -41,6 +41,7 @@ # include # include # include +# include extern zend_module_entry git2_module_entry; diff --git a/reference.c b/reference.c index cfc3b78a3b..4f91939be2 100644 --- a/reference.c +++ b/reference.c @@ -99,18 +99,17 @@ PHP_METHOD(git2_reference, lookup) PHP_METHOD(git2_reference, getTarget) { php_git2_reference *m_reference; - + const git_oid *oid; + char oid_out[GIT_OID_HEXSZ] = {0}; + m_reference = PHP_GIT2_GET_OBJECT(php_git2_reference, getThis()); - + if (git_reference_type(m_reference->reference) == GIT_REF_OID) { - const git_oid *oid; - char oid_out[GIT_OID_HEXSZ] = {0}; - - oid = git_reference_oid(m_reference->reference); + oid = git_reference_target(m_reference->reference); git_oid_fmt(oid_out, oid); RETVAL_STRINGL(oid_out,GIT_OID_HEXSZ,1); } else { - RETVAL_STRING(git_reference_target(m_reference->reference),1); + RETVAL_STRING(git_reference_symbolic_target(m_reference->reference), 1); } } /* }}} */ @@ -192,9 +191,9 @@ PHP_METHOD(git2_reference, create) m_repository = PHP_GIT2_GET_OBJECT(php_git2_repository, repository); if (git_oid_fromstr(&oid, target) == GIT_OK) { - error = git_reference_create_oid(&ref, m_repository->repository, name, &oid, (int)force); + error = git_reference_create(&ref, m_repository->repository, name, &oid, (int)force); } else { - error = git_reference_create_symbolic(&ref, m_repository->repository, name, target, (int)force); + error = git_reference_symbolic_create(&ref, m_repository->repository, name, target, (int)force); } if (error != GIT_OK) { @@ -303,7 +302,7 @@ PHP_METHOD(git2_reference, each) MAKE_STD_ZVAL(opaque.result); array_init(opaque.result); - git_reference_foreach(m_repository->repository, list_flags, &php_git2_ref_foreach_cb, (void *)&opaque); + git_reference_foreach(m_repository->repository, &php_git2_ref_foreach_cb, (void *)&opaque); RETVAL_ZVAL(opaque.result,0,1); } diff --git a/remote.c b/remote.c index 4b81e7be62..964b2defe4 100644 --- a/remote.c +++ b/remote.c @@ -88,7 +88,7 @@ PHP_METHOD(git2_remote, __construct) /* }}} */ -static int php_git2_rename_packfile(char *packname, git_indexer *idx) +static int php_git2_rename_packfile(char *packname, git_indexer_stream *idx) { char path[GIT_PATH_MAX], oid[GIT_OID_HEXSZ + 1], *slash; int ret; @@ -101,7 +101,7 @@ static int php_git2_rename_packfile(char *packname, git_indexer *idx) } memset(oid, 0x0, sizeof(oid)); - git_oid_fmt(oid, git_indexer_hash(idx)); + git_oid_fmt(oid, git_indexer_stream_hash(idx)); ret = sprintf(slash + 1, "pack-%s.pack", oid); if(ret < 0) { return -2; @@ -124,7 +124,7 @@ static int show_ref__cb(git_remote_head *head, void *payload) PHP_METHOD(git2_remote, fetch) { php_git2_remote *m_remote; - git_indexer *idx = NULL; + git_indexer_stream *idx = NULL; git_transfer_progress stats; char *packname = NULL; int error = 0; @@ -138,31 +138,31 @@ PHP_METHOD(git2_remote, fetch) return; } */ - direction = GIT_DIR_FETCH; + direction = GIT_DIRECTION_FETCH; error = git_remote_connect(m_remote->remote, direction); error = git_remote_ls(m_remote->remote, &show_ref__cb, NULL); //error = git_remote_download(&packname, m_remote->remote); - if (packname != NULL) { + /*if (packname != NULL) { // Create a new instance indexer - error = git_indexer_new(&idx, packname); + error = git_indexer_stream_new(&idx, packname); PHP_GIT2_EXCEPTION_CHECK(error); - error = git_indexer_run(idx, &stats); + error = git_indexer_stream_run(idx, &stats); PHP_GIT2_EXCEPTION_CHECK(error); - error = git_indexer_write(idx); + error = git_indexer_stream_write(idx); PHP_GIT2_EXCEPTION_CHECK(error); error = php_git2_rename_packfile(packname, idx); PHP_GIT2_EXCEPTION_CHECK(error); - } + }*/ //error = git_remote_update_tips(m_remote->remote); PHP_GIT2_EXCEPTION_CHECK(error); - free(packname); + //free(packname); git_indexer_free(idx); } /* }}} */