wip: command: stage/unstage files

weedz · Feb 19, 2024 · eec056a · eec056a
1 parent 7f5b6c6
commit eec056a
Show file tree

Hide file tree

Showing 11 changed files with 207 additions and 130 deletions.
diff --git a/src/Common/Actions.ts b/src/Common/Actions.ts
@@ -58,6 +58,8 @@ export const enum IpcAction {
     GET_RECENT_REPOSITORIES,
     OPEN_REPOSITORY,
     PULL,
+    GET_UNSTAGED_CHANGES,
+    GET_STAGED_CHANGES,
 }
 
 export type IpcActionParams = {
@@ -153,6 +155,8 @@ export type IpcActionParams = {
     [IpcAction.GET_RECENT_REPOSITORIES]: null;
     [IpcAction.OPEN_REPOSITORY]: string;
     [IpcAction.PULL]: null;
+    [IpcAction.GET_UNSTAGED_CHANGES]: null;
+    [IpcAction.GET_STAGED_CHANGES]: null;
 };
 
 export type IpcActionReturn = {
@@ -222,6 +226,8 @@ export type IpcActionReturn = {
     [IpcAction.GET_RECENT_REPOSITORIES]: string[];
     [IpcAction.OPEN_REPOSITORY]: boolean;
     [IpcAction.PULL]: boolean;
+    [IpcAction.GET_UNSTAGED_CHANGES]: PatchObj[];
+    [IpcAction.GET_STAGED_CHANGES]: PatchObj[];
 };
 
 export type RepoStatus = {

diff --git a/src/Common/TypeHelpers.ts b/src/Common/TypeHelpers.ts
@@ -0,0 +1 @@
+export type PromiseOrSync<T> = T | Promise<T>;
diff --git a/src/Main/NodegitEnums.ts b/src/Main/NodegitEnums.ts
@@ -11,9 +11,6 @@ export const enum RevwalkSORT {
     TIME = 2,
 }
 
-export const enum DiffDELTA {
-    RENAMED = 4,
-}
 export const enum DiffOPTION {
     INCLUDE_UNTRACKED = 8,
     RECURSE_UNTRACKED_DIRS = 16,

diff --git a/src/Main/Provider.ts b/src/Main/Provider.ts
@@ -15,8 +15,9 @@ import { currentProfile, getAppConfig, getAuth, signatureFromActiveProfile, sign
 import { setLastKnownHead, type Context } from "./Context.js";
 import { gpgSign, gpgVerify } from "./GPG.js";
 import { sendAction } from "./IPC.js";
-import { CheckoutSTRATEGY, DiffDELTA, DiffFIND, DiffOPTION, NodeGitErrorCODE, ObjectTYPE, ResetTYPE, RevwalkSORT, StatusOPT, StatusSHOW } from "./NodegitEnums.js";
+import { CheckoutSTRATEGY, DiffFIND, DiffOPTION, NodeGitErrorCODE, ObjectTYPE, ResetTYPE, RevwalkSORT, StatusOPT, StatusSHOW } from "./NodegitEnums.js";
 import { sendEvent } from "./WindowEvents.js";
+import { DiffDelta } from "../Common/Utils.js";
 
 declare module "nodegit" {
     interface Repository {
@@ -198,7 +199,7 @@ export async function getFileCommits(repo: nodegit.Repository, params: IpcAction
     // FIXME: HistoryEntry should set commit.repo.
     const historyEntries = await revwalk.fileHistoryWalk(currentName, params.num || 50000);
 
-    if (historyEntries[0].status === DiffDELTA.RENAMED as unknown as nodegit.Diff.DELTA) {
+    if (historyEntries[0].status === DiffDelta.RENAMED as unknown as nodegit.Diff.DELTA) {
         // We always "follow renames" if the file is renamed in the first commit
         followRenames = true;
     }
@@ -215,11 +216,11 @@ export async function getFileCommits(repo: nodegit.Repository, params: IpcAction
 
         historyCommit.path = currentName;
 
-        if (entry.status === DiffDELTA.RENAMED as unknown as nodegit.Diff.DELTA) {
+        if (entry.status === DiffDelta.RENAMED as unknown as nodegit.Diff.DELTA) {
             historyCommit.path = entry.oldName;
         }
 
-        if (entry.status === DiffDELTA.RENAMED as unknown as nodegit.Diff.DELTA && followRenames) {
+        if (entry.status === DiffDelta.RENAMED as unknown as nodegit.Diff.DELTA && followRenames) {
             followRenames = false;
 
             historyCommit.path = entry.newName;
@@ -1191,20 +1192,24 @@ export async function loadChanges(): AsyncIpcActionReturnOrError<IpcAction.GET_C
     workDirIndexPathMap.staged.clear();
     workDirIndexPathMap.unstaged.clear();
 
-    const staged = workDirIndexCache.stagedPatches.map(convPatch => {
+    return {
+        staged: await loadStagedChanges(),
+        unstaged: await loadUnstagedChanges(),
+    };
+}
+export async function loadUnstagedChanges(): Promise<PatchObj[]> {
+    return workDirIndexCache.unstagedPatches.map(convPatch => {
         const patch = handlePatch(convPatch);
-        workDirIndexPathMap.staged.set(patch.actualFile.path, convPatch);
+        workDirIndexPathMap.unstaged.set(patch.actualFile.path, convPatch);
         return patch;
     });
-    const unstaged = workDirIndexCache.unstagedPatches.map(convPatch => {
+}
+export async function loadStagedChanges(): Promise<PatchObj[]> {
+    return workDirIndexCache.stagedPatches.map(convPatch => {
         const patch = handlePatch(convPatch);
-        workDirIndexPathMap.unstaged.set(patch.actualFile.path, convPatch);
+        workDirIndexPathMap.staged.set(patch.actualFile.path, convPatch);
         return patch;
     });
-    return {
-        staged,
-        unstaged,
-    };
 }
 export async function getWorkdirHunks(repo: nodegit.Repository, path: string, type: "staged" | "unstaged"): Promise<false | HunkObj[]> {
     const patch = workDirIndexPathMap[type].get(path);

diff --git a/src/Renderer/Components/CommandPalette/commands.ts b/src/Renderer/Components/CommandPalette/commands.ts
@@ -1,17 +1,20 @@
 import { IpcAction } from "../../../Common/Actions.js";
 import { BranchFromType } from "../../../Common/Branch.js";
 import { basename } from "../../../Common/Utils.js";
-import { openSettings } from "../../Data/index.js";
+import { openFile, openSettings } from "../../Data/index.js";
 import { openDialog_BranchFrom, openDialog_Clone, openDialog_SetUpstream, openDialog_compare, openDialog_createTag, openDialog_fileHistory, openDialog_viewCommit } from "../../Data/Dialogs.js";
 import { ipcGetData, ipcSendMessage } from "../../Data/IPC.js";
 import { Store } from "../../Data/store.js";
+import { getType } from "../DiffPane/utility.js";
+import type { PromiseOrSync } from "../../../Common/TypeHelpers.js";
 
 export interface Command {
     label: string;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     data?: any;
     details?: string;
-    action: () => void | Promise<Command[]>;
+    action: () => PromiseOrSync<void | true | Command[]>;
+    focusAction?: () => PromiseOrSync<void>;
 }
 
 function openRecentRepositoryAction(this: Command) {
@@ -22,6 +25,7 @@ function checkoutBranchAction(this: Command) {
 }
 
 export const commandPaletteCommandList: Command[] = [
+    // REPO
     {
         label: "Repo: Open repository...",
         action() {
@@ -39,11 +43,10 @@ export const commandPaletteCommandList: Command[] = [
         async action() {
             const recentRepositories = await ipcGetData(IpcAction.GET_RECENT_REPOSITORIES, null);
             return recentRepositories.map(repoPath => ({
-                    label: basename(repoPath),
-                    details: repoPath,
-                    action: openRecentRepositoryAction,
-                })
-            );
+                label: basename(repoPath),
+                details: repoPath,
+                action: openRecentRepositoryAction,
+            }));
         }
     },
     {
@@ -64,6 +67,45 @@ export const commandPaletteCommandList: Command[] = [
             ipcSendMessage(IpcAction.PUSH, null);
         }
     },
+    {
+        label: "Repo: File history...",
+        action() {
+            // TODO: Send data to main thread?
+            openDialog_fileHistory();
+        }
+    },
+    {
+        label: "Repo: Compare revisions...",
+        action() {
+            // TODO: Send data to main thread?
+            openDialog_compare();
+        }
+    },
+    {
+        label: "Repo: View commit...",
+        action() {
+            // TODO: Send data to main thread?
+            openDialog_viewCommit();
+        }
+    },
+    // Working directory
+    {
+        label: "Working directory: Stage file...",
+        async action() {
+            const unstagedChanges = await ipcGetData(IpcAction.GET_UNSTAGED_CHANGES, null);
+            return unstagedChanges.map(patch => ({
+                label: `[${getType(patch.status)}] ${patch.actualFile.path}`,
+                focusAction() {
+                    openFile({ workDir: true, patch, type: "unstaged" });
+                },
+                async action() {
+                    await ipcGetData(IpcAction.STAGE_FILE, patch.actualFile.path);
+                    return true;
+                },
+            }));
+        }
+    },
+    // BRANCH
     {
         label: "Branch: Set upstream...",
         action() {
@@ -84,17 +126,20 @@ export const commandPaletteCommandList: Command[] = [
         }
     },
     {
-        label: "Open in Terminal",
-        action() {
-            ipcSendMessage(IpcAction.OPEN_IN_TERMINAL, null);
-        }
-    },
-    {
-        label: "Open in File Manager",
+        label: "Branch: Checkout...",
         action() {
-            ipcSendMessage(IpcAction.OPEN_IN_FILE_MANAGER, null);
+            // TODO: remote branches?
+            if (!Store.branches) {
+                return;
+            }
+            return Store.branches.local.map(branch => ({
+                label: branch.normalizedName,
+                data: branch.name,
+                action: checkoutBranchAction,
+            }));
         }
     },
+    // STASH
     {
         label: "Stash: Stash changes",
         action() {
@@ -114,62 +159,40 @@ export const commandPaletteCommandList: Command[] = [
         }
     },
     {
-        label: "Repo: File history...",
-        action() {
-            // TODO: Send data to main thread?
-            openDialog_fileHistory();
-        }
-    },
-    {
-        label: "Repo: Compare revisions...",
+        label: "Blame: File",
         action() {
-            // TODO: Send data to main thread?
-            openDialog_compare();
+            // TODO: return a list where the user can search for a file
+            console.log("TODO: 'Blame: File'");
         }
     },
     {
-        label: "Repo: View commit...",
+        label: "Tag: Create at HEAD...",
         action() {
-            // TODO: Send data to main thread?
-            openDialog_viewCommit();
+            const headRef = Store.head?.name;
+            if (headRef) {
+                openDialog_createTag(headRef);
+            }
         }
     },
+    // Settings and misc.
     {
-        label: "Open preferences",
+        label: "Open in Terminal",
         action() {
-            openSettings();
+            ipcSendMessage(IpcAction.OPEN_IN_TERMINAL, null);
         }
     },
     {
-        label: "Blame: File",
+        label: "Open in File Manager",
         action() {
-            // TODO: return a list where the user can search for a file
-            console.log("TODO: 'Blame: File'");
+            ipcSendMessage(IpcAction.OPEN_IN_FILE_MANAGER, null);
         }
     },
     {
-        label: "Branch: Checkout...",
+        label: "Open preferences",
         action() {
-            // TODO: remote branches?
-            if (!Store.branches) {
-                return;
-            }
-            return Store.branches.local.map(branch => ({
-                label: branch.normalizedName,
-                data: branch.name,
-                action: checkoutBranchAction,
-            }));
+            openSettings();
         }
     },
-    {
-        label: "Tag: Create at HEAD...",
-        action() {
-            const headRef = Store.head?.name;
-            if (headRef) {
-                openDialog_createTag(headRef);
-            }
-        }
-    }
 
     /**
      * TOOD: