Repository model refactoring (part 3)

src/GitHub.App/GlobalSuppressions.cs

@@ -6,6 +6,7 @@
 [assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.App.Resources.resources")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String)")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String,System.Text.Encoding)")]
+
 // This file is used by Code Analysis to maintain SuppressMessage 
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given 

src/GitHub.App/SampleData/Dialog/Clone/SelectPageViewModelDesigner.cs

@@ -38,7 +38,7 @@ public SelectPageViewModelDesigner()
         public IReadOnlyList<IRepositoryItemViewModel> Items { get; }
         public ICollectionView ItemsView { get; }
         public IRepositoryItemViewModel SelectedItem { get; set; }
-        public IRepositoryModel Repository { get; }
+        public RepositoryModel Repository { get; }
 
         public void Initialize(IConnection connection)
         {

src/GitHub.App/SampleData/ForkRepositoryExecuteViewModelDesigner.cs

@@ -35,9 +35,9 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public string Title => null;
 
-        public IRepositoryModel SourceRepository { get; set; }
+        public RepositoryModel SourceRepository { get; set; }
 
-        public IRepositoryModel DestinationRepository { get; set; }
+        public RepositoryModel DestinationRepository { get; set; }
 
         public IAccount DestinationAccount { get; }
 
@@ -57,7 +57,7 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public string Error { get; } = "I AM ERROR";
 
-        public Task InitializeAsync(ILocalRepositoryModel sourceRepository, IAccount destinationAccount, IConnection connection)
+        public Task InitializeAsync(LocalRepositoryModel sourceRepository, IAccount destinationAccount, IConnection connection)
         {
             return Task.CompletedTask;
         }

src/GitHub.App/SampleData/ForkRepositorySelectViewModelDesigner.cs

@@ -33,17 +33,17 @@ public ForkRepositorySelectViewModelDesigner()
 
         public IObservable<object> Done => null;
 
-        public IReadOnlyList<IRemoteRepositoryModel> ExistingForks { get; set; }
+        public IReadOnlyList<RemoteRepositoryModel> ExistingForks { get; set; }
 
         public bool IsLoading { get; set; }
 
         public string Title => null;
 
         public ReactiveCommand<IAccount, Unit> SelectedAccount => null;
 
-        public ReactiveCommand<IRemoteRepositoryModel, Unit> SwitchOrigin => null;
+        public ReactiveCommand<RemoteRepositoryModel, Unit> SwitchOrigin => null;
 
-        public Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection)
+        public Task InitializeAsync(LocalRepositoryModel repository, IConnection connection)
         {
             return Task.CompletedTask;
         }

src/GitHub.App/SampleData/ForkRepositorySwitchViewModelDesigner.cs

@@ -29,9 +29,9 @@ public ForkRepositorySwitchViewModelDesigner()
 
         public IObservable<object> Done => null;
 
-        public IRepositoryModel SourceRepository { get; }
+        public RepositoryModel SourceRepository { get; }
 
-        public IRepositoryModel DestinationRepository { get; }
+        public RepositoryModel DestinationRepository { get; }
 
         public ReactiveCommand<Unit, Unit> SwitchFork => null;
 
@@ -41,7 +41,7 @@ public ForkRepositorySwitchViewModelDesigner()
 
         public bool UpdateOrigin { get; set; } = true;
 
-        public void Initialize(ILocalRepositoryModel sourceRepository, IRemoteRepositoryModel remoteRepository)
+        public void Initialize(LocalRepositoryModel sourceRepository, RemoteRepositoryModel remoteRepository)
         {
         }
     }

src/GitHub.App/SampleData/GitServiceDesigner.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using GitHub.Models;
 using GitHub.Primitives;
 using GitHub.Services;
 using LibGit2Sharp;
