Author: lluis
Date: 2007-12-01 12:34:22 -0500 (Sat, 01 Dec 2007)
New Revision: 90517

Modified:
   trunk/monodevelop/Extras/VersionControl/ChangeLog
   
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
   trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/ChangeLog
   
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
   
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
   
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
   
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
Log:
* 
MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs,
  MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs,
  
MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs,
  MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs:
  In some cases it may be possible to natively move files between two
  repositories (e.g. if they are in the same server). Added a virtual
  method to check that and implemented it for SVN.
* 
MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
  Add support for version control commands for all kinds of combine
  entries, not only Project and Combine.

Modified: trunk/monodevelop/Extras/VersionControl/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/VersionControl/ChangeLog   2007-12-01 17:31:24 UTC 
(rev 90516)
+++ trunk/monodevelop/Extras/VersionControl/ChangeLog   2007-12-01 17:34:22 UTC 
(rev 90517)
@@ -1,3 +1,10 @@
+2007-12-01  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * 
MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
+         In some cases it may be possible to natively move files between two
+         repositories (e.g. if they are in the same server). Added a virtual
+         method to check that and implemented it for SVN.
+
 2007-11-09  Michael Hutchinson <[EMAIL PROTECTED]> 
 
        * 
MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/ChangeLog
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/ChangeLog    
    2007-12-01 17:31:24 UTC (rev 90516)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/ChangeLog    
    2007-12-01 17:34:22 UTC (rev 90517)
@@ -1,3 +1,15 @@
+2007-12-01  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.VersionControl/Repository.cs,
+         MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs,
+         MonoDevelop.VersionControl/UrlBasedRepository.cs: In some cases it may
+         be possible to natively move files between two repositories (e.g. if
+         they are in the same server). Added a virtual method to check that and
+         implemented it for SVN.
+       * MonoDevelop.VersionControl/VersionControlNodeExtension.cs: Add 
support for
+         version control commands for all kinds of combine entries, not only
+         Project and Combine.
+
 2007-11-13  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * MonoDevelop.VersionControl.Views/Logs.cs: Don't disable the view if

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
 2007-12-01 17:31:24 UTC (rev 90516)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
 2007-12-01 17:34:22 UTC (rev 90517)
@@ -220,8 +220,13 @@
                
                // Adds a file or directory to the repository
                public abstract void Add (string localPath, bool recurse, 
IProgressMonitor monitor);
-               
 
+               // Returns true if the file can be moved from source location 
(and repository) to this repository
+               public virtual bool CanMoveFileFrom (Repository srcRepository, 
string localSrcPath, string localDestPath)
+               {
+                       return srcRepository == this;
+               }
+
                // Moves a file. This method may be called for versioned and 
unversioned
                // files. The default implementetions performs a system file 
move.
                // It's up to the implementation to decide how smart the 
MoveFile method is.

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
 2007-12-01 17:31:24 UTC (rev 90516)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
 2007-12-01 17:34:22 UTC (rev 90517)
@@ -42,16 +42,9 @@
                {
                        get {
                                if (method.Length == 0)
-                                       return "";
-                               string login = "";
-                               if (this.User != "") {
-                                       login += this.User;
-                                       if (this.Pass != "")
-                                               login += ":" + this.Pass;
-                                       login += "@";
-                               }
+                                       return "";
                                string sdir = dir.StartsWith ("/") ? 
dir.Substring (1) : dir;
-                               return method + "://" + login + this.Server + 
(port > 0 ? ":"+port.ToString() : "") + "/" + sdir;
+                               return Root + "/" + sdir;
                        }
                        set {
                                try {
@@ -110,6 +103,21 @@
                {
                        get { return method; }
                        set { method = value; }
-               }       
+               }
+               
+               public string Root {
+                       get {
+                               if (method.Length == 0)
+                                       return "";
+                               string login = "";
+                               if (this.User != "") {
+                                       login += this.User;
+                                       if (this.Pass != "")
+                                               login += ":" + this.Pass;
+                                       login += "@";
+                               }
+                               return method + "://" + login + this.Server + 
(port > 0 ? ":"+port.ToString() : "");
+                       }
+               }
        }
 }

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
  2007-12-01 17:31:24 UTC (rev 90516)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
  2007-12-01 17:34:22 UTC (rev 90517)
@@ -48,7 +48,7 @@
                        Repository srcRepo = GetRepository (source);
                        Repository dstRepo = GetRepository (dest);
                        
-                       if (srcRepo == dstRepo)
+                       if (dstRepo.CanMoveFileFrom (srcRepo, source, dest))
                                srcRepo.MoveFile (source, dest, true, monitor);
                        else {
                                CopyFile (source, dest, true);

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
        2007-12-01 17:31:24 UTC (rev 90516)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
        2007-12-01 17:34:22 UTC (rev 90517)
@@ -26,9 +26,8 @@
                        //Console.Error.WriteLine(dataType);
                        return typeof(ProjectFile).IsAssignableFrom (dataType)
                                || typeof(SystemFile).IsAssignableFrom 
(dataType)
-                               || typeof(Project).IsAssignableFrom (dataType)
                                || typeof(ProjectFolder).IsAssignableFrom 
(dataType)
-                               || typeof(Combine).IsAssignableFrom (dataType);
+                               || typeof(CombineEntry).IsAssignableFrom 
(dataType);
                }
                
                public VersionControlNodeExtension ()
@@ -297,21 +296,15 @@
                                path = file.Path;
                                isDir = false;
                                pentry = file.Project;
-                       } else if (CurrentNode.DataItem is Project) {
-                               Project project = (Project)CurrentNode.DataItem;
-                               path = project.BaseDirectory;
-                               isDir = true;
-                               pentry = project;
                        } else if (CurrentNode.DataItem is ProjectFolder) {
                                ProjectFolder f = 
((ProjectFolder)CurrentNode.DataItem);
                                path = f.Path;
                                isDir = true;
                                pentry = f.Project;
-                       } else if (CurrentNode.DataItem is Combine) {
-                               Combine c = ((Combine)CurrentNode.DataItem);
-                               path = c.BaseDirectory;
-                               isDir = true;                           
-                               pentry = c;
+                       } else if (CurrentNode.DataItem is CombineEntry) {
+                               pentry = ((CombineEntry)CurrentNode.DataItem);
+                               path = pentry.BaseDirectory;
+                               isDir = true;
                        } else {
                                Console.Error.WriteLine(CurrentNode.DataItem);
                                return TestResult.NoVersionControl;

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
 2007-12-01 17:31:24 UTC (rev 90516)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
 2007-12-01 17:34:22 UTC (rev 90517)
@@ -184,6 +184,11 @@
                                Svn.Add (path, recurse, monitor);
                }
                
+               public override bool CanMoveFileFrom (Repository srcRepository, 
string localSrcPath, string localDestPath)
+               {
+                       return (srcRepository is SubversionRepository) && 
((SubversionRepository)srcRepository).Root == Root;
+               }
+               
                public override void MoveFile (string srcPath, string destPath, 
bool force, IProgressMonitor monitor)
                {
                        bool destIsVersioned = false;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to