Merge pull request #660 from ckuhn203/sourcecontrol

rubberduck203 · rubberduck203 · commit c6794d972140 · 2015-06-27T19:27:19.000-04:00
Sourcecontrol - Clean up
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -290,6 +290,7 @@
       <DependentUpon>AddMarkerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Settings\IAddTodoSettingsView.cs" />
+    <Compile Include="UI\SourceControl\ActionFailedEventArgs.cs" />
     <Compile Include="UI\SourceControl\App.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -406,10 +407,11 @@
     <Compile Include="UI\SourceControl\ICreateBranchView.cs" />
     <Compile Include="UI\SourceControl\IDeleteBranchView.cs" />
     <Compile Include="UI\SourceControl\IMergeView.cs" />
-    <Compile Include="UI\SourceControl\IProviderPresenter.cs" />
+    <Compile Include="UI\SourceControl\ProviderPresenter.cs" />
+    <Compile Include="UI\SourceControl\IRefreshableView.cs" />
     <Compile Include="UI\SourceControl\ISettingsView.cs" />
     <Compile Include="UI\SourceControl\ISourceControlView.cs" />
-    <Compile Include="UI\SourceControl\IUnsyncedCommitsView.cs" />
+    <Compile Include="UI\SourceControl\IUnSyncedCommitsView.cs" />
     <Compile Include="UI\SourceControl\MergeForm.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/RetailCoder.VBE/UI/SourceControl/ActionFailedEventArgs.cs b/RetailCoder.VBE/UI/SourceControl/ActionFailedEventArgs.cs
