use options instead of flags in revert command

Author: sergiolms

src/commands/git/revert.ts

@@ -33,11 +33,13 @@ interface Context {
 }
 
 type Flags = '--edit' | '--no-edit';
+type RevertOptions = { edit?: boolean };
 
 interface State<Refs = GitRevisionReference | GitRevisionReference[]> {
 	repo: string | Repository;
 	references: Refs;
 	flags: Flags[];
+	options: RevertOptions;
 }
 
 export interface RevertGitCommandArgs {
@@ -79,7 +81,7 @@ export class RevertGitCommand extends QuickCommand<State> {
 	async execute(state: RevertStepState<State<GitRevisionReference[]>>) {
 		for (const ref of state.references.reverse()) {
 			try {
-				await state.repo.git.revert(ref.ref, state.flags);
+				await state.repo.git.revert(ref.ref, state.options);
 			} catch (ex) {
 				if (ex instanceof RevertError) {
 					let shouldRetry = false;
@@ -196,7 +198,7 @@ export class RevertGitCommand extends QuickCommand<State> {
 			const result = yield* this.confirmStep(state as RevertStepState, context);
 			if (result === StepResultBreak) continue;
 
-			state.flags = result;
+			state.options = Object.assign({}, ...result);
 
 			endSteps(state);
 			await this.execute(state as RevertStepState<State<GitRevisionReference[]>>);
@@ -205,22 +207,24 @@ export class RevertGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResultBreak : undefined;
 	}
 
-	private *confirmStep(state: RevertStepState, context: Context): StepResultGenerator<Flags[]> {
-		const step: QuickPickStep<FlagsQuickPickItem<Flags>> = this.createConfirmStep(
+	private *confirmStep(state: RevertStepState, context: Context): StepResultGenerator<RevertOptions[]> {
+		const optionsArr: RevertOptions[] = [];
+		const step: QuickPickStep<FlagsQuickPickItem<RevertOptions>> = this.createConfirmStep(
 			appendReposToTitle(`Confirm ${context.title}`, state, context),
 			[
-				createFlagsQuickPickItem<Flags>(state.flags, ['--no-edit'], {
+				createFlagsQuickPickItem<RevertOptions>(optionsArr, [{ edit: false }], {
 					label: this.title,
 					description: '--no-edit',
 					detail: `Will revert ${getReferenceLabel(state.references)}`,
 				}),
-				createFlagsQuickPickItem<Flags>(state.flags, ['--edit'], {
+				createFlagsQuickPickItem<RevertOptions>(optionsArr, [{ edit: true }], {
 					label: `${this.title} & Edit`,
 					description: '--edit',
 					detail: `Will revert and edit ${getReferenceLabel(state.references)}`,
 				}),
 			],
 		);
+		state.options = Object.assign({}, ...optionsArr);
 		const selection: StepSelection<typeof step> = yield step;
 		return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak;
 	}

src/env/node/git/git.ts

@@ -108,6 +108,7 @@ export const GitErrors = {
 	invalidTagName: /invalid tag name/i,
 	remoteRejected: /rejected because the remote contains work/i,
 	revertHasConflicts: /(error: could not revert .*) (hint: After resolving the conflicts)/gi,
+	localChangesWouldBeOverwritten: /error: your local changes would be overwritten/i,
 };
 
 const GitWarnings = {
@@ -181,6 +182,7 @@ const revertErrorAndReason = [
 	[GitErrors.invalidObjectName, RevertErrorReason.InvalidObjectName],
 	[GitErrors.revertHasConflicts, RevertErrorReason.Conflict],
 	[GitErrors.changesWouldBeOverwritten, RevertErrorReason.LocalChangesWouldBeOverwritten],
+	[GitErrors.localChangesWouldBeOverwritten, RevertErrorReason.LocalChangesWouldBeOverwritten],
 ];
 
 export class Git {

src/git/gitProviderService.ts

@@ -1335,24 +1335,10 @@ export class GitProviderService implements Disposable {
 	}
 
 	@log()
-	async revert(repoPath: string | Uri, ref: string, flags: string[] | undefined = []): Promise<void> {
+	revert(repoPath: string | Uri, ref: string, options?: { edit?: boolean }): 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);
 	}