Skip to content

Commit ea15c7b

Browse files
committed
add graph
1 parent f34f0ab commit ea15c7b

File tree

4 files changed

+81
-1
lines changed

4 files changed

+81
-1
lines changed

config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PHP_ARG_ENABLE(git2-debug, for git2 debug support,
77
if test $PHP_GIT2 != "no"; then
88
PHP_SUBST(GIT2_SHARED_LIBADD)
99

10-
PHP_NEW_EXTENSION(git2, php_git2.c repository.c commit.c tree.c clone.c blob.c helper.c revwalk.c treebuilder.c reference.c g_config.c object.c index.c revparse.c branch.c tag.c status.c cred.c remote.c transport.c diff.c checkout.c filter.c ignore.c indexer.c pathspec.c patch.c merge.c note.c odb.c reflog.c blame.c packbuilder.c stash.c signature.c attr.c reset.c message.c submodule.c giterr.c push.c refspec.c, $ext_shared)
10+
PHP_NEW_EXTENSION(git2, php_git2.c repository.c commit.c tree.c clone.c blob.c helper.c revwalk.c treebuilder.c reference.c g_config.c object.c index.c revparse.c branch.c tag.c status.c cred.c remote.c transport.c diff.c checkout.c filter.c ignore.c indexer.c pathspec.c patch.c merge.c note.c odb.c reflog.c blame.c packbuilder.c stash.c signature.c attr.c reset.c message.c submodule.c giterr.c push.c refspec.c graph.c, $ext_shared)
1111
PHP_ADD_INCLUDE([$ext_srcdir/libgit2/include])
1212

1313
# for now

graph.c

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#include "php_git2.h"
2+
#include "php_git2_priv.h"
3+
#include "graph.h"
4+
/* {{{ proto long git_graph_ahead_behind(resource $repo, string $local, string $upstream)
5+
*/
6+
PHP_FUNCTION(git_graph_ahead_behind)
7+
{
8+
int result = 0, local_len = 0, upstream_len = 0, error = 0;
9+
zval *repo = NULL, *array = NULL;
10+
php_git2_t *_repo = NULL;
11+
char *local = NULL, *upstream = NULL;
12+
git_oid __local = {0}, __upstream = {0};
13+
size_t ahead = 0, behind = 0;
14+
15+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
16+
"rss", &ahead, &behind, &repo, &local, &local_len, &upstream, &upstream_len) == FAILURE) {
17+
return;
18+
}
19+
20+
ZEND_FETCH_RESOURCE(_repo, php_git2_t*, &repo, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
21+
if (git_oid_fromstrn(&__local, local, local_len)) {
22+
RETURN_FALSE;
23+
}
24+
if (git_oid_fromstrn(&__upstream, upstream, upstream_len)) {
25+
RETURN_FALSE;
26+
}
27+
result = git_graph_ahead_behind(&ahead, &behind, PHP_GIT2_V(_repo, repository), &__local, &__upstream);
28+
29+
MAKE_STD_ZVAL(array);
30+
array_init(array);
31+
add_next_index_long(array, ahead);
32+
add_next_index_long(array, behind);
33+
34+
RETURN_ZVAL(array, 0, 1);
35+
}
36+
/* }}} */
37+

graph.h

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* PHP Libgit2 Extension
3+
*
4+
* https://github.com/libgit2/php-git
5+
*
6+
* Copyright 2014 Shuhei Tanuma. All rights reserved.
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
#ifndef PHP_GIT2_GRAPH_H
27+
#define PHP_GIT2_GRAPH_H
28+
29+
ZEND_BEGIN_ARG_INFO_EX(arginfo_git_graph_ahead_behind, 0, 0, 3)
30+
ZEND_ARG_INFO(0, repo)
31+
ZEND_ARG_INFO(0, local)
32+
ZEND_ARG_INFO(0, upstream)
33+
ZEND_END_ARG_INFO()
34+
35+
/* {{{ proto long git_graph_ahead_behind(long $ahead, long $behind, resource $repo, string $local, string $upstream)
36+
*/
37+
PHP_FUNCTION(git_graph_ahead_behind);
38+
39+
#endif

php_git2.c

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
#include "giterr.h"
6666
#include "push.h"
6767
#include "refspec.h"
68+
#include "graph.h"
6869

6970
int git2_resource_handle;
7071

@@ -929,6 +930,9 @@ static zend_function_entry php_git2_functions[] = {
929930
PHP_FE(git_refspec_transform, arginfo_git_refspec_transform)
930931
PHP_FE(git_refspec_rtransform, arginfo_git_refspec_rtransform)
931932

933+
/* graph */
934+
PHP_FE(git_graph_ahead_behind, arginfo_git_graph_ahead_behind)
935+
932936
/* misc */
933937
PHP_FE(git_resource_type, arginfo_git_resource_type)
934938
PHP_FE(git_libgit2_capabilities, NULL)

0 commit comments

Comments
 (0)