Allow using several git repos

- improvements due to code review:
  - changed config 'initRepo' -> 'autoDetermineRepos' to leverage self explanation
  - added missing language description for this config

Fixes #47

Author: mhoffrog

action/editcommit.php

@@ -30,32 +30,33 @@ public function register(Doku_Event_Handler $controller) {
         $controller->register_hook('DOKUWIKI_DONE', 'AFTER', $this, 'handle_periodic_pull');
     }
 
-    private function initRepo($initRepo=True, $filePath="") {
-		if($initRepo) {
-			$repoPath = GitBackedUtil::getEffectivePath($this->getConf('repoPath'));
-		} else {
+    private function initRepo($isAutoDetermineRepos=false, $filePath="") {
+		if($isAutoDetermineRepos) {
 			$repoPath = dirname($filePath);
+		} else {
+			//get path to the repo root (by default DokuWiki's savedir)
+			$repoPath = GitBackedUtil::getEffectivePath($this->getConf('repoPath'));
 		}
         //set the path to the git binary
         $gitPath = trim($this->getConf('gitPath'));
         if ($gitPath !== '') {
             Git::set_bin($gitPath);
         }
-		if ($initRepo) {
+		if ($isAutoDetermineRepos) {
+			$repo = new GitRepo($repoPath, $this, false, false);
+		} else {
 			//init the repo and create a new one if it is not present
 			io_mkdir_p($repoPath);
 			$repo = new GitRepo($repoPath, $this, true, true);
-		} else {
-			$repo = new GitRepo($repoPath, $this, false, false);
 		}
         //set git working directory (by default DokuWiki's savedir)
-		if ($initRepo) {
+		if ($isAutoDetermineRepos) {
+			$repoWorkDir = "";
+		} else {
             $repoWorkDir = $this->getConf('repoWorkDir');
             if (!empty($repoWorkDir)) {
                 $repoWorkDir = GitBackedUtil::getEffectivePath($repoWorkDir);
             }
-		} else {
-			$repoWorkDir = "";
 		}
 
         Git::set_bin(empty($repoWorkDir) ? Git::get_bin() : Git::get_bin().' --work-tree '.escapeshellarg($repoWorkDir));
@@ -87,11 +88,11 @@ private function isIgnored($filePath) {
     private function commitFile($filePath,$message) {
 		if (!$this->isIgnored($filePath)) {
 			try {
-				$initRepo = $this->getConf('initRepo');
-				if ($initRepo) {
-					$repo = $this->initRepo();
+				$isAutoDetermineRepos = $this->getConf('autoDetermineRepos');
+				if ($isAutoDetermineRepos) {
+					$repo = $this->initRepo($isAutoDetermineRepos, $filePath);
 				} else {
-					$repo = $this->initRepo($initRepo, $filePath);
+					$repo = $this->initRepo();
 				}
 
 				//add the changed file and set the commit message

conf/default.php

@@ -5,7 +5,7 @@
  * @author Wolfgang Gassler <[email protected]>
  */
 
-$conf['initRepo'] = 1;
+$conf['autoDetermineRepos'] = 1;
 $conf['pushAfterCommit'] = 0;
 $conf['periodicPull'] = 0;
 $conf['periodicMinutes'] = 60;

conf/metadata.php

@@ -5,7 +5,7 @@
  * @author Wolfgang Gassler <[email protected]>
  */
 
-$meta['initRepo'] = array('onoff');
+$meta['autoDetermineRepos'] = array('onoff');
 $meta['pushAfterCommit'] = array('onoff');
 $meta['periodicPull'] = array('onoff');
 $meta['periodicMinutes'] = array('numeric');

lang/de/settings.php

@@ -6,6 +6,7 @@
  * @author Markus Hoffrogge <[email protected]>
  */
 
+$lang['autoDetermineRepos'] = 'Erkennt existierende git repo(s) in dem Pfad der geänderten Datei. Wenn gesetzt, dann werden die Einstellungen <code>repoPath</code> und <code>repoWorkDir</code> ignoriert.';
 $lang['pushAfterCommit'] = 'Push des aktiven Branch zum remote origin nach jedem commit';
 $lang['periodicPull'] = 'Pull des remote git Repositories alle "periodicMinutes", getriggert von einem http Page Request';
 $lang['periodicMinutes'] = 'Zeitraum (in Minuten) zwischen den periodischen pull requests';

lang/en/settings.php

@@ -6,6 +6,7 @@
  * @author Wolfgang Gassler <[email protected]>
  */
 
+$lang['autoDetermineRepos'] = 'Determine existing git repo(s) from the path of the file to commit. If set, then the configs <code>repoPath</code> and <code>repoWorkDir</code> are ignored.';
 $lang['pushAfterCommit'] = 'Push active branch to remote origin after every commit';
 $lang['periodicPull'] = 'Pull the remote git repository every "periodicMinutes" triggered by a http page request';
 $lang['periodicMinutes'] = 'Timespan (in minutes) between periodic pull requests';