[VersionControl] Do not show annoying popups when version control is disabled

Fixes bug #5178.

3 files changed, 10 insertions, 9 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
index 0871e50faa..9da8c7d73f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
@@ -7,11 +7,13 @@ namespace MonoDevelop.VersionControl
 {
 	internal class CheckoutCommand : CommandHandler
 	{
+		protected override void Update (CommandInfo info)
+		{
+			info.Enabled = VersionControlService.CheckVersionControlInstalled ();
+		}
+
 		protected override void Run()
 		{
-			if (!VersionControlService.CheckVersionControlInstalled ())
-				return;
-			
 			SelectRepositoryDialog del = new SelectRepositoryDialog (SelectRepositoryMode.Checkout);
 			try {
 				if (MessageService.RunCustomDialog (del) == (int) Gtk.ResponseType.Ok && del.Repository != null) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
index a3fa89b5c1..29dc1f015b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
@@ -12,11 +12,8 @@ namespace MonoDevelop.VersionControl
 	{

 		public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
 		{
-			if (!VersionControlService.CheckVersionControlInstalled ())
-				return false;

-
 			if (test)
-				return VersionControlService.GetRepository (entry) == null;
+				return VersionControlService.CheckVersionControlInstalled () && VersionControlService.GetRepository (entry) == null;
 

 			List<FilePath> files = new List<FilePath> ();
 
@@ -63,6 +60,9 @@ namespace MonoDevelop.VersionControl
 		}
 		
 		public static bool CanPublish (Repository vc, string path, bool isDir) {
+			if (!VersionControlService.CheckVersionControlInstalled ())
+				return false;
+
 			if (!vc.GetVersionInfo (path).IsVersioned && isDir) 
 				return true;
 			return false;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
index e145d3f4b4..7b5d81d111 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
@@ -635,8 +635,7 @@ namespace MonoDevelop.VersionControl
 				if (vcs.IsInstalled)
 					return true;
 			}
-			
-			MessageService.ShowError (GettextCatalog.GetString ("There isn't any supported version control system installed. You may need to install additional add-ins or packages."));
+
 			return false;
 		}