1 files changed, 19 insertions, 22 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
index a8ffdc9e4a..64dd18ff92 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
@@ -37,21 +37,20 @@ namespace MonoDevelop.VersionControl
 		{
 			VersionControlItemList list = new VersionControlItemList ();
 			
-			WorkspaceItem wob;
-			SolutionItem sol;
+			IWorkspaceObject wob;
 			Repository repo = null;
 			wob = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem;
 			if (wob != null)
 				repo = VersionControlService.GetRepository (wob);
 			if (repo == null) {
-				sol = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
-				if (sol != null)
-					repo = VersionControlService.GetRepository (sol);
+				wob = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
+				if (wob != null)
+					repo = VersionControlService.GetRepository (wob);
 			}
 			if (repo == null || repo.VersionControlSystem == null || !repo.VersionControlSystem.IsInstalled)
 				return list;
 
-			list.Add (new VersionControlItem (repo, wob, wob.FileName, true, null));
+			list.Add (new VersionControlItem (repo, wob, wob.BaseDirectory, true, null));
 			return list;
 		}
 		
@@ -107,7 +106,7 @@ namespace MonoDevelop.VersionControl
 			return new VersionControlItem (repo, project, doc.FileName, false, null);
 		}
 		
-		protected override void Run ()
+		protected sealed override void Run ()
 		{
 			VersionControlItemList items = GetItems ();
 			RunCommand (items, false);
@@ -244,30 +243,28 @@ namespace MonoDevelop.VersionControl
 		}
 	}
 
-	class CurrentFileDiffHandler : FileVersionControlCommandHandler
+	class CurrentFileViewHandler<T> : FileVersionControlCommandHandler where T:IAttachableViewContent
 	{
-		protected override void Run ()
+		protected override bool RunCommand (VersionControlItemList items, bool test)
 		{
+			if (test)
+				return true;
+
 			var window = IdeApp.Workbench.ActiveDocument.Window;
-			window.SwitchView (window.FindView<IDiffView> ());
+			window.SwitchView (window.FindView<T> ());
+			return true;
 		}
 	}
+
+	class CurrentFileDiffHandler : CurrentFileViewHandler<IDiffView>
+	{
+	}
 	
-	class CurrentFileBlameHandler : FileVersionControlCommandHandler
+	class CurrentFileBlameHandler : CurrentFileViewHandler<IBlameView>
 	{
-		protected override void Run ()
-		{
-			var window = IdeApp.Workbench.ActiveDocument.Window;
-			window.SwitchView (window.FindView<IBlameView> ());
-		}
 	}
 	
-	class CurrentFileLogHandler : FileVersionControlCommandHandler
+	class CurrentFileLogHandler : CurrentFileViewHandler<ILogView>
 	{
-		protected override void Run ()
-		{
-			var window = IdeApp.Workbench.ActiveDocument.Window;
-			window.SwitchView (window.FindView<ILogView> ());
-		}
 	}
 }