Close #157

Author: Hosch250

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

@@ -25,7 +25,7 @@ public enum SourceControlTab
         UnsyncedCommits,
         Settings
     }
-    
+
     public sealed class SourceControlViewViewModel : ViewModelBase, IDisposable
     {
         private readonly VBE _vbe;
@@ -368,11 +368,11 @@ private void AddOrUpdateLocalPathConfig(Repository repo)
                 var existing = _config.Repositories.Single(repository => repository.LocalLocation == repo.LocalLocation);
                 if (string.IsNullOrEmpty(repo.RemoteLocation) && !string.IsNullOrEmpty(existing.RemoteLocation))
                 {
-                    // config already has remote location and correct repository name - nothing to update
+                    // config already has remote location and correct repository id - nothing to update
                     return;
                 }
 
-                existing.Name = repo.Name;
+                existing.Id = repo.Id;
                 existing.RemoteLocation = repo.RemoteLocation;
 
                 _configService.Save(_config);
@@ -391,15 +391,18 @@ private void OpenRepo()
                 var project = _vbe.ActiveVBProject;
                 var repo = new Repository(project.Name, folderPicker.SelectedPath, string.Empty);
 
+                OnOpenRepoStarted();
                 try
                 {
                     Provider = _providerFactory.CreateProvider(project, repo, _wrapperFactory);
                 }
                 catch (SourceControlException ex)
                 {
+                    OnOpenRepoCompleted();
                     ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
                     return;
                 }
+                OnOpenRepoCompleted();
 
                 AddOrUpdateLocalPathConfig(repo);
 
@@ -409,14 +412,16 @@ private void OpenRepo()
 
         private void CloneRepo()
         {
+            OnOpenRepoStarted();
+
             try
             {
                 _provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject);
                 var repo = _provider.Clone(RemotePath, LocalDirectory);
                 Provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject, repo, _wrapperFactory);
                 AddOrUpdateLocalPathConfig(new Repository
                 {
-                    Name = _vbe.ActiveVBProject.Name,
+                    Id = _vbe.ActiveVBProject.HelpFile,
                     LocalLocation = repo.LocalLocation,
                     RemoteLocation = repo.RemoteLocation
                 });
@@ -427,6 +432,7 @@ private void CloneRepo()
                 return;
             }
 
+            OnOpenRepoCompleted();
             CloseCloneRepoGrid();
 
             SetChildPresenterSourceControlProviders(_provider);
@@ -454,15 +460,18 @@ private void OpenRepoAssignedToProject()
 
             try
             {
+                OnOpenRepoStarted();
                 Provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject,
-                    _config.Repositories.First(repo => repo.Name == _vbe.ActiveVBProject.Name), _wrapperFactory);
+                    _config.Repositories.First(repo => repo.Id == _vbe.ActiveVBProject.HelpFile), _wrapperFactory);
                 Status = RubberduckUI.Online;
             }
             catch (SourceControlException ex)
             {
                 ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
                 Status = RubberduckUI.Offline;
             }
+
+            OnOpenRepoCompleted();
         }
 
         private void Refresh()
@@ -487,7 +496,7 @@ private bool ValidRepoExists()
                 return false;
             }
 
-            var possibleRepos = _config.Repositories.Where(repo => repo.Name == _vbe.ActiveVBProject.Name);
+            var possibleRepos = _config.Repositories.Where(repo => repo.Id == _vbe.ActiveVBProject.HelpFile);
 
             var possibleCount = possibleRepos.Count();
 
@@ -535,7 +544,7 @@ public ICommand CloneRepoCommand
         {
             get { return _cloneRepoCommand; }
         }
-        
+
         private readonly ICommand _showFilePickerCommand;
         public ICommand ShowFilePickerCommand
         {
@@ -590,6 +599,26 @@ public ICommand LoginGridCancelCommand
             }
         }
 
+        public event EventHandler<EventArgs> OpenRepoStarted;
+        private void OnOpenRepoStarted()
+        {
+            var handler = OpenRepoStarted;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
+        }
+
+        public event EventHandler<EventArgs> OpenRepoCompleted;
+        private void OnOpenRepoCompleted()
+        {
+            var handler = OpenRepoCompleted;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
+        }
+
         public void Dispose()
         {
             if (_state != null)

Rubberduck.SourceControl/IRepository.cs

@@ -8,7 +8,7 @@ namespace Rubberduck.SourceControl
     public interface IRepository
     {
         [DispId(0)]
-        string Name { get; }
+        string Id { get; }
 
         [DispId(1)]
         [Description("FilePath of local repository.")]

Rubberduck.SourceControl/Repository.cs

@@ -8,16 +8,16 @@ namespace Rubberduck.SourceControl
     [ClassInterface(ClassInterfaceType.None)]
     public class Repository : IRepository
     {
-        public string Name { get; set; }
+        public string Id { get; set; }
         public string LocalLocation { get; set; }
         public string RemoteLocation { get;  set; }
 
         //parameterless constructor for serialization
         public Repository() { }
 
-        public Repository(string name, string localDirectory, string remotePathOrUrl)
+        public Repository(string id, string localDirectory, string remotePathOrUrl)
         {
-            Name = name;
+            Id = id;
             LocalLocation = localDirectory;
             RemoteLocation = remotePathOrUrl;
         }