Fixes #399 - "Open x in Remote" commands aren't always available

eamodio · eamodio · commit d2a7a1ceb378 · 2018-06-06T22:40:57.000-04:00
Closes #209 - Open File in Remote should ask for a branch if no upstream
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## [Unreleased]
 ### Added
 - Adds clipboard support for Linux without requiring any external dependencies &mdash; thanks to [PR #394](https://github.com/eamodio/vscode-gitlens/pull/394) by Cédric Malard ([@cmalard](https://github.com/cmalard))
+- Adds a select branch quick pick menu to the *Open File in Remote* command (`gitlens.openFileInRemote`) when the current branch has no upstream tracking branch &mdash; closes [#209](https://github.com/eamodio/vscode-gitlens/issues/209)
 
 ### Fixed
 - Fixes [#400](https://github.com/eamodio/vscode-gitlens/issues/400) - Reset TO commit also resets chosen one
+- Fixes [#399](https://github.com/eamodio/vscode-gitlens/issues/399) - "Open x in Remote" commands aren't always available
 - Fixes [#397](https://github.com/eamodio/vscode-gitlens/issues/397) - Error while opening the gitlens view using `Open View` command
 - Fixes [#391](https://github.com/eamodio/vscode-gitlens/issues/391) - GitLens adds some settings in settings.json
 - Fixes another case of [#343](https://github.com/eamodio/vscode-gitlens/issues/343) - Can't show blame when VSCode starts on branch without upstream &mdash; thanks to [PR #390](https://github.com/eamodio/vscode-gitlens/pull/390) by ryenus ([@ryenus](https://github.com/ryenus))
diff --git a/package.json b/package.json
@@ -2068,27 +2068,27 @@
                 },
                 {
                     "command": "gitlens.openBranchesInRemote",
-                    "when": "gitlens:activeHasRemote"
+                    "when": "gitlens:hasRemotes"
                 },
                 {
                     "command": "gitlens.openBranchInRemote",
-                    "when": "gitlens:activeHasRemote"
+                    "when": "gitlens:hasRemotes"
                 },
                 {
                     "command": "gitlens.openCommitInRemote",
-                    "when": "gitlens:activeIsBlameable && gitlens:activeHasRemote"
+                    "when": "gitlens:activeIsBlameable && gitlens:activeHasRemotes"
                 },
                 {
                     "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:activeIsTracked && gitlens:activeHasRemote"
+                    "when": "gitlens:activeIsTracked && gitlens:activeHasRemotes"
                 },
                 {
                     "command": "gitlens.openFileRevision",
                     "when": "gitlens:activeIsTracked"
                 },
                 {
                     "command": "gitlens.openRepoInRemote",
-                    "when": "gitlens:activeHasRemote"
+                    "when": "gitlens:hasRemotes"
                 },
                 {
                     "command": "gitlens.openWorkingFile",
@@ -2372,12 +2372,12 @@
                 },
                 {
                     "command": "gitlens.openFileInRemote",
-                    "when": "editorTextFocus && gitlens:activeHasRemote && config.gitlens.menus.editor.remote",
+                    "when": "editorTextFocus && gitlens:activeHasRemotes && config.gitlens.menus.editor.remote",
                     "group": "1_gitlens_1@1"
                 },
                 {
                     "command": "gitlens.openCommitInRemote",
-                    "when": "editorTextFocus && gitlens:activeHasRemote && config.gitlens.menus.editor.remote",
+                    "when": "editorTextFocus && gitlens:activeHasRemotes && config.gitlens.menus.editor.remote",
                     "group": "1_gitlens_1@2"
                 },
                 {
@@ -2450,7 +2450,7 @@
                 },
                 {
                     "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:activeHasRemote && config.gitlens.menus.editorGroup.remote",
+                    "when": "gitlens:enabled && gitlens:activeHasRemotes && config.gitlens.menus.editorGroup.remote",
                     "group": "4_gitlens"
                 },
                 {
@@ -2462,7 +2462,7 @@
             "editor/title/context": [
                 {
                     "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:activeHasRemote && config.gitlens.menus.editorTab.remote",
+                    "when": "gitlens:enabled && gitlens:activeHasRemotes && config.gitlens.menus.editorTab.remote",
                     "group": "2_files@100"
                 },
                 {
diff --git a/src/commands/openBranchInRemote.ts b/src/commands/openBranchInRemote.ts
@@ -41,23 +41,26 @@ export class OpenBranchInRemoteCommand extends ActiveEditorCommand {
             if (args.branch === undefined) {
                 args = { ...args };
 
-                const branches = await Container.git.getBranches(repoPath);
+                const branches = (await Container.git.getBranches(repoPath)).filter(b => b.tracking !== undefined);
+                if (branches.length > 1) {
+                    const pick = await BranchesQuickPick.show(branches, `Open which branch in remote${GlyphChars.Ellipsis}`);
+                    if (pick === undefined) return undefined;
 
-                const pick = await BranchesQuickPick.show(branches, `Open which branch in remote${GlyphChars.Ellipsis}`);
-                if (pick === undefined) return undefined;
+                    if (pick instanceof CommandQuickPickItem) return undefined;
 
-                if (pick instanceof CommandQuickPickItem) return undefined;
-
-                args.branch = pick.branch.name;
-                if (args.branch === undefined) return undefined;
+                    args.branch = pick.branch.name;
+                }
+                else if (branches.length === 1) {
+                    args.branch = branches[0].name;
+                }
             }
 
             const remotes = await Container.git.getRemotes(repoPath);
 
             return commands.executeCommand(Commands.OpenInRemote, uri, {
                 resource: {
                     type: 'branch',
-                    branch: args.branch
+                    branch: args.branch || 'HEAD'
                 },
                 remote: args.remote,
                 remotes
diff --git a/src/commands/openFileInRemote.ts b/src/commands/openFileInRemote.ts
@@ -1,10 +1,12 @@
 'use strict';
 import { commands, Range, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithBranch, isCommandViewContextWithCommit } from './common';
+import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { OpenInRemoteCommandArgs } from './openInRemote';
+import { BranchesQuickPick, CommandQuickPickItem } from '../quickPicks/quickPicks';
 
 export interface OpenFileInRemoteCommandArgs {
     branch?: string;
@@ -39,7 +41,21 @@ export class OpenFileInRemoteCommand extends ActiveEditorCommand {
 
         if (args.branch === undefined) {
             const branch = await Container.git.getBranch(gitUri.repoPath);
-            if (branch !== undefined) {
+            if (branch === undefined || branch.tracking === undefined) {
+                const branches = (await Container.git.getBranches(gitUri.repoPath)).filter(b => b.tracking !== undefined);
+                if (branches.length > 1) {
+                    const pick = await BranchesQuickPick.show(branches, `Open ${gitUri.getRelativePath()} in remote for which branch${GlyphChars.Ellipsis}`);
+                    if (pick === undefined) return undefined;
+
+                    if (pick instanceof CommandQuickPickItem) return undefined;
+
+                    args.branch = pick.branch.name;
+                }
+                else if (branches.length === 1) {
+                    args.branch = branches[0].name;
+                }
+            }
+            else {
                 args.branch = branch.name;
             }
         }
@@ -53,7 +69,7 @@ export class OpenFileInRemoteCommand extends ActiveEditorCommand {
             return commands.executeCommand(Commands.OpenInRemote, uri, {
                 resource: {
                     type: gitUri.sha === undefined ? 'file' : 'revision',
-                    branch: args.branch,
+                    branch: args.branch || 'HEAD',
                     fileName: gitUri.getRelativePath(),
                     range: range,
                     sha: gitUri.sha
diff --git a/src/constants.ts b/src/constants.ts
@@ -24,7 +24,7 @@ export enum BuiltInCommands {
 }
 
 export enum CommandContext {
-    ActiveHasRemote = 'gitlens:activeHasRemote',
+    ActiveHasRemotes = 'gitlens:activeHasRemotes',
     ActiveIsBlameable = 'gitlens:activeIsBlameable',
     ActiveFileIsTracked = 'gitlens:activeIsTracked',
     ActiveIsRevision = 'gitlens:activeIsRevision',
diff --git a/src/git/git.ts b/src/git/git.ts
@@ -333,6 +333,15 @@ export class Git {
         return gitCommand({ cwd: repoPath }, ...params);
     }
 
+    static branch_contains(repoPath: string, ref: string, options: { remote: boolean } = { remote: false }) {
+        const params = ['branch', '--contains'];
+        if (options.remote) {
+            params.push('-r');
+        }
+
+        return gitCommand({ cwd: repoPath }, ...params, ref);
+    }
+
     static checkout(repoPath: string, fileName: string, sha: string) {
         const [file, root] = Git.splitPath(fileName, repoPath);
 
diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts
@@ -249,16 +249,16 @@ export class Repository extends Disposable {
         return Container.git.getTags(this.path);
     }
 
-    async hasRemote(): Promise<boolean> {
-        const branch = await this.getBranch();
-        return branch !== undefined && branch.tracking !== undefined;
-    }
-
     async hasRemotes(): Promise<boolean> {
         const remotes = await this.getRemotes();
         return remotes !== undefined && remotes.length > 0;
     }
 
+    async hasTrackingBranch(): Promise<boolean> {
+        const branch = await this.getBranch();
+        return branch !== undefined && branch.tracking !== undefined;
+    }
+
     resume() {
         if (!this._suspended) return;
 
diff --git a/src/gitService.ts b/src/gitService.ts
@@ -1132,22 +1132,22 @@ export class GitService extends Disposable {
         }
     }
 
-    async hasRemote(repoPath: string | undefined): Promise<boolean> {
+    async hasRemotes(repoPath: string | undefined): Promise<boolean> {
         if (repoPath === undefined) return false;
 
         const repository = await this.getRepository(repoPath);
         if (repository === undefined) return false;
 
-        return repository.hasRemote();
+        return repository.hasRemotes();
     }
 
-    async hasRemotes(repoPath: string | undefined): Promise<boolean> {
+    async hasTrackingBranch(repoPath: string | undefined): Promise<boolean> {
         if (repoPath === undefined) return false;
 
         const repository = await this.getRepository(repoPath);
         if (repository === undefined) return false;
 
-        return repository.hasRemotes();
+        return repository.hasTrackingBranch();
     }
 
     async getMergeBase(repoPath: string, ref1: string, ref2: string, options: { forkPoint?: boolean } = {}) {
diff --git a/src/trackers/documentTracker.ts b/src/trackers/documentTracker.ts
@@ -91,7 +91,7 @@ export class DocumentTracker<T> extends Disposable {
             setCommandContext(CommandContext.ActiveIsRevision, false);
             setCommandContext(CommandContext.ActiveFileIsTracked, false);
             setCommandContext(CommandContext.ActiveIsBlameable, false);
-            setCommandContext(CommandContext.ActiveHasRemote, false);
+            setCommandContext(CommandContext.ActiveHasRemotes, false);
 
             return;
         }
diff --git a/src/trackers/trackedDocument.ts b/src/trackers/trackedDocument.ts
@@ -120,7 +120,7 @@ export class TrackedDocument<T> extends Disposable {
         setCommandContext(CommandContext.ActiveIsRevision, this.isRevision);
         setCommandContext(CommandContext.ActiveFileIsTracked, this.isTracked);
         setCommandContext(CommandContext.ActiveIsBlameable, this.isBlameable);
-        setCommandContext(CommandContext.ActiveHasRemote, this.hasRemotes);
+        setCommandContext(CommandContext.ActiveHasRemotes, this.hasRemotes);
     }
 
     async ensureInitialized() {
@@ -189,7 +189,7 @@ export class TrackedDocument<T> extends Disposable {
         }
 
         if (repo !== undefined) {
-            this._hasRemotes = await repo.hasRemote();
+            this._hasRemotes = await repo.hasRemotes();
         }
         else {
             this._hasRemotes = false;
@@ -201,7 +201,7 @@ export class TrackedDocument<T> extends Disposable {
             setCommandContext(CommandContext.ActiveIsRevision, this.isRevision);
             setCommandContext(CommandContext.ActiveFileIsTracked, this.isTracked);
             setCommandContext(CommandContext.ActiveIsBlameable, blameable);
-            setCommandContext(CommandContext.ActiveHasRemote, this.hasRemotes);
+            setCommandContext(CommandContext.ActiveHasRemotes, this.hasRemotes);
 
             if (!options.initializing && wasBlameable !== blameable) {
                 const e = { editor: active, document: this, blameable: blameable } as DocumentBlameStateChangeEvent<T>;

Original file line number	Diff line number	Diff line change
`@@ -2068,27 +2068,27 @@`
`2068`	`2068`	`},`
`2069`	`2069`	`{`
`2070`	`2070`	`"command": "gitlens.openBranchesInRemote",`
`2071`		`- "when": "gitlens:activeHasRemote"`
	`2071`	`+ "when": "gitlens:hasRemotes"`
`2072`	`2072`	`},`
`2073`	`2073`	`{`
`2074`	`2074`	`"command": "gitlens.openBranchInRemote",`
`2075`		`- "when": "gitlens:activeHasRemote"`
	`2075`	`+ "when": "gitlens:hasRemotes"`
`2076`	`2076`	`},`
`2077`	`2077`	`{`
`2078`	`2078`	`"command": "gitlens.openCommitInRemote",`
`2079`		`- "when": "gitlens:activeIsBlameable && gitlens:activeHasRemote"`
	`2079`	`+ "when": "gitlens:activeIsBlameable && gitlens:activeHasRemotes"`
`2080`	`2080`	`},`
`2081`	`2081`	`{`
`2082`	`2082`	`"command": "gitlens.openFileInRemote",`
`2083`		`- "when": "gitlens:activeIsTracked && gitlens:activeHasRemote"`
	`2083`	`+ "when": "gitlens:activeIsTracked && gitlens:activeHasRemotes"`
`2084`	`2084`	`},`
`2085`	`2085`	`{`
`2086`	`2086`	`"command": "gitlens.openFileRevision",`
`2087`	`2087`	`"when": "gitlens:activeIsTracked"`
`2088`	`2088`	`},`
`2089`	`2089`	`{`
`2090`	`2090`	`"command": "gitlens.openRepoInRemote",`
`2091`		`- "when": "gitlens:activeHasRemote"`
	`2091`	`+ "when": "gitlens:hasRemotes"`
`2092`	`2092`	`},`
`2093`	`2093`	`{`
`2094`	`2094`	`"command": "gitlens.openWorkingFile",`
`@@ -2372,12 +2372,12 @@`
`2372`	`2372`	`},`
`2373`	`2373`	`{`
`2374`	`2374`	`"command": "gitlens.openFileInRemote",`
`2375`		`- "when": "editorTextFocus && gitlens:activeHasRemote && config.gitlens.menus.editor.remote",`
	`2375`	`+ "when": "editorTextFocus && gitlens:activeHasRemotes && config.gitlens.menus.editor.remote",`
`2376`	`2376`	`"group": "1_gitlens_1@1"`
`2377`	`2377`	`},`
`2378`	`2378`	`{`
`2379`	`2379`	`"command": "gitlens.openCommitInRemote",`
`2380`		`- "when": "editorTextFocus && gitlens:activeHasRemote && config.gitlens.menus.editor.remote",`
	`2380`	`+ "when": "editorTextFocus && gitlens:activeHasRemotes && config.gitlens.menus.editor.remote",`
`2381`	`2381`	`"group": "1_gitlens_1@2"`
`2382`	`2382`	`},`
`2383`	`2383`	`{`
`@@ -2450,7 +2450,7 @@`
`2450`	`2450`	`},`
`2451`	`2451`	`{`
`2452`	`2452`	`"command": "gitlens.openFileInRemote",`
`2453`		`- "when": "gitlens:enabled && gitlens:activeHasRemote && config.gitlens.menus.editorGroup.remote",`
	`2453`	`+ "when": "gitlens:enabled && gitlens:activeHasRemotes && config.gitlens.menus.editorGroup.remote",`
`2454`	`2454`	`"group": "4_gitlens"`
`2455`	`2455`	`},`
`2456`	`2456`	`{`
`@@ -2462,7 +2462,7 @@`
`2462`	`2462`	`"editor/title/context": [`
`2463`	`2463`	`{`
`2464`	`2464`	`"command": "gitlens.openFileInRemote",`
`2465`		`- "when": "gitlens:enabled && gitlens:activeHasRemote && config.gitlens.menus.editorTab.remote",`
	`2465`	`+ "when": "gitlens:enabled && gitlens:activeHasRemotes && config.gitlens.menus.editorTab.remote",`
`2466`	`2466`	`"group": "2_files@100"`
`2467`	`2467`	`},`
`2468`	`2468`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export enum BuiltInCommands {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`export enum CommandContext {`
`27`		`- ActiveHasRemote = 'gitlens:activeHasRemote',`
	`27`	`+ ActiveHasRemotes = 'gitlens:activeHasRemotes',`
`28`	`28`	`ActiveIsBlameable = 'gitlens:activeIsBlameable',`
`29`	`29`	`ActiveFileIsTracked = 'gitlens:activeIsTracked',`
`30`	`30`	`ActiveIsRevision = 'gitlens:activeIsRevision',`
Original file line number	Diff line number	Diff line change
`@@ -1132,22 +1132,22 @@ export class GitService extends Disposable {`
`1132`	`1132`	`}`
`1133`	`1133`	`}`
`1134`	`1134`
`1135`		`- async hasRemote(repoPath: string \| undefined): Promise<boolean> {`
	`1135`	`+ async hasRemotes(repoPath: string \| undefined): Promise<boolean> {`
`1136`	`1136`	`if (repoPath === undefined) return false;`
`1137`	`1137`
`1138`	`1138`	`const repository = await this.getRepository(repoPath);`
`1139`	`1139`	`if (repository === undefined) return false;`
`1140`	`1140`
`1141`		`- return repository.hasRemote();`
	`1141`	`+ return repository.hasRemotes();`
`1142`	`1142`	`}`
`1143`	`1143`
`1144`		`- async hasRemotes(repoPath: string \| undefined): Promise<boolean> {`
	`1144`	`+ async hasTrackingBranch(repoPath: string \| undefined): Promise<boolean> {`
`1145`	`1145`	`if (repoPath === undefined) return false;`
`1146`	`1146`
`1147`	`1147`	`const repository = await this.getRepository(repoPath);`
`1148`	`1148`	`if (repository === undefined) return false;`
`1149`	`1149`
`1150`		`- return repository.hasRemotes();`
	`1150`	`+ return repository.hasTrackingBranch();`
`1151`	`1151`	`}`
`1152`	`1152`
`1153`	`1153`	`async getMergeBase(repoPath: string, ref1: string, ref2: string, options: { forkPoint?: boolean } = {}) {`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ export class DocumentTracker<T> extends Disposable {`
`91`	`91`	`setCommandContext(CommandContext.ActiveIsRevision, false);`
`92`	`92`	`setCommandContext(CommandContext.ActiveFileIsTracked, false);`
`93`	`93`	`setCommandContext(CommandContext.ActiveIsBlameable, false);`
`94`		`- setCommandContext(CommandContext.ActiveHasRemote, false);`
	`94`	`+ setCommandContext(CommandContext.ActiveHasRemotes, false);`
`95`	`95`
`96`	`96`	`return;`
`97`	`97`	`}`