Merge branch 'master' into update-authenticating-to-github

Author: Meaghan Lewis

ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 Hello! Please read the contributing guidelines before submitting an issue regarding the GitHub Extension for Visual Studio.
 
-- GitHub Extension for Visual Studio  version:
+- GitHub Extension for Visual Studio version:
 - Visual Studio version:
 
 __What happened__ (with steps, logs and screenshots, if possible)

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.4.2.{build}'
+version: '2.4.3.{build}'
 skip_tags: true
 install:
 - ps: |

src/GitHub.Api/SimpleApiClient.cs

@@ -72,7 +72,7 @@ async Task<Repository> GetRepositoryInternal()
                         if (repo != null)
                         {
                             hasWiki = await HasWikiInternal(repo);
-                            isEnterprise = await IsEnterpriseInternal();
+                            isEnterprise = isEnterprise ?? await IsEnterpriseInternal();
                             repositoryCache = repo;
                         }
                         owner = ownerLogin;
@@ -99,9 +99,14 @@ public bool HasWiki()
             return hasWiki.HasValue && hasWiki.Value;
         }
 
-        public bool IsEnterprise()
+        public async Task<bool> IsEnterprise()
         {
-            return isEnterprise.HasValue && isEnterprise.Value;
+            if (!isEnterprise.HasValue)
+            {
+                isEnterprise = await IsEnterpriseInternal();
+            }
+
+            return isEnterprise ?? false;
         }
 
         async Task<bool> HasWikiInternal(Repository repo)

src/GitHub.App/Api/ApiClient.cs

