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

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2009-04-29 10:36:48 -0400 (Wed, 29 Apr 2009)
New Revision: 319

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/name.ml
   trunk/src/props.ml
   trunk/src/update.ml
Log:
* Ignore one hour differences for deciding whether a file may have
  been updated.  This avoids slow update detection after daylight
  saving time changes under Windows.  This makes it slightly more
  likely to miss an update, but that should be safe enough.


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-03-13 02:38:02 UTC (rev 318)
+++ trunk/src/RECENTNEWS	2009-04-29 14:36:48 UTC (rev 319)
@@ -1,3 +1,11 @@
+CHANGES FROM VERSION 2.32.5
+
+* Ignore one hour differences for deciding whether a file may have
+  been updated.  This avoids slow update detection after daylight
+  saving time changes under Windows.  This makes it slightly more
+  likely to miss an update, but that should be safe enough.
+
+-------------------------------
 CHANGES FROM VERSION 2.32.4
 
 * Text UI now includes the current time in its completion message

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-03-13 02:38:02 UTC (rev 318)
+++ trunk/src/mkProjectInfo.ml	2009-04-29 14:36:48 UTC (rev 319)
@@ -102,3 +102,4 @@
 
 
 
+

Modified: trunk/src/name.ml
===================================================================
--- trunk/src/name.ml	2009-03-13 02:38:02 UTC (rev 318)
+++ trunk/src/name.ml	2009-04-29 14:36:48 UTC (rev 319)
@@ -27,4 +27,4 @@
   s
 
 let hash n =
-  Hashtbl.hash (if Case.insensitive () then String.lowercase n else n)
+  Hashtbl.hash (if Case.insensitive () then String.lowercase (Case.normalize n) else n)

Modified: trunk/src/props.ml
===================================================================
--- trunk/src/props.ml	2009-03-13 02:38:02 UTC (rev 318)
+++ trunk/src/props.ml	2009-04-29 14:36:48 UTC (rev 319)
@@ -562,8 +562,11 @@
    we have to compare then using "similar". *)
 let same p p' =
   match p, p' with
-    Synced _, Synced _ -> similar p p'
-  | _                  -> extract p = extract p'
+    Synced _, Synced _ ->
+      similar p p'
+  | _                  ->
+      let delta = extract p -. extract p' in
+      delta = 0. || delta = 3600. || delta = -3600.
 
 let init _ = ()
 

Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml	2009-03-13 02:38:02 UTC (rev 318)
+++ trunk/src/update.ml	2009-04-29 14:36:48 UTC (rev 319)
@@ -17,8 +17,9 @@
    archive changes: old archives will then automatically be discarded.  (We
    do not use the unison version number for this because usually the archive
    representation does not change between unison versions.) *)
-(*FIX: change the approximate function in props.ml next time the
+(*FIX: Use similar_correct in props.ml next time the
   format is modified (see file props.ml for the new function) *)
+(*FIX: use Case.normalize next time the format is modified *)
 (*FIX: also change Fileinfo.stamp to drop the info.ctime component, next time the
   format is modified *)
 (*FIX: also make Jerome's suggested change about file times (see his mesg in