feat: stage and unstage to context menu

denolehov · Aug 16, 2022 · 081ad1d · 081ad1d
1 parent 76e317b
commit 081ad1d
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 14 deletions.
diff --git a/src/gitManager.ts b/src/gitManager.ts
@@ -17,9 +17,9 @@ export abstract class GitManager {
 
     abstract commit(message?: string): Promise<number | undefined>;
 
-    abstract stageAll(status?: Status): Promise<void>;
+    abstract stageAll({ }: { dir?: string, status?: Status; }): Promise<void>;
 
-    abstract unstageAll(): Promise<void>;
+    abstract unstageAll({ }: { dir?: string, status?: Status; }): Promise<void>;
 
     abstract stage(filepath: string, relativeToVault: boolean): Promise<void>;
 

diff --git a/src/isomorphicGit.ts b/src/isomorphicGit.ts
@@ -110,7 +110,7 @@ export class IsomorphicGit extends GitManager {
 
     async commitAll(message?: string, status?: Status): Promise<number> {
         try {
-            await this.stageAll(status);
+            await this.stageAll({ status: status });
             return this.commit(message);
         } catch (error) {
             this.plugin.displayError(error);
@@ -164,15 +164,15 @@ export class IsomorphicGit extends GitManager {
         }
     }
 
-    async stageAll(status?: Status): Promise<void> {
+    async stageAll({ dir, status }: { dir?: string, status?: Status; }): Promise<void> {
         try {
             if (status) {
                 await Promise.all(
                     status.changed.map(file =>
                         (file.working_dir !== "D") ? this.wrapFS(git.add({ ...this.getRepo(), filepath: file.path })) : git.remove(({ ...this.getRepo(), filepath: file.path }))
                     ));
             } else {
-                const newStatus = await this.wrapFS(git.statusMatrix(this.getRepo()));
+                const newStatus = await this.wrapFS(git.statusMatrix({ ...this.getRepo(), filepaths: [dir ?? "."] }));
                 await Promise.all(
                     newStatus.map(([filepath, , worktreeStatus]) =>
                         worktreeStatus ? this.wrapFS(git.add({ ...this.getRepo(), filepath })) : git.remove(({ ...this.getRepo(), filepath }))
@@ -195,12 +195,16 @@ export class IsomorphicGit extends GitManager {
         }
     }
 
-    async unstageAll(): Promise<void> {
+    async unstageAll({ dir, status }: { dir?: string, status?: Status; }): Promise<void> {
         try {
-            const changed = this.plugin.cachedStatus.staged;
-            for (const file of changed) {
-                await this.unstage(file.path, false);
+            let staged: string[];
+            if (status) {
+                staged = status.staged.map(file => file.path);
+            } else {
+                const newStatus = await this.wrapFS(git.statusMatrix({ ...this.getRepo(), filepaths: [dir ?? "."] }));
+                staged = newStatus.map(([filepath]) => filepath);
             }
+            await Promise.all(staged.map(file => this.unstage(file, false)));
         } catch (error) {
             this.plugin.displayError(error);
             throw error;

diff --git a/src/main.ts b/src/main.ts
@@ -1,4 +1,4 @@
-import { debounce, Debouncer, EventRef, Notice, Plugin, TFile } from "obsidian";
+import { debounce, Debouncer, EventRef, Menu, Notice, Plugin, TAbstractFile, TFile } from "obsidian";
 import { PromiseQueue } from "src/promiseQueue";
 import { ObsidianGitSettingsTab } from "src/settings";
 import { StatusBar } from "src/statusBar";
@@ -290,6 +290,11 @@ export default class ObsidianGit extends Plugin {
             }
         });
 
+        this.registerEvent(
+            this.app.workspace.on('file-menu', (menu, file, source) => {
+                this.handleFileMenu(menu, file, source);
+            }));
+
 
         if (this.settings.showStatusBar) {
             // init statusBar
@@ -303,6 +308,48 @@ export default class ObsidianGit extends Plugin {
 
     }
 
+    handleFileMenu(menu: Menu, file: TAbstractFile, source: string): void {
+        if (source !== "file-explorer-context-menu") {
+            return;
+        }
+        if (!file) {
+            return;
+        }
+        if (!this.gitReady) return;
+        menu.addItem((item) => {
+            item
+                .setTitle(`Git: Stage`)
+                .setIcon('plus-circle')
+                .setSection("action")
+                .onClick((_) => {
+                    this.promiseQueue.addTask(async () => {
+                        if (file instanceof TFile) {
+                            await this.gitManager.stage(file.path, true);
+                        } else {
+                            await this.gitManager.stageAll({ dir: this.gitManager.getPath(file.path, true) });
+                        }
+                        this.displayMessage(`Staged ${file.path}`);
+                    });
+                });
+        });
+        menu.addItem((item) => {
+            item
+                .setTitle(`Git: Unstage`)
+                .setIcon('minus-circle')
+                .setSection("action")
+                .onClick((_) => {
+                    this.promiseQueue.addTask(async () => {
+                        if (file instanceof TFile) {
+                            await this.gitManager.unstage(file.path, true);
+                        } else {
+                            await this.gitManager.unstageAll({ dir: this.gitManager.getPath(file.path, true) });
+                        }
+                        this.displayMessage(`Unstaged ${file.path}`);
+                    });
+                });
+        });
+    }
+
     migrateSettings(): Promise<void> {
         if (this.settings.mergeOnPull != undefined) {
             this.settings.syncMethod = this.settings.mergeOnPull ? 'merge' : 'rebase';

diff --git a/src/simpleGit.ts b/src/simpleGit.ts
@@ -167,10 +167,10 @@ export class SimpleGit extends GitManager {
         this.plugin.setState(PluginState.idle);
     }
 
-    async stageAll(): Promise<void> {
+    async stageAll({ dir }: { dir?: string; }): Promise<void> {
         this.plugin.setState(PluginState.add);
         await this.git.add(
-            "-A", (err) => this.onError(err)
+            dir ?? "-A", (err) => this.onError(err)
         );
         this.plugin.setState(PluginState.idle);
     }

diff --git a/src/ui/sidebar/gitView.svelte b/src/ui/sidebar/gitView.svelte
@@ -102,12 +102,14 @@
 
   function stageAll() {
     loading = true;
-    plugin.gitManager.stageAll(status).finally(triggerRefresh);
+    plugin.gitManager.stageAll({status: status}).finally(triggerRefresh);
   }
+
   function unstageAll() {
     loading = true;
-    plugin.gitManager.unstageAll().finally(triggerRefresh);
+    plugin.gitManager.unstageAll({status:status}).finally(triggerRefresh);
   }
+  
   function push() {
     loading = true;