@@ -7,6 +8,8 @@ namespace GitHub.SampleData
 {
     class GitServiceDesigner : IGitService
     {
+        public LocalRepositoryModel CreateLocalRepositoryModel(string localPath) => null;
+        public BranchModel GetBranch(LocalRepositoryModel model) => null;
         public Task<string> GetLatestPushedSha(string path, string remote = "origin") => Task.FromResult<string>(null);
         public UriString GetRemoteUri(IRepository repo, string remote = "origin") => null;
         public IRepository GetRepository(string path) => null;

src/GitHub.App/SampleData/LocalRepositoryModelDesigner.cs

@@ -1,39 +1,16 @@
-using System;
-using System.ComponentModel;
-using System.Threading.Tasks;
-using GitHub.Models;
+using GitHub.Models;
 using GitHub.Primitives;
 using GitHub.UI;
-using GitHub.Exports;
 
 namespace GitHub.App.SampleData
 {
-    public class LocalRepositoryModelDesigner : ILocalRepositoryModel
+    public class LocalRepositoryModelDesigner : LocalRepositoryModel
     {
-        public UriString CloneUrl { get; set; }
-        public IBranch CurrentBranch { get; set; }
-        public Octicon Icon { get; set; }
-        public string LocalPath { get; set; }
-        public string Name { get; set; }
-        public string Owner { get; set; }
-
-#pragma warning disable CS0067
-        public event PropertyChangedEventHandler PropertyChanged;
-#pragma warning restore CS0067
-
-        public Task<UriString> GenerateUrl(LinkType linkType, string path = null, int startLine = -1, int endLine = -1)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Refresh()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetIcon(bool isPrivate, bool isFork)
-        {
-            throw new NotImplementedException();
-        }
+        public new UriString CloneUrl { get; set; }
+        public BranchModel CurrentBranch { get; set; }
+        public new Octicon Icon { get; set; }
+        public new string LocalPath { get; set; }
+        public new string Name { get; set; }
+        public new string Owner { get; set; }
     }
 }

src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs

@@ -15,15 +15,21 @@ public class PullRequestCreationViewModelDesigner : PanePageViewModelBase, IPull
     {
         public PullRequestCreationViewModelDesigner()
         {
-            Branches = new List<IBranch>
+            var repositoryModel = new LocalRepositoryModel
             {
-                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())),
+                Name = "repo",
+                CloneUrl = "http://github.com/user/repo"
+            };
+
+            Branches = new List<BranchModel>
+            {
+                new BranchModel("master", repositoryModel),
+                new BranchModel("don/stub-ui", repositoryModel),
+                new BranchModel("feature/pr/views", repositoryModel),
+                new BranchModel("release-1.0.17.0", repositoryModel),
             }.AsReadOnly();
 
-            TargetBranch = new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo", new GitServiceDesigner()));
+            TargetBranch = new BranchModel("master", repositoryModel);
             SourceBranch = Branches[2];
 
             SelectedAssignee = "Haacked (Phil Haack)";
@@ -34,9 +40,9 @@ public PullRequestCreationViewModelDesigner()
             };
         }
 
-        public IBranch SourceBranch { get; set; }
-        public IBranch TargetBranch { get; set; }
-        public IReadOnlyList<IBranch> Branches { get; set; }
+        public BranchModel SourceBranch { get; set; }
+        public BranchModel TargetBranch { get; set; }
+        public IReadOnlyList<BranchModel> Branches { get; set; }
 
         public string SelectedAssignee { get; set; }
         public List<string> Users { get; set; }
@@ -50,6 +56,6 @@ public PullRequestCreationViewModelDesigner()
 
         public ReactivePropertyValidator BranchValidator { get; }
 
-        public Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection) => Task.CompletedTask;
+        public Task InitializeAsync(LocalRepositoryModel repository, IConnection connection) => Task.CompletedTask;
     }
 }

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -101,7 +101,7 @@ public PullRequestDetailViewModelDesigner()
 
         public PullRequestDetailModel Model { get; }
         public IPullRequestSession Session { get; }
-        public ILocalRepositoryModel LocalRepository { get; }
+        public LocalRepositoryModel LocalRepository { get; }
         public string RemoteRepositoryOwner { get; }
         public int Number { get; set; }
         public IActorViewModel Author { get; set; }
@@ -127,7 +127,7 @@ public PullRequestDetailViewModelDesigner()
 
         public IReadOnlyList<IPullRequestCheckViewModel> Checks { get; }
 
