Merge pull request #75 from tiktok/feat-checkout-dash

Supports "sparo checkout -"

apps/sparo-lib/src/cli/commands/checkout.ts

@@ -122,11 +122,11 @@ export class CheckoutCommand implements ICommand<ICheckoutCommandOptions> {
     if (!branch) {
       const checkoutIndex: number = process.argv.findIndex((value: string) => value === 'checkout');
       if (checkoutIndex >= 0 && process.argv[checkoutIndex + 1] === '-') {
-        branch = '-';
+        // - is a shortcut of @{-1}
-        // FIXME: supports "sparo checkout -"
+        branch = gitService.getPreviousBranch(1);
-        throw new Error(
+        if (!branch) {
-          `Git's "-" token is not yet supported. If this feature is important for your work, please let us know by creating a GitHub issue.`
+          throw new Error(`Argument "-" is unknown revision or path not in the working tree.`);
-        );
+        }
       }
     }
 

apps/sparo-lib/src/services/GitService.ts

@@ -445,6 +445,24 @@ Please specify a directory on the command line
     return currentBranch;
   }
 
+  /**
+   * Retrieves the previous branch name using `@{-n}` syntax
+   *
+   * Assume:
+   * git checkout feature
+   * git checkout main
+   * ---
+   * `git checkout @{-1}` equals to run `git checkout feature`.
+   * Running `getPreviousBranch(1)` works in the similar way and returns "feature" in this case.
+   */
+  public getPreviousBranch(n: number): string {
+    const result: string = this.executeGitCommandAndCaptureOutput({
+      args: ['rev-parse', '--symbolic-full-name', '--abbrev-ref=loose', `@{-${n}}`]
+    }).trim();
+    this._terminalService.terminal.writeDebugLine(`getPreviousBranch ${n}: ${result}`);
+    return result;
+  }
+
   /**
    * Check existence for a list of branch name
    */

common/changes/sparo/feat-checkout-dash_2024-05-30-05-28.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "sparo",
+      "comment": "\"sparo checkout -\" can checkout to previous branch correctly",
+      "type": "none"
+    }
+  ],
+  "packageName": "sparo"
+}

common/reviews/api/sparo-lib.api.md

@@ -46,6 +46,7 @@ export class GitService {
     getIsSparseCheckoutMode(): boolean | undefined;
     // (undocumented)
     getObjectType(object: string): IObjectType | undefined;
+    getPreviousBranch(n: number): string;
     // (undocumented)
     getRepoInfo(): GitRepoInfo;
     get gitPath(): string | undefined;