[Unison-hackers] [unison-svn] r289 - in trunk: doc src src/lwt src/ubase src/uimacnew
Benjamin C. Pierce
bcpierce at seas.upenn.edu
Mon Jun 23 18:06:46 EDT 2008
Author: bcpierce
Date: 2008-06-23 18:05:17 -0400 (Mon, 23 Jun 2008)
New Revision: 289
Modified:
trunk/doc/unison-manual.tex
trunk/src/RECENTNEWS
trunk/src/abort.ml
trunk/src/case.ml
trunk/src/case.mli
trunk/src/checksum.ml
trunk/src/checksum.mli
trunk/src/clroot.ml
trunk/src/clroot.mli
trunk/src/common.ml
trunk/src/common.mli
trunk/src/copy.ml
trunk/src/fileinfo.ml
trunk/src/fileinfo.mli
trunk/src/files.ml
trunk/src/files.mli
trunk/src/fileutil.ml
trunk/src/fileutil.mli
trunk/src/fingerprint.ml
trunk/src/fingerprint.mli
trunk/src/fspath.ml
trunk/src/fspath.mli
trunk/src/globals.ml
trunk/src/globals.mli
trunk/src/linkgtk.ml
trunk/src/linkgtk2.ml
trunk/src/linktext.ml
trunk/src/linktk.ml
trunk/src/lock.ml
trunk/src/lock.mli
trunk/src/lwt/pqueue.ml
trunk/src/lwt/pqueue.mli
trunk/src/main.ml
trunk/src/mkProjectInfo.ml
trunk/src/name.ml
trunk/src/name.mli
trunk/src/os.ml
trunk/src/os.mli
trunk/src/osx.ml
trunk/src/osx.mli
trunk/src/osxsupport.c
trunk/src/path.ml
trunk/src/path.mli
trunk/src/pixmaps.ml
trunk/src/pred.ml
trunk/src/pred.mli
trunk/src/props.ml
trunk/src/props.mli
trunk/src/recon.ml
trunk/src/recon.mli
trunk/src/remote.ml
trunk/src/remote.mli
trunk/src/sortri.ml
trunk/src/sortri.mli
trunk/src/stasher.ml
trunk/src/strings.mli
trunk/src/test.ml
trunk/src/test.mli
trunk/src/transfer.ml
trunk/src/transfer.mli
trunk/src/transport.ml
trunk/src/transport.mli
trunk/src/tree.ml
trunk/src/tree.mli
trunk/src/ubase/rx.ml
trunk/src/ubase/rx.mli
trunk/src/ubase/safelist.ml
trunk/src/ubase/safelist.mli
trunk/src/ubase/trace.ml
trunk/src/ubase/trace.mli
trunk/src/ubase/uarg.ml
trunk/src/ubase/util.ml
trunk/src/ubase/util.mli
trunk/src/ui.mli
trunk/src/uicommon.ml
trunk/src/uicommon.mli
trunk/src/uigtk2.ml
trunk/src/uigtk2.mli
trunk/src/uimacnew/ProgressCell.m
trunk/src/uitext.ml
trunk/src/uitext.mli
trunk/src/update.ml
trunk/src/update.mli
trunk/src/uutil.ml
trunk/src/uutil.mli
trunk/src/xferhint.ml
trunk/src/xferhint.mli
Log:
* When using the internal transfer method, remove any temp file on the
destination (which may be left over from a previous interrupted run
of Unison) before starting the transfer.
* Fixed (hopefully!) the bug causing Unison to backup the new archive
version after a (partially or fully) successful merge.
* Updated copyright notices to 2008. :-)
Modified: trunk/doc/unison-manual.tex
===================================================================
--- trunk/doc/unison-manual.tex 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/doc/unison-manual.tex 2008-06-23 22:05:17 UTC (rev 289)
@@ -2042,7 +2042,7 @@
small files by itself, but can be useful for testing.) If you set it to a
larger value, Unison will use the external utility for all files larger than
this size (which is given in kilobytes, so setting it to 1000 will cause the
-external tool to be used for all transfers larger than a megabyte).
+external tool to be used for all transfers larger than a megabyte).
If you want to use a different external copy utility, set the {\tt copyprog}
preference.
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/RECENTNEWS 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,3 +1,16 @@
+CHANGES FROM VERSION 2.29.4
+
+* When using the internal transfer method, remove any temp file on the
+ destination (which may be left over from a previous interrupted run
+ of Unison) before starting the transfer.
+
+* Fixed (hopefully!) the bug causing Unison to backup the new archive
+ version after a (partially or fully) successful merge.
+
+* Updated copyright notices to 2008. :-)
+
+
+-------------------------------
CHANGES FROM VERSION 2.29.3
* Updated documentation to describe new features
Modified: trunk/src/abort.ml
===================================================================
--- trunk/src/abort.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/abort.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/abort.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let debug = Trace.debug "abort"
Modified: trunk/src/case.ml
===================================================================
--- trunk/src/case.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/case.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/case.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* The update detector, reconciler, and transporter behave differently *)
(* depending on whether the local and/or remote file system is case *)
Modified: trunk/src/case.mli
===================================================================
--- trunk/src/case.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/case.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/case.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
val insensitive : unit -> bool
Modified: trunk/src/checksum.ml
===================================================================
--- trunk/src/checksum.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/checksum.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/checksum.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* The checksum (or fast fingerprinting) algorithm must be fast and has to *)
(* be called in a rolling fashion (i.e. we must be able to calculate a new *)
Modified: trunk/src/checksum.mli
===================================================================
--- trunk/src/checksum.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/checksum.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/checksum.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type t = int
type u = int array
Modified: trunk/src/clroot.ml
===================================================================
--- trunk/src/clroot.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/clroot.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/clroot.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*
This file parses the unison command-line arguments that
Modified: trunk/src/clroot.mli
===================================================================
--- trunk/src/clroot.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/clroot.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/clroot.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Command-line roots *)
type clroot =
Modified: trunk/src/common.ml
===================================================================
--- trunk/src/common.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/common.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/common.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type hostname = string
Modified: trunk/src/common.mli
===================================================================
--- trunk/src/common.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/common.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/common.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(***************************************************************************)
(* COMMON TYPES USED BY ALL MODULES *)
Modified: trunk/src/copy.ml
===================================================================
--- trunk/src/copy.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/copy.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/copy.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let (>>=) = Lwt.bind
@@ -326,8 +326,13 @@
(if ressOnly then
(* Skip data fork *)
Lwt.return ()
- else
+ else begin
(* Data fork *)
+ if Os.exists fspathTo pathTo then begin
+ debug (fun() -> Util.msg "Removing old temp file %s / %s\n"
+ (Fspath.toString fspathTo) (Path.toString pathTo));
+ Os.delete fspathTo pathTo
+ end;
startReceivingFile
fspathTo pathTo realPathTo `DATA update srcFileSize id file_id
>>= (fun (outfd, infd, firstBi, remBi) ->
@@ -348,7 +353,7 @@
Remote.MsgIdMap.remove file_id !decompressor; (* For GC *)
close_all_no_error infd outfd;
Lwt.fail e)
- )) >>= (fun () ->
+ )end) >>= (fun () ->
(* Resource fork *)
(if ressLength > Uutil.Filesize.zero then begin
Modified: trunk/src/fileinfo.ml
===================================================================
--- trunk/src/fileinfo.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fileinfo.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fileinfo.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let debugV = Util.debug "fileinfo+"
Modified: trunk/src/fileinfo.mli
===================================================================
--- trunk/src/fileinfo.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fileinfo.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fileinfo.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type typ = [`ABSENT | `FILE | `DIRECTORY | `SYMLINK]
val type2string : typ -> string
Modified: trunk/src/files.ml
===================================================================
--- trunk/src/files.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/files.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/files.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
open Lwt
@@ -884,6 +884,7 @@
(Path.toString path));
if not (Stasher.shouldBackupCurrent path) then
Util.msg "Warning: 'backupcurrent' is not set for path %s\n" (Path.toString path);
+ Stasher.stashCurrentVersion workingDirForMerge localPath1 (Some workingarch);
let infoarch = Fileinfo.get false workingDirForMerge workingarch in
let dig = Os.fingerprint arch_fspath Path.empty infoarch in
debug (fun () -> Util.msg "New digest is %s\n" (Os.fullfingerprint_to_string dig));
Modified: trunk/src/files.mli
===================================================================
--- trunk/src/files.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/files.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/files.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* As usual, these functions should only be called by the client (i.e., in *)
(* the same address space as the user interface). *)
Modified: trunk/src/fileutil.ml
===================================================================
--- trunk/src/fileutil.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fileutil.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fileutil.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Convert backslashes in a string to forward slashes. Useful in Windows. *)
let backslashes2forwardslashes s0 =
Modified: trunk/src/fileutil.mli
===================================================================
--- trunk/src/fileutil.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fileutil.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fileutil.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Convert backslashes in a string to forward slashes. Useful in Windows. *)
val backslashes2forwardslashes : string -> string
Modified: trunk/src/fingerprint.ml
===================================================================
--- trunk/src/fingerprint.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fingerprint.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fingerprint.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* NOTE: IF YOU CHANGE TYPE "FINGERPRINT", THE ARCHIVE FORMAT CHANGES; *)
(* INCREMENT "UPDATE.ARCHIVEFORMAT" *)
Modified: trunk/src/fingerprint.mli
===================================================================
--- trunk/src/fingerprint.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fingerprint.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fingerprint.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type t
Modified: trunk/src/fspath.ml
===================================================================
--- trunk/src/fspath.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fspath.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fspath.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Defines an abstract type of absolute filenames (fspaths). Keeping the *)
(* type abstract lets us enforce some invariants which are important for *)
Modified: trunk/src/fspath.mli
===================================================================
--- trunk/src/fspath.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/fspath.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fspath.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Defines an abstract type of absolute filenames (fspaths) *)
Modified: trunk/src/globals.ml
===================================================================
--- trunk/src/globals.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/globals.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/globals.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
Modified: trunk/src/globals.mli
===================================================================
--- trunk/src/globals.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/globals.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/globals.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Global variables and functions needed by top-level modules and user *)
(* interfaces *)
Modified: trunk/src/linkgtk.ml
===================================================================
--- trunk/src/linkgtk.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/linkgtk.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/linkgtk.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module TopLevel = Main.Body(Uigtk.Body)
Modified: trunk/src/linkgtk2.ml
===================================================================
--- trunk/src/linkgtk2.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/linkgtk2.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/linkgtk2.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module TopLevel = Main.Body(Uigtk2.Body)
Modified: trunk/src/linktext.ml
===================================================================
--- trunk/src/linktext.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/linktext.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/linktext.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module TopLevel = Main.Body(Uitext.Body)
Modified: trunk/src/linktk.ml
===================================================================
--- trunk/src/linktk.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/linktk.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/linktk.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module TopLevel = Main.Body(Uitk.Body)
Modified: trunk/src/lock.ml
===================================================================
--- trunk/src/lock.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/lock.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/lock.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let rename oldFile newFile =
begin try Unix.link oldFile newFile with Unix.Unix_error _ -> () end;
Modified: trunk/src/lock.mli
===================================================================
--- trunk/src/lock.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/lock.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/lock.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* A simple utility module for setting and releasing inter-process locks
using entries in the filesystem. *)
Modified: trunk/src/lwt/pqueue.ml
===================================================================
--- trunk/src/lwt/pqueue.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/lwt/pqueue.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/lwt/pqueue.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module type OrderedType =
sig
Modified: trunk/src/lwt/pqueue.mli
===================================================================
--- trunk/src/lwt/pqueue.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/lwt/pqueue.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/lwt/pqueue.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module type OrderedType =
sig
Modified: trunk/src/main.ml
===================================================================
--- trunk/src/main.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/main.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/main.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* ---------------------------------------------------------------------- *)
Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/mkProjectInfo.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -74,3 +74,4 @@
+
Modified: trunk/src/name.ml
===================================================================
--- trunk/src/name.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/name.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/name.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* NOTE: IF YOU CHANGE TYPE "NAME", THE ARCHIVE FORMAT CHANGES;
INCREMENT "UPDATE.ARCHIVEFORMAT" *)
Modified: trunk/src/name.mli
===================================================================
--- trunk/src/name.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/name.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/name.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type t
Modified: trunk/src/os.ml
===================================================================
--- trunk/src/os.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/os.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/os.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* This file attempts to isolate operating system specific details from the *)
(* rest of the program. *)
@@ -388,11 +388,11 @@
if Util.osType = `Win32 && not Util.isCygwin then begin
debug (fun()-> Util.msg "Executing external program windows-style\n");
let c = Unix.open_process_in ("\"" ^ cmd ^ "\"") in
- let mergeLog = readChannelTillEof c in
+ let log = readChannelTillEof c in
let returnValue = Unix.close_process_in c in
let mergeResultLog =
cmd ^
- (if mergeLog <> "" then "\n\n" ^ mergeLog else "") ^
+ (if log <> "" then "\n\n" ^ log else "") ^
(if returnValue <> Unix.WEXITED 0 then
"\n\n" ^ Util.process_status_to_string returnValue
else
@@ -403,18 +403,19 @@
Lwt_unix.open_process_full cmd (Unix.environment ())
>>= (fun (out, ipt, err) ->
readChannelsTillEof [out;err]
- >>= (function [mergeLogOut;mergeLogErr] ->
+ >>= (function [logOut;logErr] ->
Lwt_unix.close_process_full (out, ipt, err)
>>= (fun returnValue ->
+ let logOut = Util.trimWhitespace logOut in
+ let logErr = Util.trimWhitespace logErr in
return (returnValue, (
- cmd
- ^ "\n\n" ^
- (if mergeLogOut = "" || mergeLogErr = ""
- then mergeLogOut ^ mergeLogErr
- else mergeLogOut ^ "\n\n" ^ ("Error Output:"^mergeLogErr))
- ^"\n\n"
+ (* cmd
+ ^ "\n\n" ^ *)
+ (if logOut = "" || logErr = ""
+ then logOut ^ logErr
+ else logOut ^ "\n\n" ^ ("Error Output:" ^ logErr))
^ (if returnValue = Unix.WEXITED 0
then ""
- else Util.process_status_to_string returnValue))))
+ else "\n\n" ^ Util.process_status_to_string returnValue))))
(* Stop typechechecker from complaining about non-exhaustive pattern above *)
| _ -> assert false)))
Modified: trunk/src/os.mli
===================================================================
--- trunk/src/os.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/os.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/os.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
val myCanonicalHostName : string
Modified: trunk/src/osx.ml
===================================================================
--- trunk/src/osx.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/osx.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/osx.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
external isMacOSXPred : unit -> bool = "isMacOSX"
Modified: trunk/src/osx.mli
===================================================================
--- trunk/src/osx.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/osx.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/osx.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
val init : bool -> unit
val isMacOSX : bool
Modified: trunk/src/osxsupport.c
===================================================================
--- trunk/src/osxsupport.c 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/osxsupport.c 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
/* Unison file synchronizer: src/osxsupport.c */
-/* Copyright 1999-2007 (see COPYING for details) */
+/* Copyright 1999-2008 (see COPYING for details) */
#include <caml/mlvalues.h>
#include <caml/alloc.h>
Modified: trunk/src/path.ml
===================================================================
--- trunk/src/path.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/path.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/path.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Defines an abstract type of relative pathnames *)
Modified: trunk/src/path.mli
===================================================================
--- trunk/src/path.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/path.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/path.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Abstract type of relative pathnames *)
type 'a path
Modified: trunk/src/pixmaps.ml
===================================================================
--- trunk/src/pixmaps.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/pixmaps.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/pixmaps.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let copyAB color = [|
(* width height num_colors chars_per_pixel *)
Modified: trunk/src/pred.ml
===================================================================
--- trunk/src/pred.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/pred.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/pred.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let debug = Util.debug "pred"
Modified: trunk/src/pred.mli
===================================================================
--- trunk/src/pred.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/pred.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/pred.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Predicates over paths.
Modified: trunk/src/props.ml
===================================================================
--- trunk/src/props.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/props.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/props.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let debug = Util.debug "props"
Modified: trunk/src/props.mli
===================================================================
--- trunk/src/props.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/props.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/props.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* File properties: time, permission, length, etc. *)
Modified: trunk/src/recon.ml
===================================================================
--- trunk/src/recon.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/recon.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/recon.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
Modified: trunk/src/recon.mli
===================================================================
--- trunk/src/recon.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/recon.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/recon.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
val reconcileAll :
Common.updateItem list Common.oneperpath
Modified: trunk/src/remote.ml
===================================================================
--- trunk/src/remote.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/remote.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/remote.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*
XXX
Modified: trunk/src/remote.mli
===================================================================
--- trunk/src/remote.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/remote.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/remote.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module Thread : sig
val unwindProtect : (unit -> 'a Lwt.t) -> (exn -> unit Lwt.t) -> 'a Lwt.t
Modified: trunk/src/sortri.ml
===================================================================
--- trunk/src/sortri.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/sortri.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/sortri.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
Modified: trunk/src/sortri.mli
===================================================================
--- trunk/src/sortri.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/sortri.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/sortri.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Sort a list of recon items according to the current setting of
various preferences (defined in sort.ml, and accessible from the
Modified: trunk/src/stasher.ml
===================================================================
--- trunk/src/stasher.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/stasher.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,6 +1,6 @@
(* Unison file synchronizer: src/stasher.ml *)
(* $I2: Last modified by lescuyer *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*------------------------------------------------------------------------------------*)
(* Preferences for backing up and stashing *)
Modified: trunk/src/strings.mli
===================================================================
--- trunk/src/strings.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/strings.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/strings.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
val docs : (string * (string * string)) list
Modified: trunk/src/test.ml
===================================================================
--- trunk/src/test.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/test.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/test.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let (>>=) = Lwt.(>>=)
Modified: trunk/src/test.mli
===================================================================
--- trunk/src/test.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/test.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/test.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Internal self-tests *)
Modified: trunk/src/transfer.ml
===================================================================
--- trunk/src/transfer.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/transfer.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/transfer.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* rsync compression algorithm
Modified: trunk/src/transfer.mli
===================================================================
--- trunk/src/transfer.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/transfer.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/transfer.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*
Rsync : general algorithm description
Modified: trunk/src/transport.ml
===================================================================
--- trunk/src/transport.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/transport.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/transport.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
open Lwt
Modified: trunk/src/transport.mli
===================================================================
--- trunk/src/transport.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/transport.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/transport.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Executes the actions implied by the reconItem list. *)
val transportItem :
Modified: trunk/src/tree.ml
===================================================================
--- trunk/src/tree.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/tree.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/tree.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type ('a, 'b) t =
Node of ('a * ('a, 'b) t) list * 'b option
Modified: trunk/src/tree.mli
===================================================================
--- trunk/src/tree.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/tree.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/tree.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* An ('a, 'b) t is a tree with 'a-labeled arcs and 'b-labeled nodes. *)
(* Labeling for the internal nodes is optional *)
Modified: trunk/src/ubase/rx.ml
===================================================================
--- trunk/src/ubase/rx.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/rx.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/rx.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*
Inspired by some code and algorithms from Mark William Hopkins
(regexp.tar.gz, available in the comp.compilers file archive)
Modified: trunk/src/ubase/rx.mli
===================================================================
--- trunk/src/ubase/rx.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/rx.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/rx.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
type t
Modified: trunk/src/ubase/safelist.ml
===================================================================
--- trunk/src/ubase/safelist.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/safelist.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/safelist.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let filterBoth f l =
let rec loop r1 r2 = function
Modified: trunk/src/ubase/safelist.mli
===================================================================
--- trunk/src/ubase/safelist.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/safelist.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/safelist.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* All functions here are tail recursive and will work for arbitrary
sized lists (unlike some of the standard ones). The intention is that
Modified: trunk/src/ubase/trace.ml
===================================================================
--- trunk/src/ubase/trace.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/trace.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/trace.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* ---------------------------------------------------------------------- *)
(* Choosing where messages go *)
Modified: trunk/src/ubase/trace.mli
===================================================================
--- trunk/src/ubase/trace.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/trace.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/trace.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* ---------------------------------------------------------------------- *)
(* Debugging support *)
Modified: trunk/src/ubase/uarg.ml
===================================================================
--- trunk/src/ubase/uarg.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/uarg.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/uarg.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* by Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* Slightly modified by BCP, July 1999 *)
Modified: trunk/src/ubase/util.ml
===================================================================
--- trunk/src/ubase/util.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/util.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/util.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*****************************************************************************)
(* CASE INSENSITIVE COMPARISON *)
Modified: trunk/src/ubase/util.mli
===================================================================
--- trunk/src/ubase/util.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ubase/util.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/util.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Miscellaneous utility functions and datatypes *)
Modified: trunk/src/ui.mli
===================================================================
--- trunk/src/ui.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/ui.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ui.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* The module Ui provides only the user interface signature.
Implementations are provided by Uitext and Uitk. *)
Modified: trunk/src/uicommon.ml
===================================================================
--- trunk/src/uicommon.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uicommon.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uicommon.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
open Lwt
Modified: trunk/src/uicommon.mli
===================================================================
--- trunk/src/uicommon.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uicommon.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uicommon.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* Kinds of UI *)
type interface =
Modified: trunk/src/uigtk2.ml
===================================================================
--- trunk/src/uigtk2.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uigtk2.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uigtk2.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
open Lwt
Modified: trunk/src/uigtk2.mli
===================================================================
--- trunk/src/uigtk2.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uigtk2.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/uigtk2.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module Body : Uicommon.UI
Modified: trunk/src/uimacnew/ProgressCell.m
===================================================================
--- trunk/src/uimacnew/ProgressCell.m 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uimacnew/ProgressCell.m 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright 2007 (see file COPYING for more information)
+ * Copyright 2008 (see file COPYING for more information)
*
* Loosely based on TorrentCell from Transmission (.png files are from
* the original).
Modified: trunk/src/uitext.ml
===================================================================
--- trunk/src/uitext.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uitext.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uitext.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
open Lwt
Modified: trunk/src/uitext.mli
===================================================================
--- trunk/src/uitext.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uitext.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/uitext.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module Body : Uicommon.UI
Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/update.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/update.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
open Common
let (>>=) = Lwt.(>>=)
@@ -1668,7 +1668,7 @@
let (localPath, subArch) = getPathInArchive archive Path.empty path in
let newArch = updateArchiveRec ui (stripArchive path subArch) in
let commit () =
- let _ = Stasher.stashCurrentVersion fspath localPath in
+ let _ = Stasher.stashCurrentVersion fspath localPath None in
let archive = getArchive root in
let archive, () =
updatePathInArchive archive fspath Path.empty path
Modified: trunk/src/update.mli
===================================================================
--- trunk/src/update.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/update.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/update.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
module NameMap : Map.S with type key = Name.t
Modified: trunk/src/uutil.ml
===================================================================
--- trunk/src/uutil.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uutil.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uutil.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(*****************************************************************************)
(* Unison name and version *)
Modified: trunk/src/uutil.mli
===================================================================
--- trunk/src/uutil.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/uutil.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uutil.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* This module collects a number of low-level, Unison-specific utility
functions. It is kept separate from the Util module so that that module
Modified: trunk/src/xferhint.ml
===================================================================
--- trunk/src/xferhint.ml 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/xferhint.ml 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/xferhint.ml *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
let debug = Trace.debug "xferhint"
Modified: trunk/src/xferhint.mli
===================================================================
--- trunk/src/xferhint.mli 2008-06-22 12:49:20 UTC (rev 288)
+++ trunk/src/xferhint.mli 2008-06-23 22:05:17 UTC (rev 289)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/xferhint.mli *)
-(* Copyright 1999-2007 (see COPYING for details) *)
+(* Copyright 1999-2008 (see COPYING for details) *)
(* This module maintains a cache that can be used to map
an Os.fingerprint to a (Fspath.t * Path.t) naming a file that *may*
More information about the Unison-hackers
mailing list