-        public Task InitializeAsync(ILocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int number) => Task.CompletedTask;
+        public Task InitializeAsync(LocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int number) => Task.CompletedTask;
 
         public string GetLocalFilePath(IPullRequestFileNode file)
         {

src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs

@@ -53,10 +53,10 @@ public PullRequestListViewModelDesigner()
         public IUserFilterViewModel AuthorFilter { get; set; }
         public IReadOnlyList<IIssueListItemViewModelBase> Items { get; }
         public ICollectionView ItemsView { get; }
-        public ILocalRepositoryModel LocalRepository { get; set; }
+        public LocalRepositoryModel LocalRepository { get; set; }
         public IssueListMessage Message { get; set; }
-        public IRepositoryModel RemoteRepository { get; set; }
-        public IReadOnlyList<IRepositoryModel> Forks { get; }
+        public RepositoryModel RemoteRepository { get; set; }
+        public IReadOnlyList<RepositoryModel> Forks { get; }
         public string SearchQuery { get; set; }
         public string SelectedState { get; set; }
         public string StateCaption { get; set; }
@@ -66,6 +66,6 @@ public PullRequestListViewModelDesigner()
         public ReactiveCommand<IIssueListItemViewModelBase, Unit> OpenItem { get; }
         public ReactiveCommand<IPullRequestListItemViewModel, IPullRequestListItemViewModel> OpenItemInBrowser { get; }
 
-        public Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection) => Task.CompletedTask;
+        public Task InitializeAsync(LocalRepositoryModel repository, IConnection connection) => Task.CompletedTask;
     }
 }

src/GitHub.App/SampleData/PullRequestReviewAuthoringViewModelDesigner.cs

@@ -43,7 +43,7 @@ public PullRequestReviewAuthoringViewModelDesigner()
         public bool CanApproveRequestChanges { get; set; }
         public IReadOnlyList<IPullRequestReviewFileCommentViewModel> FileComments { get; }
         public IPullRequestFilesViewModel Files { get; }
-        public ILocalRepositoryModel LocalRepository { get; set; }
+        public LocalRepositoryModel LocalRepository { get; set; }
         public PullRequestReviewModel Model { get; set; }
         public ReactiveCommand<Unit, Unit> NavigateToPullRequest { get; }
         public string OperationError { get; set; }
@@ -55,7 +55,7 @@ public PullRequestReviewAuthoringViewModelDesigner()
         public ReactiveCommand<Unit, Unit> Cancel { get; }
 
         public Task InitializeAsync(
-            ILocalRepositoryModel localRepository,
+            LocalRepositoryModel localRepository,
             IConnection connection,
             string owner,
             string repo,

src/GitHub.App/SampleData/PullRequestReviewViewModelDesigner.cs

@@ -64,7 +64,7 @@ public PullRequestReviewViewModelDesigner()
         public IReadOnlyList<IPullRequestReviewFileCommentViewModel> FileComments { get; set; }
         public bool IsExpanded { get; set; }
         public bool HasDetails { get; set; }
-        public ILocalRepositoryModel LocalRepository { get; set; }
+        public LocalRepositoryModel LocalRepository { get; set; }
         public PullRequestReviewModel Model { get; set; }
         public ReactiveCommand<Unit, Unit> NavigateToPullRequest { get; }
         public IReadOnlyList<IPullRequestReviewFileCommentViewModel> OutdatedFileComments { get; set; }

src/GitHub.App/SampleData/PullRequestUserReviewsViewModelDesigner.cs

@@ -63,15 +63,15 @@ public PullRequestUserReviewsViewModelDesigner()
             };
         }
 
-        public ILocalRepositoryModel LocalRepository { get; set; }
+        public LocalRepositoryModel LocalRepository { get; set; }
         public string RemoteRepositoryOwner { get; set; }
         public int PullRequestNumber { get; set; }
         public IActorViewModel User { get; set; }
         public IReadOnlyList<IPullRequestReviewViewModel> Reviews { get; set; }
         public string PullRequestTitle { get; set; }
         public ReactiveCommand<Unit, Unit> NavigateToPullRequest { get; }
 
