Fixes #207 - stash command not working

eamodio · eamodio · commit c47d6b5e6b29 · 2017-11-20T23:00:37.000-05:00
Fixes #203 - open changed files is broken Fixes highlander repository method Adds repository picker
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Fixes [#207](https://github.com/eamodio/vscode-gitlens/issues/207) - Applying and deleting stashes suddenly stopped working
+- Fixes [#203](https://github.com/eamodio/vscode-gitlens/issues/203) - Open Changed Files is broken
+
 ## [6.1.1] - 2017-11-17
 ### Fixed
 - Fixes [#201](https://github.com/eamodio/vscode-gitlens/issues/201) - "Open in Remote" commands should check for branch upstream tracking
diff --git a/src/commands/copyMessageToClipboard.ts b/src/commands/copyMessageToClipboard.ts
@@ -37,9 +37,10 @@ export class CopyMessageToClipboardCommand extends ActiveEditorCommand {
 
             // If we don't have an editor then get the message of the last commit to the branch
             if (uri === undefined) {
-                if (!this.git.repoPath) return undefined;
+                const repoPath = await this.git.getActiveRepoPath(editor);
+                if (!repoPath) return undefined;
 
-                const log = await this.git.getLogForRepo(this.git.repoPath, undefined, 1);
+                const log = await this.git.getLogForRepo(repoPath, undefined, 1);
                 if (!log) return undefined;
 
                 args.message = Iterables.first(log.commits.values()).message;
diff --git a/src/commands/copyShaToClipboard.ts b/src/commands/copyShaToClipboard.ts
@@ -36,9 +36,10 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand {
 
             // If we don't have an editor then get the sha of the last commit to the branch
             if (uri === undefined) {
-                if (!this.git.repoPath) return undefined;
+                const repoPath = await this.git.getActiveRepoPath(editor);
+                if (!repoPath) return undefined;
 
-                const log = await this.git.getLogForRepo(this.git.repoPath, undefined, 1);
+                const log = await this.git.getLogForRepo(repoPath, undefined, 1);
                 if (!log) return undefined;
 
                 args.sha = Iterables.first(log.commits.values()).sha;
diff --git a/src/commands/openBranchInRemote.ts b/src/commands/openBranchInRemote.ts
@@ -35,7 +35,7 @@ export class OpenBranchInRemoteCommand extends ActiveEditorCommand {
 
         const gitUri = uri && await GitUri.fromUri(uri, this.git);
 
-        const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
+        const repoPath = gitUri === undefined ? this.git.getHighlanderRepoPath() : gitUri.repoPath;
         if (!repoPath) return undefined;
 
         try {
diff --git a/src/commands/openBranchesInRemote.ts b/src/commands/openBranchesInRemote.ts
@@ -31,7 +31,7 @@ export class OpenBranchesInRemoteCommand extends ActiveEditorCommand {
 
         const gitUri = uri && await GitUri.fromUri(uri, this.git);
 
-        const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
+        const repoPath = gitUri === undefined ? this.git.getHighlanderRepoPath() : gitUri.repoPath;
         if (!repoPath) return undefined;
 
         try {
diff --git a/src/commands/openRepoInRemote.ts b/src/commands/openRepoInRemote.ts
@@ -31,7 +31,7 @@ export class OpenRepoInRemoteCommand extends ActiveEditorCommand {
 
         const gitUri = uri && await GitUri.fromUri(uri, this.git);
 
-        const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
+        const repoPath = gitUri === undefined ? this.git.getHighlanderRepoPath() : gitUri.repoPath;
         if (!repoPath) return undefined;
 
         try {
diff --git a/src/commands/showCommitSearch.ts b/src/commands/showCommitSearch.ts
@@ -38,7 +38,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
 
         const gitUri = uri === undefined ? undefined : await GitUri.fromUri(uri, this.git);
 
-        const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
+        const repoPath = gitUri === undefined ? this.git.getHighlanderRepoPath() : gitUri.repoPath;
         if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to show commit search`);
 
         args = { ...args };
diff --git a/src/commands/showQuickBranchHistory.ts b/src/commands/showQuickBranchHistory.ts
@@ -38,7 +38,7 @@ export class ShowQuickBranchHistoryCommand extends ActiveEditorCachedCommand {
 
         let progressCancellation = args.branch === undefined ? undefined : BranchHistoryQuickPick.showProgress(args.branch);
         try {
-            const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
+            const repoPath = gitUri === undefined ? this.git.getHighlanderRepoPath() : gitUri.repoPath;
             if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to show branch history`);
 
             if (args.branch === undefined) {
diff --git a/src/commands/stashApply.ts b/src/commands/stashApply.ts
@@ -5,12 +5,12 @@ import { Command, CommandContext, Commands, isCommandViewContextWithCommit } fro
 import { GlyphChars } from '../constants';
 import { GitService, GitStashCommit } from '../gitService';
 import { Logger } from '../logger';
-import { CommandQuickPickItem, CommitQuickPickItem, StashListQuickPick } from '../quickPicks';
+import { CommandQuickPickItem, RepositoriesQuickPick, StashListQuickPick } from '../quickPicks';
 
 export interface StashApplyCommandArgs {
     confirm?: boolean;
     deleteAfter?: boolean;
-    stashItem?: { stashName: string, message: string };
+    stashItem?: { stashName: string, message: string, repoPath: string };
 
     goBackCommand?: CommandQuickPickItem;
 }
@@ -26,28 +26,43 @@ export class StashApplyCommand extends Command {
     protected async preExecute(context: CommandContext, args: StashApplyCommandArgs = { confirm: true, deleteAfter: false }) {
         if (isCommandViewContextWithCommit<GitStashCommit>(context)) {
             args = { ...args };
-            args.stashItem = { stashName: context.node.commit.stashName, message: context.node.commit.message };
+            args.stashItem = context.node.commit;
             return this.execute(args);
         }
 
         return this.execute(args);
     }
 
     async execute(args: StashApplyCommandArgs = { 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);
+            let goBackToRepositoriesCommand: CommandQuickPickItem | undefined;
+
+            let repoPath = await this.git.getActiveRepoPath();
+            if (!repoPath) {
+                const pick = await RepositoriesQuickPick.show(this.git, `Apply stashed changes from which repository${GlyphChars.Ellipsis}`, args.goBackCommand);
+                if (pick instanceof CommandQuickPickItem) return pick.execute();
+                if (pick === undefined) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
+
+                goBackToRepositoriesCommand = new CommandQuickPickItem({
+                    label: `go back ${GlyphChars.ArrowBack}`,
+                    description: `${Strings.pad(GlyphChars.Dash, 2, 3)} to pick another repository`
+                }, Commands.StashApply, [args]);
+
+                repoPath = pick.repoPath;
+            }
+
+            const stash = await this.git.getStashList(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 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', goBackToRepositoriesCommand || args.goBackCommand, currentCommand);
+            if (pick instanceof CommandQuickPickItem) return pick.execute();
+            if (pick === undefined) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
 
             args.goBackCommand = currentCommand;
             args.stashItem = pick.commit as GitStashCommit;
@@ -62,7 +77,7 @@ export class StashApplyCommand extends Command {
                 args.deleteAfter = result.title !== 'Yes';
             }
 
-            return await this.git.stashApply(this.git.repoPath, args.stashItem.stashName, args.deleteAfter);
+            return await this.git.stashApply(args.stashItem.repoPath, args.stashItem.stashName, args.deleteAfter);
         }
         catch (ex) {
             Logger.error(ex, 'StashApplyCommand');
diff --git a/src/commands/stashDelete.ts b/src/commands/stashDelete.ts
@@ -8,7 +8,7 @@ import { CommandQuickPickItem } from '../quickPicks';
 
 export interface StashDeleteCommandArgs {
     confirm?: boolean;
-    stashItem?: { stashName: string, message: string };
+    stashItem?: { stashName: string, message: string, repoPath: string };
 
     goBackCommand?: CommandQuickPickItem;
 }
@@ -24,18 +24,16 @@ export class StashDeleteCommand extends Command {
     protected async preExecute(context: CommandContext, args: StashDeleteCommandArgs = { confirm: true }) {
         if (isCommandViewContextWithCommit<GitStashCommit>(context)) {
             args = { ...args };
-            args.stashItem = { stashName: context.node.commit.stashName, message: context.node.commit.message };
+            args.stashItem = context.node.commit;
             return this.execute(args);
         }
 
         return this.execute(args);
     }
 
     async execute(args: StashDeleteCommandArgs = { confirm: true }) {
-        if (!this.git.repoPath) return undefined;
-
         args = { ...args };
-        if (args.stashItem === undefined || args.stashItem.stashName === undefined) return undefined;
+        if (args.stashItem === undefined || args.stashItem.stashName === undefined || args.stashItem.repoPath === undefined) return undefined;
 
         if (args.confirm === undefined) {
             args.confirm = true;
@@ -48,7 +46,7 @@ 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);
+            return await this.git.stashDelete(args.stashItem.repoPath, args.stashItem.stashName);
         }
         catch (ex) {
             Logger.error(ex, 'StashDeleteCommand');
diff --git a/src/commands/stashSave.ts b/src/commands/stashSave.ts
@@ -4,7 +4,8 @@ import { GitService } from '../gitService';
 import { CommandContext } from '../commands';
 import { Command, Commands } from './common';
 import { Logger } from '../logger';
-import { CommandQuickPickItem } from '../quickPicks';
+import { CommandQuickPickItem, RepositoriesQuickPick } from '../quickPicks';
+import { GlyphChars } from '../constants';
 
 export interface StashSaveCommandArgs {
     message?: string;
@@ -38,7 +39,14 @@ export class StashSaveCommand extends Command {
     }
 
     async execute(args: StashSaveCommandArgs = {}) {
-        if (!this.git.repoPath) return undefined;
+        let repoPath = await this.git.getHighlanderRepoPath();
+        if (!repoPath) {
+            const pick = await RepositoriesQuickPick.show(this.git, `Stash changes for which repository${GlyphChars.Ellipsis}`, args.goBackCommand);
+            if (pick instanceof CommandQuickPickItem) return pick.execute();
+            if (pick === undefined) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
+
+            repoPath = pick.repoPath;
+        }
 
         try {
             if (args.message == null) {
@@ -50,7 +58,7 @@ export class StashSaveCommand extends Command {
                 if (args.message === undefined) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
             }
 
-            return await this.git.stashSave(this.git.repoPath, args.message, args.uris);
+            return await this.git.stashSave(repoPath, args.message, args.uris);
         }
         catch (ex) {
             Logger.error(ex, 'StashSaveCommand');
diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts
@@ -60,10 +60,11 @@ export class Repository extends Disposable {
         return this._onDidChangeFileSystem.event;
     }
 
+    readonly formattedName: string;
     readonly index: number;
     readonly name: string;
     readonly normalizedPath: string;
-    readonly storage: Map<string, any> = new Map();
+    // readonly storage: Map<string, any> = new Map();
 
     private _branch: Promise<GitBranch | undefined> | undefined;
     private readonly _disposable: Disposable;
@@ -86,10 +87,11 @@ export class Repository extends Disposable {
     ) {
         super(() => this.dispose());
 
-        this.index = folder.index;
-        this.name = root
+        this.formattedName = root
             ? folder.name
             : `${folder.name} (${_path.relative(folder.uri.fsPath, path)})`;
+        this.index = folder.index;
+        this.name = folder.name;
 
         this.normalizedPath = (this.path.endsWith('/') ? this.path : `${this.path}/`).toLowerCase();
 
@@ -109,12 +111,12 @@ export class Repository extends Disposable {
     dispose() {
         this.stopWatchingFileSystem();
 
-        // Clean up any disposables in storage
-        for (const item of this.storage.values()) {
-            if (item != null && typeof item.dispose === 'function') {
-                item.dispose();
-            }
-        }
+        // // Clean up any disposables in storage
+        // for (const item of this.storage.values()) {
+        //     if (item != null && typeof item.dispose === 'function') {
+        //         item.dispose();
+        //     }
+        // }
 
         this._disposable && this._disposable.dispose();
     }
diff --git a/src/gitService.ts b/src/gitService.ts
@@ -138,14 +138,6 @@ export class GitService extends Disposable {
         this._versionedUriCache.clear();
     }
 
-    get repoPath(): string | undefined {
-        const entry = this._repositoryTree.highlander();
-        if (entry === undefined) return undefined;
-
-        const [repo] = entry;
-        return repo.path;
-    }
-
     get UseCaching() {
         return this.config.advanced.caching.enabled;
     }
@@ -476,6 +468,26 @@ export class GitService extends Disposable {
         }
     }
 
+    async getActiveRepoPath(editor?: TextEditor): Promise<string | undefined> {
+        if (editor === undefined) {
+            const repoPath = this.getHighlanderRepoPath();
+            if (repoPath !== undefined) return repoPath;
+        }
+
+        editor = editor || window.activeTextEditor;
+        if (editor === undefined) return undefined;
+
+        return this.getRepoPath(editor.document.uri);
+    }
+
+    getHighlanderRepoPath(): string | undefined {
+        const entry = this._repositoryTree.highlander();
+        if (entry === undefined) return undefined;
+
+        const [repo] = entry;
+        return repo.path;
+    }
+
     public async getBlameability(uri: GitUri): Promise<boolean> {
         if (!this.UseCaching) return await this.isTracked(uri);
 
@@ -1035,7 +1047,7 @@ export class GitService extends Disposable {
     async getRepoPath(filePath: string): Promise<string | undefined>;
     async getRepoPath(uri: Uri | undefined): Promise<string | undefined>;
     async getRepoPath(filePathOrUri: string | Uri | undefined): Promise<string | undefined> {
-        if (filePathOrUri === undefined) return this.repoPath;
+        if (filePathOrUri === undefined) return await this.getActiveRepoPath();
         if (filePathOrUri instanceof GitUri) return filePathOrUri.repoPath;
 
         const repo = await this.getRepository(filePathOrUri);
diff --git a/src/quickPicks.ts b/src/quickPicks.ts
@@ -8,5 +8,6 @@ export * from './quickPicks/commits';
 export * from './quickPicks/branchHistory';
 export * from './quickPicks/fileHistory';
 export * from './quickPicks/remotes';
+export * from './quickPicks/repositories';
 export * from './quickPicks/repoStatus';
 export * from './quickPicks/stashList';
diff --git a/src/quickPicks/branches.ts b/src/quickPicks/branches.ts
@@ -24,7 +24,7 @@ export class BranchesQuickPick {
 
         const items = branches.map(b => new BranchQuickPickItem(b)) as (BranchQuickPickItem | CommandQuickPickItem)[];
 
-        if (goBackCommand) {
+        if (goBackCommand !== undefined) {
             items.splice(0, 0, goBackCommand);
         }
 
@@ -35,7 +35,6 @@ export class BranchesQuickPick {
                 placeHolder: placeHolder,
                 ignoreFocusOut: getQuickPickIgnoreFocusOut()
             } as QuickPickOptions);
-        if (!pick) return undefined;
 
         // await scope.dispose();
 
diff --git a/src/quickPicks/commits.ts b/src/quickPicks/commits.ts
@@ -17,9 +17,9 @@ export class CommitsQuickPick {
     }
 
     static async show(git: GitService, log: GitLog, placeHolder: string, progressCancellation: CancellationTokenSource, goBackCommand?: CommandQuickPickItem): Promise<CommitQuickPickItem | CommandQuickPickItem | undefined> {
-        const items = ((log && Array.from(Iterables.map(log.commits.values(), c => new CommitQuickPickItem(c)))) || []) as (CommitQuickPickItem | CommandQuickPickItem)[];
+        const items = ((log && [...Iterables.map(log.commits.values(), c => new CommitQuickPickItem(c))]) || []) as (CommitQuickPickItem | CommandQuickPickItem)[];
 
-        if (goBackCommand) {
+        if (goBackCommand !== undefined) {
             items.splice(0, 0, goBackCommand);
         }
 
diff --git a/src/quickPicks/repositories.ts b/src/quickPicks/repositories.ts
diff --git a/src/system/searchTree.ts b/src/system/searchTree.ts
diff --git a/src/views/repositoryNode.ts b/src/views/repositoryNode.ts
