feat: add tags and checkout in status bar tooltip

koog1000 · May 26, 2023 · 2b57064 · 2b57064
1 parent dd8a54f
commit 2b57064
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -72,9 +72,9 @@ about cloning from the extension.
 
   Use "Fossil log" from command palette and navigate the options till specific checkout.
 
-* **Get current checkout hash?**
+* **Get current checkout hash or tags?**
 
-  Not possible yet using UI.
+  Hover over current branch name in the status bar
 
 * **Close/reopen a branch?**
 

diff --git a/src/openedRepository.ts b/src/openedRepository.ts
@@ -119,6 +119,8 @@ export interface FossilStatus {
     readonly statuses: FileStatus[];
     readonly isMerge: boolean;
     readonly info: Map<string, string>;
+    readonly tags: string[]; // not FossilTag for a reason
+    readonly checkout: { checkin: FossilCheckin; date: string };
 }
 
 export interface BranchDetails {
@@ -627,6 +629,16 @@ export class OpenedRepository {
                 info.set(key, value);
             }
         }
+        const checkoutStr = info.get('checkout')!;
+        const spaceIdx = checkoutStr.indexOf(' ');
+        const checkout = {
+            checkin: checkoutStr.slice(0, spaceIdx) as FossilCheckin,
+            date: checkoutStr.slice(spaceIdx + 1),
+        };
+        const tags = info
+            .get('tags')!
+            .split(',')
+            .map(t => t.trim());
         const isMerge =
             info.has('CHERRYPICK') ||
             info.has('BACKOUT') ||
@@ -636,6 +648,8 @@ export class OpenedRepository {
             statuses,
             isMerge,
             info,
+            checkout,
+            tags,
         };
     }
 

diff --git a/src/statusbar.ts b/src/statusbar.ts
@@ -25,7 +25,7 @@ class ScopeStatusBar {
     private disposables: Disposable[] = [];
 
     constructor(private repository: Repository) {
-        repository.onDidChange(
+        repository.onDidChangeStatus(
             this._onDidChange.fire,
             this._onDidChange,
             this.disposables
@@ -43,10 +43,14 @@ class ScopeStatusBar {
             ' ' +
             currentBranch +
             (this.repository.workingGroup.resourceStates.length ? '+' : '');
-
         return {
             command: 'fossil.branchChange',
-            tooltip: localize('branch change', 'Change Branch...'),
+            tooltip: localize(
+                'branch change {0} {1}',
+                '\n{0}\nTags:\n \u2022 {1}\nChange Branch...',
+                fossilStatus?.checkout.checkin,
+                fossilStatus?.tags.join('\n \u2022 ')
+            ),
             title,
             arguments: [this.repository],
         };

diff --git a/src/test/suite/test_commands.ts b/src/test/suite/test_commands.ts
@@ -232,11 +232,15 @@ function fakeFossilStatus<T extends sinon.SinonStub>(
     execStub: T,
     status: string
 ) {
+    const header =
+        'checkout:     0000000000000000000000000000000000000000 2023-05-26 12:43:56 UTC\n' +
+        'parent:       0000000000000000000000000000000000000001 2023-05-26 12:43:56 UTC\n' +
+        'tags:         trunk, this is a test, custom tag\n';
     const args = ['status', '--differ', '--merge'] as const;
     return execStub.withArgs(args).resolves({
         fossilPath: '',
         exitCode: 0,
-        stdout: status, // fake_status.join('\n'),
+        stdout: header + status, // fake_status.join('\n'),
         stderr: '',
         args: args,
         cwd: '',