From da288f50bc1cf085da970fe74a85bd5db699a02e Mon Sep 17 00:00:00 2001 From: Ramin Tadayon <67011668+axosoft-ramint@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:04:00 +0900 Subject: [PATCH] 2728 Submodule commit graph will not open in the panel layout (#2733) * Sends command args through to graph when it is in a view Adds missing repository set flag * Reverts webview changes, converts uri to repo before passing through --- src/commands/showView.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/commands/showView.ts b/src/commands/showView.ts index e493f60..a8722fb 100644 --- a/src/commands/showView.ts +++ b/src/commands/showView.ts @@ -27,11 +27,13 @@ export class ShowViewCommand extends Command { ]); } - protected override preExecute(context: CommandContext) { - return this.execute(context.command as Commands); + protected override preExecute(context: CommandContext, ...args: any[]) { + return this.execute(context, ...args); } - async execute(command: Commands) { + async execute(context: CommandContext, ...args: any[]) { + const command = context.command as Commands; + let commandArgs = args; switch (command) { case Commands.ShowBranchesView: return this.container.branchesView.show(); @@ -48,7 +50,11 @@ export class ShowViewCommand extends Command { case Commands.ShowAccountView: return this.container.accountView.show(); case Commands.ShowGraphView: - return this.container.graphView.show(); + if (context.type === 'scm' && context.scm?.rootUri != null) { + const repo = this.container.git.getRepository(context.scm.rootUri); + commandArgs = repo != null ? [repo, ...args] : args; + } + return this.container.graphView.show(undefined, ...commandArgs); case Commands.ShowLineHistoryView: return this.container.lineHistoryView.show(); case Commands.ShowRemotesView: