Reworks branches/tags quickpick

src/commands/diffWithRevision.ts

@@ -129,7 +129,7 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {
 
                 return commands.executeCommand(Commands.DiffWithRevision, gitUri, {
                     ...args,
-                    branchOrTag: branchOrTag.branchOrTag,
+                    branchOrTag: branchOrTag.item,
                     goBackCommand: currentCommand
                 } as DiffWithRevisionCommandArgs);
             }

src/commands/openBranchInRemote.ts

@@ -4,7 +4,7 @@ import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
-import { BranchesQuickPick, CommandQuickPickItem } from '../quickpicks';
+import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickpicks';
 import {
     ActiveEditorCommand,
     command,
@@ -53,21 +53,19 @@ export class OpenBranchInRemoteCommand extends ActiveEditorCommand {
             if (args.branch === undefined) {
                 args = { ...args };
 
-                const branches = (await Container.git.getBranches(repoPath)).filter(b => b.tracking !== undefined);
-                if (branches.length > 1) {
-                    const pick = await BranchesQuickPick.show(
-                        branches,
-                        `Open which branch on remote${GlyphChars.Ellipsis}`
-                    );
-                    if (pick === undefined) return undefined;
+                const pick = await new BranchesAndTagsQuickPick(repoPath).show(
+                    `Open which branch on remote${GlyphChars.Ellipsis}`,
+                    {
+                        autoPick: true,
+                        filters: {
+                            branches: b => b.tracking !== undefined
+                        },
+                        include: 'branches'
+                    }
+                );
+                if (pick === undefined || pick instanceof CommandQuickPickItem) return undefined;
 
-                    if (pick instanceof CommandQuickPickItem) return undefined;
-
-                    args.branch = pick.branch.name;
-                }
-                else if (branches.length === 1) {
-                    args.branch = branches[0].name;
-                }
+                args.branch = pick.item.name;
             }
 
             const remotes = await Container.git.getRemotes(repoPath);

src/commands/openFileInRemote.ts

@@ -1,10 +1,11 @@
 'use strict';
+import { __await } from 'tslib';
 import { commands, Range, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
-import { BranchesQuickPick, CommandQuickPickItem } from '../quickpicks';
+import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickpicks';
 import {
     ActiveEditorCommand,
     command,
@@ -54,27 +55,21 @@ export class OpenFileInRemoteCommand extends ActiveEditorCommand {
         if (args.branch === undefined) {
             const branch = await Container.git.getBranch(gitUri.repoPath);
             if (branch === undefined || branch.tracking === undefined) {
-                const branches = (await Container.git.getBranches(gitUri.repoPath)).filter(
-                    b => b.tracking !== undefined
+                const pick = await new BranchesAndTagsQuickPick(gitUri.repoPath).show(
+                    args.clipboard
+                        ? `Copy url for ${gitUri.getRelativePath()} to clipboard for which branch${GlyphChars.Ellipsis}`
+                        : `Open ${gitUri.getRelativePath()} on remote for which branch${GlyphChars.Ellipsis}`,
+                    {
+                        autoPick: true,
+                        filters: {
+                            branches: b => b.tracking !== undefined
+                        },
+                        include: 'branches'
+                    }
                 );
-                if (branches.length > 1) {
-                    const pick = await BranchesQuickPick.show(
-                        branches,
-                        args.clipboard
-                            ? `Copy url for ${gitUri.getRelativePath()} to clipboard for which branch${
-                                  GlyphChars.Ellipsis
-                              }`
-                            : `Open ${gitUri.getRelativePath()} on remote for which branch${GlyphChars.Ellipsis}`
-                    );
-                    if (pick === undefined) return undefined;
+                if (pick === undefined || pick instanceof CommandQuickPickItem) return undefined;
 
-                    if (pick instanceof CommandQuickPickItem) return undefined;
-
-                    args.branch = pick.branch.name;
-                }
-                else if (branches.length === 1) {
-                    args.branch = branches[0].name;
-                }
+                args.branch = pick.item.name;
             }
             else {
                 args.branch = branch.name;

src/commands/openFileRevision.ts

@@ -157,7 +157,7 @@ export class OpenFileRevisionCommand extends ActiveEditorCommand {
 
                     return commands.executeCommand(Commands.OpenFileRevision, gitUri, {
                         ...args,
-                        branchOrTag: branchOrTag.branchOrTag,
+                        branchOrTag: branchOrTag.item,
                         goBackCommand: currentCommand
                     } as OpenFileRevisionCommandArgs);
                 }

src/commands/showQuickBranchHistory.ts

@@ -5,7 +5,7 @@ import { Container } from '../container';
 import { GitLog, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
-import { BranchesQuickPick, BranchHistoryQuickPick, CommandQuickPickItem } from '../quickpicks';
+import { BranchesAndTagsQuickPick, BranchHistoryQuickPick, CommandQuickPickItem } from '../quickpicks';
 import { Strings } from '../system';
 import { ActiveEditorCachedCommand, command, Commands, getCommandUri, getRepoPathOrActiveOrPrompt } from './common';
 import { ShowQuickCommitDetailsCommandArgs } from './showQuickCommitDetails';
@@ -46,8 +46,6 @@ export class ShowQuickBranchHistoryCommand extends ActiveEditorCachedCommand {
             if (!repoPath) return undefined;
 
             if (args.branch === undefined) {
-                const branches = await Container.git.getBranches(repoPath);
-
                 let goBackCommand;
                 if (!(await Container.git.getRepoPathOrActive(uri, editor))) {
                     goBackCommand = new CommandQuickPickItem(
@@ -60,14 +58,17 @@ export class ShowQuickBranchHistoryCommand extends ActiveEditorCachedCommand {
                     );
                 }
 
-                const pick = await BranchesQuickPick.show(branches, `Show history for branch${GlyphChars.Ellipsis}`, {
-                    goBackCommand: goBackCommand
-                });
+                const pick = await new BranchesAndTagsQuickPick(repoPath).show(
+                    `Show history for branch${GlyphChars.Ellipsis}`,
+                    {
+                        goBack: goBackCommand,
+                        include: 'branches'
+                    }
+                );
                 if (pick === undefined) return undefined;
-
                 if (pick instanceof CommandQuickPickItem) return pick.execute();
 
-                args.branch = pick.branch.name;
+                args.branch = pick.item.name;
                 if (args.branch === undefined) return undefined;
 
                 progressCancellation = BranchHistoryQuickPick.showProgress(args.branch);

src/commands/showQuickFileHistory.ts

@@ -172,7 +172,7 @@ export class ShowQuickFileHistoryCommand extends ActiveEditorCachedCommand {
                 return commands.executeCommand(Commands.ShowQuickFileHistory, gitUri, {
                     ...args,
                     log: undefined,
-                    branchOrTag: branchOrTag.branchOrTag,
+                    branchOrTag: branchOrTag.item,
                     goBackCommand: currentCommand
                 } as ShowQuickFileHistoryCommandArgs);
             }

src/quickpicks.ts

@@ -1,7 +1,6 @@
 'use strict';
 
 export * from './quickpicks/branchesAndTagsQuickPick';
-export * from './quickpicks/branchesQuickPick';
 export * from './quickpicks/branchHistoryQuickPick';
 export * from './quickpicks/commitFileQuickPick';
 export * from './quickpicks/commitQuickPick';