up: support branch alias for open PR

inhere · Jan 7, 2021 · bbe1cdc · bbe1cdc
1 parent 072bb31
commit bbe1cdc
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/app/Common/GitLocal/AbstractGitLocal.php b/app/Common/GitLocal/AbstractGitLocal.php
@@ -249,6 +249,7 @@ public function parseRemote(string $remote = ''): self
             $this->setRemote($remote);
         }
 
+        Color::println('find and parse remote info ...', 'normal');
         $str = 'git remote get-url --push ' . $this->remote;
         $run = CmdRunner::new($str, $this->workDir);
         $url = $run->do()->getOutput(true);
@@ -339,7 +340,6 @@ public function loadCurPjInfo(string $pjName = ''): self
         return $this;
     }
 
-
     /**
      * @param string $repo
      * @param bool   $useGitUrl
@@ -371,6 +371,28 @@ public function parseRepoUrl(string $repo, bool $useGitUrl = false): string
         return $repoUrl;
     }
 
+    /**
+     * @param string $alias
+     *
+     * @return string
+     */
+    public function getRealBranchName(string $alias): string
+    {
+        if (isset($this->config['branchAliases'])) {
+            return $this->config['branchAliases'][$alias] ?? $alias;
+        }
+
+        return $alias;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBranchAliases(): array
+    {
+        return $this->config['branchAliases'] ?? [];
+    }
+
     /**
      * @return string
      */
@@ -406,6 +428,17 @@ public function getValue(string $key, $default = null)
         return $this->config[$key] ?? $default;
     }
 
+    /**
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public function getParam(string $key, $default = null)
+    {
+        return $this->config[$key] ?? $default;
+    }
+
     /**
      * @param array $config
      */

diff --git a/app/Common/GitLocal/GitLab.php b/app/Common/GitLocal/GitLab.php
@@ -46,7 +46,7 @@ public function findPjName(): string
         if (!$pjName) {
             $info = $this->parseRemote()->getRemoteInfo();
             $path = $info['path'] ?? '';
-
+// \vdump($info);
             if ($path && isset($this->projects[$path])) {
                 $pjName = $path;
 

diff --git a/app/Console/Controller/GitLabController.php b/app/Console/Controller/GitLabController.php
@@ -53,7 +53,8 @@ public static function aliases(): array
     protected function groupOptions(): array
     {
         return [
-            '-y, --yes' => 'Direct execution without confirmation',
+            '-y, --yes'         => 'Direct execution without confirmation',
+            '-i, --interactive' => 'Run in an interactive environment[TODO]',
         ];
     }
 
@@ -463,7 +464,8 @@ public function pullRequestCommand(Input $input, Output $output): void
         $output->info('auto fetch current branch name');
         $curBranch = GitUtil::getCurrentBranchName();
         $srcBranch = $input->getSameStringOpt(['s', 'source']);
-        $tgtBranch = $input->getSameStringOpt(['t', 'target']);
+        $tgtBranch = $input->getSameStringOpt('t,target');
+        $tgtBranch = $gitlab->getRealBranchName($tgtBranch);
 
         if ($fullSBranch = $input->getStringOpt('full-source')) {
             $srcBranch = $fullSBranch;