@@ -0,0 +1,23 @@
+﻿using System;
+using Rubberduck.SourceControl;
+
+namespace Rubberduck.UI.SourceControl
+{
+    public class ActionFailedEventArgs : EventArgs
+    {
+        private readonly string _message;
+        public string Message { get { return _message; } }
+
+        private readonly string _title;
+        public string Title { get { return _title; } }
+
+        public ActionFailedEventArgs(string title, string message)
+        {
+            _title = title;
+            _message = message;
+        }
+
+        public ActionFailedEventArgs(SourceControlException ex)
+            : this(ex.Message, ex.InnerException.Message) { }
+    }
+}
diff --git a/RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs b/RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs
@@ -6,21 +6,18 @@
 
 namespace Rubberduck.UI.SourceControl
 {
-    public interface IBranchesPresenter : IProviderPresenter
+    public interface IBranchesPresenter : IProviderPresenter, IRefreshable
     {
-        void RefreshView();
         event EventHandler<EventArgs> BranchChanged;
     }
 
-    public class BranchesPresenter : IBranchesPresenter
+    public class BranchesPresenter : ProviderPresenterBase, IBranchesPresenter
     {
         private readonly IBranchesView _view;
         private readonly ICreateBranchView _createView;
         private readonly IDeleteBranchView _deleteView;
         private readonly IMergeView _mergeView;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public event EventHandler<EventArgs> BranchChanged;
 
         public BranchesPresenter
@@ -78,7 +75,10 @@ private void OnSelectedBranchChanged(object sender, EventArgs e)
             catch (SourceControlException ex)
             {
                 //todo: find a better way of displaying these errors
+                //todo: remove messagebox
                 MessageBox.Show(ex.InnerException.Message, ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+                RaiseActionFailedEvent(ex);
             }
 
             if (BranchChanged != null)
@@ -146,7 +146,16 @@ private void OnDeleteViewSelectionChanged(object sender, BranchDeleteArgs e)
         private void OnDeleteBranch(object sender, BranchDeleteArgs e)
         {
             _deleteView.Hide();
-            Provider.DeleteBranch(e.BranchName);
+
+            try
+            {
+                Provider.DeleteBranch(e.BranchName);
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
+
             RefreshView();
         }
 
@@ -165,7 +174,16 @@ private void OnShowCreateBranchView(object sender, EventArgs e)
         private void OnCreateBranch(object sender, BranchCreateArgs e)
         {
             HideCreateBranchView();
-            this.Provider.CreateBranch(e.BranchName);
+
+            try
+            {
+                this.Provider.CreateBranch(e.BranchName);
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }            
+            
             RefreshView();
         }
 
@@ -212,6 +230,7 @@ private void OnMerge(object sender, EventArgs e)
             {
                 _mergeView.Status = MergeStatus.Failure;
                 _mergeView.StatusText = ex.Message + ": " + ex.InnerException.Message;
+                //todo: raise action failed event?
             }
         }
 
diff --git a/RetailCoder.VBE/UI/SourceControl/ChangesPresenter.cs b/RetailCoder.VBE/UI/SourceControl/ChangesPresenter.cs
@@ -5,18 +5,15 @@
 
 namespace Rubberduck.UI.SourceControl
 {
-    public interface IChangesPresenter : IProviderPresenter
+    public interface IChangesPresenter : IProviderPresenter, IRefreshable
     {
-        void Refresh();
         void Commit();
     }
 
-    public class ChangesPresenter : IChangesPresenter
+    public class ChangesPresenter : ProviderPresenterBase, IChangesPresenter
     {
         private readonly IChangesView _view;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public ChangesPresenter(IChangesView view)
         {
             _view = view;
@@ -47,7 +44,7 @@ private bool ShouldEnableCommit()
             return !string.IsNullOrEmpty(_view.CommitMessage) && _view.CommitAction != CommitAction.Unset;
         }
 
-        public void Refresh()
+        public void RefreshView()
         {
             var fileStats = this.Provider.Status().ToList();
 
@@ -67,26 +64,33 @@ public void Commit()
                 return;
             }
 
-            this.Provider.Stage(changes);
-            this.Provider.Commit(_view.CommitMessage);
-
-            if (_view.CommitAction == CommitAction.CommitAndSync)
+            try
             {
-                this.Provider.Pull();
-                this.Provider.Push();
+                this.Provider.Stage(changes);
+                this.Provider.Commit(_view.CommitMessage);
+
+                if (_view.CommitAction == CommitAction.CommitAndSync)
+                {
+                    this.Provider.Pull();
+                    this.Provider.Push();
+                }
+
+                if (_view.CommitAction == CommitAction.CommitAndPush)
+                {
+                    this.Provider.Push();
+                }
             }
-
-            if (_view.CommitAction == CommitAction.CommitAndPush)
+            catch(SourceControlException ex)
             {
-                this.Provider.Push();
+                RaiseActionFailedEvent(ex);
             }
         }
 
         private void OnCommit(object sender, EventArgs e)
         {
             Commit();
             _view.CommitMessage = string.Empty;
-            Refresh();
+            RefreshView();
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/SourceControl/DeleteBranchForm.cs b/RetailCoder.VBE/UI/SourceControl/DeleteBranchForm.cs
@@ -1,9 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
 
 namespace Rubberduck.UI.SourceControl
 {
+    [ExcludeFromCodeCoverage]
     public partial class DeleteBranchForm : Form, IDeleteBranchView
     {
         public DeleteBranchForm()
diff --git a/RetailCoder.VBE/UI/SourceControl/IProviderPresenter.cs b/RetailCoder.VBE/UI/SourceControl/IProviderPresenter.cs
diff --git a/RetailCoder.VBE/UI/SourceControl/IRefreshableView.cs b/RetailCoder.VBE/UI/SourceControl/IRefreshableView.cs
@@ -0,0 +1,7 @@
+﻿namespace Rubberduck.UI.SourceControl
+{
+    public interface IRefreshable
+    {
+        void RefreshView();
+    }
+}
diff --git a/RetailCoder.VBE/UI/SourceControl/ProviderPresenter.cs b/RetailCoder.VBE/UI/SourceControl/ProviderPresenter.cs
@@ -0,0 +1,26 @@
+﻿using System;
+using Rubberduck.SourceControl;
+
+namespace Rubberduck.UI.SourceControl
+{
+    public interface IProviderPresenter
+    {
+        ISourceControlProvider Provider { get; set; }
+        event EventHandler<ActionFailedEventArgs> ActionFailed;
+    }
+
+    public abstract class ProviderPresenterBase : IProviderPresenter
+    {
+        public virtual ISourceControlProvider Provider { get; set; }
+
+        public event EventHandler<ActionFailedEventArgs> ActionFailed;
+        protected virtual void RaiseActionFailedEvent(SourceControlException ex)
+        {
+            var handler = ActionFailed;
+            if (handler != null)
+            {
+                handler(this, new ActionFailedEventArgs(ex));
+            }
+        }
+    }
+}
diff --git a/RetailCoder.VBE/UI/SourceControl/SettingsPresenter.cs b/RetailCoder.VBE/UI/SourceControl/SettingsPresenter.cs
@@ -7,20 +7,17 @@
 
 namespace Rubberduck.UI.SourceControl
 {
-    public interface ISettingsPresenter : IProviderPresenter
+    public interface ISettingsPresenter : IProviderPresenter, IRefreshable
     {
-        void RefreshView();
     }
 
-    public class SettingsPresenter : ISettingsPresenter
+    public class SettingsPresenter : ProviderPresenterBase, ISettingsPresenter
     {
         private readonly ISettingsView _view;
         private readonly IConfigurationService<SourceControlConfiguration> _configurationService;
         private readonly IFolderBrowserFactory _folderBrowserFactory;
         private SourceControlConfiguration _config;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public SettingsPresenter(ISettingsView view, IConfigurationService<SourceControlConfiguration> configService, IFolderBrowserFactory folderBrowserFactory)
         {
             _configurationService = configService;
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs
@@ -48,7 +48,7 @@ public SourceControlPresenter
 
         private void _branchesPresenter_BranchChanged(object sender, EventArgs e)
         {
-            _changesPresenter.Refresh();
+            _changesPresenter.RefreshView();
         }
 
         private void OnInitNewRepository(object sender, EventArgs e)
@@ -147,7 +147,7 @@ private void SetChildPresenterSourceControlProviders(ISourceControlProvider prov
             _unsyncedPresenter.Provider = provider;
 
             _branchesPresenter.RefreshView();
-            _changesPresenter.Refresh();
+            _changesPresenter.RefreshView();
             // Purposely not refreshing settingsPresenter.
             //  Settings it's provider doesn't affect it's view.
         }
diff --git a/RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsPresenter.cs b/RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsPresenter.cs
@@ -1,24 +1,16 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Rubberduck.SourceControl;
 
 namespace Rubberduck.UI.SourceControl
 {
-    public interface IUnsyncedCommitsPresenter
+    public interface IUnsyncedCommitsPresenter : IProviderPresenter, IRefreshable
     {
-        ISourceControlProvider Provider { get; set; }
-        void Refresh();
     }
 
-    public class UnsyncedCommitsPresenter : IUnsyncedCommitsPresenter
+    public class UnsyncedCommitsPresenter : ProviderPresenterBase, IUnsyncedCommitsPresenter
     {
         private readonly IUnsyncedCommitsView _view;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public UnsyncedCommitsPresenter(IUnsyncedCommitsView view)
         {
             _view = view;
@@ -31,27 +23,56 @@ public UnsyncedCommitsPresenter(IUnsyncedCommitsView view)
 
         void OnPush(object sender, EventArgs e)
         {
-            Provider.Push();
+            try
+            {
+                Provider.Push();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
         }
 
         void OnPull(object sender, EventArgs e)
         {
-            Provider.Pull();
+            try
+            {
+                Provider.Pull();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
         }
 
         void OnFetch(object sender, EventArgs e)
         {
-            Provider.Fetch();
+            try
+            {
+                Provider.Fetch();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
+            
             _view.IncomingCommits = Provider.UnsyncedRemoteCommits;
         }
 
         void OnSync(object sender, EventArgs e)
         {
-            Provider.Pull();
-            Provider.Push();
+            try
+            {
+                Provider.Pull();
+                Provider.Push();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
         }
 
-        public void Refresh()
+        public void RefreshView()
         {
             if (this.Provider != null)
             {
diff --git a/RubberduckTests/SourceControl/ChangesPresenterTests.cs b/RubberduckTests/SourceControl/ChangesPresenterTests.cs
diff --git a/RubberduckTests/SourceControl/SCPresenterTests.cs b/RubberduckTests/SourceControl/SCPresenterTests.cs
diff --git a/RubberduckTests/SourceControl/UnsyncedCommitsPresenterTests.cs b/RubberduckTests/SourceControl/UnsyncedCommitsPresenterTests.cs

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,18 @@`
`6`	`6`
`7`	`7`	`namespace Rubberduck.UI.SourceControl`
`8`	`8`	`{`
`9`		`- public interface IBranchesPresenter : IProviderPresenter`
	`9`	`+ public interface IBranchesPresenter : IProviderPresenter, IRefreshable`
`10`	`10`	`{`
`11`		`- void RefreshView();`
`12`	`11`	`event EventHandler<EventArgs> BranchChanged;`
`13`	`12`	`}`
`14`	`13`
`15`		`- public class BranchesPresenter : IBranchesPresenter`
	`14`	`+ public class BranchesPresenter : ProviderPresenterBase, IBranchesPresenter`
`16`	`15`	`{`
`17`	`16`	`private readonly IBranchesView _view;`
`18`	`17`	`private readonly ICreateBranchView _createView;`
`19`	`18`	`private readonly IDeleteBranchView _deleteView;`
`20`	`19`	`private readonly IMergeView _mergeView;`
`21`	`20`
`22`		`- public ISourceControlProvider Provider { get; set; }`
`23`		`-`
`24`	`21`	`public event EventHandler<EventArgs> BranchChanged;`
`25`	`22`
`26`	`23`	`public BranchesPresenter`
`@@ -78,7 +75,10 @@ private void OnSelectedBranchChanged(object sender, EventArgs e)`
`78`	`75`	`catch (SourceControlException ex)`
`79`	`76`	`{`
`80`	`77`	`//todo: find a better way of displaying these errors`
	`78`	`+ //todo: remove messagebox`
`81`	`79`	`MessageBox.Show(ex.InnerException.Message, ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);`
	`80`	`+`
	`81`	`+ RaiseActionFailedEvent(ex);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if (BranchChanged != null)`
`@@ -146,7 +146,16 @@ private void OnDeleteViewSelectionChanged(object sender, BranchDeleteArgs e)`
`146`	`146`	`private void OnDeleteBranch(object sender, BranchDeleteArgs e)`
`147`	`147`	`{`
`148`	`148`	`_deleteView.Hide();`
`149`		`- Provider.DeleteBranch(e.BranchName);`
	`149`	`+`
	`150`	`+ try`
	`151`	`+ {`
	`152`	`+ Provider.DeleteBranch(e.BranchName);`
	`153`	`+ }`
	`154`	`+ catch (SourceControlException ex)`
	`155`	`+ {`
	`156`	`+ RaiseActionFailedEvent(ex);`
	`157`	`+ }`
	`158`	`+`
`150`	`159`	`RefreshView();`
`151`	`160`	`}`
`152`	`161`
`@@ -165,7 +174,16 @@ private void OnShowCreateBranchView(object sender, EventArgs e)`
`165`	`174`	`private void OnCreateBranch(object sender, BranchCreateArgs e)`
`166`	`175`	`{`
`167`	`176`	`HideCreateBranchView();`
`168`		`- this.Provider.CreateBranch(e.BranchName);`
	`177`	`+`
	`178`	`+ try`
	`179`	`+ {`
	`180`	`+ this.Provider.CreateBranch(e.BranchName);`
	`181`	`+ }`
	`182`	`+ catch (SourceControlException ex)`
	`183`	`+ {`
	`184`	`+ RaiseActionFailedEvent(ex);`
	`185`	`+ }`
	`186`	`+`
`169`	`187`	`RefreshView();`
`170`	`188`	`}`
`171`	`189`
`@@ -212,6 +230,7 @@ private void OnMerge(object sender, EventArgs e)`
`212`	`230`	`{`
`213`	`231`	`_mergeView.Status = MergeStatus.Failure;`
`214`	`232`	`_mergeView.StatusText = ex.Message + ": " + ex.InnerException.Message;`
	`233`	`+ //todo: raise action failed event?`
`215`	`234`	`}`
`216`	`235`	`}`
`217`	`236`
Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,15 @@`
`5`	`5`
`6`	`6`	`namespace Rubberduck.UI.SourceControl`
`7`	`7`	`{`
`8`		`- public interface IChangesPresenter : IProviderPresenter`
	`8`	`+ public interface IChangesPresenter : IProviderPresenter, IRefreshable`
`9`	`9`	`{`
`10`		`- void Refresh();`
`11`	`10`	`void Commit();`
`12`	`11`	`}`
`13`	`12`
`14`		`- public class ChangesPresenter : IChangesPresenter`
	`13`	`+ public class ChangesPresenter : ProviderPresenterBase, IChangesPresenter`
`15`	`14`	`{`
`16`	`15`	`private readonly IChangesView _view;`
`17`	`16`
`18`		`- public ISourceControlProvider Provider { get; set; }`
`19`		`-`
`20`	`17`	`public ChangesPresenter(IChangesView view)`
`21`	`18`	`{`
`22`	`19`	`_view = view;`
`@@ -47,7 +44,7 @@ private bool ShouldEnableCommit()`
`47`	`44`	`return !string.IsNullOrEmpty(_view.CommitMessage) && _view.CommitAction != CommitAction.Unset;`
`48`	`45`	`}`
`49`	`46`
`50`		`- public void Refresh()`
	`47`	`+ public void RefreshView()`
`51`	`48`	`{`
`52`	`49`	`var fileStats = this.Provider.Status().ToList();`
`53`	`50`
`@@ -67,26 +64,33 @@ public void Commit()`
`67`	`64`	`return;`
`68`	`65`	`}`
`69`	`66`
`70`		`- this.Provider.Stage(changes);`
`71`		`- this.Provider.Commit(_view.CommitMessage);`
`72`		`-`
`73`		`- if (_view.CommitAction == CommitAction.CommitAndSync)`
	`67`	`+ try`
`74`	`68`	`{`
`75`		`- this.Provider.Pull();`
`76`		`- this.Provider.Push();`
	`69`	`+ this.Provider.Stage(changes);`
	`70`	`+ this.Provider.Commit(_view.CommitMessage);`
	`71`	`+`
	`72`	`+ if (_view.CommitAction == CommitAction.CommitAndSync)`
	`73`	`+ {`
	`74`	`+ this.Provider.Pull();`
	`75`	`+ this.Provider.Push();`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ if (_view.CommitAction == CommitAction.CommitAndPush)`
	`79`	`+ {`
	`80`	`+ this.Provider.Push();`
	`81`	`+ }`
`77`	`82`	`}`
`78`		`-`
`79`		`- if (_view.CommitAction == CommitAction.CommitAndPush)`
	`83`	`+ catch(SourceControlException ex)`
`80`	`84`	`{`
`81`		`- this.Provider.Push();`
	`85`	`+ RaiseActionFailedEvent(ex);`
`82`	`86`	`}`
`83`	`87`	`}`
`84`	`88`
`85`	`89`	`private void OnCommit(object sender, EventArgs e)`
`86`	`90`	`{`
`87`	`91`	`Commit();`
`88`	`92`	`_view.CommitMessage = string.Empty;`
`89`		`- Refresh();`
	`93`	`+ RefreshView();`
`90`	`94`	`}`
`91`	`95`	`}`
`92`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Diagnostics.CodeAnalysis;`
`3`	`4`	`using System.Windows.Forms;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.SourceControl`
`6`	`7`	`{`
	`8`	`+ [ExcludeFromCodeCoverage]`
`7`	`9`	`public partial class DeleteBranchForm : Form, IDeleteBranchView`
`8`	`10`	`{`
`9`	`11`	`public DeleteBranchForm()`
Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,17 @@`
`7`	`7`
`8`	`8`	`namespace Rubberduck.UI.SourceControl`
`9`	`9`	`{`
`10`		`- public interface ISettingsPresenter : IProviderPresenter`
	`10`	`+ public interface ISettingsPresenter : IProviderPresenter, IRefreshable`
`11`	`11`	`{`
`12`		`- void RefreshView();`
`13`	`12`	`}`
`14`	`13`
`15`		`- public class SettingsPresenter : ISettingsPresenter`
	`14`	`+ public class SettingsPresenter : ProviderPresenterBase, ISettingsPresenter`
`16`	`15`	`{`
`17`	`16`	`private readonly ISettingsView _view;`
`18`	`17`	`private readonly IConfigurationService<SourceControlConfiguration> _configurationService;`
`19`	`18`	`private readonly IFolderBrowserFactory _folderBrowserFactory;`
`20`	`19`	`private SourceControlConfiguration _config;`
`21`	`20`
`22`		`- public ISourceControlProvider Provider { get; set; }`
`23`		`-`
`24`	`21`	`public SettingsPresenter(ISettingsView view, IConfigurationService<SourceControlConfiguration> configService, IFolderBrowserFactory folderBrowserFactory)`
`25`	`22`	`{`
`26`	`23`	`_configurationService = configService;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public SourceControlPresenter`
`48`	`48`
`49`	`49`	`private void _branchesPresenter_BranchChanged(object sender, EventArgs e)`
`50`	`50`	`{`
`51`		`- _changesPresenter.Refresh();`
	`51`	`+ _changesPresenter.RefreshView();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private void OnInitNewRepository(object sender, EventArgs e)`
`@@ -147,7 +147,7 @@ private void SetChildPresenterSourceControlProviders(ISourceControlProvider prov`
`147`	`147`	`_unsyncedPresenter.Provider = provider;`
`148`	`148`
`149`	`149`	`_branchesPresenter.RefreshView();`
`150`		`- _changesPresenter.Refresh();`
	`150`	`+ _changesPresenter.RefreshView();`
`151`	`151`	`// Purposely not refreshing settingsPresenter.`
`152`	`152`	`// Settings it's provider doesn't affect it's view.`
`153`	`153`	`}`