[Unison-hackers] [unison-svn] r464 - in branches/2.40/src: . system

[vouillon at seas.upenn.edu]

Author: vouillon
Date: 2010-10-08 11:44:59 -0400 (Fri, 08 Oct 2010)
New Revision: 464

Modified:
   branches/2.40/src/Makefile
   branches/2.40/src/RECENTNEWS
   branches/2.40/src/fpcache.ml
   branches/2.40/src/mkProjectInfo.ml
   branches/2.40/src/osx.ml
   branches/2.40/src/recon.ml
   branches/2.40/src/system/system_win_stubs.c
Log:
* Fixed fingerprint cache: do not cache file properties
* Fixed O_APPEND mode for open under Windows (the previous attempt in
  revision 422 was incomplete)
* Fixed String.sub invalid argument error when an AppleDouble file does
  not contain a finder information field


Modified: branches/2.40/src/Makefile
===================================================================
--- branches/2.40/src/Makefile	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/Makefile	2010-10-08 15:44:59 UTC (rev 464)
@@ -61,10 +61,10 @@
 -include Makefile.ProjectInfo
 
 Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
-	ocaml str.cma unix.cma ./mkProjectInfo.ml > $@
+	./mkProjectInfo > $@
 
-#mkProjectInfo: mkProjectInfo.ml
-#	ocamlc -o $@ unix.cma str.cma $^
+mkProjectInfo: mkProjectInfo.ml
+	ocamlc -o $@ unix.cma str.cma $^
 
 clean::
 	$(RM) mkProjectInfo

Modified: branches/2.40/src/RECENTNEWS
===================================================================
--- branches/2.40/src/RECENTNEWS	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/RECENTNEWS	2010-10-08 15:44:59 UTC (rev 464)
@@ -1,5 +1,14 @@
 CHANGES FROM VERSION 2.40.16
 
+* Fixed fingerprint cache: do not cache file properties
+* Fixed O_APPEND mode for open under Windows (the previous attempt in
+  revision 422 was incomplete)
+* Fixed String.sub invalid argument error when an AppleDouble file does
+  not contain a finder information field
+
+-------------------------------
+CHANGES FROM VERSION 2.40.16
+
 * Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12.
 
 -------------------------------

Modified: branches/2.40/src/fpcache.ml
===================================================================
--- branches/2.40/src/fpcache.ml	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/fpcache.ml	2010-10-08 15:44:59 UTC (rev 464)
@@ -238,15 +238,17 @@
 let fingerprint fastCheck currfspath path info optDig =
   let res =
     try
-      let (oldDesc, oldDig, oldStamp, oldRess) as res =
+      let (cachedDesc, cachedDig, cachedStamp, cachedRess) =
         PathTbl.find tbl (Path.toString path) in
       if
-        not (clearlyUnchanged fastCheck path info oldDesc oldStamp oldRess)
+        not (clearlyUnchanged
+               fastCheck path info cachedDesc cachedStamp cachedRess)
       then
         raise Not_found;
       debug (fun () -> Util.msg "cache hit for path %s\n"
                          (Path.toDebugString path));
-      res
+      (info.Fileinfo.desc, cachedDig, Fileinfo.stamp info,
+       Fileinfo.ressStamp info)
     with Not_found ->
       if fastCheck then
         debug (fun () -> Util.msg "cache miss for path %s\n"

Modified: branches/2.40/src/mkProjectInfo.ml
===================================================================
--- branches/2.40/src/mkProjectInfo.ml	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/mkProjectInfo.ml	2010-10-08 15:44:59 UTC (rev 464)
@@ -118,3 +118,4 @@
 
 
 
+

Modified: branches/2.40/src/osx.ml
===================================================================
--- branches/2.40/src/osx.ml	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/osx.ml	2010-10-08 15:44:59 UTC (rev 464)
@@ -291,7 +291,7 @@
                   readDoubleFromOffset
                     dataFspath dataPath doubleFspath inch ofs 32
                 with Not_found ->
-                  "")
+                  String.make 32 '\000')
                 (fun () -> close_in_noerr inch)
             in
             close_in inch;

Modified: branches/2.40/src/recon.ml
===================================================================
--- branches/2.40/src/recon.ml	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/recon.ml	2010-10-08 15:44:59 UTC (rev 464)
@@ -163,7 +163,7 @@
     ("Including the preference \\texttt{-nodeletion \\ARG{root}} prevents \
       Unison from performing any file deletion on root \\ARG{root}.\n\n\
       This preference can be included twice, once for each root, if you \
-      want to prevent any creation.")
+      want to prevent any deletion.")
 
 let noUpdate =
   Prefs.createStringList "noupdate"

Modified: branches/2.40/src/system/system_win_stubs.c
===================================================================
--- branches/2.40/src/system/system_win_stubs.c	2010-09-06 16:37:04 UTC (rev 463)
+++ branches/2.40/src/system/system_win_stubs.c	2010-10-08 15:44:59 UTC (rev 464)
@@ -45,7 +45,7 @@
 };
 
 static int open_create_flags[12] = {
-  0, 0, 0, 0, 0, O_CREAT, O_TRUNC, O_EXCL, 0, 0, 0, 0
+  0, 0, 0, 0, O_APPEND, O_CREAT, O_TRUNC, O_EXCL, 0, 0, 0, 0
 };
 
 /****/