Merge pull request #135 from bcpierce00/prepare-beta-release

Prepare beta release
bcpierce00 · Jan 27, 2018 · f804e03 · f804e03
2 parents fb2aee8 + 1536c9d
commit f804e03
Show file tree

Hide file tree

Showing 107 changed files with 121 additions and 206 deletions.
diff --git a/doc/changes.tex b/doc/changes.tex
@@ -1,5 +1,16 @@
 \begin{changesfromversion}{2.48}
 \item Repository transplanted from SVN to Git and moved to GitHub (\URL{https://github.com/bcpierce00/unison}).
+\item Add a new preference, '{\tt atomic}', for specifying directories that
+  should be treated atomically: if there are changes within such a
+  directory in both replicase, the whole directory is marked as a
+  conflict instead of propagating any of the changes.  Thanks to
+  Julian Squires for submitting this patch!
+\item OSX / macOS
+  \begin{itemize}
+    \item Ported to 10.13, High Sierra, and Apple's new APFS (earlier
+    versions of Unison break because of new behavior of AppleDouble files)
+    \item Replaced Growl with OS X native notification center.
+\end{itemioze}
 \item Miscellaneous:
 \begin{itemize}
 \item The OCaml compiler version is now included in the ``connection header

diff --git a/src/Makefile b/src/Makefile
@@ -1,7 +1,7 @@
 #######################################################################
 # $I1: Unison file synchronizer: src/Makefile $
 # $I2: Last modified by bcpierce on Sun, 22 Aug 2004 22:29:04 -0400 $
-# $I3: Copyright 1999-2017 (see COPYING for details) $
+# $I3: Copyright 1999-2018 (see COPYING for details) $
 #######################################################################
 ## User Settings
 
@@ -341,6 +341,7 @@ testmerge:
 tags:
 	-if [ -f "`which $(ETAGS)`" ]; then \
 	    $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
+	             *Makefile* \
           ; fi 
 
 all:: TAGS

diff --git a/src/RECENTNEWS b/src/RECENTNEWS
@@ -1,98 +0,0 @@
-CHANGES FROM VERSION 2.49.543
-
-* Add OCaml compiler version (<= 4.02.1 or >= 4.02.2) to connection
-  header string that is exchanged when client connects to server, to
-  fail more cleanly when incompatible versions are recognized.
-* Bump version number to 2.50.0 to avoid confusion
-* Fix description of where the command-line tool will be installed
-* Improve error report when failing on OCaml compiler version mismatch
-
--------------------------------
-CHANGES FROM VERSION 2.49.600
-
-* Tidy Makefiles for move to Git
-* Tidy a bunch of other miscellaneous stuff
-
--------------------------------
-CHANGES FROM VERSION 2.49.600
-
-* Tidy Makefiles for move to Git
-* Tidy a bunch of other miscellaneous stuff
-
--------------------------------
-CHANGES FROM VERSION 2.49.9
-
-* Make the installation Makefile a bit more paranoid, to prevent bad
-  behavior if the OCaml installation is not present or messed up
--------------------------------
-CHANGES FROM VERSION 2.49.8
-
-* Update copyright dates to 2016
-
--------------------------------
-CHANGES FROM VERSION 2.49.7
-
-* Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scan
-  profiles before main window is created. (second try)
-
--------------------------------
-CHANGES FROM VERSION 2.49.6
-
-* Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scan
-  profiles before main window is created.
-
-* Small fix to avoid assertion failure on conflicts involving deleted
-  files when using -copyonconflict flag
-
-
--------------------------------
-CHANGES FROM VERSION 2.49.4
-
-* Remove colon from names of files created by the -copyonconflict
-  flag, to avoid unhappiness with some filesystems.
--------------------------------
-CHANGES FROM VERSION 2.49.3
-
-uimac14: install the command-line tool in /usr/local/bin
--------------------------------
-CHANGES FROM VERSION 2.49.2
-
-* Wording improvement in manual
-
--------------------------------
-CHANGES FROM VERSION 2.49.1
-
-* Update to cygwin install instructions from Mario Emmenlauer
-
-
-
--------------------------------
-CHANGES FROM VERSION 2.49.0
-
-* Small change for OSX El Capitan, from Alan Shutko
-
-* Add a new preference, 'atomic', for specifying directories that
-  should be treated atomically -- if there are changes within such a
-  directory in both replicase, the whole directory is marked as a
-  conflict instead of propagating any of the changes.  Thanks to
-  Julian Squires for submitting this patch!
--------------------------------
-CHANGES FROM VERSION 2.48.6
-
-* Add shortcut key to GTK2 user interface allowing - to be used as a
-  synonym for / (to accommodate german keyboards)
-
-* Small fix to manual
-
--------------------------------
-CHANGES FROM VERSION 2.48.5
-
-uimac14: replace Growl with OS X native notification center.
-
-Thanks to Jan Hacker for the patch.
--------------------------------
-CHANGES FROM VERSION 2.48.3
-
-* Final cleanup for stable release
-
--------------------------------

diff --git a/src/abort.ml b/src/abort.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/abort.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/bytearray.ml b/src/bytearray.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/bytearray.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/bytearray.mli b/src/bytearray.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/bytearray.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 type t =
   (char, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t

diff --git a/src/bytearray_stubs.c b/src/bytearray_stubs.c
@@ -1,5 +1,5 @@
 /* Unison file synchronizer: src/bytearray_stubs.c */
-/* Copyright 1999-2017 (see COPYING for details) */
+/* Copyright 1999-2018 (see COPYING for details) */
 
 #include <string.h>
 

diff --git a/src/case.ml b/src/case.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/case.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/case.mli b/src/case.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/case.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 val caseInsensitiveMode : [`True|`False|`Default] Prefs.t
 val unicodeEncoding : bool Prefs.t

diff --git a/src/checksum.ml b/src/checksum.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/checksum.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/checksum.mli b/src/checksum.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/checksum.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 type t = int
 type u = int array

diff --git a/src/clroot.ml b/src/clroot.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/clroot.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/clroot.mli b/src/clroot.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/clroot.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (* Command-line roots *)
 type clroot =

diff --git a/src/common.ml b/src/common.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/common.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/common.mli b/src/common.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/common.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (***************************************************************************)
 (*               COMMON TYPES USED BY ALL MODULES                          *)

diff --git a/src/copy.ml b/src/copy.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/copy.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/external.ml b/src/external.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/external.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/external.mli b/src/external.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/external.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 val runExternalProgram : string -> (Unix.process_status * string) Lwt.t
 val readChannelTillEof : in_channel -> string
diff --git a/src/fileinfo.ml b/src/fileinfo.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fileinfo.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fileinfo.mli b/src/fileinfo.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fileinfo.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 type typ = [`ABSENT | `FILE | `DIRECTORY | `SYMLINK]
 val type2string : typ -> string

diff --git a/src/files.ml b/src/files.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/files.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/files.mli b/src/files.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/files.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, 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).                            *)

diff --git a/src/fileutil.ml b/src/fileutil.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fileutil.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fileutil.mli b/src/fileutil.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fileutil.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (* Convert backslashes in a string to forward slashes.  Useful in Windows. *)
 val backslashes2forwardslashes : string -> string

diff --git a/src/fingerprint.ml b/src/fingerprint.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fingerprint.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fingerprint.mli b/src/fingerprint.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fingerprint.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 type t
 

diff --git a/src/fpcache.ml b/src/fpcache.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fpcache.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fpcache.mli b/src/fpcache.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fpcache.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (* Initialize the cache *)
 val init : bool -> bool -> System.fspath -> unit

diff --git a/src/fs.ml b/src/fs.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fs.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fs.mli b/src/fs.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fs.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (* Operations on fspaths *)
 

diff --git a/src/fspath.ml b/src/fspath.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fspath.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fspath.mli b/src/fspath.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fspath.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (* Defines an abstract type of absolute filenames (fspaths) *)
 

diff --git a/src/fswatch.ml b/src/fswatch.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fswatch.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/fswatch.mli b/src/fswatch.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fswatch.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 type archiveHash = string
 

diff --git a/src/fswatchold.ml b/src/fswatchold.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/fswatcherold.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/globals.ml b/src/globals.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/globals.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/globals.mli b/src/globals.mli
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/globals.mli *)
-(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *)
+(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *)
 
 (* Global variables and functions needed by top-level modules and user       *)
 (* interfaces                                                                *)

diff --git a/src/linkgtk.ml b/src/linkgtk.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/linkgtk.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/linkgtk2.ml b/src/linkgtk2.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/linkgtk2.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/linktext.ml b/src/linktext.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/linktext.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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

diff --git a/src/lock.ml b/src/lock.ml
@@ -1,5 +1,5 @@
 (* Unison file synchronizer: src/lock.ml *)
-(* Copyright 1999-2017, Benjamin C. Pierce
+(* Copyright 1999-2018, 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