@aaronshaf/ger 1.2.9 → 1.2.11

package/README.md

@@ -23,6 +23,6 @@ ger branch
 # list branches with expanded gerrit info
 ger branch -v
 
-# prompt to delete already-merged branches
+# prompt to delete branches of submitted or abandoned changes
 ger branch -d
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "description": "Gerrit CLI",
   "main": "src/ger.ts",
   "bin": {

package/src/commands/branch.ts

@@ -39,7 +39,9 @@ export function branch({
     const changeId = localBranchDataMap[name].changeId;
     if (changeId) {
       const gerritData = gerritOutputByChangeId[changeId];
-      return gerritData?.status === "MERGED";
+      return (
+        gerritData?.status === "MERGED" || gerritData?.status === "ABANDONED"
+      );
     }
     return false;
   });
@@ -100,19 +102,21 @@ function output(
         .filter(Boolean)
         .map((str) => `[${str}]`) as string[];
 
-      const approvals = (gerritData.currentPatchSet.approvals || []).map((a) => {
-        let description = a.description;
-        if (a.type === "SUBM" && !description) {
-          description = "Submitted";
+      const approvals = (gerritData.currentPatchSet.approvals || []).map(
+        (a) => {
+          let description = a.description;
+          if (a.type === "SUBM" && !description) {
+            description = "Submitted";
+          }
+          return isVerbose
+            ? `${description || a.type}: ${normalizeValue(
+                a.value
+              )} (${normalizeApproverName(a.by.name)})`
+            : `${abbreviateApproverDescription(
+                description || a.type
+              )}${normalizeValue(a.value)}`;
         }
-        return isVerbose
-          ? `${description || a.type}: ${normalizeValue(
-              a.value
-            )} (${normalizeApproverName(a.by.name)})`
-          : `${abbreviateApproverDescription(
-              description || a.type
-            )}${normalizeValue(a.value)}`;
-      });
+      );
 
       const approvalText = approvals.join(isVerbose ? "\n" : ", ");
 
@@ -122,8 +126,10 @@ function output(
 
       if (isVerbose) {
         table.push([
-          `${bold(localBranch)}${topicText}\n${localBranchDataMap[localBranch].shortHash}`,
-          `${labels.join(" ")}`,
+          `${bold(localBranch)}${topicText}\n${
+            localBranchDataMap[localBranch].shortHash
+          }`,
+          `${labels.join("\n")}`,
           `${subject}\n${yellow(gerritData.url.replace("https://", ""))}`,
           approvalText,
         ]);
@@ -163,11 +169,21 @@ async function promptForMergedBranchDeletion(mergedBranches: string[]) {
     input: process.stdin,
     output: process.stdout,
   });
+  
+  if (mergedBranches.length > 0) {
+    console.log('')
+    console.log(
+      `The following ${bold(String(mergedBranches.length))} local branches are merged or abandoned:`
+    );
+    for (const mergedLocalBranch of mergedBranches) {
+      console.log(`  ${bold(mergedLocalBranch)}`);
+    }
+  }
 
   for (const mergedLocalBranch of mergedBranches) {
     const answer: string = await new Promise((resolve) => {
       readline.question(
-        `Delete merged local branch ${bold(mergedLocalBranch)}? (y/n) `,
+        `Delete local branch ${bold(mergedLocalBranch)}? (y/n) `,
         resolve
       );
     });

package/src/utils.ts

@@ -13,7 +13,7 @@ export function bold(text: string) {
 }
 
 export function grey(text: string) {
-  return `\x1b[37m\x1b[40m${text}\x1b[0m`;
+  return `\x1b[90m${text}\x1b[0m`;
 }
 
 export function darkBrown(text: string) {