Renames commands/commands to commands/common

Renames quickpicks/quickpicks to quickpicks/common
Moves git quick picks into common and other quick pick files

src/quickPicks/branchHistory.ts

@@ -2,8 +2,9 @@
 import { Arrays, Iterables } from '../system';
 import { CancellationTokenSource, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, Keyboard, KeyNoopCommand } from '../commands';
+import { CommandQuickPickItem, CommitQuickPickItem, getQuickPickIgnoreFocusOut, showQuickPickProgress } from './common';
 import { GitService, GitUri, IGitLog } from '../gitService';
-import { CommandQuickPickItem, CommitQuickPickItem, getQuickPickIgnoreFocusOut, OpenRemotesCommandQuickPickItem, showQuickPickProgress } from '../quickPicks';
+import { OpenRemotesCommandQuickPickItem } from './remotes';
 
 export class BranchHistoryQuickPick {
 

src/quickPicks/branches.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { QuickPickItem, QuickPickOptions, window } from 'vscode';
 import { GitBranch } from '../gitService';
-import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './quickPicks';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './common';
 
 export class BranchQuickPickItem implements QuickPickItem {
 

src/quickPicks/commitDetails.ts

@@ -2,11 +2,45 @@
 import { Arrays, Iterables } from '../system';
 import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, Keyboard, KeyNoopCommand } from '../commands';
-import { GitLogCommit, GitService, IGitLog } from '../gitService';
-import { CommandQuickPickItem, CommitWithFileStatusQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFilesCommandQuickPickItem, OpenRemotesCommandQuickPickItem } from '../quickPicks';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem } from './common';
+import { getGitStatusIcon, Git, GitCommit, GitLogCommit, GitService, GitStatusFileStatus, GitUri, IGitLog, IGitStatusFile } from '../gitService';
+import { OpenRemotesCommandQuickPickItem } from './remotes';
 import * as moment from 'moment';
 import * as path from 'path';
 
+export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickItem {
+
+    fileName: string;
+    gitUri: GitUri;
+    sha: string;
+    shortSha: string;
+    status: GitStatusFileStatus;
+
+    constructor(commit: GitCommit, status: IGitStatusFile) {
+        const icon = getGitStatusIcon(status.status);
+
+        let directory = Git.normalizePath(path.dirname(status.fileName));
+        if (!directory || directory === '.') {
+            directory = undefined;
+        }
+
+        let description = (status.status === 'R' && status.originalFileName)
+            ? `${directory || ''} \u00a0\u2190\u00a0 ${status.originalFileName}`
+            : directory;
+
+        super(GitService.toGitContentUri(commit.sha, status.fileName, commit.repoPath, commit.originalFileName), {
+            label: `\u00a0\u00a0\u00a0\u00a0${icon}\u00a0\u00a0 ${path.basename(status.fileName)}`,
+            description: description
+        });
+
+        this.fileName = status.fileName;
+        this.gitUri = new GitUri(Uri.file(path.resolve(commit.repoPath, status.fileName)));
+        this.sha = commit.sha;
+        this.shortSha = commit.shortSha;
+        this.status = status.status;
+    }
+}
+
 export class OpenCommitFilesCommandQuickPickItem extends OpenFilesCommandQuickPickItem {
 
     constructor(commit: GitLogCommit, item?: QuickPickItem) {

src/quickPicks/commitFileDetails.ts

@@ -2,8 +2,9 @@
 import { Arrays, Iterables } from '../system';
 import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, Keyboard, KeyNoopCommand } from '../commands';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem } from './common';
 import { GitCommit, GitLogCommit, GitService, GitUri, IGitLog } from '../gitService';
-import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem, OpenRemotesCommandQuickPickItem } from '../quickPicks';
+import { OpenRemotesCommandQuickPickItem } from './remotes';
 import * as moment from 'moment';
 import * as path from 'path';
 

src/quickPicks/common.ts

@@ -2,7 +2,9 @@
 import { CancellationTokenSource, commands, Disposable, QuickPickItem, QuickPickOptions, TextEditor, Uri, window, workspace } from 'vscode';
 import { Commands, Keyboard, KeyboardScope, KeyMapping, openEditor } from '../commands';
 import { IAdvancedConfig } from '../configuration';
+import { GitCommit } from '../gitService';
 // import { Logger } from '../logger';
+import * as moment from 'moment';
 
 export function getQuickPickIgnoreFocusOut() {
     return !workspace.getConfiguration('gitlens').get<IAdvancedConfig>('advanced').quickPick.closeOnFocusOut;
@@ -106,4 +108,17 @@ export class OpenFilesCommandQuickPickItem extends CommandQuickPickItem {
         }
         return undefined;
     }
