Moves gitService into git folder & renames a couple of git files

src/annotations/annotations.ts

@@ -24,7 +24,7 @@ import {
     GitService,
     GitUri,
     ICommitFormatOptions
-} from '../gitService';
+} from '../git/gitService';
 import { Objects, Strings } from '../system';
 import { toRgba } from '../ui/shared/colors';
 

src/annotations/blameAnnotationProvider.ts

@@ -12,7 +12,7 @@ import {
     TextEditorDecorationType
 } from 'vscode';
 import { Container } from '../container';
-import { GitBlame, GitCommit, GitUri } from '../gitService';
+import { GitBlame, GitCommit, GitUri } from '../git/gitService';
 import { Arrays, Iterables } from '../system';
 import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 import { AnnotationProviderBase } from './annotationProvider';

src/annotations/gutterBlameAnnotationProvider.ts

@@ -3,7 +3,7 @@ import { DecorationOptions, DecorationRenderOptions, Range, TextEditorDecoration
 import { FileAnnotationType, GravatarDefaultStyle } from '../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitBlameCommit, ICommitFormatOptions } from '../gitService';
+import { GitBlameCommit, ICommitFormatOptions } from '../git/gitService';
 import { Logger } from '../logger';
 import { Objects, Strings } from '../system';
 import { Annotations } from './annotations';

src/annotations/heatmapBlameAnnotationProvider.ts

@@ -2,7 +2,7 @@
 import { DecorationOptions, Range } from 'vscode';
 import { FileAnnotationType } from '../configuration';
 import { Container } from '../container';
-import { GitBlameCommit } from '../gitService';
+import { GitBlameCommit } from '../git/gitService';
 import { Logger } from '../logger';
 import { Strings } from '../system';
 import { Annotations } from './annotations';

src/annotations/recentChangesAnnotationProvider.ts

@@ -2,7 +2,7 @@
 import { DecorationOptions, MarkdownString, Position, Range, TextEditor, TextEditorDecorationType } from 'vscode';
 import { FileAnnotationType } from '../configuration';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Strings } from '../system';
 import { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';

src/codelens/codeLensController.ts

@@ -9,7 +9,7 @@ import {
     DocumentDirtyIdleTriggerEvent,
     GitDocumentState
 } from '../trackers/gitDocumentTracker';
-import { GitCodeLensProvider } from './gitCodeLensProvider';
+import { GitCodeLensProvider } from './codeLensProvider';
 
 export class CodeLensController implements Disposable {
     private _canToggle: boolean = false;

src/codelens/gitCodeLensProvider.ts → src/codelens/codeLensProvider.ts

@@ -33,7 +33,7 @@ import {
 } from '../configuration';
 import { BuiltInCommands, DocumentSchemes } from '../constants';
 import { Container } from '../container';
-import { GitBlame, GitBlameCommit, GitBlameLines, GitService, GitUri } from '../gitService';
+import { GitBlame, GitBlameCommit, GitBlameLines, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Functions, Iterables } from '../system';
 import { DocumentTracker, GitDocumentState } from '../trackers/gitDocumentTracker';

src/commands/common.ts

@@ -15,7 +15,7 @@ import {
 } from 'vscode';
 import { BuiltInCommands, DocumentSchemes, ImageMimetypes } from '../constants';
 import { Container } from '../container';
-import { GitBranch, GitCommit, GitRemote, GitUri } from '../gitService';
+import { GitBranch, GitCommit, GitRemote, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { CommandQuickPickItem, RepositoriesQuickPick } from '../quickpicks';
 // import { Telemetry } from '../telemetry';

src/commands/copyMessageToClipboard.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Iterables } from '../system';
 import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithCommit } from './common';

src/commands/copyShaToClipboard.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Iterables } from '../system';
 import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithCommit } from './common';

src/commands/diffLineWithPrevious.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitCommit, GitService, GitUri } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';

src/commands/diffLineWithWorking.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitCommit, GitService, GitUri } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';

src/commands/diffWith.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window } from 'vscode';
 import { BuiltInCommands, GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitCommit, GitService, GitUri } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { ActiveEditorCommand, Commands } from './common';
 

