[Unison-hackers] [unison-svn] r286 - trunk/src

[ALAN SCHMITT]

Author: schmitta
Date: 2008-06-21 11:20:39 -0400 (Sat, 21 Jun 2008)
New Revision: 286

Modified:
   trunk/src/RECENTNEWS
   trunk/src/files.mli
   trunk/src/mkProjectInfo.ml
   trunk/src/remote.mli
   trunk/src/transport.ml
Log:
Follow maxthreads preference when transferring directories.

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2008-06-21 15:17:48 UTC (rev 285)
+++ trunk/src/RECENTNEWS	2008-06-21 15:20:39 UTC (rev 286)
@@ -1,3 +1,7 @@
+CHANGES FROM VERSION 2.29.1
+
+Follow maxthreads preference when transferring directories.
+-------------------------------
 CHANGES FROM VERSION 2.29.0
 
 This version introduces some pretty big changes, by BCP in

Modified: trunk/src/files.mli
===================================================================
--- trunk/src/files.mli	2008-06-21 15:17:48 UTC (rev 285)
+++ trunk/src/files.mli	2008-06-21 15:20:39 UTC (rev 286)
@@ -13,6 +13,10 @@
   -> Common.updateItem           (* updates that will be discarded *)
   -> unit Lwt.t
 
+(* Region used for the copying. Exported to be correctly set in transport.ml *)
+(* to the maximum number of threads                                          *)
+val copyReg : Lwt_util.region
+
 (* Copy a path in one replica to another path in a second replica.  The copy *)
 (* is performed atomically (or as close to atomically as the os will         *)
 (* support) using temporary files.                                           *)

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2008-06-21 15:17:48 UTC (rev 285)
+++ trunk/src/mkProjectInfo.ml	2008-06-21 15:20:39 UTC (rev 286)
@@ -71,3 +71,4 @@
 
 
 
+

Modified: trunk/src/remote.mli
===================================================================
--- trunk/src/remote.mli	2008-06-21 15:17:48 UTC (rev 285)
+++ trunk/src/remote.mli	2008-06-21 15:20:39 UTC (rev 286)
@@ -96,7 +96,7 @@
 val registerRootCmdWithConnection :
     string                          (* command name *)
  -> (connection -> 'a -> 'b Lwt.t)  (* local command *)
- ->    Common.root                  (* root on with the command is executed *)
+ ->    Common.root                  (* root on which the command is executed *)
     -> Common.root                  (* other root *)
     -> 'a                           (* additional arguments *)
     -> 'b Lwt.t                     (* result *)

Modified: trunk/src/transport.ml
===================================================================
--- trunk/src/transport.ml	2008-06-21 15:17:48 UTC (rev 285)
+++ trunk/src/transport.ml	2008-06-21 15:20:39 UTC (rev 286)
@@ -72,6 +72,7 @@
 
 let doAction (fromRoot,toRoot) path fromContents toContents id =
   Lwt_util.resize_region actionReg (Prefs.read maxthreads);
+  Lwt_util.resize_region Files.copyReg (Prefs.read maxthreads);
   Lwt_util.run_in_region actionReg 1 (fun () ->
     if not !Trace.sendLogMsgsToStderr then
       Trace.statusDetail (Path.toString path);