X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_gitrepo.php;h=3c195073cf5a751f9501cc05bc32f1187f435a0f;hp=d9d9fef42d1020eab054fa11ba43d32b9f9cddad;hb=HEAD;hpb=43b78ea0976ab7ec013c6a1ace53db98ede89012
diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index d9d9fef..3c19507 100644
--- a/gwvpmini/gwvpmini_gitrepo.php
+++ b/gwvpmini/gwvpmini_gitrepo.php
@@ -55,6 +55,7 @@ function gwvpmini_RepoMainPageBody()
if(gwvpmini_isLoggedIn()) {
$repos = gwvpmini_GetOwnedRepos($_SESSION["username"]);
+ error_log("repos, ".print_r($repos, true));
if(!$repos) {
echo "You currently own no repos
";
} else {
@@ -63,26 +64,37 @@ function gwvpmini_RepoMainPageBody()
foreach($repos as $repo) {
$name = $repo["name"];
$desc = $repo["desc"];
+ $stat = $repo["status"];
+ $llog = "";
+ if($stat != 0) {
+ switch($stat) {
+ case 1:
+ $llog = "Repo Administratively Disabled";
+ break;
+ case 2:
+ $llog = "Repo Cloning from remote";
+ break;
+ }
+ } else {
- if($desc == "") $desc = "none";
-
- $repo_base = gwvpmini_getConfigVal("repodir");
- $cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
- echo "
$name | $desc | ";
- echo "";
- // error_log("CMD: $cmd");
- //system("$cmd");
- $fls = popen($cmd, "r");
- $tks = "";
- if($fls !== false) while(!feof($fls)) {
- $tks .= fread($fls,1024);
+ if($desc == "") $desc = "none";
+
+ $repo_base = gwvpmini_getConfigVal("repodir");
+ $cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
+ // error_log("CMD: $cmd");
+ //system("$cmd");
+ $fls = popen($cmd, "r");
+ $tks = "";
+ if($fls !== false) while(!feof($fls)) {
+ $tks .= fread($fls,1024);
+ }
+
+ if($tks == "") {
+ $llog = "No Log Info Yet";
+ } else $llog = $tks;
+
}
-
- if($tks == "") {
- echo "No Log Info Yet";
- } else echo $tks;
- echo " | ";
- echo "
";
+ echo "$name | $desc | $llog |
";
}
echo "";
}
@@ -97,20 +109,32 @@ function gwvpmini_RepoMainPageBody()
foreach($contreps as $repo) {
$name = $repo["name"];
$desc = $repo["desc"];
- $repo_base = gwvpmini_getConfigVal("repodir");
- $cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
- // error_log("CMD: $cmd");
- //system("$cmd");
- $fls = popen($cmd, "r");
- $tks = "";
- if($fls !== false) while(!feof($fls)) {
- $tks .= fread($fls,1024);
+ $stat = $repo["status"];
+ if($stat != 0) {
+ switch($stat) {
+ case 1:
+ $lastlog = "Repo Administratively Disabled";
+ break;
+ case 2:
+ $lastlog = "Repo Cloning from remote";
+ break;
+ }
+ } else {
+ $repo_base = gwvpmini_getConfigVal("repodir");
+ $cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
+ // error_log("CMD: $cmd");
+ //system("$cmd");
+ $fls = popen($cmd, "r");
+ $tks = "";
+ if($fls !== false) while(!feof($fls)) {
+ $tks .= fread($fls,1024);
+ }
+
+ if($tks == "") {
+ $lastlog = "No Log Info Yet";
+ } else $lastlog = $tks;
}
- if($tks == "") {
- $lastlog = "No Log Info Yet";
- } else $lastlog = $tks;
-
$owner = gwvpmini_getUser(null, null, $repo["owner"]);
$repname = "$name";
$repown = gwvpmini_HtmlGravatar($owner["email"], 30, "
")."".$owner["username"]."";
@@ -126,7 +150,8 @@ function gwvpmini_RepoMainPageBody()
function gwvpmini_GitLogProvider()
-{
+{
+ global $cmd_line_tool,$git_cli_cmd,$php_cli_cmd;
/*
* The home page provider will:
* 1) show the last 10 commits for every repository - though, excluding private repos
@@ -156,7 +181,7 @@ function gwvpmini_GitLogProvider()
echo "$name | $desc | ";
echo "";
$repo_base = gwvpmini_getConfigVal("repodir");
- $cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
+ $cmd = "$git_cli_cmd --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
// error_log("CMD: $cmd");
//system("$cmd");
$fls = popen($cmd, "r");
@@ -327,5 +352,51 @@ function gwvpmini_CompressCommitId($cid)
return $compressedcid;
}
+
+function gwvpmini_GetCommitDetail($repo, $commitid)
+{
+ global $cmd_line_tool,$git_cli_cmd,$php_cli_cmd;
+
+ $repo_base = gwvpmini_getConfigVal("repodir");
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git log $commitid -1 --format='%an'";
+ exec($cmd, $commitername, $returnvar);
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git log $commitid -1 --format='%ae'";
+ exec($cmd, $commiteremail, $returnvar);
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git log $commitid -1 --format='%ct'";
+ exec($cmd, $commitertime, $returnvar);
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git log $commitid -1 --format='%s'";
+ exec($cmd, $commiterlog, $returnvar);
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git log $commitid -1 --format='%b'";
+ exec($cmd, $commiterbody, $returnvar);
+}
+
+function gwvpmini_GetCommitList($repo, $branch, $num=20)
+{
+ global $git_cli_cmd,$git_cli_cmd,$php_cli_cmd;
+
+ $repo_base = gwvpmini_getConfigVal("repodir");
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git log $commitid -1 --format='%an'";
+ exec($cmd, $commitername, $returnvar);
+
+}
+
+function gwvpmini_GetRefList($repo)
+{
+ global $cmd_line_tool,$git_cli_cmd,$php_cli_cmd;
+
+ $repo_base = gwvpmini_getConfigVal("repodir");
+
+ $cmd = "$git_cli_cmd --git-dir=$repo_base/$repo.git for-each-ref $commitid --format='%(objecttype):%(objectname):%(refname)'";
+ error_log("command was $cmd");
+ exec($cmd, $reflist, $returnvar);
+
+ return $reflist;
+}
?>
\ No newline at end of file
|