Merge pull request #1750 from Hosch250/SourceControlTweaks

Source control tweaks

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -325,6 +325,8 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>
                 return;
             }
 
+            _panelVM.RemoveComponent(e.Item);
+
             _logger.Debug("Component '{0}' was removed.", e.Item.Name);
             _parser.State.ClearStateCache(e.Item, true);
         }
@@ -351,6 +353,8 @@ async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e
                 return;
             }
 
+            _panelVM.AddComponent(e.Item);
+
             _logger.Debug("Component '{0}' was added.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
         }

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

@@ -90,6 +90,28 @@ public void SetTab(SourceControlTab tab)
             SelectedItem = TabItems.First(t => t.ViewModel.Tab == tab);
         }
 
+        public void AddComponent(VBComponent component)
+        {
+            if (Provider == null) { return; }
+
+            var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == component.Name);
+            if (fileStatus != null)
+            {
+                Provider.AddFile(fileStatus.FilePath);
+            }
+        }
+
+        public void RemoveComponent(VBComponent component)
+        {
+            if (Provider == null) { return; }
+
+            var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == component.Name);
+            if (fileStatus != null)
+            {
+                Provider.RemoveFile(fileStatus.FilePath, true);
+            }
+        }
+
         private static readonly IDictionary<NotificationType, BitmapImage> IconMappings =
             new Dictionary<NotificationType, BitmapImage>
             {
@@ -469,6 +491,9 @@ private void OpenRepoAssignedToProject()
             {
                 ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
                 Status = RubberduckUI.Offline;
+
+                _config.Repositories.Remove(_config.Repositories.FirstOrDefault(repo => repo.Id == _vbe.ActiveVBProject.HelpFile));
+                _configService.Save(_config);
             }
 
             OnOpenRepoCompleted();
@@ -497,12 +522,10 @@ private bool ValidRepoExists()
             }
 
             var possibleRepos = _config.Repositories.Where(repo => repo.Id == _vbe.ActiveVBProject.HelpFile);
-
             var possibleCount = possibleRepos.Count();
 
             //todo: if none are found, prompt user to create one
-            //todo: more than one are found, prompt for correct one
-            return possibleCount != 0 && possibleCount <= 1;
+            return possibleCount == 1;
         }
 
         private void ShowFilePicker()

Rubberduck.SourceControl/GitProvider.cs

@@ -437,14 +437,15 @@ public override void AddFile(string filePath)
         }
 
         /// <summary>
-        /// Removes file from staging area, but leaves the file in the working directory.
+        /// Removes file from staging area.
         /// </summary>
         /// <param name="filePath"></param>
-        public override void RemoveFile(string filePath)
+        /// <param name="removeFromWorkingDirectory"></param>
+        public override void RemoveFile(string filePath, bool removeFromWorkingDirectory)
         {
             try
             {
-                _repo.Remove(filePath, false);
+                _repo.Remove(filePath, removeFromWorkingDirectory);
             }
             catch (LibGit2SharpException ex)
             {
@@ -457,7 +458,8 @@ public override IEnumerable<IFileStatusEntry> Status()
             try
             {
                 base.Status();
-                return _repo.RetrieveStatus().Select(item => new FileStatusEntry(item));
+                return _repo.RetrieveStatus(new StatusOptions {IncludeUnaltered = true})
+                        .Select(item => new FileStatusEntry(item));
             }
             catch (LibGit2SharpException ex)
             {

Rubberduck.SourceControl/ISourceControlProvider.cs

@@ -112,7 +112,7 @@ public interface ISourceControlProvider
         /// Removes file from tracking.
         /// </summary>
         /// <param name="filePath"></param>
-        void RemoveFile(string filePath);
+        void RemoveFile(string filePath, bool removeFromWorkingDirectory);
 
         /// <summary>
         /// Returns a collection of file status entries.

Rubberduck.SourceControl/Interop/ISourceControlProvider.cs

@@ -75,7 +75,7 @@ public interface ISourceControlProvider
 
         [DispId(16)]
         [Description("Removes file from tracking.")]
-        void RemoveFile(string filePath);
+        void RemoveFile(string filePath, bool removeFromWorkingDirectory);
 
         [DispId(17)]
         [Description("Returns a collection of file status entries.\n Semantically the same as calling $git status.")]

Rubberduck.SourceControl/SourceControlProviderBase.cs

@@ -35,7 +35,7 @@ protected SourceControlProviderBase(VBProject project, IRepository repository, I
         public abstract void Push();
         public abstract void Fetch(string remoteName);
         public abstract void AddFile(string filePath);
-        public abstract void RemoveFile(string filePath);
+        public abstract void RemoveFile(string filePath, bool removeFromWorkingDirectory);
         public abstract void CreateBranch(string branch);
         public abstract void DeleteBranch(string branch);
         public abstract IRepository Init(string directory, bool bare = false);