src/commands/diffWithBranch.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { commands, TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Messages } from '../messages';
 import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickpicks';
 import { Strings } from '../system';

src/commands/diffWithNext.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitLogCommit, GitService, GitStatusFile, GitUri } from '../gitService';
+import { GitLogCommit, GitService, GitStatusFile, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { Iterables } from '../system';

src/commands/diffWithPrevious.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitCommit, GitService, GitUri } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { Iterables } from '../system';

src/commands/diffWithRevision.ts

@@ -2,7 +2,7 @@
 import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitBranch, GitTag, GitUri } from '../gitService';
+import { GitBranch, GitTag, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { ChooseFromBranchesAndTagsQuickPickItem, CommandQuickPickItem, FileHistoryQuickPick } from '../quickpicks';

src/commands/diffWithWorking.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitCommit, GitService, GitUri } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';

src/commands/openBranchInRemote.ts

@@ -2,7 +2,7 @@
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { BranchesQuickPick, CommandQuickPickItem } from '../quickpicks';
 import {

src/commands/openBranchesInRemote.ts

@@ -2,7 +2,7 @@
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import {
     ActiveEditorCommand,

src/commands/openCommitInRemote.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithCommit } from './common';

src/commands/openFileInRemote.ts

@@ -2,7 +2,7 @@
 import { commands, Range, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { BranchesQuickPick, CommandQuickPickItem } from '../quickpicks';
 import {

src/commands/openFileRevision.ts

@@ -3,7 +3,7 @@ import { CancellationTokenSource, commands, Range, TextDocumentShowOptions, Text
 import { FileAnnotationType } from '../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitBranch, GitTag, GitUri } from '../gitService';
+import { GitBranch, GitTag, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { ChooseFromBranchesAndTagsQuickPickItem, CommandQuickPickItem, FileHistoryQuickPick } from '../quickpicks';

src/commands/openInRemote.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
-import { GitLogCommit, GitRemote, GitService, RemoteResource, RemoteResourceType } from '../gitService';
+import { GitLogCommit, GitRemote, GitService, RemoteResource, RemoteResourceType } from '../git/gitService';
 import { Logger } from '../logger';
 import { CommandQuickPickItem, OpenRemoteCommandQuickPickItem, RemotesQuickPick } from '../quickpicks';
 import { Strings } from '../system';

src/commands/openRepoInRemote.ts

@@ -2,7 +2,7 @@
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import {
     ActiveEditorCommand,

src/commands/openWorkingFile.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { FileAnnotationType } from '../configuration';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { ActiveEditorCommand, Commands, getCommandUri, openEditor } from './common';
 

src/commands/showCommitSearch.ts

@@ -2,7 +2,7 @@
 import { commands, InputBoxOptions, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitRepoSearchBy, GitService, GitUri } from '../gitService';
+import { GitRepoSearchBy, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { CommandQuickPickItem, CommitsQuickPick, ShowCommitsSearchInResultsQuickPickItem } from '../quickpicks';
 import { Strings } from '../system';

src/commands/showQuickBranchHistory.ts

@@ -2,7 +2,7 @@
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitLog, GitUri } from '../gitService';
+import { GitLog, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { BranchesQuickPick, BranchHistoryQuickPick, CommandQuickPickItem } from '../quickpicks';
 import { Strings } from '../system';

src/commands/showQuickCommitDetails.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitCommit, GitLog, GitLogCommit, GitUri } from '../gitService';
+import { GitCommit, GitLog, GitLogCommit, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { CommandQuickPickItem, CommitQuickPick, CommitWithFileStatusQuickPickItem } from '../quickpicks';

src/commands/showQuickCommitFileDetails.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitCommit, GitLog, GitLogCommit, GitService, GitUri } from '../gitService';
+import { GitCommit, GitLog, GitLogCommit, GitService, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { CommandQuickPickItem, CommitFileQuickPick } from '../quickpicks';

src/commands/showQuickFileHistory.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { commands, Range, TextEditor, Uri, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitBranch, GitLog, GitTag, GitUri } from '../gitService';
+import { GitBranch, GitLog, GitTag, GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import {

src/commands/stashApply.ts

@@ -2,7 +2,7 @@
 import { MessageItem, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitStashCommit } from '../gitService';
+import { GitStashCommit } from '../git/gitService';
 import { Logger } from '../logger';
 import { CommandQuickPickItem, RepositoriesQuickPick, StashListQuickPick } from '../quickpicks';
 import { Strings } from '../system';

src/commands/stashDelete.ts

@@ -2,7 +2,7 @@
 import { MessageItem, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitStashCommit } from '../gitService';
+import { GitStashCommit } from '../git/gitService';
 import { Logger } from '../logger';
 import { CommandQuickPickItem } from '../quickpicks';
 import { Command, CommandContext, Commands, isCommandViewContextWithCommit } from './common';

src/configuration.ts

@@ -12,7 +12,7 @@ import {
 } from 'vscode';
 import { CommandContext, extensionId, setCommandContext } from './constants';
 import { Container } from './container';
-import { clearGravatarCache } from './gitService';
+import { clearGravatarCache } from './git/gitService';
 import { Functions } from './system';
 import { IConfig, KeyMap } from './ui/config';
 

src/container.ts

@@ -5,7 +5,7 @@ import { LineAnnotationController } from './annotations/lineAnnotationController
 import { CodeLensController } from './codelens/codeLensController';
 import { configuration, IConfig } from './configuration';
 import { GitFileSystemProvider } from './git/fsProvider';
-import { GitService } from './gitService';
+import { GitService } from './git/gitService';
 import { LineHoverController } from './hovers/lineHoverController';
 import { Keyboard } from './keyboard';
 import { StatusBarController } from './statusbar/statusBarController';

src/extension.ts

@@ -15,7 +15,7 @@ import {
 } from './configuration';
 import { CommandContext, extensionQualifiedId, GlobalState, GlyphChars, setCommandContext } from './constants';
 import { Container } from './container';
-import { GitService } from './gitService';
+import { GitService } from './git/gitService';
 import { Logger } from './logger';
 import { Messages } from './messages';
 import { Strings, Versions } from './system';

src/git/fsProvider.ts

@@ -13,7 +13,7 @@ import {
 } from 'vscode';
 import { DocumentSchemes } from '../constants';
 import { Container } from '../container';
-import { GitService, GitTree, GitUri } from '../gitService';
+import { GitService, GitTree, GitUri } from '../git/gitService';
 import { Iterables, TernarySearchTree } from '../system';
 
 export function fromGitLensFSUri(uri: Uri): { path: string; ref: string; repoPath: string } {

src/git/git.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import { GlyphChars } from '../constants';
 import { Logger } from '../logger';
 import { Objects, Strings } from '../system';
-import { findGitPath, IGitInfo } from './gitLocator';
+import { findGitPath, IGitInfo } from './locator';
 import { run, RunOptions } from './shell';
 
 export { IGitInfo };

src/gitService.ts → src/git/gitService.ts

@@ -16,10 +16,13 @@ import {
     WorkspaceFolder,
     WorkspaceFoldersChangeEvent
 } from 'vscode';
-import { GitExtension } from './@types/git';
-import { configuration, IRemotesConfig } from './configuration';
-import { CommandContext, DocumentSchemes, GlyphChars, setCommandContext } from './constants';
-import { Container } from './container';
+import { GitExtension } from '../@types/git';
+import { configuration, IRemotesConfig } from '../configuration';
+import { CommandContext, DocumentSchemes, GlyphChars, setCommandContext } from '../constants';
+import { Container } from '../container';
+import { Logger } from '../logger';
+import { Iterables, Objects, Strings, TernarySearchTree, Versions } from '../system';
+import { CachedBlame, CachedDiff, CachedLog, GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 import {
     CommitFormatting,
     Git,
@@ -53,18 +56,15 @@ import {
     GitTreeParser,
     Repository,
     RepositoryChange
-} from './git/git';
-import { GitUri, IGitCommitInfo } from './git/gitUri';
-import { RemoteProviderFactory, RemoteProviderMap } from './git/remotes/factory';
-import { Logger } from './logger';
-import { Iterables, Objects, Strings, TernarySearchTree, Versions } from './system';
-import { CachedBlame, CachedDiff, CachedLog, GitDocumentState, TrackedDocument } from './trackers/gitDocumentTracker';
+} from './git';
+import { GitUri, IGitCommitInfo } from './gitUri';
+import { RemoteProviderFactory, RemoteProviderMap } from './remotes/factory';
 
 export { GitUri, IGitCommitInfo };
-export * from './git/models/models';
-export * from './git/formatters/formatters';
-export { getNameFromRemoteResource, RemoteProvider, RemoteResource, RemoteResourceType } from './git/remotes/provider';
-export { RemoteProviderFactory } from './git/remotes/factory';
+export * from './models/models';
+export * from './formatters/formatters';
+export { getNameFromRemoteResource, RemoteProvider, RemoteResource, RemoteResourceType } from './remotes/provider';
+export { RemoteProviderFactory } from './remotes/factory';
 
 const RepoSearchWarnings = {
     doesNotExist: /no such file or directory/i

src/git/gitUri.ts

@@ -4,7 +4,7 @@ import { Uri } from 'vscode';
 import { UriComparer } from '../comparers';
 import { DocumentSchemes, GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitCommit, GitService, IGitStatusFile } from '../gitService';
+import { GitCommit, GitService, IGitStatusFile } from '../git/gitService';
 import { Strings } from '../system';
 
 export interface IGitCommitInfo {

src/git/gitLocator.ts → src/git/locator.ts

@@ -1,5 +1,4 @@
 'use strict';
-// import { findActualExecutable, spawnPromise } from 'spawn-rx';
 import * as path from 'path';
 import { findExecutable, run } from './shell';
 

src/messages.ts

@@ -2,7 +2,7 @@
 import { ConfigurationTarget, MessageItem, window } from 'vscode';
 import { configuration, KeyMap } from './configuration';
 import { Container } from './container';
-import { GitCommit } from './gitService';
+import { GitCommit } from './git/gitService';
 import { Logger } from './logger';
 
 export enum SuppressedMessages {

src/quickpicks/branchHistoryQuickPick.ts

@@ -3,7 +3,7 @@ import { CancellationTokenSource, QuickPickOptions, window } from 'vscode';
 import { Commands, ShowCommitSearchCommandArgs, ShowQuickBranchHistoryCommandArgs } from '../commands';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitLog, GitUri, RemoteResource } from '../gitService';
+import { GitLog, GitUri, RemoteResource } from '../git/gitService';
 import { KeyNoopCommand } from '../keyboard';
 import { Iterables, Strings } from '../system';
 import {

src/quickpicks/branchesAndTagsQuickPick.ts

@@ -2,7 +2,7 @@
 import { CancellationTokenSource, QuickPickItem, QuickPickOptions, window } from 'vscode';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitBranch, GitTag } from '../gitService';
+import { GitBranch, GitTag } from '../git/gitService';
 import { KeyNoopCommand } from '../keyboard';
 import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, showQuickPickProgress } from './commonQuickPicks';
 

src/quickpicks/branchesQuickPick.ts

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

src/quickpicks/commitFileQuickPick.ts

@@ -14,7 +14,7 @@ import {
 } from '../commands';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitLog, GitLogCommit, GitUri, RemoteResource } from '../gitService';
+import { GitLog, GitLogCommit, GitUri, RemoteResource } from '../git/gitService';
 import { KeyCommand, KeyNoopCommand } from '../keyboard';
 import { Iterables, Strings } from '../system';
 import {

src/quickpicks/commitQuickPick.ts

@@ -23,7 +23,7 @@ import {
     GitUri,
     IGitStatusFile,
     RemoteResource
-} from '../gitService';
+} from '../git/gitService';
 import { KeyCommand, KeyNoopCommand, Keys } from '../keyboard';
 import { Arrays, Iterables, Strings } from '../system';
 import {

src/quickpicks/commitsQuickPick.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { CancellationTokenSource, QuickPickOptions, window } from 'vscode';
 import { Container } from '../container';
-import { GitLog } from '../gitService';
+import { GitLog } from '../git/gitService';
 import { KeyNoopCommand } from '../keyboard';
 import { Iterables } from '../system';
 import {

src/quickpicks/commonQuickPicks.ts

@@ -13,7 +13,7 @@ import { Commands, openEditor } from '../commands';
 import { configuration } from '../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitLog, GitLogCommit, GitStashCommit } from '../gitService';
+import { GitLog, GitLogCommit, GitStashCommit } from '../git/gitService';
 import { KeyMapping, Keys } from '../keyboard';
 import { Strings } from '../system';
 import { BranchesAndTagsQuickPick, BranchOrTagQuickPickItem } from './branchesAndTagsQuickPick';

src/quickpicks/fileHistoryQuickPick.ts

@@ -4,7 +4,7 @@ import { CancellationTokenSource, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, ShowQuickCurrentBranchHistoryCommandArgs, ShowQuickFileHistoryCommandArgs } from '../commands';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitLog, GitUri, RemoteResource } from '../gitService';
+import { GitLog, GitUri, RemoteResource } from '../git/gitService';
 import { KeyNoopCommand } from '../keyboard';
 import { Iterables, Strings } from '../system';
 import {

src/quickpicks/remotesQuickPick.ts

@@ -10,7 +10,7 @@ import {
     GitService,
     RemoteResource,
     RemoteResourceType
-} from '../gitService';
+} from '../git/gitService';
 import { Strings } from '../system';
 import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './commonQuickPicks';
 

src/quickpicks/repoStatusQuickPick.ts

@@ -19,7 +19,7 @@ import {
     GitStatusFile,
     GitStatusFileStatus,
     GitUri
-} from '../gitService';
+} from '../git/gitService';
 import { Keys } from '../keyboard';
 import { Iterables, Strings } from '../system';
 import {

src/quickpicks/repositoriesQuickPick.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { QuickPickItem, QuickPickOptions, window } from 'vscode';
 import { Container } from '../container';
-import { Repository } from '../gitService';
+import { Repository } from '../git/gitService';
 import { Iterables } from '../system';
 import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './commonQuickPicks';
 

src/quickpicks/stashListQuickPick.ts

@@ -3,7 +3,7 @@ import { CancellationTokenSource, QuickPickOptions, window } from 'vscode';
 import { Commands, StashSaveCommandArgs } from '../commands';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { GitStash } from '../gitService';
+import { GitStash } from '../git/gitService';
 import { KeyNoopCommand } from '../keyboard';
 import { Iterables, Strings } from '../system';
 import {

src/statusbar/statusBarController.ts

@@ -4,7 +4,7 @@ import { Commands } from '../commands';
 import { configuration, StatusBarCommand } from '../configuration';
 import { isTextEditor } from '../constants';
 import { Container } from '../container';
-import { CommitFormatter, GitCommit, ICommitFormatOptions } from '../gitService';
+import { CommitFormatter, GitCommit, ICommitFormatOptions } from '../git/gitService';
 import { LinesChangeEvent } from '../trackers/gitLineTracker';
 
 export class StatusBarController implements Disposable {

src/trackers/documentTracker.ts

@@ -17,7 +17,7 @@ import {
 } from 'vscode';
 import { configuration } from '../configuration';
 import { CommandContext, DocumentSchemes, isActiveDocument, isTextEditor, setCommandContext } from '../constants';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Functions, IDeferrable } from '../system';
 import { DocumentBlameStateChangeEvent, TrackedDocument } from './trackedDocument';
 

src/trackers/gitLineTracker.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { Disposable, TextEditor } from 'vscode';
 import { Container } from '../container';
-import { GitBlameCommit, GitLogCommit } from '../gitService';
+import { GitBlameCommit, GitLogCommit } from '../git/gitService';
 import {
     DocumentBlameStateChangeEvent,
     DocumentDirtyIdleTriggerEvent,

src/trackers/trackedDocument.ts

@@ -2,7 +2,7 @@
 import { Disposable, Event, EventEmitter, TextDocument, TextEditor, Uri } from 'vscode';
 import { CommandContext, getEditorIfActive, isActiveDocument, setCommandContext } from '../constants';
 import { Container } from '../container';
-import { GitUri, Repository, RepositoryChange, RepositoryChangeEvent } from '../gitService';
+import { GitUri, Repository, RepositoryChange, RepositoryChangeEvent } from '../git/gitService';
 import { Logger } from '../logger';
 import { Functions } from '../system';
 

src/views/explorerCommands.ts

@@ -15,7 +15,7 @@ import {
 import { CommandContext, extensionTerminalName, setCommandContext } from '../constants';
 import { Container } from '../container';
 import { toGitLensFSUri } from '../git/fsProvider';
-import { GitService, GitUri } from '../gitService';
+import { GitService, GitUri } from '../git/gitService';
 import { Arrays } from '../system';
 import {
     BranchNode,

src/views/gitExplorer.ts

@@ -22,7 +22,7 @@ import {
 } from '../configuration';
 import { CommandContext, GlyphChars, setCommandContext, WorkspaceState } from '../constants';
 import { Container } from '../container';
-import { GitUri } from '../gitService';
+import { GitUri } from '../git/gitService';
 import { Logger } from '../logger';
 import { Functions } from '../system';
 import { RefreshNodeCommandArgs } from '../views/explorerCommands';

src/views/nodes/activeRepositoryNode.ts

@@ -2,7 +2,7 @@
 import { TextEditor, TreeItem, TreeItemCollapsibleState, window } from 'vscode';
 import { isTextEditor } from '../../constants';
 import { Container } from '../../container';
-import { GitUri } from '../../gitService';
+import { GitUri } from '../../git/gitService';
 import { Functions } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { ExplorerNode } from './explorerNode';

src/views/nodes/branchNode.ts

@@ -3,7 +3,7 @@ import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerBranchesLayout } from '../../configuration';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { GitBranch, GitUri } from '../../gitService';
+import { GitBranch, GitUri } from '../../git/gitService';
 import { Arrays, Iterables } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { CommitNode } from './commitNode';

src/views/nodes/branchOrTagFolderNode.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { GitUri } from '../../gitService';
+import { GitUri } from '../../git/gitService';
 import { Arrays, Objects } from '../../system';
 import { BranchNode } from './branchNode';
 // import { Container } from '../../container';

src/views/nodes/branchesNode.ts

@@ -2,7 +2,7 @@
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerBranchesLayout } from '../../configuration';
 import { Container } from '../../container';
-import { GitUri, Repository } from '../../gitService';
+import { GitUri, Repository } from '../../git/gitService';
 import { Arrays, Iterables } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { BranchNode } from './branchNode';

src/views/nodes/commitFileNode.ts

@@ -13,7 +13,7 @@ import {
     IGitStatusFile,
     IStatusFormatOptions,
     StatusFileFormatter
-} from '../../gitService';
+} from '../../git/gitService';
 import { Explorer, ExplorerNode, ExplorerRefNode, ResourceType } from './explorerNode';
 
 export enum CommitFileNodeDisplayAs {

src/views/nodes/commitNode.ts

@@ -5,7 +5,7 @@ import { Commands, DiffWithPreviousCommandArgs } from '../../commands';
 import { ExplorerFilesLayout } from '../../configuration';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { CommitFormatter, GitBranch, GitLogCommit, ICommitFormatOptions } from '../../gitService';
+import { CommitFormatter, GitBranch, GitLogCommit, ICommitFormatOptions } from '../../git/gitService';
 import { Arrays, Iterables, Strings } from '../../system';
 import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';
 import { Explorer, ExplorerNode, ExplorerRefNode, ResourceType } from './explorerNode';

src/views/nodes/commitResultsNode.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { GitLogCommit } from '../../gitService';
+import { GitLogCommit } from '../../git/gitService';
 import { ResultsExplorer } from '../resultsExplorer';
 import { CommitNode } from './commitNode';
 import { ExplorerNode, ResourceType } from './explorerNode';

src/views/nodes/commitsNode.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { GitLog, GitUri } from '../../gitService';
+import { GitLog, GitUri } from '../../git/gitService';
 import { Iterables } from '../../system';
 import { CommitNode } from './commitNode';
 import { Explorer, ExplorerNode, ResourceType, ShowAllNode } from './explorerNode';

src/views/nodes/commitsResultsNode.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { GitLog, GitUri } from '../../gitService';
+import { GitLog, GitUri } from '../../git/gitService';
 import { Iterables } from '../../system';
 import { CommitNode } from './commitNode';
 import { Explorer, ExplorerNode, ResourceType, ShowAllNode } from './explorerNode';

src/views/nodes/comparisonResultsNode.ts

@@ -2,7 +2,7 @@
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { GitLog, GitService, GitUri } from '../../gitService';
+import { GitLog, GitService, GitUri } from '../../git/gitService';
 import { Strings } from '../../system';
 import { CommitsResultsNode } from './commitsResultsNode';
 import { Explorer, ExplorerNode, NamedRef, ResourceType } from './explorerNode';

src/views/nodes/explorerNode.ts

@@ -2,7 +2,7 @@
 import { Command, Disposable, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { GitUri } from '../../gitService';
+import { GitUri } from '../../git/gitService';
 import { RefreshNodeCommandArgs } from '../explorerCommands';
 import { GitExplorer } from '../gitExplorer';
 import { HistoryExplorer } from '../historyExplorer';

src/views/nodes/fileHistoryNode.ts

@@ -10,7 +10,7 @@ import {
     RepositoryChange,
     RepositoryChangeEvent,
     RepositoryFileSystemChangeEvent
-} from '../../gitService';
+} from '../../git/gitService';
 import { Logger } from '../../logger';
 import { Iterables } from '../../system';
 import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';

src/views/nodes/folderNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerFilesLayout, IExplorersFilesConfig } from '../../configuration';
-import { GitUri } from '../../gitService';
+import { GitUri } from '../../git/gitService';
 import { Arrays, Objects } from '../../system';
 import { Explorer, ExplorerNode, ResourceType } from './explorerNode';
 

src/views/nodes/historyNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Container } from '../../container';
-import { GitUri, Repository } from '../../gitService';
+import { GitUri, Repository } from '../../git/gitService';
 import { Explorer, ExplorerNode, ResourceType } from './explorerNode';
 import { FileHistoryNode } from './fileHistoryNode';
 

src/views/nodes/remoteNode.ts

@@ -3,7 +3,7 @@ import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerBranchesLayout } from '../../configuration';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { GitRemote, GitRemoteType, GitUri, Repository } from '../../gitService';
+import { GitRemote, GitRemoteType, GitUri, Repository } from '../../git/gitService';
 import { Arrays, Iterables } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { BranchNode } from './branchNode';

src/views/nodes/remotesNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Container } from '../../container';
-import { GitUri, Repository } from '../../gitService';
+import { GitUri, Repository } from '../../git/gitService';
 import { Iterables } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { ExplorerNode, MessageNode, ResourceType } from './explorerNode';

src/views/nodes/repositoriesNode.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { GitUri, Repository } from '../../gitService';
+import { GitUri, Repository } from '../../git/gitService';
 import { GitExplorer } from '../gitExplorer';
 import { ActiveRepositoryNode } from './activeRepositoryNode';
 import { ExplorerNode, ResourceType } from './explorerNode';

src/views/nodes/repositoryNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { Disposable, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { GlyphChars } from '../../constants';
-import { GitUri, Repository, RepositoryChange, RepositoryChangeEvent } from '../../gitService';
+import { GitUri, Repository, RepositoryChange, RepositoryChangeEvent } from '../../git/gitService';
 import { Logger } from '../../logger';
 import { Strings } from '../../system';
 import { GitExplorer } from '../gitExplorer';

src/views/nodes/stashFileNode.ts

@@ -1,5 +1,5 @@
 'use strict';
-import { GitLogCommit, IGitStatusFile } from '../../gitService';
+import { GitLogCommit, IGitStatusFile } from '../../git/gitService';
 import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';
 import { Explorer, ResourceType } from './explorerNode';
 

src/views/nodes/stashNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Container } from '../../container';
-import { CommitFormatter, GitStashCommit, ICommitFormatOptions } from '../../gitService';
+import { CommitFormatter, GitStashCommit, ICommitFormatOptions } from '../../git/gitService';
 import { Iterables } from '../../system';
 import { Explorer, ExplorerNode, ExplorerRefNode, ResourceType } from './explorerNode';
 import { StashFileNode } from './stashFileNode';

src/views/nodes/stashesNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Container } from '../../container';
-import { GitUri, Repository } from '../../gitService';
+import { GitUri, Repository } from '../../git/gitService';
 import { Iterables } from '../../system';
 import { Explorer, ExplorerNode, MessageNode, ResourceType } from './explorerNode';
 import { StashNode } from './stashNode';

src/views/nodes/statusFileCommitsNode.ts

@@ -11,7 +11,7 @@ import {
     IGitStatusFileWithCommit,
     IStatusFormatOptions,
     StatusFileFormatter
-} from '../../gitService';
+} from '../../git/gitService';
 import { Strings } from '../../system';
 import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';
 import { Explorer, ExplorerNode, ResourceType } from './explorerNode';

src/views/nodes/statusFileNode.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Command, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Commands, DiffWithCommandArgs } from '../../commands';
 import { Container } from '../../container';
-import { getGitStatusIcon, GitStatusFile, GitUri, IStatusFormatOptions, StatusFileFormatter } from '../../gitService';
+import { getGitStatusIcon, GitStatusFile, GitUri, IStatusFormatOptions, StatusFileFormatter } from '../../git/gitService';
 import { Explorer, ExplorerNode, ResourceType } from './explorerNode';
 
 export class StatusFileNode extends ExplorerNode {

src/views/nodes/statusFilesNode.ts

@@ -11,7 +11,7 @@ import {
     GitStatus,
     GitUri,
     IGitStatusFileWithCommit
-} from '../../gitService';
+} from '../../git/gitService';
 import { Arrays, Iterables, Objects, Strings } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { ExplorerNode, ResourceType, ShowAllNode } from './explorerNode';

src/views/nodes/statusFilesResultsNode.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerFilesLayout } from '../../configuration';
 import { Container } from '../../container';
-import { GitStatusFile, GitUri } from '../../gitService';
+import { GitStatusFile, GitUri } from '../../git/gitService';
 import { Arrays, Iterables, Strings } from '../../system';
 import { Explorer, ExplorerNode, ResourceType } from './explorerNode';
 import { FolderNode, IFileExplorerNode } from './folderNode';

src/views/nodes/statusNode.ts

@@ -1,7 +1,7 @@
 import { Disposable, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { GitBranch, GitUri, Repository, RepositoryFileSystemChangeEvent } from '../../gitService';
+import { GitBranch, GitUri, Repository, RepositoryFileSystemChangeEvent } from '../../git/gitService';
 import { GitExplorer } from '../gitExplorer';
 import { BranchNode } from './branchNode';
 import { ExplorerNode, ResourceType } from './explorerNode';

src/views/nodes/statusUpstreamNode.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Container } from '../../container';
-import { GitStatus, GitUri } from '../../gitService';
+import { GitStatus, GitUri } from '../../git/gitService';
 import { Iterables, Strings } from '../../system';
 import { CommitNode } from './commitNode';
 import { Explorer, ExplorerNode, ResourceType } from './explorerNode';

src/views/nodes/tagNode.ts

@@ -2,7 +2,7 @@
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerBranchesLayout } from '../../configuration';
 import { Container } from '../../container';
-import { GitTag, GitUri } from '../../gitService';
+import { GitTag, GitUri } from '../../git/gitService';
 import { Iterables } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { CommitNode } from './commitNode';

src/views/nodes/tagsNode.ts

@@ -2,7 +2,7 @@
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerBranchesLayout } from '../../configuration';
 import { Container } from '../../container';
-import { GitUri, Repository } from '../../gitService';
+import { GitUri, Repository } from '../../git/gitService';
 import { Arrays } from '../../system';
 import { GitExplorer } from '../gitExplorer';
 import { BranchOrTagFolderNode } from './branchOrTagFolderNode';

src/views/resultsExplorer.ts

@@ -13,7 +13,7 @@ import {
 import { configuration, ExplorerFilesLayout, IExplorersConfig, IResultsExplorerConfig } from '../configuration';
 import { CommandContext, GlyphChars, setCommandContext, WorkspaceState } from '../constants';
 import { Container } from '../container';
-import { GitLog, GitLogCommit } from '../gitService';
+import { GitLog, GitLogCommit } from '../git/gitService';
 import { Logger } from '../logger';
 import { Functions, Strings } from '../system';
 import { RefreshNodeCommandArgs } from './explorerCommands';