1. TakUnity
  2. monodevelop-hg

Commits

TakUnity  committed 6c7bc9f Merge

Merge bleeding-edge to unity-staging.

  • Participants
  • Parent commits 1107309, 6e71ef1
  • Branches unity-staging

Comments (0)

Files changed (3)

File monodevelop-hg/MercurialCommands.cs

View file
 					worker.Operation = delegate {
 						repo.LocalBasePath = MercurialRepository.GetLocalBasePath (localPath);
 						Revision[] history = repo.GetIncoming (bsd.SelectedLocation);
-						DispatchService.GuiDispatch (() => {
+						DispatchService.GuiDispatch (new MessageHandler(() => {
 							var view = new MonoDevelop.VersionControl.Views.LogView (localPath, true, history, repo);
 							IdeApp.Workbench.OpenDocument (view, true);
-						});
+						}));
 					};
 					worker.Start ();
 				}

File monodevelop-hg/MercurialRepository.cs

View file
 			return localFile;
 		}
 
-		public override Revision[] GetHistory (FilePath localFilePath, Revision since)
+		protected override Revision[] OnGetHistory (FilePath localFilePath, Revision since)
 		{
 			if (null == LocalBasePath) {
 				// System.Console.WriteLine ("Getting local base path for {0}", localFile);
 		{
 			return Client.GetRevisionChanges (this, (MercurialRevision)revision);
 		}		
-		
+
 		// Deprecated
-		public override Repository Publish (string serverPath, FilePath localPath, FilePath[] files, string message, IProgressMonitor monitor)
+		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, IProgressMonitor monitor)
 		{
 			serverPath = string.Format ("{0}{1}{2}", Url, Url.EndsWith ("/")? string.Empty: "/", serverPath);
 			// System.Console.WriteLine ("Got publish {0} {1}", serverPath, localPath);
 			Client.Merge (this);
 		}// Merge
 		
-		public override void Update (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnUpdate (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
 		{
 			foreach (FilePath localPath in localPaths)
 				Client.Update (localPath.FullPath, recurse, monitor);
 		}
 
-		public override void Commit (ChangeSet changeSet, IProgressMonitor monitor)
+		protected override void OnCommit (ChangeSet changeSet, IProgressMonitor monitor)
 		{
 			Client.Commit (changeSet, monitor);
 			FileService.NotifyFileChanged (changeSet.BaseLocalPath);
 		}
 
-		public override void Checkout (FilePath targetLocalPath, Revision rev, bool recurse, IProgressMonitor monitor)
+		protected override void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, IProgressMonitor monitor)
 		{
 			MercurialRevision brev = (null == rev)? new MercurialRevision (this, MercurialRevision.HEAD): (MercurialRevision)rev;
 			Client.Checkout (Url, targetLocalPath.FullPath, brev, recurse, monitor);
 		}
 
-		public override void Revert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnRevert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
 		{
 			foreach (FilePath localPath in localPaths)
 				Client.Revert (localPath.FullPath, recurse, monitor, new MercurialRevision (this, MercurialRevision.HEAD));
 		}
 		
-		public override void Add (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnAdd (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
 		{
 			foreach (FilePath localPath in localPaths)
 				Client.Add (localPath.FullPath, recurse, monitor);
 		}
 
-		public override string GetTextAtRevision (FilePath repositoryPath, Revision revision)
+		protected override string OnGetTextAtRevision (FilePath repositoryPath, Revision revision)
 		{
 			// System.Console.WriteLine ("Got GetTextAtRevision for {0}", repositoryPath);
 			MercurialRevision brev = (null == revision)? new MercurialRevision (this, MercurialRevision.HEAD): (MercurialRevision)revision;
 			return Client.GetTextAtRevision (repositoryPath.FullPath, brev);
 		}
 
-		public override void RevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		protected override void OnRevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
 		{
 			if (IsModified (MercurialRepository.GetLocalBasePath (localPath))) {
 				MessageDialog md = new MessageDialog (MonoDevelop.Ide.IdeApp.Workbench.RootWindow, DialogFlags.Modal, 
 			Client.Revert (localPath.FullPath, true, monitor, brev);
 		}
 
-		public override void RevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		protected override void OnRevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
 		{
 //			if (IsModified (MercurialRepository.GetLocalBasePath (localPath))) {
 //				MessageDialog md = new MessageDialog (null, DialogFlags.Modal, 
 			return (null != info && info.IsVersioned && info.HasLocalChanges);
 		}
 
-		public override void MoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		protected override void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
 		{
 			Client.Move (localSrcPath.FullPath, localDestPath.FullPath, force);
 		}
 
-		public override void MoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		protected override void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
 		{
 			Client.Move (localSrcPath.FullPath, localDestPath.FullPath, force);
 		}		
 			return Client.Diff (localPath, (MercurialRevision)fromRevision, (MercurialRevision)toRevision);
 		}
 
-		public override void DeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor)
+		protected override void OnDeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor)
 		{
 			foreach (FilePath localPath in localPaths)
 				Client.Remove (localPath.FullPath, force, monitor);
 		}// DeleteFiles
 
-		public override void DeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor)
+		protected override void OnDeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor)
 		{
 			foreach (FilePath localPath in localPaths)
 				Client.Remove (localPath.FullPath, force, monitor);

File monodevelop-hg/MonoDevelop.VersionControl.Mercurial.addin.xml

View file
  
 	<Runtime>
 		<Import assembly="MonoDevelop.VersionControl.Mercurial.dll"/>
+		<Import assembly="Mercurial.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="2.8"/>
-		<Addin id="Ide" version="2.8"/>
-		<Addin id="VersionControl" version="2.8"/>
+		<Addin id="Core" version="4.0"/>
+		<Addin id="Ide" version="4.0"/>
+		<Addin id="VersionControl" version="4.0"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">