3530 Change revert terminal-run commands into normal commands w/ proper error handling
#3789
+187
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sergiolms
force-pushed
the
feature/#3530_change_git-revert_command_to_normal_cmd
branch
from
b3280b6
to
5d90ed8
Compare
sergiolms
force-pushed
the
feature/#3530_change_git-revert_command_to_normal_cmd
branch
from
5d90ed8
to
bf93067
Compare
sergiolms
force-pushed
the
feature/#3530_change_git-revert_command_to_normal_cmd
branch
from
bf93067
to
87b29d1
Compare
Comment on lines
+1338
to
+1357
| async revert(repoPath: string | Uri, ref: string, flags: string[] | undefined = []): Promise<void> { | ||
| const { provider, path } = this.getProvider(repoPath); | ||
| if (provider.revert == null) throw new ProviderNotSupportedError(provider.descriptor.name); | ||
|
|
||
| const options: { edit?: boolean } = {}; | ||
| for (const flag of flags) { | ||
| switch (flag) { | ||
| case '--edit': | ||
| options.edit = true; | ||
| break; | ||
| case '--no-edit': | ||
| options.edit = false; | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return provider.revert(path, ref, options); | ||
| } |
There was a problem hiding this comment.
I'm not sure if this is a pattern in other places or not but, why at the git provider service level should the caller provide flags instead of just passing in options? Flags feel like low-level terminal args that should be abstracted down to the git.ts level and anything coming in from above should really only be dealing with a list of options.
Comment on lines
+1601
to
+1614
| async revert(repoPath: string, ...args: string[]) { | ||
| try { | ||
| await this.git<string>({ cwd: repoPath }, 'revert', ...args); | ||
| } catch (ex) { | ||
| const msg: string = ex?.toString() ?? ''; | ||
| for (const [error, reason] of revertErrorAndReason) { | ||
| if (error.test(msg) || error.test(ex.stderr ?? '')) { | ||
| throw new RevertError(reason, ex); | ||
| } | ||
| } | ||
|
|
||
| throw new RevertError(RevertErrorReason.Other, ex); | ||
| } | ||
| } |
There was a problem hiding this comment.
This should take constrained options, generate the flags and params necessary off of those options, and then run the command with the args it generated.
Comment on lines
+80
to
+114
| for (const ref of state.references.reverse()) { | ||
| try { | ||
| await state.repo.git.revert(ref.ref, state.flags); | ||
| } catch (ex) { | ||
| if (ex instanceof RevertError) { | ||
| let shouldRetry = false; | ||
| if (ex.reason === RevertErrorReason.LocalChangesWouldBeOverwritten) { | ||
| const response = await showShouldCommitOrStashPrompt(); | ||
| if (response === 'Stash') { | ||
| await executeCommand(Commands.GitCommandsStashPush); | ||
| shouldRetry = true; | ||
| } else if (response === 'Commit') { | ||
| await executeCoreCommand('workbench.view.scm'); | ||
| shouldRetry = true; | ||
| } else { | ||
| continue; | ||
| } | ||
| } | ||
|
|
||
| if (shouldRetry) { | ||
| try { | ||
| await state.repo.git.revert(ref.ref, state.flags); | ||
| } catch (ex) { | ||
| Logger.error(ex, this.title); | ||
| void showGenericErrorMessage(ex.message); | ||
| } | ||
| } | ||
|
|
||
| continue; | ||
| } | ||
|
|
||
| Logger.error(ex, this.title); | ||
| void showGenericErrorMessage(ex.message); | ||
| } | ||
| } |
There was a problem hiding this comment.
This is probably going to result in me receiving a crash course on git revert flows, but for my own education, can you explain what this is doing?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This task creates the git revert commands to move away from runTerminalCommand
Solves #3530
Checklist
Fixes $XXX -orCloses #XXX -prefix to auto-close the issue that your PR addresses