[Unison-hackers] [unison-svn] r320 - in trunk/src: . lwt ubase uimacnew/uimacnew.xcodeproj
Benjamin C. Pierce
bcpierce at seas.upenn.edu
Fri May 1 21:57:37 EDT 2009
Author: bcpierce
Date: 2009-05-01 21:57:23 -0400 (Fri, 01 May 2009)
New Revision: 320
Modified:
trunk/src/Makefile.OCaml
trunk/src/RECENTNEWS
trunk/src/TODO.txt
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/external.ml
trunk/src/external.mli
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/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/uimacnew.xcodeproj/project.pbxproj
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:
* Update copyright notices and add GPLv3 boilerplate to .ml files
(.mli files are left with a short copyright line, to reduce clutter)
Modified: trunk/src/Makefile.OCaml
===================================================================
--- trunk/src/Makefile.OCaml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/Makefile.OCaml 2009-05-02 01:57:23 UTC (rev 320)
@@ -155,6 +155,8 @@
endif
endif
+MINOSXVERSION=10.5
+
# NOTE: the OCAMLLIBDIR is not getting passed correctly?
# The two cases for cltool are needed because Xcode 2.1+
# builds in build/Default/, and earlier versions use build/
@@ -162,9 +164,9 @@
# sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
(cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)
if [ -e $(UIMACDIR)/build/Default ]; then \
- gcc -mmacosx-version-min=10.4 $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
+ gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
else \
- gcc -mmacosx-version-min=10.4 $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
+ gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
fi
# OCaml objects for the bytecode version
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/RECENTNEWS 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,11 +1,19 @@
+CHANGES FROM VERSION 2.32.6
+
+* Update copyright notices and add GPLv3 boilerplate to .ml files
+ (.mli files are left with a short copyright line, to reduce clutter)
+
+-------------------------------
CHANGES FROM VERSION 2.32.5
+* Update copyright notices and add GPLv3 boilerplate to .ml files
+ (.mli files are left with a short copyright line, to reduce clutter)
+
* 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
@@ -39,20 +47,11 @@
shortcut-copying completely unrelated files that happen to also have
zero length!).
-
-
-
-
-
-
-------------------------------
CHANGES FROM VERSION 2.32.0
* Bumped version number to reflect newly added preference
-
-
-
-------------------------------
CHANGES FROM VERSION 2.31.11
@@ -69,35 +68,21 @@
* Add some suggestions to TODO file
-
-
-
-
-
-------------------------------
CHANGES FROM VERSION 2.31.10
* Another slight tweak.
-
-
-
-
-------------------------------
CHANGES FROM VERSION 2.31.9
* Slight tweak to the last commit, suggested by Rasmus.
-
-
-
-------------------------------
CHANGES FROM VERSION 2.31.8
* (Forgot to add a couple of new files.)
-
-
-------------------------------
CHANGES FROM VERSION 2.31.5
@@ -113,8 +98,6 @@
* Logging tweak.
-
-
-------------------------------
CHANGES FROM VERSION 2.31.5
@@ -130,29 +113,11 @@
* Logging tweak.
+* Resizing the update window vertically no longer moves the status
+ label. Fix contributed by Pedro Melo.
-
-------------------------------
-CHANGES FROM VERSION 2.31.5
-* A special hack for Rasmus, who has a special situation that requires
- the utimes-setting program to run 'setuid root' (and we do not want
- all of Unison to run setuid, so we just spin off an external utility
- to do it). This functionality is disabled by default and requires
- editing the source code (changing 'false' to 'true' on line 496 of
- props.ml) and recompiling to enable. If there are other people that
- want it, we can easily make it accessible using a preference
- instead, but I prefer not to add a preference until someone else
- requests it, to avoid creating an incompatible version.
-
-* Logging tweak.
-
-
-CHANGES FROM VERSION 2.31.5
-
-Resizing the update window vertically no longer moves the status label. Fix contributed by Pedro Melo.
--------------------------------
-
CHANGES FROM VERSION 2.31.4
* Don't ignore files that look like backup files if the {\\tt
@@ -194,16 +159,11 @@
* Record some current TODO items
-
-
-
-------------------------------
CHANGES FROM VERSION 2.30.3
* Update docs
-
-
-------------------------------
CHANGES FROM VERSION 2.30.2
@@ -219,14 +179,12 @@
* A better fix for the "single file transfer failed in large directory" issue.
-
-------------------------------
CHANGES FROM VERSION 2.29.9
* Trying a possible fix for the "assert failure in remote.ml" bug
(thanks Jerome!)
-
-------------------------------
CHANGES FROM VERSION 2.29.8
@@ -236,7 +194,6 @@
still supported, for backwards compatibility, but they do not appear
in the documentation.
-
-------------------------------
CHANGES FROM VERSION 2.29.7
@@ -253,9 +210,6 @@
whether a partially transferred file already exists or not. (Rsync
doesn't seem to care about this, but other utilities may.)
-
-
-
-------------------------------
CHANGES FROM VERSION 2.29.7
@@ -272,15 +226,11 @@
whether a partially transferred file already exists or not. (Rsync
doesn't seem to care about this, but other utilities may.)
-
-
-
-------------------------------
CHANGES FROM VERSION 2.29.6
* Fix a small bug in the external copyprog setup.
-
-------------------------------
CHANGES FROM VERSION 2.29.5
@@ -289,8 +239,6 @@
This should hopefully make Unison a little more approachable for new
users.)
-
-
-------------------------------
CHANGES FROM VERSION 2.29.4
@@ -303,7 +251,6 @@
* Updated copyright notices to 2008. :-)
-
-------------------------------
CHANGES FROM VERSION 2.29.3
@@ -317,7 +264,6 @@
* Automatically supply "user@" in argument to external copy program.
-
-------------------------------
CHANGES FROM VERSION 2.29.1
@@ -363,13 +309,11 @@
Unison is run, it will continue filling in this temporary directory,
skipping transferring files that it finds are already there.
-
-------------------------------
CHANGES FROM VERSION 2.28.51
* Propagating changes from 2.27 branch
-
-------------------------------
CHANGES FROM VERSION 2.28.51
@@ -512,7 +456,6 @@
* Add couple of missing files.
-
-------------------------------
CHANGES FROM VERSION 2.28.4
@@ -543,7 +486,6 @@
with fastcheck. This *might* fix the bug that Karl M. has reported.
(Copying fix into trunk.)
-
-------------------------------
CHANGES FROM VERSION 2.28.-2
Modified: trunk/src/TODO.txt
===================================================================
--- trunk/src/TODO.txt 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/TODO.txt 2009-05-02 01:57:23 UTC (rev 320)
@@ -250,6 +250,16 @@
* SMALL FUNCTIONALITY IMPROVEMENTS
* ================================
+**** When I tell unison to ignore a file whose name has a comma in it,
+ then unison adds to the preferences file a line like:
+ ignore = Path{this file, has a comma}
+ which gets interpreted as "this file" OR " has a comma".
+ unison should be escaping that comma and write it as \, instead.
+
+**** Please let me say
+ root = ~/bla
+ instead of requiring me to give an absolute path to my home dir.
+
**** The archive should indicate whether it is case-dependant or not.
(This is important for correctness -- if the case-insensitive flag is
set differently on different runs, things can get very confused!)
Modified: trunk/src/abort.ml
===================================================================
--- trunk/src/abort.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/abort.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/abort.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let debug = Trace.debug "abort"
let files = ref ([] : Uutil.File.t list)
Modified: trunk/src/case.ml
===================================================================
--- trunk/src/case.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/case.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/case.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* The update detector, reconciler, and transporter behave differently *)
(* depending on whether the local and/or remote file system is case *)
(* insensitive. This pref is set during the initial handshake if any one of *)
Modified: trunk/src/case.mli
===================================================================
--- trunk/src/case.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/case.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/case.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
val insensitive : unit -> bool
Modified: trunk/src/checksum.ml
===================================================================
--- trunk/src/checksum.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/checksum.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/checksum.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* 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 *)
(* checksum when provided the current checksum, the outgoing character and *)
Modified: trunk/src/checksum.mli
===================================================================
--- trunk/src/checksum.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/checksum.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/checksum.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
type t = int
type u = int array
Modified: trunk/src/clroot.ml
===================================================================
--- trunk/src/clroot.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/clroot.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/clroot.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(*
This file parses the unison command-line arguments that
specify replicas. The syntax for replicas is based on that of
Modified: trunk/src/clroot.mli
===================================================================
--- trunk/src/clroot.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/clroot.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/clroot.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Command-line roots *)
type clroot =
Modified: trunk/src/common.ml
===================================================================
--- trunk/src/common.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/common.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/common.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
type hostname = string
(* Canonized roots *)
Modified: trunk/src/common.mli
===================================================================
--- trunk/src/common.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/common.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/common.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(***************************************************************************)
(* COMMON TYPES USED BY ALL MODULES *)
Modified: trunk/src/copy.ml
===================================================================
--- trunk/src/copy.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/copy.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/copy.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let (>>=) = Lwt.bind
let debug = Trace.debug "copy"
Modified: trunk/src/external.ml
===================================================================
--- trunk/src/external.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/external.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/external.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(*****************************************************************************)
(* RUNNING EXTERNAL PROGRAMS *)
(*****************************************************************************)
Modified: trunk/src/external.mli
===================================================================
--- trunk/src/external.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/external.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/external.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
val runExternalProgram : string -> Unix.process_status * string
val readChannelTillEof : in_channel -> string
Modified: trunk/src/fileinfo.ml
===================================================================
--- trunk/src/fileinfo.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fileinfo.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/fileinfo.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let debugV = Util.debug "fileinfo+"
type typ = [ `ABSENT | `FILE | `DIRECTORY | `SYMLINK ]
Modified: trunk/src/fileinfo.mli
===================================================================
--- trunk/src/fileinfo.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fileinfo.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fileinfo.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
type typ = [`ABSENT | `FILE | `DIRECTORY | `SYMLINK]
val type2string : typ -> string
Modified: trunk/src/files.ml
===================================================================
--- trunk/src/files.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/files.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/files.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
open Lwt
open Fileinfo
Modified: trunk/src/files.mli
===================================================================
--- trunk/src/files.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/files.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/files.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fileutil.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/fileutil.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* Convert backslashes in a string to forward slashes. Useful in Windows. *)
let backslashes2forwardslashes s0 =
try
Modified: trunk/src/fileutil.mli
===================================================================
--- trunk/src/fileutil.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fileutil.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fileutil.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fingerprint.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/fingerprint.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* NOTE: IF YOU CHANGE TYPE "FINGERPRINT", THE ARCHIVE FORMAT CHANGES; *)
(* INCREMENT "UPDATE.ARCHIVEFORMAT" *)
type t = string
Modified: trunk/src/fingerprint.mli
===================================================================
--- trunk/src/fingerprint.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fingerprint.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fingerprint.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
type t
Modified: trunk/src/fspath.ml
===================================================================
--- trunk/src/fspath.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fspath.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/fspath.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* Defines an abstract type of absolute filenames (fspaths). Keeping the *)
(* type abstract lets us enforce some invariants which are important for *)
(* correct behavior of some system calls. *)
Modified: trunk/src/fspath.mli
===================================================================
--- trunk/src/fspath.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/fspath.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/fspath.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Defines an abstract type of absolute filenames (fspaths) *)
Modified: trunk/src/globals.ml
===================================================================
--- trunk/src/globals.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/globals.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/globals.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
let debug = Trace.debug "globals"
Modified: trunk/src/globals.mli
===================================================================
--- trunk/src/globals.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/globals.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/globals.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/linkgtk.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,19 @@
(* Unison file synchronizer: src/linkgtk.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
module TopLevel = Main.Body(Uigtk.Body)
Modified: trunk/src/linkgtk2.ml
===================================================================
--- trunk/src/linkgtk2.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/linkgtk2.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,19 @@
(* Unison file synchronizer: src/linkgtk2.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
module TopLevel = Main.Body(Uigtk2.Body)
Modified: trunk/src/linktext.ml
===================================================================
--- trunk/src/linktext.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/linktext.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,19 @@
(* Unison file synchronizer: src/linktext.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
module TopLevel = Main.Body(Uitext.Body)
Modified: trunk/src/linktk.ml
===================================================================
--- trunk/src/linktk.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/linktk.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,19 @@
(* Unison file synchronizer: src/linktk.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
module TopLevel = Main.Body(Uitk.Body)
Modified: trunk/src/lock.ml
===================================================================
--- trunk/src/lock.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/lock.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/lock.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let rename oldFile newFile =
begin try Unix.link oldFile newFile with Unix.Unix_error _ -> () end;
let res = try (Unix.LargeFile.stat oldFile).Unix.LargeFile.st_nlink = 2
Modified: trunk/src/lock.mli
===================================================================
--- trunk/src/lock.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/lock.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/lock.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/lwt/pqueue.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/lwt/pqueue.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
module type OrderedType =
sig
type t
Modified: trunk/src/lwt/pqueue.mli
===================================================================
--- trunk/src/lwt/pqueue.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/lwt/pqueue.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/lwt/pqueue.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
module type OrderedType =
sig
Modified: trunk/src/main.ml
===================================================================
--- trunk/src/main.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/main.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/main.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* ---------------------------------------------------------------------- *)
(* This is the main program -- the thing that gets executed first when
Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/mkProjectInfo.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -103,3 +103,4 @@
+
Modified: trunk/src/name.ml
===================================================================
--- trunk/src/name.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/name.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/name.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* NOTE: IF YOU CHANGE TYPE "NAME", THE ARCHIVE FORMAT CHANGES;
INCREMENT "UPDATE.ARCHIVEFORMAT" *)
type t = string
Modified: trunk/src/name.mli
===================================================================
--- trunk/src/name.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/name.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/name.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
type t
Modified: trunk/src/os.ml
===================================================================
--- trunk/src/os.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/os.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/os.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* This file attempts to isolate operating system specific details from the *)
(* rest of the program. *)
Modified: trunk/src/os.mli
===================================================================
--- trunk/src/os.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/os.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/os.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
val myCanonicalHostName : string
Modified: trunk/src/osx.ml
===================================================================
--- trunk/src/osx.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/osx.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/osx.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
external isMacOSXPred : unit -> bool = "isMacOSX"
let isMacOSX = isMacOSXPred ()
Modified: trunk/src/osx.mli
===================================================================
--- trunk/src/osx.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/osx.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/osx.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
val init : bool -> unit
val isMacOSX : bool
Modified: trunk/src/path.ml
===================================================================
--- trunk/src/path.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/path.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/path.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* Defines an abstract type of relative pathnames *)
type 'a path = string
Modified: trunk/src/path.mli
===================================================================
--- trunk/src/path.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/path.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/path.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Abstract type of relative pathnames *)
type 'a path
Modified: trunk/src/pixmaps.ml
===================================================================
--- trunk/src/pixmaps.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/pixmaps.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/pixmaps.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let copyAB color = [|
(* width height num_colors chars_per_pixel *)
" 28 14 2 1";
Modified: trunk/src/pred.ml
===================================================================
--- trunk/src/pred.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/pred.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/pred.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let debug = Util.debug "pred"
(********************************************************************)
Modified: trunk/src/pred.mli
===================================================================
--- trunk/src/pred.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/pred.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/pred.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Predicates over paths.
Modified: trunk/src/props.ml
===================================================================
--- trunk/src/props.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/props.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/props.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let debug = Util.debug "props"
module type S = sig
Modified: trunk/src/props.mli
===================================================================
--- trunk/src/props.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/props.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/props.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* File properties: time, permission, length, etc. *)
Modified: trunk/src/recon.ml
===================================================================
--- trunk/src/recon.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/recon.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/recon.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
(* ------------------------------------------------------------------------- *)
Modified: trunk/src/recon.mli
===================================================================
--- trunk/src/recon.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/recon.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/recon.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
val reconcileAll :
Common.updateItem list Common.oneperpath
Modified: trunk/src/remote.ml
===================================================================
--- trunk/src/remote.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/remote.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/remote.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(*
XXX
- Check exception handling
Modified: trunk/src/remote.mli
===================================================================
--- trunk/src/remote.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/remote.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/remote.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/sortri.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/sortri.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
let dbgsort = Util.debug "sort"
Modified: trunk/src/sortri.mli
===================================================================
--- trunk/src/sortri.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/sortri.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/sortri.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/stasher.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,7 +1,22 @@
(* Unison file synchronizer: src/stasher.ml *)
(* $I2: Last modified by lescuyer *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* --------------------------------------------------------------------------*)
(* Preferences for backing up and stashing *)
Modified: trunk/src/strings.mli
===================================================================
--- trunk/src/strings.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/strings.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/strings.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
val docs : (string * (string * string)) list
Modified: trunk/src/test.ml
===================================================================
--- trunk/src/test.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/test.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/test.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let (>>=) = Lwt.(>>=)
(* ---------------------------------------------------------------------- *)
Modified: trunk/src/test.mli
===================================================================
--- trunk/src/test.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/test.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/test.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Internal self-tests *)
Modified: trunk/src/transfer.ml
===================================================================
--- trunk/src/transfer.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/transfer.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/transfer.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* rsync compression algorithm
To compress, we use a compression buffer with a size a lot
Modified: trunk/src/transfer.mli
===================================================================
--- trunk/src/transfer.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/transfer.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/transfer.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(*
Rsync : general algorithm description
Modified: trunk/src/transport.ml
===================================================================
--- trunk/src/transport.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/transport.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/transport.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
open Lwt
Modified: trunk/src/transport.mli
===================================================================
--- trunk/src/transport.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/transport.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/transport.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Executes the actions implied by the reconItem list. *)
val transportItem :
Modified: trunk/src/tree.ml
===================================================================
--- trunk/src/tree.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/tree.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/tree.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
type ('a, 'b) t =
Node of ('a * ('a, 'b) t) list * 'b option
| Leaf of 'b
Modified: trunk/src/tree.mli
===================================================================
--- trunk/src/tree.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/tree.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/tree.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/rx.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,20 @@
(* Unison file synchronizer: src/ubase/rx.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
(*
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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/rx.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/rx.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
type t
Modified: trunk/src/ubase/safelist.ml
===================================================================
--- trunk/src/ubase/safelist.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/safelist.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/ubase/safelist.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let filterBoth f l =
let rec loop r1 r2 = function
[] -> (List.rev r1, List.rev r2)
Modified: trunk/src/ubase/safelist.mli
===================================================================
--- trunk/src/ubase/safelist.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/safelist.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/safelist.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/trace.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/ubase/trace.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(* ---------------------------------------------------------------------- *)
(* Choosing where messages go *)
Modified: trunk/src/ubase/trace.mli
===================================================================
--- trunk/src/ubase/trace.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/trace.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/trace.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* ---------------------------------------------------------------------- *)
(* Debugging support *)
Modified: trunk/src/ubase/uarg.ml
===================================================================
--- trunk/src/ubase/uarg.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/uarg.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/uarg.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/util.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/ubase/util.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(*****************************************************************************)
(* CASE INSENSITIVE COMPARISON *)
(*****************************************************************************)
Modified: trunk/src/ubase/util.mli
===================================================================
--- trunk/src/ubase/util.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ubase/util.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ubase/util.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Miscellaneous utility functions and datatypes *)
Modified: trunk/src/ui.mli
===================================================================
--- trunk/src/ui.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/ui.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/ui.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uicommon.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/uicommon.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
open Lwt
Modified: trunk/src/uicommon.mli
===================================================================
--- trunk/src/uicommon.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uicommon.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uicommon.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
(* Kinds of UI *)
type interface =
Modified: trunk/src/uigtk2.ml
===================================================================
--- trunk/src/uigtk2.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uigtk2.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/uigtk2.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
open Lwt
Modified: trunk/src/uigtk2.mli
===================================================================
--- trunk/src/uigtk2.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uigtk2.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/uigtk2.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
module Body : Uicommon.UI
Modified: trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj
===================================================================
--- trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj 2009-05-02 01:57:23 UTC (rev 320)
@@ -669,7 +669,7 @@
baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */;
buildSettings = {
LIBRARY_SEARCH_PATHS = "";
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
};
name = Development;
Modified: trunk/src/uitext.ml
===================================================================
--- trunk/src/uitext.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uitext.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/uitext.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
open Lwt
Modified: trunk/src/uitext.mli
===================================================================
--- trunk/src/uitext.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uitext.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,4 +1,4 @@
(* Unison file synchronizer: src/uitext.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
module Body : Uicommon.UI
Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/update.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/update.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
open Common
let (>>=) = Lwt.(>>=)
@@ -650,7 +665,7 @@
("When this preference is set, Unison will ignore any lock files "
^ "that may have been left over from a previous run of Unison that "
^ "was interrupted while reading or writing archive files; by default, "
- ^ "when Unison sees these lock files it will stop and request manual"
+ ^ "when Unison sees these lock files it will stop and request manual "
^ "intervention. This "
^ "option should be set only if you are {\\em positive} that no other "
^ "instance of Unison might be concurrently accessing the same archive "
Modified: trunk/src/update.mli
===================================================================
--- trunk/src/update.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/update.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/update.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
module NameMap : Map.S with type key = Name.t
Modified: trunk/src/uutil.ml
===================================================================
--- trunk/src/uutil.ml 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uutil.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/uutil.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
(*****************************************************************************)
(* Unison name and version *)
(*****************************************************************************)
Modified: trunk/src/uutil.mli
===================================================================
--- trunk/src/uutil.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/uutil.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/uutil.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/xferhint.ml 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,6 +1,21 @@
(* Unison file synchronizer: src/xferhint.ml *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+
let debug = Trace.debug "xferhint"
let xferbycopying =
Modified: trunk/src/xferhint.mli
===================================================================
--- trunk/src/xferhint.mli 2009-04-29 14:36:48 UTC (rev 319)
+++ trunk/src/xferhint.mli 2009-05-02 01:57:23 UTC (rev 320)
@@ -1,5 +1,5 @@
(* Unison file synchronizer: src/xferhint.mli *)
-(* Copyright 1999-2008 (see COPYING for details) *)
+(* Copyright 1999-2009, Benjamin C. Pierce (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