@@ -157,7 +157,7 @@ static string GetMachineNameSafe()
             }
             catch (Exception e)
             {
-                log.Information(e, "Failed to retrieve host name using `DNS.GetHostName`");
+                log.Warning(e, "Failed to retrieve host name using `DNS.GetHostName`");
                 try
                 {
                     return Environment.MachineName;
@@ -242,7 +242,8 @@ public IObservable<PullRequest> GetPullRequestsForRepository(string owner, strin
             Guard.ArgumentNotEmptyString(name, nameof(name));
 
             return gitHubClient.PullRequest.GetAllForRepository(owner, name,
-                new PullRequestRequest {
+                new PullRequestRequest
+                {
                     State = ItemStateFilter.All,
                     SortProperty = PullRequestSort.Updated,
                     SortDirection = SortDirection.Descending
@@ -268,7 +269,7 @@ public IObservable<Branch> GetBranches(string owner, string repo)
             Guard.ArgumentNotEmptyString(owner, nameof(owner));
             Guard.ArgumentNotEmptyString(repo, nameof(repo));
 
-#pragma warning disable CS0618
+#pragma warning disable 618
             // GetAllBranches is obsolete, but don't want to introduce the change to fix the
             // warning in the PR, so disabling for now.
             return gitHubClient.Repository.GetAllBranches(owner, repo);

src/GitHub.App/GitHub.App.csproj

@@ -154,6 +154,7 @@
     <Compile Include="Models\PullRequestDetailArgument.cs" />
     <Compile Include="Services\EnterpriseCapabilitiesService.cs" />
     <Compile Include="Services\GlobalConnection.cs" />
+    <Compile Include="Services\PullRequestEditorService.cs" />
     <Compile Include="Services\TeamExplorerContext.cs" />
     <Compile Include="Services\OAuthCallbackListener.cs" />
     <Compile Include="ViewModels\Dialog\GistCreationViewModel.cs" />

src/GitHub.App/Resources.Designer.cs

@@ -285,4 +285,13 @@
   <data name="WorkingDirectoryHasUncommittedCHanges" xml:space="preserve">
     <value>Cannot checkout as your working directory has uncommitted changes.</value>
   </data>
+  <data name="SyncSubmodules" xml:space="preserve">
+    <value>Sync {0} submodules</value>
+  </data>
+  <data name="CouldntFindGitOnPath" xml:space="preserve">
+    <value>Couldn't find Git.exe on PATH.
+
+Please install Git for Windows from:
+https://git-scm.com/download/win</value>
+  </data>
 </root>

src/GitHub.App/Resources.resx

@@ -94,6 +94,7 @@ public PullRequestDetailViewModelDesigner()
         public ReactiveCommand<Unit> Checkout { get; }
         public ReactiveCommand<Unit> Pull { get; }
         public ReactiveCommand<Unit> Push { get; }
+        public ReactiveCommand<Unit> SyncSubmodules { get; }
         public ReactiveCommand<object> OpenOnGitHub { get; }
         public ReactiveCommand<object> DiffFile { get; }
         public ReactiveCommand<object> DiffFileWithWorkingDirectory { get; }

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;
+using System.Diagnostics;
 using GitHub.Models;
 using System.Reactive.Linq;
 using Rothko;
@@ -103,13 +104,44 @@ public IObservable<IReadOnlyList<CommitMessage>> GetMessagesForUniqueCommits(
             });
         }
 
+        public IObservable<int> CountSubmodulesToSync(ILocalRepositoryModel repository)
+        {
+            using (var repo = gitService.GetRepository(repository.LocalPath))
+            {
+                var count = 0;
+                foreach (var submodule in repo.Submodules)
+                {
+                    var status = submodule.RetrieveStatus();
+                    if ((status & SubmoduleStatus.WorkDirAdded) != 0)
+                    {
+                        count++;
+                    }
+                    else if ((status & SubmoduleStatus.WorkDirDeleted) != 0)
+                    {
+                        count++;
+                    }
+                    else if ((status & SubmoduleStatus.WorkDirModified) != 0)
+                    {
+                        count++;
+                    }
+                    else if ((status & SubmoduleStatus.WorkDirUninitialized) != 0)
+                    {
+                        count++;
+                    }
+                }
+
+                return Observable.Return(count);
+            }
+        }
+
         public IObservable<bool> IsWorkingDirectoryClean(ILocalRepositoryModel repository)
         {
             // The `using` appears to resolve this issue:
             // https://github.com/github/VisualStudio/issues/1306
             using (var repo = gitService.GetRepository(repository.LocalPath))
             {
-                var isClean = !IsFilthy(repo.RetrieveStatus());
+                var statusOptions = new StatusOptions { ExcludeSubmodules = true };
+                var isClean = !IsFilthy(repo.RetrieveStatus(statusOptions));
                 return Observable.Return(isClean);
             }
         }
@@ -154,6 +186,69 @@ public IObservable<Unit> Push(ILocalRepositoryModel repository)
             });
         }
 
+        public async Task<bool> SyncSubmodules(ILocalRepositoryModel repository, Action<string> progress)
+        {
+            var exitCode = await Where("git");
+            if (exitCode != 0)
+            {
+                progress(App.Resources.CouldntFindGitOnPath);
+                return false;
+            }
+
+            return await SyncSubmodules(repository.LocalPath, progress) == 0;
+        }
+
+        // LibGit2Sharp has limited submodule support so shelling out Git.exe for submodule commands.
+        async Task<int> SyncSubmodules(string workingDir, Action<string> progress)
+        {
+            var cmdArguments = "/C git submodule init & git submodule sync --recursive & git submodule update --recursive";
+            var startInfo = new ProcessStartInfo("cmd", cmdArguments)
+            {
+                WorkingDirectory = workingDir,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true
+            };
+
+            using (var process = Process.Start(startInfo))
+            {
+                await Task.WhenAll(
+                    ReadLinesAsync(process.StandardOutput, progress),
+                    ReadLinesAsync(process.StandardError, progress),
+                    Task.Run(() => process.WaitForExit()));
+                return process.ExitCode;
+            }
+        }
+
+        static Task<int> Where(string fileName)
+        {
+            return Task.Run(() =>
+            {
+                var cmdArguments = "/C WHERE /Q " + fileName;
+                var startInfo = new ProcessStartInfo("cmd", cmdArguments)
+                {
+                    UseShellExecute = false,
+                    CreateNoWindow = true
+                };
+
+                using (var process = Process.Start(startInfo))
+                {
+                    process.WaitForExit();
+                    return process.ExitCode;
+                }
+            });
+        }
+
+        static async Task ReadLinesAsync(TextReader reader, Action<string> progress)
+        {
+            string line;
+            while ((line = await reader.ReadLineAsync()) != null)
+            {
+                progress(line);
+            }
+        }
+
         public IObservable<Unit> Checkout(ILocalRepositoryModel repository, IPullRequestModel pullRequest, string localBranchName)
         {
             return Observable.Defer(async () =>