ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-02 09:35:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

WIP of Stash Explorer commands

Browse Source 
# Conflicts:
#	src/commands/stashApply.ts
This commit is contained in:
rebornix
2017-06-26 16:14:17 -07:00
committed by Eric Amodio
parent c96a659e9e
commit b81d873a34
8 changed files with 107 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/commands/stashApply.ts
View File

@@ -7,6 +7,7 @@ import { GlyphChars } from '../constants';
import { CommitQuickPickItem, StashListQuickPick } from '../quickPicks';
import { Logger } from '../logger';
import { CommandQuickPickItem } from '../quickPicks';
import { StashCommitNode } from '../views/stashCommitNode';
export interface StashApplyCommandArgs {
confirm?: boolean;
@@ -22,45 +23,59 @@ export class StashApplyCommand extends Command {
super(Commands.StashApply);
}
async execute(args: StashApplyCommandArgs = { confirm: true, deleteAfter: false }) {
async execute(args: StashApplyCommandArgs | StashCommitNode = { confirm: true, deleteAfter: false }) {
if (!this.git.repoPath) return undefined;
args = { ...args };
if (args.stashItem === undefined || args.stashItem.stashName === undefined) {
const stash = await this.git.getStashList(this.git.repoPath);
if (stash === undefined) return window.showInformationMessage(`There are no stashed changes`);
if (args instanceof StashCommitNode) {
try {
const ret = await this.git.stashApply(this.git.repoPath, args.commit.stashName, false);
args.refreshNode();
return ret;
} catch (ex) {
return this._errorHandling(ex);
}
} else {
args = { ...args };
if (args.stashItem === undefined || args.stashItem.stashName === undefined) {
const stash = await this.git.getStashList(this.git.repoPath);
if (stash === undefined) return window.showInformationMessage(`There are no stashed changes`);
const currentCommand = new CommandQuickPickItem({
label: `go back ${GlyphChars.ArrowBack}`,
description: `${Strings.pad(GlyphChars.Dash, 2, 3)} to apply stashed changes`
}, Commands.StashApply, [args]);
const currentCommand = new CommandQuickPickItem({
label: `go back ${GlyphChars.ArrowBack}`,
description: `${Strings.pad(GlyphChars.Dash, 2, 3)} to apply stashed changes`
}, Commands.StashApply, [args]);
const pick = await StashListQuickPick.show(this.git, stash, 'apply', args.goBackCommand, currentCommand);
if (pick === undefined || !(pick instanceof CommitQuickPickItem)) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
const pick = await StashListQuickPick.show(this.git, stash, 'apply', args.goBackCommand, currentCommand);
if (pick === undefined || !(pick instanceof CommitQuickPickItem)) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
args.goBackCommand = currentCommand;
args.stashItem = pick.commit as GitStashCommit;
}
try {
if (args.confirm) {
const message = args.stashItem.message.length > 80 ? `${args.stashItem.message.substring(0, 80)}${GlyphChars.Ellipsis}` : args.stashItem.message;
const result = await window.showWarningMessage(`Apply stashed changes '${message}' to your working tree?`, { title: 'Yes, delete after applying' } as MessageItem, { title: 'Yes' } as MessageItem, { title: 'No', isCloseAffordance: true } as MessageItem);
if (result === undefined || result.title === 'No') return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
args.deleteAfter = result.title !== 'Yes';
args.goBackCommand = currentCommand;
args.stashItem = pick.commit as GitStashCommit;
}
return await this.git.stashApply(this.git.repoPath, args.stashItem.stashName, args.deleteAfter);
}
catch (ex) {
Logger.error(ex, 'StashApplyCommand');
if (ex.message.includes('Your local changes to the following files would be overwritten by merge')) {
return window.showErrorMessage(`Unable to apply stash. Your working tree changes would be overwritten.`);
try {
if (args.confirm) {
const message = args.stashItem.message.length > 80 ? `${args.stashItem.message.substring(0, 80)}${GlyphChars.Ellipsis}` : args.stashItem.message;
const result = await window.showWarningMessage(`Apply stashed changes '${message}' to your working tree?`, { title: 'Yes, delete after applying' } as MessageItem, { title: 'Yes' } as MessageItem, { title: 'No', isCloseAffordance: true } as MessageItem);
if (result === undefined || result.title === 'No') return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
args.deleteAfter = result.title !== 'Yes';
}
return await this.git.stashApply(this.git.repoPath, args.stashItem.stashName, args.deleteAfter);
}
else {
return window.showErrorMessage(`Unable to apply stash. See output channel for more details`);
catch (ex) {
return this._errorHandling(ex);
}
}
}
private _errorHandling(ex: any) {
Logger.error(ex, 'StashApplyCommand');
if (ex.message.includes('Your local changes to the following files would be overwritten by merge')) {
return window.showErrorMessage(`Unable to apply stash. Your working tree changes would be overwritten.`);
}
else {
return window.showErrorMessage(`Unable to apply stash. See output channel for more details`);
}
}
}

17
src/commands/stashDelete.ts
View File

@@ -5,6 +5,7 @@ import { GlyphChars } from '../constants';
import { GitService } from '../gitService';
import { Logger } from '../logger';
import { CommandQuickPickItem } from '../quickPicks';
import { StashCommitNode } from '../views/stashCommitNode';
export interface StashDeleteCommandArgs {
confirm?: boolean;
@@ -19,8 +20,16 @@ export class StashDeleteCommand extends Command {
super(Commands.StashDelete);
}
async execute(args: StashDeleteCommandArgs = { confirm: true }) {
async execute(args: StashDeleteCommandArgs | StashCommitNode = { confirm: true }) {
if (!this.git.repoPath) return undefined;
let stashCommitNode = undefined;
if (args instanceof StashCommitNode) {
stashCommitNode = args;
args = {
confirm: true,
stashItem: args.commit
};
}
args = { ...args };
if (args.stashItem === undefined || args.stashItem.stashName === undefined) return undefined;
@@ -36,7 +45,11 @@ export class StashDeleteCommand extends Command {
if (result === undefined || result.title !== 'Yes') return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
}
return await this.git.stashDelete(this.git.repoPath, args.stashItem.stashName);
const ret = await this.git.stashDelete(this.git.repoPath, args.stashItem.stashName);
if (stashCommitNode) {
stashCommitNode.refreshNode();
}
return ret;
}
catch (ex) {
Logger.error(ex, 'StashDeleteCommand');