[Unison-hackers] [unison-svn] r327 - in trunk: doc src

[Benjamin C. Pierce]

Author: bcpierce
Date: 2009-05-05 08:41:35 -0400 (Tue, 05 May 2009)
New Revision: 327

Modified:
   trunk/doc/unison-manual.tex
   trunk/src/RECENTNEWS
   trunk/src/case.ml
   trunk/src/mkProjectInfo.ml
   trunk/src/update.ml
Log:
* Incorporate recent change from 2.32 branch.



Modified: trunk/doc/unison-manual.tex
===================================================================
--- trunk/doc/unison-manual.tex	2009-05-04 18:48:23 UTC (rev 326)
+++ trunk/doc/unison-manual.tex	2009-05-05 12:41:35 UTC (rev 327)
@@ -51,7 +51,7 @@
   \LARGE%
   Version \unisonversion \\[4ex] %
   % \today %
-  \large Copyright 1998-2008, Benjamin C. Pierce
+  \large Copyright 1998-2009, Benjamin C. Pierce
   \end{center}%
 \fi%
 %

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-05-04 18:48:23 UTC (rev 326)
+++ trunk/src/RECENTNEWS	2009-05-05 12:41:35 UTC (rev 327)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.33.1
+
+* Incorporate recent change from 2.32 branch.
+
+
+-------------------------------
 CHANGES FROM VERSION 2.33.-4
 
 * Updated list of bad Windows file names following the MSDN

Modified: trunk/src/case.ml
===================================================================
--- trunk/src/case.ml	2009-05-04 18:48:23 UTC (rev 326)
+++ trunk/src/case.ml	2009-05-05 12:41:35 UTC (rev 327)
@@ -90,7 +90,7 @@
 
 let rmTrailDots s =
   s
-(*FIX: disabled for know -- requires an archive version change
+(*FIX: disabled for now -- requires an archive version change
   if
     Prefs.read someHostIsRunningWindows &&
     not (Prefs.read allHostsAreRunningWindows) &&

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-05-04 18:48:23 UTC (rev 326)
+++ trunk/src/mkProjectInfo.ml	2009-05-05 12:41:35 UTC (rev 327)
@@ -106,3 +106,4 @@
 
 
 
+

Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml	2009-05-04 18:48:23 UTC (rev 326)
+++ trunk/src/update.ml	2009-05-05 12:41:35 UTC (rev 327)
@@ -1004,56 +1004,57 @@
 
 (** Status display **)
 
-(* BCP (3/09) We used to try to be smart about showing status messages
-   at regular intervals, but people seem to find this confusing.
-   Let's replace all this with something simpler -- just show directories as
-   they are scanned...  (but I'll leave the code in for now, in case we find
-   we want to restore the old behavior). *)
-(*
-  let bigFileLength = 10 * 1024
-  let bigFileLengthFS = Uutil.Filesize.ofInt bigFileLength
-  let smallFileLength = 1024
-  let fileLength = ref 0
-  let t0 = ref 0.
+let bigFileLength = 10 * 1024
+let bigFileLengthFS = Uutil.Filesize.ofInt bigFileLength
+let smallFileLength = 1024
+let fileLength = ref 0
+let t0 = ref 0.
 
-  (* Note that we do *not* want to do any status displays from the server
-     side, since this will cause the server to block until the client has
-     finished its own update detection and can receive and acknowledge
-     the status display message -- thus effectively serializing the client 
-     and server! *)
-  let showStatusAddLength info =
-    if not !Trace.runningasserver then begin
-      let len1 = Props.length info.Fileinfo.desc in
-      let len2 = Osx.ressLength info.Fileinfo.osX.Osx.ressInfo in
-      if len1 >= bigFileLengthFS || len2 >= bigFileLengthFS then
-        fileLength := bigFileLength
-      else
-        fileLength :=
-          min bigFileLength
-           (!fileLength + Uutil.Filesize.toInt len1 + Uutil.Filesize.toInt len2)
-    end
+(* Note that we do *not* want to do any status displays from the server
+   side, since this will cause the server to block until the client has
+   finished its own update detection and can receive and acknowledge
+   the status display message -- thus effectively serializing the client 
+   and server! *)
+let showStatusAddLength info =
+  if not !Trace.runningasserver then begin
+    let len1 = Props.length info.Fileinfo.desc in
+    let len2 = Osx.ressLength info.Fileinfo.osX.Osx.ressInfo in
+    if len1 >= bigFileLengthFS || len2 >= bigFileLengthFS then
+      fileLength := bigFileLength
+    else
+      fileLength :=
+        min bigFileLength
+         (!fileLength + Uutil.Filesize.toInt len1 + Uutil.Filesize.toInt len2)
+  end
 
-  let showStatus path =
-    if not !Trace.runningasserver then begin
-      fileLength := !fileLength + smallFileLength;
-      if !fileLength >= bigFileLength then begin
-        fileLength := 0;
-        let t = Unix.gettimeofday () in
-        if t -. !t0 > 0.05 then begin
-          Trace.statusDetail ("scanning... got to " ^ Path.toString path);
-          t0 := t
-        end
+let showStatus path =
+  if not !Trace.runningasserver then begin
+    fileLength := !fileLength + smallFileLength;
+    if !fileLength >= bigFileLength then begin
+      fileLength := 0;
+      let t = Unix.gettimeofday () in
+      if t -. !t0 > 0.05 then begin
+        Trace.statusDetail ("scanning... " ^ Path.toString path);
+        t0 := t
       end
     end
-*)
+  end
 
+let showStatusDir path = ()
+
+(* BCP (4/09) The code above tries to be smart about showing status messages
+   at regular intervals, but people seem to find this confusing.
+   I tried replace all this with something simpler -- just show directories as
+   they are scanned -- but this seems worse: it prints far too much stuff.
+   So I'm going to revert to the old version. *)
+(*
 let showStatus path = ()
 let showStatusAddLength info = ()
-
 let showStatusDir path =
   if not !Trace.runningasserver then begin
         Trace.statusDetail ("scanning... " ^ Path.toString path);
   end
+*)
 
 (* ------- *)