Suggest local branches in git merge

Resolves: #33
AnderssonPeter · Jan 30, 2022 · 946c731 · 946c731
1 parent 487845f
commit 946c731
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/PowerType/Dictionaries/git.ps1 b/PowerType/Dictionaries/git.ps1
@@ -54,6 +54,18 @@ $allBranches = [DynamicSource]@{
     }
 }
 
+$localBranches = [DynamicSource]@{
+    Name = "LocalBranches";
+    Description = "Local branches";
+    CommandExpression = {
+        git --no-optional-locks branch --no-color  | % { $_.trim(' *$(') } | % { $_.StartsWith("remotes/origin/") ? $_.Substring(15) : $_ } | Where-Object { !$_.StartsWith("HEAD") } | Select -Unique
+    };
+    Cache = [Cache]@{
+        ByCurrentWorkingDirectory = $true;
+        ByTime = New-TimeSpan -Seconds 10
+    }
+}
+
 $stashes = [DynamicSource]@{
     Name = "Stashes";
     Description = "Stashes";
@@ -789,6 +801,10 @@ $stashes = [DynamicSource]@{
             Name = "merge";
             Description = "Join two or more development histories together";
             Parameters = @(
+                [ValueParameter]@{
+                    Name = "local-branch";
+                    Source = $localBranches
+                },
                 [FlagParameter]@{
                     Keys = @("--commit");
                     Name = "commit";

diff --git a/PowerType/Properties/launchSettings.json b/PowerType/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "PowerShell": {
       "commandName": "Executable",
       "executablePath": "pwsh.exe",
-      "commandLineArgs": "-NoExit -command \"$DebugPreference = 'Continue'\nImport-Module $(TargetDir)$(TargetFileName)\nEnable-PowerType -PassThru\""
+      "commandLineArgs": "-NoExit -NoProfile -command \"$DebugPreference = 'Continue'\nImport-Module $(TargetDir)$(TargetFileName)\nEnable-PowerType\nSet-PSReadLineOption -PredictionViewStyle ListView\""
     }
   }
 }