-        public Task InitializeAsync(ILocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int pullRequestNumber, string login)
+        public Task InitializeAsync(LocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int pullRequestNumber, string login)
         {
             return Task.CompletedTask;
         }

src/GitHub.App/SampleData/RemoteRepositoryModelDesigner.cs

@@ -6,37 +6,18 @@
 namespace GitHub.SampleData
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1036:OverrideMethodsOnComparableTypes")]
-    public class RemoteRepositoryModelDesigner : IRemoteRepositoryModel
+    public class RemoteRepositoryModelDesigner : RemoteRepositoryModel
     {
-        public UriString CloneUrl { get; set; }
-        public DateTimeOffset CreatedAt { get; set; }
-        public IBranch DefaultBranch { get; set; }
-        public Octicon Icon { get; set; }
-        public long Id { get; set; }
-        public bool IsFork { get; set; }
-        public string Name { get; set; }
-        public string Owner { get; set; }
-        public IAccount OwnerAccount { get; set; }
-        public IRemoteRepositoryModel Parent { get; set; }
-        public DateTimeOffset UpdatedAt { get; set; }
-
-        public int CompareTo(IRemoteRepositoryModel other)
-        {
-            return 0;
-        }
-
-        public void CopyFrom(IRemoteRepositoryModel other)
-        {
-        }
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
-        public bool Equals(IRemoteRepositoryModel other)
-        {
-            return false;
-        }
-
-        public void SetIcon(bool isPrivate, bool isFork)
-        {
-        }
+        public new UriString CloneUrl { get; set; }
+        public new DateTimeOffset CreatedAt { get; set; }
+        public new BranchModel DefaultBranch { get; set; }
+        public new Octicon Icon { get; set; }
+        public new long Id { get; set; }
+        public new bool IsFork { get; set; }
+        public new string Name { get; set; }
+        public new string Owner { get; set; }
+        public new IAccount OwnerAccount { get; set; }
+        public new RemoteRepositoryModel Parent { get; set; }
+        public new DateTimeOffset UpdatedAt { get; set; }
     }
 }

src/GitHub.App/SampleData/RepositoryRecloneViewModelDesigner.cs

@@ -17,7 +17,7 @@ public class RepositoryRecloneViewModelDesigner : ViewModelBase, IRepositoryRecl
         public ReactivePropertyValidator<string> BaseRepositoryPathValidator { get; }
         public ICommand BrowseForDirectory { get; }
         public ReactiveCommand<Unit, Unit> CloneCommand { get; }
-        public IRepositoryModel SelectedRepository { get; set; }
+        public RepositoryModel SelectedRepository { get; set; }
         public IObservable<object> Done { get; }
 
         public Task InitializeAsync(IConnection connection) => Task.CompletedTask;

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -254,7 +254,7 @@ public IConnection SelectedConnection
     [ExcludeFromCodeCoverage]
     public static class RepositoryModelDesigner
     {
-        public static IRemoteRepositoryModel Create(string name = null, string owner = null)
+        public static RemoteRepositoryModel Create(string name = null, string owner = null)
         {
             name = name ?? "octocat";
             owner = owner ?? "github";

src/GitHub.App/Services/DialogService.cs

@@ -52,7 +52,7 @@ public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection, str
             }
         }
 
-        public async Task<string> ShowReCloneDialog(IRepositoryModel repository)
+        public async Task<string> ShowReCloneDialog(RepositoryModel repository)
         {
             Guard.ArgumentNotNull(repository, nameof(repository));
 
@@ -91,7 +91,7 @@ public async Task<IConnection> ShowLoginDialog()
             return (IConnection)await showDialog.Show(viewModel);
         }
 
-        public async Task ShowForkDialog(ILocalRepositoryModel repository, IConnection connection)
+        public async Task ShowForkDialog(LocalRepositoryModel repository, IConnection connection)
         {
             Guard.ArgumentNotNull(repository, nameof(repository));
             Guard.ArgumentNotNull(connection, nameof(connection));