+}
+
+export class CommitQuickPickItem implements QuickPickItem {
+
+    label: string;
+    description: string;
+    detail: string;
+
+    constructor(public commit: GitCommit, descriptionSuffix: string = '') {
+        this.label = `${commit.author}, ${moment(commit.date).fromNow()}`;
+        this.description = `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.shortSha}${descriptionSuffix}`;
+        this.detail = commit.message;
+    }
 }

src/quickPicks/fileHistory.ts

@@ -2,8 +2,9 @@
 import { Arrays, Iterables } from '../system';
 import { CancellationTokenSource, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, Keyboard, KeyNoopCommand } from '../commands';
+import { CommandQuickPickItem, CommitQuickPickItem, getQuickPickIgnoreFocusOut, showQuickPickProgress } from './common';
 import { GitService, GitUri, IGitLog } from '../gitService';
-import { CommandQuickPickItem, CommitQuickPickItem, getQuickPickIgnoreFocusOut, OpenRemotesCommandQuickPickItem, showQuickPickProgress } from '../quickPicks';
+import { OpenRemotesCommandQuickPickItem } from './remotes';
 import * as path from 'path';
 
 export class FileHistoryQuickPick {

src/quickPicks/gitQuickPicks.ts

@@ -1,52 +0,0 @@
-'use strict';
-import { QuickPickItem, Uri } from 'vscode';
-import { getGitStatusIcon, Git, GitCommit, GitStatusFileStatus, GitService, GitUri, IGitStatusFile } from '../gitService';
-import { OpenFileCommandQuickPickItem } from './quickPicks';
-import * as moment from 'moment';
-import * as path from 'path';
-
-export class CommitQuickPickItem implements QuickPickItem {
-
-    label: string;
-    description: string;
-    detail: string;
-
-    constructor(public commit: GitCommit, descriptionSuffix: string = '') {
-        this.label = `${commit.author}, ${moment(commit.date).fromNow()}`;
-        this.description = `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.shortSha}${descriptionSuffix}`;
-        this.detail = commit.message;
-    }
-}
-
-export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickItem {
-
-    fileName: string;
-    gitUri: GitUri;
-    sha: string;
-    shortSha: string;
-    status: GitStatusFileStatus;
-
-    constructor(commit: GitCommit, status: IGitStatusFile) {
-        const icon = getGitStatusIcon(status.status);
-
-        let directory = Git.normalizePath(path.dirname(status.fileName));
-        if (!directory || directory === '.') {
-            directory = undefined;
-        }
-
-        let description = (status.status === 'R' && status.originalFileName)
-            ? `${directory || ''} \u00a0\u2190\u00a0 ${status.originalFileName}`
-            : directory;
-
-        super(GitService.toGitContentUri(commit.sha, status.fileName, commit.repoPath, commit.originalFileName), {
-            label: `\u00a0\u00a0\u00a0\u00a0${icon}\u00a0\u00a0 ${path.basename(status.fileName)}`,
-            description: description
-        });
-
-        this.fileName = status.fileName;
-        this.gitUri = new GitUri(Uri.file(path.resolve(commit.repoPath, status.fileName)));
-        this.sha = commit.sha;
-        this.shortSha = commit.shortSha;
-        this.status = status.status;
-    }
-}

src/quickPicks/remotes.ts

@@ -1,20 +1,10 @@
 'use strict';
 import { QuickPickOptions, window } from 'vscode';
 import { Commands } from '../commands';
-import { GitRemote, RemoteOpenType } from '../gitService';
-import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './quickPicks';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './common';
+import { getNameFromRemoteOpenType, GitRemote, RemoteOpenType } from '../gitService';
 import * as path from 'path';
 
-function getNameFromRemoteOpenType(type: RemoteOpenType) {
-    switch (type) {
-        case 'branch': return 'Branch';
-        case 'commit': return 'Commit';
-        case 'file': return 'File';
-        case 'working-file': return 'Working File';
-        default: return '';
-    }
-}
-
 export class OpenRemoteCommandQuickPickItem extends CommandQuickPickItem {
 
     private remote: GitRemote;

src/quickPicks/repoStatus.ts

@@ -2,8 +2,8 @@
 import { Iterables } from '../system';
 import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, Keyboard } from '../commands';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem } from './common';
 import { Git, GitStatusFile, GitUri, IGitStatus } from '../gitService';
-import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem } from '../quickPicks';
 import * as path from 'path';
 
 export class OpenStatusFileCommandQuickPickItem extends OpenFileCommandQuickPickItem {