@@ -154,11 +154,11 @@ discard block |
||
| 154 | 154 | public function actionUpdate() |
| 155 | 155 | { |
| 156 | 156 | foreach ($this->repos as $repo) { |
| 157 | - $this->rebaseRepo($repo, $this->getFilesystemRepoPath($repo)); |
|
| 157 | + $this->rebaseRepo($repo, $this->getFilesystemRepoPath($repo)); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | foreach ($this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []) as $repo => $path) { |
| 161 | - $this->rebaseRepo($repo, $path); |
|
| 161 | + $this->rebaseRepo($repo, $path); |
|
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | public function actionClone($vendor = null, $repo = null) |
| 172 | 172 | { |
| 173 | - // if `vendor/repo` notation is provided |
|
| 174 | - if ($vendor !== null && strpos($vendor, '/')) { |
|
| 175 | - list($vendor, $repo) = explode("/", $vendor); |
|
| 176 | - } |
|
| 173 | + // if `vendor/repo` notation is provided |
|
| 174 | + if ($vendor !== null && strpos($vendor, '/')) { |
|
| 175 | + list($vendor, $repo) = explode("/", $vendor); |
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | 178 | if (empty($vendor)) { |
| 179 | 179 | $vendor = $this->prompt("Enter the username/vendor for this repo (e.g. luyadev)"); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | if (empty($repo)) { |
| 183 | - $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)"); |
|
| 183 | + $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)"); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
@@ -201,14 +201,14 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | public function actionRemove($repo) |
| 203 | 203 | { |
| 204 | - FileHelper::removeDirectory($this->getFilesystemRepoPath($repo)); |
|
| 205 | - $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
|
| 206 | - if (isset($clones[$repo])) { |
|
| 207 | - unset($clones[$repo]); |
|
| 208 | - $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones); |
|
| 209 | - } |
|
| 204 | + FileHelper::removeDirectory($this->getFilesystemRepoPath($repo)); |
|
| 205 | + $clones = $this->getConfig(self::CONFIG_VAR_CUSTOMCLONES, []); |
|
| 206 | + if (isset($clones[$repo])) { |
|
| 207 | + unset($clones[$repo]); |
|
| 208 | + $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones); |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - return $this->outputSuccess("Removed repo {$repo}."); |
|
| 211 | + return $this->outputSuccess("Removed repo {$repo}."); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | private $_gitWrapper; |
@@ -296,16 +296,16 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | private function rebaseRepo($repo, $repoFileSystemPath) |
| 298 | 298 | { |
| 299 | - $wrapper = new GitWrapper(); |
|
| 299 | + $wrapper = new GitWrapper(); |
|
| 300 | 300 | |
| 301 | - $wrapper->git('checkout master', $repoFileSystemPath); |
|
| 302 | - $this->outputInfo("{$repo}: checkout master ✔"); |
|
| 301 | + $wrapper->git('checkout master', $repoFileSystemPath); |
|
| 302 | + $this->outputInfo("{$repo}: checkout master ✔"); |
|
| 303 | 303 | |
| 304 | - $wrapper->git('fetch upstream', $repoFileSystemPath); |
|
| 305 | - $this->outputInfo("{$repo}: fetch upstream ✔"); |
|
| 304 | + $wrapper->git('fetch upstream', $repoFileSystemPath); |
|
| 305 | + $this->outputInfo("{$repo}: fetch upstream ✔"); |
|
| 306 | 306 | |
| 307 | - $wrapper->git('rebase upstream/master master', $repoFileSystemPath); |
|
| 308 | - $this->outputInfo("{$repo}: rebase master ✔"); |
|
| 307 | + $wrapper->git('rebase upstream/master master', $repoFileSystemPath); |
|
| 308 | + $this->outputInfo("{$repo}: rebase master ✔"); |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /** |