Pass IGitService into LocalRepositoryModel

jcansdale · jcansdale · commit 66a7ad79197d · 2018-05-03T15:44:48.000+01:00
Make LocalRepositoryModel's dependency on IGitService explicit.
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -211,6 +211,7 @@
     <Compile Include="Models\PullRequestReviewCommentModel.cs" />
     <Compile Include="Models\PullRequestDetailArgument.cs" />
     <Compile Include="Models\PullRequestReviewModel.cs" />
+    <Compile Include="SampleData\GitServiceDesigner.cs" />
     <Compile Include="SampleData\PullRequestFilesViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestReviewAuthoringViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestReviewFileCommentViewModelDesigner.cs" />
diff --git a/src/GitHub.App/SampleData/GitServiceDesigner.cs b/src/GitHub.App/SampleData/GitServiceDesigner.cs
@@ -0,0 +1,16 @@
+﻿using System.Threading.Tasks;
+using GitHub.Primitives;
+using GitHub.Services;
+using LibGit2Sharp;
+
+namespace GitHub.SampleData
+{
+    class GitServiceDesigner : IGitService
+    {
+        public Task<string> GetLatestPushedSha(string path) => Task.FromResult<string>(null);
+        public UriString GetRemoteUri(IRepository repo, string remote = "origin") => null;
+        public IRepository GetRepository(string path) => null;
+        public UriString GetUri(string path, string remote = "origin") => null;
+        public UriString GetUri(IRepository repository, string remote = "origin") => null;
+    }
+}
diff --git a/src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs
@@ -16,13 +16,13 @@ public PullRequestCreationViewModelDesigner()
         {
             Branches = new List<IBranch>
             {
-                new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo")),
-                new BranchModel("don/stub-ui", new LocalRepositoryModel("http://github.com/user/repo")),
-                new BranchModel("feature/pr/views", new LocalRepositoryModel("http://github.com/user/repo")),
-                new BranchModel("release-1.0.17.0", new LocalRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo", new GitServiceDesigner())),
+                new BranchModel("don/stub-ui", new LocalRepositoryModel("http://github.com/user/repo", new GitServiceDesigner())),
+                new BranchModel("feature/pr/views", new LocalRepositoryModel("http://github.com/user/repo", new GitServiceDesigner())),
+                new BranchModel("release-1.0.17.0", new LocalRepositoryModel("http://github.com/user/repo", new GitServiceDesigner())),
             }.AsReadOnly();
 
-            TargetBranch = new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo"));
+            TargetBranch = new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo", new GitServiceDesigner()));
             SourceBranch = Branches[2];
 
             SelectedAssignee = "Haacked (Phil Haack)";
diff --git a/src/GitHub.App/SampleData/SampleViewModels.cs b/src/GitHub.App/SampleData/SampleViewModels.cs
@@ -197,7 +197,7 @@ class Conn : IConnection
             public HostAddress HostAddress { get; set; }
 
             public string Username { get; set; }
-            public ObservableCollection<ILocalRepositoryModel> Repositories { get; set;  }
+            public ObservableCollection<ILocalRepositoryModel> Repositories { get; set; }
 
             public Octokit.User User => null;
             public bool IsLoggedIn => true;
@@ -396,12 +396,12 @@ public class GitHubConnectSectionDesigner : IGitHubConnectSection
         public GitHubConnectSectionDesigner()
         {
             Repositories = new ObservableCollection<ILocalRepositoryModel>();
-            Repositories.Add(new LocalRepositoryModel("octokit", new UriString("https://github.com/octokit/octokit.net"), @"C:\Users\user\Source\Repos\octokit.net"));
-            Repositories.Add(new LocalRepositoryModel("cefsharp", new UriString("https://github.com/cefsharp/cefsharp"), @"C:\Users\user\Source\Repos\cefsharp"));
-            Repositories.Add(new LocalRepositoryModel("git-lfs", new UriString("https://github.com/github/git-lfs"), @"C:\Users\user\Source\Repos\git-lfs"));
-            Repositories.Add(new LocalRepositoryModel("another octokit", new UriString("https://github.com/octokit/octokit.net"), @"C:\Users\user\Source\Repos\another-octokit.net"));
-            Repositories.Add(new LocalRepositoryModel("some cefsharp", new UriString("https://github.com/cefsharp/cefsharp"), @"C:\Users\user\Source\Repos\something-else"));
-            Repositories.Add(new LocalRepositoryModel("even more git-lfs", new UriString("https://github.com/github/git-lfs"), @"C:\Users\user\Source\Repos\A different path"));
+            Repositories.Add(new LocalRepositoryModel("octokit", new UriString("https://github.com/octokit/octokit.net"), @"C:\Users\user\Source\Repos\octokit.net", new GitServiceDesigner()));
+            Repositories.Add(new LocalRepositoryModel("cefsharp", new UriString("https://github.com/cefsharp/cefsharp"), @"C:\Users\user\Source\Repos\cefsharp", new GitServiceDesigner()));
+            Repositories.Add(new LocalRepositoryModel("git-lfs", new UriString("https://github.com/github/git-lfs"), @"C:\Users\user\Source\Repos\git-lfs", new GitServiceDesigner()));
+            Repositories.Add(new LocalRepositoryModel("another octokit", new UriString("https://github.com/octokit/octokit.net"), @"C:\Users\user\Source\Repos\another-octokit.net", new GitServiceDesigner()));
+            Repositories.Add(new LocalRepositoryModel("some cefsharp", new UriString("https://github.com/cefsharp/cefsharp"), @"C:\Users\user\Source\Repos\something-else", new GitServiceDesigner()));
+            Repositories.Add(new LocalRepositoryModel("even more git-lfs", new UriString("https://github.com/github/git-lfs"), @"C:\Users\user\Source\Repos\A different path", new GitServiceDesigner()));
         }
 
         public ObservableCollection<ILocalRepositoryModel> Repositories
diff --git a/src/GitHub.Exports/Models/BranchModel.cs b/src/GitHub.Exports/Models/BranchModel.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Globalization;
+using GitHub.Services;
 
 namespace GitHub.Models
 {
@@ -31,7 +32,7 @@ public BranchModel(LibGit2Sharp.Branch branch, IRepositoryModel repo)
             Extensions.Guard.ArgumentNotNull(repo, nameof(repo));
             Name = DisplayName = branch.FriendlyName;
 #pragma warning disable 0618 // TODO: Replace `Branch.Remote` with `Repository.Network.Remotes[branch.RemoteName]`.
-            Repository = branch.IsRemote ? new LocalRepositoryModel(branch.Remote.Url) : repo;
+            Repository = branch.IsRemote ? new LocalRepositoryModel(branch.Remote.Url, GitService.GitServiceHelper) : repo;
 #pragma warning restore 0618
             IsTracking = branch.IsTracking;
             Sha = branch.Tip?.Sha;
diff --git a/src/GitHub.Exports/Models/LocalRepositoryModel.cs b/src/GitHub.Exports/Models/LocalRepositoryModel.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using GitHub.Primitives;
 using GitHub.UI;
+using GitHub.Exports;
 using GitHub.Services;
 using GitHub.Extensions;
 using System.Threading.Tasks;
-using GitHub.Exports;
 
 namespace GitHub.Models
 {
@@ -18,17 +18,21 @@ namespace GitHub.Models
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class LocalRepositoryModel : RepositoryModel, ILocalRepositoryModel, IEquatable<LocalRepositoryModel>
     {
+        readonly IGitService gitService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LocalRepositoryModel"/> class.
         /// </summary>
         /// <param name="name">The repository name.</param>
         /// <param name="cloneUrl">The repository's clone URL.</param>
         /// <param name="localPath">The repository's local path.</param>
-        public LocalRepositoryModel(string name, UriString cloneUrl, string localPath, IGitService gitService = null)
-            : base(name, cloneUrl, gitService)
+        public LocalRepositoryModel(string name, UriString cloneUrl, string localPath, IGitService gitService)
+            : base(name, cloneUrl)
         {
             Guard.ArgumentNotEmptyString(localPath, nameof(localPath));
+            Guard.ArgumentNotNull(gitService, nameof(gitService));
 
+            this.gitService = gitService;
             LocalPath = localPath;
             Icon = Octicon.repo;
         }
@@ -37,9 +41,12 @@ public LocalRepositoryModel(string name, UriString cloneUrl, string localPath, I
         /// Initializes a new instance of the <see cref="LocalRepositoryModel"/> class.
         /// </summary>
         /// <param name="path">The repository's local path.</param>
-        public LocalRepositoryModel(string path, IGitService gitService = null)
+        public LocalRepositoryModel(string path, IGitService gitService)
             : base(path, gitService)
         {
+            Guard.ArgumentNotNull(gitService, nameof(gitService));
+
+            this.gitService = gitService;
             LocalPath = path;
             Icon = Octicon.repo;
         }
@@ -51,7 +58,7 @@ public void Refresh()
         {
             if (LocalPath == null)
                 return;
-            CloneUrl = GitService.GetUri(LocalPath);
+            CloneUrl = gitService.GetUri(LocalPath);
         }
 
         /// <summary>
@@ -68,7 +75,7 @@ public async Task<UriString> GenerateUrl(LinkType linkType, string path = null,
             if (CloneUrl == null)
                 return null;
 
-            var sha = await GitService.GetLatestPushedSha(path ?? LocalPath);
+            var sha = await gitService.GetLatestPushedSha(path ?? LocalPath);
             // this also incidentally checks whether the repo has a valid LocalPath
             if (String.IsNullOrEmpty(sha))
                 return CloneUrl.ToRepositoryUrl().AbsoluteUri;
@@ -157,7 +164,7 @@ public string HeadSha
         {
             get
             {
-                using (var repo = GitService.GetRepository(LocalPath))
+                using (var repo = gitService.GetRepository(LocalPath))
                 {
                     return repo?.Commits.FirstOrDefault()?.Sha ?? string.Empty;
                 }
@@ -172,7 +179,7 @@ public IBranch CurrentBranch
             get
             {
                 // BranchModel doesn't keep a reference to Repository
-                using (var repo = GitService.GetRepository(LocalPath))
+                using (var repo = gitService.GetRepository(LocalPath))
                 {
                     return new BranchModel(repo?.Head, this);
                 }
diff --git a/src/GitHub.Exports/Models/RepositoryModel.cs b/src/GitHub.Exports/Models/RepositoryModel.cs
@@ -24,8 +24,7 @@ public class RepositoryModel : NotificationAwareObject, IRepositoryModel
         /// <param name="cloneUrl">The repository's clone URL.</param>
         public RepositoryModel(
             string name,
-            UriString cloneUrl,
-            IGitService gitService = null) : this(gitService)
+            UriString cloneUrl)
         {
             Guard.ArgumentNotEmptyString(name, nameof(name));
             Guard.ArgumentNotNull(cloneUrl, nameof(cloneUrl));
@@ -41,7 +40,7 @@ public RepositoryModel(
         /// The path to the local repository from which repository name and clone URL will be
         /// extracted.
         /// </param>
-        protected RepositoryModel(string path, IGitService gitService = null) : this(gitService)
+        protected RepositoryModel(string path, IGitService gitService)
         {
             Guard.ArgumentNotNull(path, nameof(path));
 
@@ -53,11 +52,6 @@ protected RepositoryModel(string path, IGitService gitService = null) : this(git
             CloneUrl = gitService.GetUri(path);
         }
 
-        RepositoryModel(IGitService gitService = null)
-        {
-            GitService = gitService ?? Services.GitService.GitServiceHelper;
-        }
-
         /// <summary>
         /// Gets the name of the repository.
         /// </summary>
@@ -113,7 +107,5 @@ public void SetIcon(bool isPrivate, bool isFork)
                     ? Octicon.repo_forked
                     : Octicon.repo;
         }
-
-        protected IGitService GitService { get; }
     }
 }
diff --git a/src/GitHub.TeamFoundation.14/RegistryHelper.cs b/src/GitHub.TeamFoundation.14/RegistryHelper.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using GitHub.Logging;
 using GitHub.Models;
+using GitHub.Services;
 using Microsoft.Win32;
 using Serilog;
 
@@ -39,7 +40,7 @@ internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryL
                                 {
                                     var path = subkey?.GetValue("Path") as string;
                                     if (path != null && Directory.Exists(path))
-                                        return new LocalRepositoryModel(path);
+                                        return new LocalRepositoryModel(path, GitService.GitServiceHelper);
                                 }
                                 catch (Exception)
                                 {
diff --git a/src/GitHub.TeamFoundation.14/Services/LocalRepositoryModelFactory.cs b/src/GitHub.TeamFoundation.14/Services/LocalRepositoryModelFactory.cs
@@ -1,13 +1,13 @@
-﻿using System.ComponentModel.Composition;
-using GitHub.Models;
+﻿using GitHub.Models;
+using GitHub.Services;
 
 namespace GitHub.TeamFoundation.Services
 {
     class LocalRepositoryModelFactory : ILocalRepositoryModelFactory
     {
         public ILocalRepositoryModel Create(string localPath)
         {
-            return new LocalRepositoryModel(localPath);
+            return new LocalRepositoryModel(localPath, GitService.GitServiceHelper);
         }
     }
 }
diff --git a/src/GitHub.TeamFoundation.15/RegistryHelper.cs b/src/GitHub.TeamFoundation.15/RegistryHelper.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using GitHub.Logging;
 using GitHub.Models;
-using GitHub.VisualStudio;
+using GitHub.Services;
 using Microsoft.Win32;
 using Serilog;
 
@@ -34,7 +34,7 @@ internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryL
                         {
                             var path = subkey?.GetValue("Path") as string;
                             if (path != null)
-                                return new LocalRepositoryModel(path);
+                                return new LocalRepositoryModel(path, GitService.GitServiceHelper);
                         }
                         catch (Exception)
                         {
diff --git a/src/GitHub.VisualStudio/Commands/LinkCommandBase.cs b/src/GitHub.VisualStudio/Commands/LinkCommandBase.cs
@@ -46,7 +46,7 @@ protected ILocalRepositoryModel GetRepositoryByPath(string path)
                 if (!string.IsNullOrEmpty(path))
                 {
                     var repo = ServiceProvider.TryGetService<IGitService>().GetRepository(path);
-                    return new LocalRepositoryModel(repo.Info.WorkingDirectory.TrimEnd('\\'));
+                    return new LocalRepositoryModel(repo.Info.WorkingDirectory.TrimEnd('\\'), GitService.GitServiceHelper);
                 }
             }
             catch (Exception ex)
@@ -66,7 +66,7 @@ protected ILocalRepositoryModel GetActiveRepo()
                 var path = ServiceProvider.TryGetService<IVSGitServices>()?.GetActiveRepoPath() ?? String.Empty;
                 try
                 {
-                    activeRepo = !string.IsNullOrEmpty(path) ? new LocalRepositoryModel(path) : null;
+                    activeRepo = !string.IsNullOrEmpty(path) ? new LocalRepositoryModel(path, GitService.GitServiceHelper) : null;
                 }
                 catch (Exception ex)
                 {
@@ -86,7 +86,7 @@ void RefreshRepo()
                 string path = vsGitServices?.GetActiveRepoPath() ?? String.Empty;
                 try
                 {
-                    ActiveRepo = !String.IsNullOrEmpty(path) ? new LocalRepositoryModel(path) : null;
+                    ActiveRepo = !String.IsNullOrEmpty(path) ? new LocalRepositoryModel(path, GitService.GitServiceHelper) : null;
                 }
                 catch (Exception ex)
                 {
diff --git a/test/UnitTests/GitHub.App/Models/RepositoryModelTests.cs b/test/UnitTests/GitHub.App/Models/RepositoryModelTests.cs
@@ -19,8 +19,9 @@ public class ComparisonTests : TestBaseClass
         [TestCase("a name", "https://github.com/github/VisualStudio", @"C:\some\path\", "a name", "https://github.com/github/VisualStudio", @"c:\some\path\")]
         public void SameContentEqualsTrue(string name1, string url1, string path1, string name2, string url2, string path2)
         {
-            var a = new LocalRepositoryModel(name1, new UriString(url1), path1);
-            var b = new LocalRepositoryModel(name2, new UriString(url2), path2);
+            var gitService = Substitute.For<IGitService>();
+            var a = new LocalRepositoryModel(name1, new UriString(url1), path1, gitService);
+            var b = new LocalRepositoryModel(name2, new UriString(url2), path2, gitService);
             Assert.That(a, Is.EqualTo(b));
             Assert.False(a == b);
             Assert.That(a.GetHashCode(), Is.EqualTo(b.GetHashCode()));
diff --git a/test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs b/test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs
@@ -667,6 +667,7 @@ static IPullRequestModel CreatePullRequest()
     public void CreatePullRequestAllArgsMandatory()
     {
         var serviceProvider = Substitutes.ServiceProvider;
+        var gitService = serviceProvider.GetGitService();
         var service = new PullRequestService(Substitute.For<IGitClient>(), serviceProvider.GetGitService(), serviceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
 
         IModelService ms = null;
@@ -682,10 +683,10 @@ public void CreatePullRequestAllArgsMandatory()
         ms = Substitute.For<IModelService>();
         Assert.Throws<ArgumentNullException>(() => service.CreatePullRequest(ms, sourceRepo, targetRepo, source, target, title, body));
 
-        sourceRepo = new LocalRepositoryModel("name", new GitHub.Primitives.UriString("http://github.com/github/stuff"), "c:\\path");
+        sourceRepo = new LocalRepositoryModel("name", new GitHub.Primitives.UriString("http://github.com/github/stuff"), "c:\\path", gitService);
         Assert.Throws<ArgumentNullException>(() => service.CreatePullRequest(ms, sourceRepo, targetRepo, source, target, title, body));
 
-        targetRepo = new LocalRepositoryModel("name", new GitHub.Primitives.UriString("http://github.com/github/stuff"), "c:\\path");
+        targetRepo = new LocalRepositoryModel("name", new GitHub.Primitives.UriString("http://github.com/github/stuff"), "c:\\path", gitService);
         Assert.Throws<ArgumentNullException>(() => service.CreatePullRequest(ms, sourceRepo, targetRepo, source, target, title, body));
 
         title = "a title";

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using GitHub.Primitives;`
`7`	`7`	`using GitHub.UI;`
	`8`	`+using GitHub.Exports;`
`8`	`9`	`using GitHub.Services;`
`9`	`10`	`using GitHub.Extensions;`
`10`	`11`	`using System.Threading.Tasks;`
`11`		`-using GitHub.Exports;`
`12`	`12`
`13`	`13`	`namespace GitHub.Models`
`14`	`14`	`{`
`@@ -18,17 +18,21 @@ namespace GitHub.Models`
`18`	`18`	`[DebuggerDisplay("{DebuggerDisplay,nq}")]`
`19`	`19`	`public class LocalRepositoryModel : RepositoryModel, ILocalRepositoryModel, IEquatable<LocalRepositoryModel>`
`20`	`20`	`{`
	`21`	`+ readonly IGitService gitService;`
	`22`	`+`
`21`	`23`	`/// <summary>`
`22`	`24`	`/// Initializes a new instance of the <see cref="LocalRepositoryModel"/> class.`
`23`	`25`	`/// </summary>`
`24`	`26`	`/// <param name="name">The repository name.</param>`
`25`	`27`	`/// <param name="cloneUrl">The repository's clone URL.</param>`
`26`	`28`	`/// <param name="localPath">The repository's local path.</param>`
`27`		`- public LocalRepositoryModel(string name, UriString cloneUrl, string localPath, IGitService gitService = null)`
`28`		`- : base(name, cloneUrl, gitService)`
	`29`	`+ public LocalRepositoryModel(string name, UriString cloneUrl, string localPath, IGitService gitService)`
	`30`	`+ : base(name, cloneUrl)`
`29`	`31`	`{`
`30`	`32`	`Guard.ArgumentNotEmptyString(localPath, nameof(localPath));`
	`33`	`+ Guard.ArgumentNotNull(gitService, nameof(gitService));`
`31`	`34`
	`35`	`+ this.gitService = gitService;`
`32`	`36`	`LocalPath = localPath;`
`33`	`37`	`Icon = Octicon.repo;`
`34`	`38`	`}`
`@@ -37,9 +41,12 @@ public LocalRepositoryModel(string name, UriString cloneUrl, string localPath, I`
`37`	`41`	`/// Initializes a new instance of the <see cref="LocalRepositoryModel"/> class.`
`38`	`42`	`/// </summary>`
`39`	`43`	`/// <param name="path">The repository's local path.</param>`
`40`		`- public LocalRepositoryModel(string path, IGitService gitService = null)`
	`44`	`+ public LocalRepositoryModel(string path, IGitService gitService)`
`41`	`45`	`: base(path, gitService)`
`42`	`46`	`{`
	`47`	`+ Guard.ArgumentNotNull(gitService, nameof(gitService));`
	`48`	`+`
	`49`	`+ this.gitService = gitService;`
`43`	`50`	`LocalPath = path;`
`44`	`51`	`Icon = Octicon.repo;`
`45`	`52`	`}`
`@@ -51,7 +58,7 @@ public void Refresh()`
`51`	`58`	`{`
`52`	`59`	`if (LocalPath == null)`
`53`	`60`	`return;`
`54`		`- CloneUrl = GitService.GetUri(LocalPath);`
	`61`	`+ CloneUrl = gitService.GetUri(LocalPath);`
`55`	`62`	`}`
`56`	`63`
`57`	`64`	`/// <summary>`
`@@ -68,7 +75,7 @@ public async Task<UriString> GenerateUrl(LinkType linkType, string path = null,`
`68`	`75`	`if (CloneUrl == null)`
`69`	`76`	`return null;`
`70`	`77`
`71`		`- var sha = await GitService.GetLatestPushedSha(path ?? LocalPath);`
	`78`	`+ var sha = await gitService.GetLatestPushedSha(path ?? LocalPath);`
`72`	`79`	`// this also incidentally checks whether the repo has a valid LocalPath`
`73`	`80`	`if (String.IsNullOrEmpty(sha))`
`74`	`81`	`return CloneUrl.ToRepositoryUrl().AbsoluteUri;`
`@@ -157,7 +164,7 @@ public string HeadSha`
`157`	`164`	`{`
`158`	`165`	`get`
`159`	`166`	`{`
`160`		`- using (var repo = GitService.GetRepository(LocalPath))`
	`167`	`+ using (var repo = gitService.GetRepository(LocalPath))`
`161`	`168`	`{`
`162`	`169`	`return repo?.Commits.FirstOrDefault()?.Sha ?? string.Empty;`
`163`	`170`	`}`
`@@ -172,7 +179,7 @@ public IBranch CurrentBranch`
`172`	`179`	`get`
`173`	`180`	`{`
`174`	`181`	`// BranchModel doesn't keep a reference to Repository`
`175`		`- using (var repo = GitService.GetRepository(LocalPath))`
	`182`	`+ using (var repo = gitService.GetRepository(LocalPath))`
`176`	`183`	`{`
`177`	`184`	`return new BranchModel(repo?.Head, this);`
`178`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ public class RepositoryModel : NotificationAwareObject, IRepositoryModel`
`24`	`24`	`/// <param name="cloneUrl">The repository's clone URL.</param>`
`25`	`25`	`public RepositoryModel(`
`26`	`26`	`string name,`
`27`		`- UriString cloneUrl,`
`28`		`- IGitService gitService = null) : this(gitService)`
	`27`	`+ UriString cloneUrl)`
`29`	`28`	`{`
`30`	`29`	`Guard.ArgumentNotEmptyString(name, nameof(name));`
`31`	`30`	`Guard.ArgumentNotNull(cloneUrl, nameof(cloneUrl));`
`@@ -41,7 +40,7 @@ public RepositoryModel(`
`41`	`40`	`/// The path to the local repository from which repository name and clone URL will be`
`42`	`41`	`/// extracted.`
`43`	`42`	`/// </param>`
`44`		`- protected RepositoryModel(string path, IGitService gitService = null) : this(gitService)`
	`43`	`+ protected RepositoryModel(string path, IGitService gitService)`
`45`	`44`	`{`
`46`	`45`	`Guard.ArgumentNotNull(path, nameof(path));`
`47`	`46`
`@@ -53,11 +52,6 @@ protected RepositoryModel(string path, IGitService gitService = null) : this(git`
`53`	`52`	`CloneUrl = gitService.GetUri(path);`
`54`	`53`	`}`
`55`	`54`
`56`		`- RepositoryModel(IGitService gitService = null)`
`57`		`- {`
`58`		`- GitService = gitService ?? Services.GitService.GitServiceHelper;`
`59`		`- }`
`60`		`-`
`61`	`55`	`/// <summary>`
`62`	`56`	`/// Gets the name of the repository.`
`63`	`57`	`/// </summary>`
`@@ -113,7 +107,5 @@ public void SetIcon(bool isPrivate, bool isFork)`
`113`	`107`	`? Octicon.repo_forked`
`114`	`108`	`: Octicon.repo;`
`115`	`109`	`}`
`116`		`-`
`117`		`- protected IGitService GitService { get; }`
`118`	`110`	`}`
`119`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using GitHub.Logging;`
`7`	`7`	`using GitHub.Models;`
	`8`	`+using GitHub.Services;`
`8`	`9`	`using Microsoft.Win32;`
`9`	`10`	`using Serilog;`
`10`	`11`
`@@ -39,7 +40,7 @@ internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryL`
`39`	`40`	`{`
`40`	`41`	`var path = subkey?.GetValue("Path") as string;`
`41`	`42`	`if (path != null && Directory.Exists(path))`
`42`		`- return new LocalRepositoryModel(path);`
	`43`	`+ return new LocalRepositoryModel(path, GitService.GitServiceHelper);`
`43`	`44`	`}`
`44`	`45`	`catch (Exception)`
`45`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`		`-using System.ComponentModel.Composition;`
`2`		`-using GitHub.Models;`
	`1`	`+using GitHub.Models;`
	`2`	`+using GitHub.Services;`
`3`	`3`
`4`	`4`	`namespace GitHub.TeamFoundation.Services`
`5`	`5`	`{`
`6`	`6`	`class LocalRepositoryModelFactory : ILocalRepositoryModelFactory`
`7`	`7`	`{`
`8`	`8`	`public ILocalRepositoryModel Create(string localPath)`
`9`	`9`	`{`
`10`		`- return new LocalRepositoryModel(localPath);`
	`10`	`+ return new LocalRepositoryModel(localPath, GitService.GitServiceHelper);`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using GitHub.Logging;`
`9`	`9`	`using GitHub.Models;`
`10`		`-using GitHub.VisualStudio;`
	`10`	`+using GitHub.Services;`
`11`	`11`	`using Microsoft.Win32;`
`12`	`12`	`using Serilog;`
`13`	`13`
`@@ -34,7 +34,7 @@ internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryL`
`34`	`34`	`{`
`35`	`35`	`var path = subkey?.GetValue("Path") as string;`
`36`	`36`	`if (path != null)`
`37`		`- return new LocalRepositoryModel(path);`
	`37`	`+ return new LocalRepositoryModel(path, GitService.GitServiceHelper);`
`38`	`38`	`}`
`39`	`39`	`catch (Exception)`
`40`	`40`	`{`