Updates path from gitdir lookup to open rebase editor

Author: d13

src/views/viewCommands.ts

@@ -715,32 +715,56 @@ export class ViewCommands implements Disposable {
 	}
 
 	@log()
-	private abortPausedOperation(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status')) return Promise.resolve();
+	private async abortPausedOperation(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status')) return;
 
-		return this.container.git.status(node.pausedOpStatus.repoPath).abortPausedOperation?.();
+		const abortPausedOperation = this.container.git.status(node.pausedOpStatus.repoPath).abortPausedOperation;
+		if (abortPausedOperation == null) return;
+
+		try {
+			await abortPausedOperation();
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	@log()
-	private continuePausedOperation(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status')) return Promise.resolve();
+	private async continuePausedOperation(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status')) return;
 
-		return this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation?.();
+		const continuePausedOperation = this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation;
+		if (continuePausedOperation == null) return;
+
+		try {
+			await continuePausedOperation();
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	@log()
-	private skipPausedOperation(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status')) return Promise.resolve();
+	private async skipPausedOperation(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status')) return;
 
-		return this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation?.({ skip: true });
+		const continuePausedOperation = this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation;
+		if (continuePausedOperation == null) return;
+
+		try {
+			await continuePausedOperation({ skip: true });
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	@log()
-	private openPausedOperationInRebaseEditor(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status') || node.pausedOpStatus.type !== 'rebase') return Promise.resolve();
+	private async openPausedOperationInRebaseEditor(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status') || node.pausedOpStatus.type !== 'rebase') return;
+
+		const gitDir = await this.container.git.getGitDir(node.repoPath);
+		if (gitDir == null) return;
 
-		const rebaseTodoUri = Uri.joinPath(node.uri, '.git', 'rebase-merge', 'git-rebase-todo');
-		return executeCoreCommand('vscode.openWith', rebaseTodoUri, 'gitlens.rebase', {
+		const rebaseTodoUri = Uri.joinPath(gitDir.uri, 'rebase-merge', 'git-rebase-todo');
+		void executeCoreCommand('vscode.openWith', rebaseTodoUri, 'gitlens.rebase', {
 			preview: false,
 		});
 	}

src/webviews/home/homeWebview.ts

@@ -491,10 +491,10 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 	private async openRebaseEditor(pausedOpArgs: GitPausedOperationCommandArgs) {
 		if (pausedOpArgs.operation.type !== 'rebase') return;
 
-		const repo = this._repositoryBranches.get(pausedOpArgs.operation.repoPath)?.repo;
-		if (repo == null) return;
+		const gitDir = await this.container.git.getGitDir(pausedOpArgs.operation.repoPath);
+		if (gitDir == null) return;
 
-		const rebaseTodoUri = Uri.joinPath(repo.uri, '.git', 'rebase-merge', 'git-rebase-todo');
+		const rebaseTodoUri = Uri.joinPath(gitDir.uri, 'rebase-merge', 'git-rebase-todo');
 		await executeCoreCommand('vscode.openWith', rebaseTodoUri, 'gitlens.rebase', {
 			preview: false,
 		});