Fixes #198 - submodules & nested repos not working

Author: eamodio

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Changes to use `diff.guitool` first if available, before falling back to `diff.tool` -- closes [#195](https://github.com/eamodio/vscode-gitlens/issues/195)
 
 ### Fixed
+- Fixes [#198](https://github.com/eamodio/vscode-gitlens/issues/198) - Files in submodules or nested repositories no longer work properly
 - Fixes issue where failed git commands would get stuck in the pending queue causing future similar commands to also fail
 - Fixes issue where changes to git remotes would refresh the entire `GitLens` view
 

README.md

@@ -460,10 +460,11 @@ GitLens is highly customizable and provides many configuration settings to allow
 |Name | Description
 |-----|------------
 |`gitlens.advanced.telemetry.enabled`|Specifies whether or not to enable GitLens telemetry (even if enabled still abides by the overall `telemetry.enableTelemetry` setting
+|`gitlens.advanced.git`|Specifies the git path to use
+|`gitlens.advanced.repositorySearchDepth`|Specifies how many folders deep to search for repositories
 |`gitlens.advanced.menus`|Specifies which commands will be added to which menus
 |`gitlens.advanced.caching.enabled`|Specifies whether git output will be cached
 |`gitlens.advanced.caching.maxLines`|Specifies the threshold for caching larger documents
-|`gitlens.advanced.git`|Specifies the git path to use
 |`gitlens.advanced.maxQuickHistory`|Specifies the maximum number of QuickPick history entries to show
 |`gitlens.advanced.quickPick.closeOnFocusOut`|Specifies whether or not to close the QuickPick menu when focus is lost
 

package.json

@@ -980,6 +980,12 @@
                     "description": "Specifies whether or not to close the QuickPick menu when focus is lost",
                     "scope": "window"
                 },
+                "gitlens.advanced.repositorySearchDepth": {
+                    "type": "number",
+                    "default": 1,
+                    "description": "Specifies how many folders deep to search for repositories",
+                    "scope": "resource"
+                },
                 "gitlens.advanced.telemetry.enabled": {
                     "type": "boolean",
                     "default": true,

src/configuration.ts

@@ -93,6 +93,7 @@ export interface IAdvancedConfig {
     quickPick: {
         closeOnFocusOut: boolean;
     };
+    repositorySearchDepth: number;
     telemetry: {
         enabled: boolean;
     };
@@ -518,6 +519,7 @@ const emptyConfig: IConfig = {
         quickPick: {
             closeOnFocusOut: false
         },
+        repositorySearchDepth: 0,
         telemetry: {
             enabled: false
         }

src/git/models/repository.ts

@@ -5,6 +5,7 @@ import { configuration, IRemotesConfig } from '../../configuration';
 import { GitBranch, GitDiffShortStat, GitRemote, GitStash, GitStatus } from '../git';
 import { GitService, GitUri } from '../../gitService';
 import { RemoteProviderFactory, RemoteProviderMap } from '../remotes/factory';
+import * as _path from 'path';
 
 export enum RepositoryChange {
     Config = 'config',
@@ -70,21 +71,25 @@ export class Repository extends Disposable {
     private _fsWatchCounter = 0;
     private _fsWatcherDisposable: Disposable | undefined;
     private _pendingChanges: { repo?: RepositoryChangeEvent, fs?: RepositoryFileSystemChangeEvent } = { };
-    private _providerMap: RemoteProviderMap;
+    private _providerMap: RemoteProviderMap | undefined;
     private _remotes: GitRemote[] | undefined;
     private _suspended: boolean;
 
     constructor(
-        private readonly folder: WorkspaceFolder,
+        public readonly folder: WorkspaceFolder,
         public readonly path: string,
+        public readonly root: boolean,
         private readonly git: GitService,
         private readonly onAnyRepositoryChanged: () => void,
         suspended: boolean
     ) {
         super(() => this.dispose());
 
         this.index = folder.index;
-        this.name = folder.name;
+        this.name = root
+            ? folder.name
+            : `${folder.name} (${_path.relative(folder.uri.fsPath, path)})`;
+
         this.normalizedPath = (this.path.endsWith('/') ? this.path : `${this.path}/`).toLowerCase();
 
         this._suspended = suspended;
@@ -118,7 +123,9 @@ export class Repository extends Disposable {
 
         const section = configuration.name('remotes').value;
         if (initializing || configuration.changed(e, section, this.folder.uri)) {
-            this._providerMap = RemoteProviderFactory.createMap(configuration.get<IRemotesConfig[] | null | undefined>(section, this.folder.uri));
+            // Can't reset the provider map here because of https://github.com/Microsoft/vscode/issues/38229
+            // this._providerMap = RemoteProviderFactory.createMap(configuration.get<IRemotesConfig[] | null | undefined>(section, this.folder.uri));
+            this._providerMap = undefined;
 
             if (!initializing) {
                 this._remotes = undefined;
@@ -234,6 +241,11 @@ export class Repository extends Disposable {
 
     async getRemotes(): Promise<GitRemote[]> {
         if (this._remotes === undefined) {
+            if (this._providerMap === undefined) {
+                const remotesCfg = configuration.get<IRemotesConfig[] | null | undefined>(configuration.name('remotes').value, this.folder.uri);
+                this._providerMap = RemoteProviderFactory.createMap(remotesCfg);
+            }
+
             this._remotes = await this.git.getRemotesCore(this.path, this._providerMap);
         }