Merge pull request kbjr#6 from uuf6429/master

kbjr · kbjr · commit 41d61a31c113 · 2012-10-30T10:23:30.000-07:00
Bug fixes
diff --git a/CI_Git.php b/CI_Git.php
@@ -104,7 +104,7 @@ class GitRepo {
 	 */	
 	public static function &create_new($repo_path, $source = null) {
 		if (is_dir($repo_path) && file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {
-			throw new Exception('"$repo_path" is already a git repository');
+			throw new Exception('"'.$repo_path.'" is already a git repository');
 		} else {
 			$repo = new self($repo_path, true, false);
 			if (is_string($source))
@@ -151,11 +151,11 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {
 							$this->repo_path = $repo_path;
 							if ($_init) $this->run('init');
 						} else {
-							throw new Exception('"$repo_path" is not a git repository');
+							throw new Exception('"'.$repo_path.'" is not a git repository');
 						}
 					}
 				} else {
-					throw new Exception('"$repo_path" is not a directory');
+					throw new Exception('"'.$repo_path.'" is not a directory');
 				}
 			} else {
 				if ($create_new) {
@@ -167,7 +167,7 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {
 						throw new Exception('cannot create repository in non-existent directory');
 					}
 				} else {
-					throw new Exception('"$repo_path" does not exist');
+					throw new Exception('"'.$repo_path.'" does not exist');
 				}
 			}
 		}
diff --git a/Git.php b/Git.php
@@ -97,7 +97,7 @@ class GitRepo {
 	 */
 	public static function &create_new($repo_path, $source = null) {
 		if (is_dir($repo_path) && file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {
-			throw new Exception('"$repo_path" is already a git repository');
+			throw new Exception('"'.$repo_path.'" is already a git repository');
 		} else {
 			$repo = new self($repo_path, true, false);
 			if (is_string($source))
@@ -144,11 +144,11 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {
 							$this->repo_path = $repo_path;
 							if ($_init) $this->run('init');
 						} else {
-							throw new Exception('"$repo_path" is not a git repository');
+							throw new Exception('"'.$repo_path.'" is not a git repository');
 						}
 					}
 				} else {
-					throw new Exception('"$repo_path" is not a directory');
+					throw new Exception('"'.$repo_path.'" is not a directory');
 				}
 			} else {
 				if ($create_new) {
@@ -160,7 +160,7 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {
 						throw new Exception('cannot create repository in non-existent directory');
 					}
 				} else {
-					throw new Exception('"$repo_path" does not exist');
+					throw new Exception('"'.$repo_path.'" does not exist');
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class GitRepo {`
`104`	`104`	`*/`
`105`	`105`	`public static function &create_new($repo_path, $source = null) {`
`106`	`106`	`if (is_dir($repo_path) && file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {`
`107`		`- throw new Exception('"$repo_path" is already a git repository');`
	`107`	`+ throw new Exception('"'.$repo_path.'" is already a git repository');`
`108`	`108`	`} else {`
`109`	`109`	`$repo = new self($repo_path, true, false);`
`110`	`110`	`if (is_string($source))`
`@@ -151,11 +151,11 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {`
`151`	`151`	`$this->repo_path = $repo_path;`
`152`	`152`	`if ($_init) $this->run('init');`
`153`	`153`	`} else {`
`154`		`- throw new Exception('"$repo_path" is not a git repository');`
	`154`	`+ throw new Exception('"'.$repo_path.'" is not a git repository');`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`} else {`
`158`		`- throw new Exception('"$repo_path" is not a directory');`
	`158`	`+ throw new Exception('"'.$repo_path.'" is not a directory');`
`159`	`159`	`}`
`160`	`160`	`} else {`
`161`	`161`	`if ($create_new) {`
`@@ -167,7 +167,7 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {`
`167`	`167`	`throw new Exception('cannot create repository in non-existent directory');`
`168`	`168`	`}`
`169`	`169`	`} else {`
`170`		`- throw new Exception('"$repo_path" does not exist');`
	`170`	`+ throw new Exception('"'.$repo_path.'" does not exist');`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class GitRepo {`
`97`	`97`	`*/`
`98`	`98`	`public static function &create_new($repo_path, $source = null) {`
`99`	`99`	`if (is_dir($repo_path) && file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {`
`100`		`- throw new Exception('"$repo_path" is already a git repository');`
	`100`	`+ throw new Exception('"'.$repo_path.'" is already a git repository');`
`101`	`101`	`} else {`
`102`	`102`	`$repo = new self($repo_path, true, false);`
`103`	`103`	`if (is_string($source))`
`@@ -144,11 +144,11 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {`
`144`	`144`	`$this->repo_path = $repo_path;`
`145`	`145`	`if ($_init) $this->run('init');`
`146`	`146`	`} else {`
`147`		`- throw new Exception('"$repo_path" is not a git repository');`
	`147`	`+ throw new Exception('"'.$repo_path.'" is not a git repository');`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`} else {`
`151`		`- throw new Exception('"$repo_path" is not a directory');`
	`151`	`+ throw new Exception('"'.$repo_path.'" is not a directory');`
`152`	`152`	`}`
`153`	`153`	`} else {`
`154`	`154`	`if ($create_new) {`
`@@ -160,7 +160,7 @@ public function set_repo_path($repo_path, $create_new = false, $_init = true) {`
`160`	`160`	`throw new Exception('cannot create repository in non-existent directory');`
`161`	`161`	`}`
`162`	`162`	`} else {`
`163`		`- throw new Exception('"$repo_path" does not exist');`
	`163`	`+ throw new Exception('"'.$repo_path.'" does not exist');`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`