Exclude changes works.

Author: Hosch250

RetailCoder.VBE/UI/SourceControl/ChangesViewViewModel.cs

@@ -51,7 +51,6 @@ public void RefreshView()
         {
             OnPropertyChanged("CurrentBranch");
             OnPropertyChanged("IncludedChanges");
-            OnPropertyChanged("ExcludedChanges");
             OnPropertyChanged("UntrackedFiles");
         }
 
@@ -75,26 +74,17 @@ public IEnumerable<IFileStatusEntry> IncludedChanges
                     ? new ObservableCollection<IFileStatusEntry>()
                     : new ObservableCollection<IFileStatusEntry>(
                         Provider.Status()
-                            .Where(
-                                stat =>
-                                    stat.FileStatus.HasFlag(FileStatus.Modified) ||
-                                    stat.FileStatus.HasFlag(FileStatus.Added)));
+                            .Where(stat =>
+                                    (stat.FileStatus.HasFlag(FileStatus.Modified) ||
+                                    stat.FileStatus.HasFlag(FileStatus.Added)) &&
+                                    !ExcludedChanges.Select(f => f.FilePath).Contains(stat.FilePath)));
             }
         }
 
-        public IEnumerable<IFileStatusEntry> ExcludedChanges
+        private readonly ObservableCollection<IFileStatusEntry> _excludedChanges = new ObservableCollection<IFileStatusEntry>();
+        public ObservableCollection<IFileStatusEntry> ExcludedChanges
         {
-            get
-            {
-                return Provider == null
-                    ? new ObservableCollection<IFileStatusEntry>()
-                    : new ObservableCollection<IFileStatusEntry>(
-                        Provider.Status()
-                            .Where(
-                                stat =>
-                                    stat.FileStatus.HasFlag(FileStatus.Ignored) &&
-                                    stat.FileStatus.HasFlag(FileStatus.Modified)));
-            }
+            get { return _excludedChanges; }
         }
 
         public IEnumerable<IFileStatusEntry> UntrackedFiles
@@ -162,14 +152,21 @@ private void Commit()
 
         private void IncludeChanges(IFileStatusEntry fileStatusEntry)
         {
-            Provider.AddFile(fileStatusEntry.FilePath);
+            if (UntrackedFiles.FirstOrDefault(f => f.FilePath == fileStatusEntry.FilePath) != null)
+            {
+                Provider.AddFile(fileStatusEntry.FilePath);
+            }
+            else
+            {
+                ExcludedChanges.Remove(ExcludedChanges.FirstOrDefault(f => f.FilePath == fileStatusEntry.FilePath));
+            }
 
             RefreshView();
         }
 
         private void ExcludeChanges(IFileStatusEntry fileStatusEntry)
         {
-            Provider.ExcludeFile(fileStatusEntry.FilePath);
+            ExcludedChanges.Add(fileStatusEntry);
 
             RefreshView();
         }

Rubberduck.SourceControl/GitProvider.cs

@@ -436,19 +436,6 @@ public override void AddFile(string filePath)
             }
         }
 
-        public override void ExcludeFile(string filePath)
-        {
-            try
-            {
-                // https://github.com/libgit2/libgit2sharp/wiki/Git-add
-                _repo.Unstage(filePath);
-            }
-            catch (LibGit2SharpException ex)
-            {
-                throw new SourceControlException(string.Format("Failed to stage file {0}", filePath), ex);
-            }
-        }
-
         /// <summary>
         /// Removes file from staging area, but leaves the file in the working directory.
         /// </summary>

Rubberduck.SourceControl/ISourceControlProvider.cs

@@ -108,12 +108,6 @@ public interface ISourceControlProvider
         /// <param name="filePath"></param>
         void AddFile(string filePath);
 
-        /// <summary>
-        /// Exclude a file from tracking.
-        /// </summary>
-        /// <param name="filePath">The name of the file to exclude</param>
-        void ExcludeFile(string filePath);
-
         /// <summary>
         /// Removes file from tracking.
         /// </summary>

Rubberduck.SourceControl/SourceControlProviderBase.cs

@@ -42,7 +42,6 @@ protected SourceControlProviderBase(VBProject project, IRepository repository, I
         public abstract void Commit(string message);
         public abstract void Publish(string branch);
         public abstract void Unpublish(string branch);
-        public abstract void ExcludeFile(string filePath);
 
         public virtual void CreateBranch(string sourceBranch, string branch)
         {