Allow using several git repos

- editcommit.php, Git.php:
  - fixed issue for non git repo related paths in case of auto determining repos

Author: mhoffrog

action/editcommit.php

@@ -30,6 +30,15 @@ public function register(Doku_Event_Handler $controller) {
         $controller->register_hook('DOKUWIKI_DONE', 'AFTER', $this, 'handle_periodic_pull');
     }
 
+    /**
+     * Create a GitRepo class instance according to this plugins config.
+     * If auto determination of git rpos is configured, this method will return null,
+     * if there is no git repo found.
+     *
+     * @access  private
+     * @param   string  path to the file or directory to be commited (required for auto determination only)
+     * @return  GitRepo instance or null if there is no repo related to fileOrDirPath
+     */
     private function initRepo($fileOrDirPath="") {
         //set the path to the git binary
         $gitPath = trim($this->getConf('gitPath'));
@@ -39,22 +48,24 @@ private function initRepo($fileOrDirPath="") {
 
 		$isAutoDetermineRepos = $this->getConf('autoDetermineRepos');
 		if ($isAutoDetermineRepos) {
+			if (empty($fileOrDirPath)) {
+				return null;
+			}
 			$repoPath = is_dir($fileOrDirPath) ? $fileOrDirPath : dirname($fileOrDirPath);
 			$repo = new GitRepo($repoPath, $this, false, false);
 			$repoPath = $repo->get_repo_path();
+			if (empty($repoPath)) {
+				return null;
+			}
 			$repoWorkDir = '';
 		} else {
 			//get path to the repo root (by default DokuWiki's savedir)
 			$repoPath = GitBackedUtil::getEffectivePath($this->getConf('repoPath'));
 			//init the repo and create a new one if it is not present
 			io_mkdir_p($repoPath);
 			$repo = new GitRepo($repoPath, $this, true, true);
-		}
-        //set git working directory (by default DokuWiki's savedir)
-		if ($isAutoDetermineRepos) {
-			$repoWorkDir = '';
-		} else {
-            $repoWorkDir = $this->getConf('repoWorkDir');
+			//set git working directory (by default DokuWiki's savedir)
+            $repoWorkDir = trim($this->getConf('repoWorkDir'));
             if (!empty($repoWorkDir)) {
                 $repoWorkDir = GitBackedUtil::getEffectivePath($repoWorkDir);
             }
@@ -90,7 +101,9 @@ private function commitFile($filePath,$message) {
 		if (!$this->isIgnored($filePath)) {
 			try {
 				$repo = $this->initRepo($filePath);
-
+				if (is_null($repo)) {
+					return;
+				}
 				//add the changed file and set the commit message
 				$repo->add($filePath);
 				$repo->commit($message);
@@ -131,17 +144,19 @@ public function handle_periodic_pull(Doku_Event &$event, $param) {
 
             //if it is time to run a pull request
             if ($lastPull+$timeToWait < $now) {
-				try {
-                	$repo = $this->initRepo();
-
-                	//execute the pull request
-                	$repo->pull('origin',$repo->active_branch());
-				} catch (Exception $e) {
-					if (!$this->isNotifyByEmailOnGitCommandError()) {
-						throw new Exception('Git command failed to perform periodic pull: '.$e->getMessage(), 2, $e);
-					}
-					return;
-				}
+                try {
+                    $repo = $this->initRepo();
+                    if (is_null($repo)) {
+                        return;
+                    }
+                    //execute the pull request
+                    $repo->pull('origin',$repo->active_branch());
+                } catch (Exception $e) {
+                    if (!$this->isNotifyByEmailOnGitCommandError()) {
+                        throw new Exception('Git command failed to perform periodic pull: '.$e->getMessage(), 2, $e);
+                    }
+                    return;
+                }
 
                 //save the current time to the file to track the last pull execution
                 file_put_contents($lastPullFile,serialize(time()));

lib/Git.php

@@ -233,6 +233,10 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {
 							if ($_init) {
 								$this->run('init');
 							}
+						} if (!$_init) {
+							// If we do not have to init the repo, we just reflect that there is no repo path yet.
+							// This may be the case for auto determining repos, if there is no repo related to the current resource going to be commited.
+							$this->repo_path = '';
 						} else {
 							throw new Exception($this->handle_repo_path_error($repo_path, '"'.$repo_path.'" is not a git repository'));
 						}
@@ -344,6 +348,10 @@ public function absolute_git_dir($path) {
 	 * @return  string  or null in case of an error
 	 */
 	protected function run_command($command) {
+		//dbglog("Git->run_command: repo_path=[".$this->repo_path."])");
+		if (empty($this->repo_path)) {
+			throw new Exception($this->handle_repo_path_error($this->repo_path, "Failure on GitRepo->run_command(): Git command must not be run for an empty repo path"));
+		}
 		//dbglog("Git->run_command(command=[".$command."])");
 		$descriptorspec = array(
 			1 => array('pipe', 'w'),
@@ -368,9 +376,7 @@ protected function run_command($command) {
 		} else {
 			$env = array_merge($_ENV, $this->envopts);
 		}
-		$cwd = $this->repo_path;
-		//dbglog("GitBacked - cwd: [".$cwd."]");
-		$resource = proc_open($command, $descriptorspec, $pipes, $cwd, $env);
+		$resource = proc_open($command, $descriptorspec, $pipes, $this->repo_path, $env);
 
 		$stdout = stream_get_contents($pipes[1]);
 		$stderr = stream_get_contents($pipes[2]);