Merge pull request #34 from alexiszamanidis/feat-auto-push

feat(auto-push): add auto-push option
alexiszamanidis · Sep 9, 2023 · affa9cc · affa9cc · github-actions · Sep 9, 2023
2 parents c2b2a7a + d22f5be
commit affa9cc
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -83,6 +83,8 @@ To select a workspace, simply choose from the list of available workspaces when
 | vsCodeGitWorktrees.remove.stalledBranches   | boolean | false         | Removes local(stalled) branches that do not exist on remote |
 | vsCodeGitWorktrees.move.openNewVscodeWindow | boolean | true          | Open new vscode window when you switch or create a worktree |
 | vsCodeGitWorktrees.worktrees.dir.path       | string  | null          | Define a directory for all worktrees between your projects  |
+| vsCodeGitWorktrees.add.autoPush             | boolean | true          | Auto push worktree branch after its creation                |
+| vsCodeGitWorktrees.add.autoPull             | boolean | true          | Auto pull worktree branch after its creation                |
 
 ## Contribution
 

diff --git a/package.json b/package.json
@@ -72,6 +72,28 @@
                         "description": "Define a directory for all worktrees between your projects"
                     }
                 }
+            },
+            {
+                "id": "auto-push",
+                "title": "Auto push",
+                "properties": {
+                    "vsCodeGitWorktrees.add.autoPush": {
+                        "type": "boolean",
+                        "default": true,
+                        "description": "Auto push worktree branch after its creation"
+                    }
+                }
+            },
+            {
+                "id": "auto-pull",
+                "title": "Auto pull",
+                "properties": {
+                    "vsCodeGitWorktrees.add.autoPull": {
+                        "type": "boolean",
+                        "default": true,
+                        "description": "Auto pull worktree branch after its creation"
+                    }
+                }
             }
         ]
     },

diff --git a/src/helpers/gitWorktreeHelpers.ts b/src/helpers/gitWorktreeHelpers.ts
@@ -5,6 +5,8 @@ import {
     worktreesDirPath,
     getWorkspaceFilePath,
     shouldOpenNewVscodeWindow,
+    shouldAutoPushAfterWorktreeCreation,
+    shouldAutoPullAfterWorktreeCreation,
 } from "./helpers";
 import { existsRemoteBranch, isBareRepository } from "./gitHelpers";
 import { MAIN_WORKTREES } from "../constants/constants";
@@ -302,6 +304,11 @@ export const existsWorktree = async (workspaceFolder: string, worktree: string)
     }
 };
 
+export const pushBranch = async (branch: string, workspaceFolder: string) => {
+    const pushCommand = `git push --set-upstream origin ${branch}`;
+    await executeCommand(pushCommand, { cwd: workspaceFolder });
+};
+
 export const addNewWorktree = async (
     workspaceFolder: string,
     remoteBranch: string,
@@ -316,8 +323,9 @@ export const addNewWorktree = async (
         const worktreeAddCommand = `git worktree add --track -b ${newBranch} ${newWorktreePath} origin/${remoteBranch}`;
         await executeCommand(worktreeAddCommand, { cwd: workspaceFolder });
 
-        const pushCommand = `git push --set-upstream origin ${newBranch}`;
-        await executeCommand(pushCommand, { cwd: workspaceFolder });
+        if (shouldAutoPushAfterWorktreeCreation) {
+            await pushBranch(newBranch, workspaceFolder);
+        }
 
         const newWtInfo = await moveIntoWorktree(workspaceFolder, newWorktreePath);
 
@@ -329,6 +337,11 @@ export const addNewWorktree = async (
     }
 };
 
+export const pullBranch = async (worktreePath: string, workspaceFolder: string) => {
+    const pullCommand = `git -C ${worktreePath} pull`;
+    await executeCommand(pullCommand, { cwd: workspaceFolder });
+};
+
 export const addRemoteWorktree = async (
     workspaceFolder: string,
     remoteBranch: string,
@@ -343,8 +356,9 @@ export const addRemoteWorktree = async (
         const worktreeAddCommand = `git worktree add ${newWorktreePath} ${newBranch}`;
         await executeCommand(worktreeAddCommand, { cwd: workspaceFolder });
 
-        const pullCommand = `git -C ${newWorktreePath} pull`;
-        await executeCommand(pullCommand, { cwd: workspaceFolder });
+        if (shouldAutoPullAfterWorktreeCreation) {
+            await pullBranch(newWorktreePath, workspaceFolder);
+        }
 
         const newWtInfo = await moveIntoWorktree(workspaceFolder, newWorktreePath);
 

diff --git a/src/helpers/helpers.ts b/src/helpers/helpers.ts
@@ -120,3 +120,9 @@ export const shouldOpenNewVscodeWindow =
 
 export const worktreesDirPath =
     vscode.workspace.getConfiguration().get("vsCodeGitWorktrees.worktrees.dir.path") ?? null;
+
+export const shouldAutoPushAfterWorktreeCreation =
+    vscode.workspace.getConfiguration().get("vsCodeGitWorktrees.add.autoPush") ?? true;
+
+export const shouldAutoPullAfterWorktreeCreation =
+    vscode.workspace.getConfiguration().get("vsCodeGitWorktrees.add.autoPull") ?? true;