[Unison-hackers] [unison-svn] r465 - in trunk/src: . system
vouillon at seas.upenn.edu
vouillon at seas.upenn.edu
Fri Oct 8 11:46:46 EDT 2010
Author: vouillon
Date: 2010-10-08 11:46:46 -0400 (Fri, 08 Oct 2010)
New Revision: 465
Modified:
trunk/src/Makefile
trunk/src/RECENTNEWS
trunk/src/fpcache.ml
trunk/src/mkProjectInfo.ml
trunk/src/osx.ml
trunk/src/recon.ml
trunk/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: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/Makefile 2010-10-08 15:46:46 UTC (rev 465)
@@ -60,11 +60,11 @@
# NAME, VERSION, and MAJORVERSION, automatically generated
-include Makefile.ProjectInfo
-Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
- ocaml str.cma unix.cma ./mkProjectInfo.ml > $@
+Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
+ ./mkProjectInfo > $@
-#mkProjectInfo: mkProjectInfo.ml
-# ocamlc -o $@ unix.cma str.cma $^
+mkProjectInfo: mkProjectInfo.ml
+ ocamlc -o $@ unix.cma str.cma $^
clean::
$(RM) mkProjectInfo
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/RECENTNEWS 2010-10-08 15:46:46 UTC (rev 465)
@@ -1,3 +1,12 @@
+CHANGES FROM VERSION 2.43.7
+
+* 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.43.6
* A small fix suggested by Jerome. Still thinking about what needs to
Modified: trunk/src/fpcache.ml
===================================================================
--- trunk/src/fpcache.ml 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/fpcache.ml 2010-10-08 15:46:46 UTC (rev 465)
@@ -238,15 +238,17 @@
let fingerprint ?(newfile=false) fastCheck currfspath path info optDig =
let res =
try
- let (oldDesc, oldDig, oldStamp, oldRess) as res =
- PathTbl.find tbl (Path.toString path) in
+ 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: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/mkProjectInfo.ml 2010-10-08 15:46:46 UTC (rev 465)
@@ -52,3 +52,4 @@
Printf.printf "NAME=%s\n" projectName;;
+
Modified: trunk/src/osx.ml
===================================================================
--- trunk/src/osx.ml 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/osx.ml 2010-10-08 15:46:46 UTC (rev 465)
@@ -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: trunk/src/recon.ml
===================================================================
--- trunk/src/recon.ml 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/recon.ml 2010-10-08 15:46:46 UTC (rev 465)
@@ -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: trunk/src/system/system_win_stubs.c
===================================================================
--- trunk/src/system/system_win_stubs.c 2010-10-08 15:44:59 UTC (rev 464)
+++ trunk/src/system/system_win_stubs.c 2010-10-08 15:46:46 UTC (rev 465)
@@ -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
};
/****/
More information about the Unison-hackers
mailing list