Optimize checkout and update readme

Author: zaknafeyn

README.md

@@ -37,6 +37,13 @@ In this mode, extension creates a stash from working directory, switches to a ne
 > [!TIP]
 > stash created with this mode is not compatible with the stash created by mode `Auto stash in current branch`, this means that it want be used to automatically restore. This stash might be used for manual access if needed.
 
+> [!TIP]
+> you could set default auto stash behavior when using `Checkout to ... (With Stash)` command by changing default mode in status bar. If set to manual, you will be prompted to select auto stash mode after each checkout, otherwise selected auto stash strategy will be used by default.
+
 ### No auto stash
 
 This mode is just ordinary checkout without any auto stash functionality.
+
+## Pull with stash
+
+The extension provides a convenient **Pull with stash** feature. When you run this command, your uncommitted changes are automatically stashed before pulling updates from the remote branch. After the pull completes, your changes are restored. This ensures a smooth workflow and prevents conflicts or loss of local changes during a pull operation.

package.json

@@ -74,6 +74,11 @@
           "type": "boolean",
           "default": true,
           "description": "Enable logging output"
+        },
+        "git-smart-checkout.refetchBeforeCheckout": {
+          "type": "boolean",
+          "default": false,
+          "description": "Refetch remotes each time before checkout"
         }
       }
     }

src/commands/checkoutToCommand/index.ts

@@ -82,7 +82,8 @@ export class CheckoutToCommand extends BaseCommand {
     }
 
     // Get the list of branches in current repo and show user a quick pick list
-    const branchList = await git.getAllRefListExtended();
+    const { refetchBeforeCheckout } = this.configManager.get();
+    const branchList = await git.getAllRefListExtended(refetchBeforeCheckout);
 
     const [locals, remotes] = getMergedBranchLists(branchList, currentBranch);
 

src/common/git/gitExecutor.ts

@@ -52,7 +52,7 @@ export class GitExecutor {
   // #endregion private
 
   async fetchAllRemoteBranchesAndTags() {
-    const commandFetchAllBranches = 'git fetch --all --prune';
+    const commandFetchAllBranches = 'git fetch --all';
     // fetch all tags and overwrite local tags with remote if remote one has changed
     const commandFetchAllTags = 'git fetch --tags --force';
 
@@ -94,7 +94,7 @@ export class GitExecutor {
     }
   }
 
-  async getAllRefListExtended(fetchRemotes = true): Promise<IGitRef[]> {
+  async getAllRefListExtended(fetchRemotes = false): Promise<IGitRef[]> {
     if (fetchRemotes) {
       await this.fetchAllRemoteBranchesAndTags();
     }

src/configuration/configurationManager.ts

@@ -10,6 +10,7 @@ export class ConfigurationManager {
 
     this.config = {
       mode: vscodeConfig.get('mode', AUTO_STASH_MODE_MANUAL),
+      refetchBeforeCheckout: vscodeConfig.get('refetchBeforeCheckout', false),
       logging: {
         enabled: vscodeConfig.get('logging.enabled', true),
       },
@@ -21,6 +22,7 @@ export class ConfigurationManager {
 
     this.config = {
       mode: vscodeConfig.get('mode', AUTO_STASH_MODE_MANUAL),
+      refetchBeforeCheckout: vscodeConfig.get('refetchBeforeCheckout', false),
       logging: {
         enabled: vscodeConfig.get('logging.enabled', true),
       },
@@ -40,4 +42,9 @@ export class ConfigurationManager {
     const config = workspace.getConfiguration(EXTENSION_NAME);
     await config.update('logging.enabled', enabled, ConfigurationTarget.Global);
   }
+
+  public async updateRefetchBeforeCheckoutEnabled(enabled: boolean): Promise<void> {
+    const config = workspace.getConfiguration(EXTENSION_NAME);
+    await config.update('refetchBeforeCheckout', enabled, ConfigurationTarget.Global);
+  }
 }

src/configuration/extensionConfig.ts

@@ -16,6 +16,7 @@ export const AUTO_STASH_MODES = Object.values(autoStashModeConfig);
 
 export interface ExtensionConfig {
   mode: TAutoStashModeConfig;
+  refetchBeforeCheckout: boolean;
   logging: {
     enabled: boolean;
   };

src/logging/loggingService.ts

@@ -26,7 +26,7 @@ export class LoggingService implements Disposable {
       this.outputChannel.appendLine(`Data: ${JSON.stringify(data, null, 2)}`);
     }
 
-    if (Boolean(data)) {
+    if (!data) {
       console.log(formattedMessage);
     } else {
       console.log(formattedMessage, `Data: ${JSON.stringify(data, null, 2)}`);

src/statusBar/statusBarManager.ts

@@ -11,6 +11,7 @@ import { ConfigurationManager } from '../configuration/configurationManager';
 import { LoggingService } from '../logging/loggingService';
 import { EXTENSION_NAME } from '../const';
 import {
+  AUTO_STASH_MODE_MANUAL,
   AUTO_STASH_MODES,
   AUTO_STASH_MODES_DETAILS,
   TAutoStashModeConfig,
@@ -38,7 +39,13 @@ export class StatusBarManager implements Disposable {
 
     this.statusBarItem.text = `${modeDetails.icon} ${modeDetails.briefLabel}`;
     this.statusBarItem.tooltip = `${EXTENSION_NAME}\nCurrent mode: ${modeDetails.label}\nClick to switch modes`;
-    this.statusBarItem.backgroundColor = new ThemeColor('statusBarItem.warningBackground');
+
+    const statusBarColor =
+      config.mode === AUTO_STASH_MODE_MANUAL
+        ? 'statusBarItem.descriptionForeground'
+        : 'statusBarItem.warningBackground';
+
+    this.statusBarItem.backgroundColor = new ThemeColor(statusBarColor);
   }
 
   public async showModeQuickPick(): Promise<void> {