adding the ability to clone from an existing repo and maintain some form

[gwvp-mini.git] / gwvpmini / gwvpmini_gitrepo.php

diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index edf8fd6..d642c92 100644 (file)
--- a/gwvpmini/gwvpmini_gitrepo.php
+++ b/gwvpmini/gwvpmini_gitrepo.php
@@ -3,7 +3,7 @@ global $HOME_PAGE_PROVIDERS;
 
 
 $CALL_ME_FUNCTIONS["repoadmin"] = "gwvpmini_RepoCallMe";
-$HOME_PAGE_PROVIDERS["gitlog"] = "gwvpmini_GitLogProvider";\r
+$HOME_PAGE_PROVIDERS["00gitlog"] = "gwvpmini_GitLogProvider";\r
 \r
 \r
 // the home_page_provders bit is an array\r
@@ -63,6 +63,9 @@ function gwvpmini_RepoMainPageBody()
                        foreach($repos as $repo) {
                                $name = $repo["name"];
                                $desc = $repo["desc"];
+                               
+                               if($desc == "") $desc = "none";
+                               
                                $repo_base = gwvpmini_getConfigVal("repodir");
                                $cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
                                echo "<tr><td><a href=\"$BASE_URL/view/$name\">$name</a></td><td>$desc</td>";
@@ -148,6 +151,8 @@ function gwvpmini_GitLogProvider()
                        foreach($repos as $repo) {
                                $name = $repo["name"];
                                $desc = $repo["desc"];
+                               
+                               if($desc == "") $desc = "-";
                                echo "<tr><td><a href=\"$BASE_URL/view/$name\">$name</a></td><td>$desc</td>";
                                echo "<td>";
                                $repo_base = gwvpmini_getConfigVal("repodir");
@@ -169,15 +174,6 @@ function gwvpmini_GitLogProvider()
                        echo "</table>";
                }\r
        }
-       
-       $logs = gwvpmini_GetActivityLog();
-       if($logs !== null) {
-               echo "<h2>Global Log</h2><table>";
-               foreach($logs as $ents) {
-                       echo "<tr><td>".$ents["type"]."</td><td>".$ents["commitid"]."</td></tr>";
-               }
-               echo "</table>";
-       }
 }
 
 function gwvpmini_GitCreateRepoForm()
@@ -187,15 +183,15 @@ function gwvpmini_GitCreateRepoForm()
        echo "<form method=\"post\" action=\"$BASE_URL/repos/create\">";
        echo "<table border=\"1\">";
        echo "<tr><th colspan=\"2\">Create Repo</th></tr>";
-       echo "<tr><th>Repo Name</th><td><input type=\"text\" name=\"reponame\"></td></tr>";
-       echo "<tr><th>Repo Description</th><td><input type=\"text\" name=\"repodesc\"></td></tr>";
+       echo "<tr><th>Repo Name</th><td><input type=\"text\" name=\"reponame\"></td><td>Name of your repo - letters, numbers _ and - only</td></tr>";
+       echo "<tr><th>Repo Description</th><td><input type=\"text\" name=\"repodesc\"></td><td>Description of your repo</td></tr>";
        echo "<tr><th>Read Permissions</th><td>";
        echo "<select name=\"perms\">";
        echo "<option value=\"perms-public\">Anyone Can Read</option>";
        echo "<option value=\"perms-registered\">Must be Registered To Read</option>";
        echo "<option value=\"perms-onlywrite\">Only Writers can Read</option>";
-       echo "</select>";
-       echo "</td></tr>";
+       echo "</select></td><td>The basic permissions for the initial repo creation</td></tr>";
+       echo "<tr><th>Clone From</th><td><input type=\"text\" name=\"clonefrom\"></td><td>Either a repo name (existing on this site) or a git url to clone from (blank for none)</td></tr>";
        echo "<tr><td colspan=\"2\"><input type=\"submit\" name=\"Create\" value=\"Create\"></td></tr>";
        echo "</table>";
        echo "</form>";
@@ -209,6 +205,7 @@ function gwvpmini_RepoCreate()
        // TODO: check the stuff out
        // first reponame
        $inputcheck = true;
+       
 
        // remove a .git at the end if it was input
        $_REQUEST["reponame"] = preg_replace("/\.git$/", "", $_REQUEST["reponame"]);
@@ -220,6 +217,28 @@ function gwvpmini_RepoCreate()
                $inputcheckerror = "Repo name contains invalid characters, repos can only contain a-z, A-Z, 0-9, _, - and .";
        }
        
+       $clonefrom = false;
+       $fromremote = false;
+       if(isset($_REQUEST["clonefrom"])) {
+               if($_REQUEST["clonefrom"] != "") {
+                       $clonefrom = $_REQUEST["clonefrom"];
+                       if(preg_match("/git.*:\/\/.*/", $clonefrom)>0) {
+                               $fromremote = true;
+                       }
+                       if(preg_match("/http.*\:\/\//", $clonefrom)>0) $fromremote = true;
+               }
+       }
+       
+       if($clonefrom !== false && $fromremote == false) {
+               // check the local repo exists
+               $rn = gwvpmini_getRepo(null, $clonefrom, null);
+               if($rn == false) {
+                       gwvpmini_SendMessage("error", "local repo $clonefrom given as upstream clone, however $clonefrom doesnt exist on this site");
+                       header("Location: $BASE_URL/repos");
+                       return;
+               }
+       }
+       
        if(!$inputcheck) {
                gwvpmini_SendMessage("error", "$inputcheckerror");\r
                header("Location: $BASE_URL/repos");
@@ -229,7 +248,7 @@ function gwvpmini_RepoCreate()
                        gwvpmini_SendMessage("error", "Repo ".$_REQUEST["reponame"]." already exists");\r
                        header("Location: $BASE_URL/repos");
                } else {
-                       gwvpmini_createGitRepo($_REQUEST["reponame"], $_SESSION["id"], $_REQUEST["repodesc"], $_REQUEST["perms"]);
+                       gwvpmini_createGitRepo($_REQUEST["reponame"], $_SESSION["id"], $_REQUEST["repodesc"], $_REQUEST["perms"], $clonefrom);
                        gwvpmini_SendMessage("info", "Repo ".$_REQUEST["reponame"]." has been created");
                        header("Location: $BASE_URL/repos");
                }
@@ -281,5 +300,12 @@ function gwvpmini_RecursiveDelete($fpath)
                return @rmdir($fpath);\r
        }
 }
+
+function gwvpmini_CompressCommitId($cid)
+{
+       $compressedcid = substr($cid, 0, 5)."...".substr($cid, strlen($cid)-5, strlen($cid));
+       
+       return $compressedcid;
+}
        
 ?>
\ No newline at end of file