From 2ebf4d4b65241d319dd56eff8a68ab5da37825ce Mon Sep 17 00:00:00 2001 From: Benjamin Pierce Date: Sat, 27 Jan 2018 08:35:01 -0500 Subject: [PATCH 1/4] Fic incorrect check for OCaml version --- src/remote.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote.ml b/src/remote.ml index 77062ebbd..2d5f6222c 100644 --- a/src/remote.ml +++ b/src/remote.ml @@ -922,8 +922,8 @@ let connectionHeader = Scanf.sscanf Sys.ocaml_version "%d.%d.%d" (fun x y z -> (x,y,z)) in let compiler = if major < 4 - || major = 4 && minor <= 2 - || major = 4 && minor = 2 && patchlevel <= 1 + || major = 4 && minor < 1 + || major = 4 && minor = 1 && patchlevel <= 1 then "<= 4.01.1" else ">= 4.01.2" in "Unison " ^ Uutil.myMajorVersion ^ " with OCaml " ^ compiler ^ "\n" From 393129a1ce023aa2f919ba03619eaa3472f97a9c Mon Sep 17 00:00:00 2001 From: Benjamin Pierce Date: Sat, 27 Jan 2018 08:41:15 -0500 Subject: [PATCH 2/4] Better fix --- src/remote.ml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/remote.ml b/src/remote.ml index 2d5f6222c..8551bd03f 100644 --- a/src/remote.ml +++ b/src/remote.ml @@ -922,10 +922,16 @@ let connectionHeader = Scanf.sscanf Sys.ocaml_version "%d.%d.%d" (fun x y z -> (x,y,z)) in let compiler = if major < 4 - || major = 4 && minor < 1 - || major = 4 && minor = 1 && patchlevel <= 1 + || major = 4 && minor < 2 + || major = 4 && minor = 2 && patchlevel <= 1 then "<= 4.01.1" else ">= 4.01.2" + (* BCP: These strings seem wrong -- they should say 4.02, + not 4.01, according to my understanding of when the breaking + change happened. However, I'm nervous about breaking installations + that are working, so I'm going to leave it. Hopefully we are + far enough beyond these OCaml versions that it doesn't matter + anyway. *) in "Unison " ^ Uutil.myMajorVersion ^ " with OCaml " ^ compiler ^ "\n" let rec checkHeader conn buffer pos len = From aceddab87958afe7a650ad62fd9d8049c5a08efb Mon Sep 17 00:00:00 2001 From: Benjamin Pierce Date: Sat, 27 Jan 2018 08:55:49 -0500 Subject: [PATCH 3/4] Update copyright dates --- doc/changes.tex | 11 ++++ src/Makefile | 3 +- src/RECENTNEWS | 98 ------------------------------------ src/abort.ml | 2 +- src/bytearray.ml | 2 +- src/bytearray.mli | 2 +- src/bytearray_stubs.c | 2 +- src/case.ml | 2 +- src/case.mli | 2 +- src/checksum.ml | 2 +- src/checksum.mli | 2 +- src/clroot.ml | 2 +- src/clroot.mli | 2 +- src/common.ml | 2 +- src/common.mli | 2 +- src/copy.ml | 2 +- src/external.ml | 2 +- src/external.mli | 2 +- src/fileinfo.ml | 2 +- src/fileinfo.mli | 2 +- src/files.ml | 2 +- src/files.mli | 2 +- src/fileutil.ml | 2 +- src/fileutil.mli | 2 +- src/fingerprint.ml | 2 +- src/fingerprint.mli | 2 +- src/fpcache.ml | 2 +- src/fpcache.mli | 2 +- src/fs.ml | 2 +- src/fs.mli | 2 +- src/fspath.ml | 2 +- src/fspath.mli | 2 +- src/fswatch.ml | 2 +- src/fswatch.mli | 2 +- src/fswatchold.ml | 2 +- src/globals.ml | 2 +- src/globals.mli | 2 +- src/linkgtk.ml | 2 +- src/linkgtk2.ml | 2 +- src/linktext.ml | 2 +- src/lock.ml | 2 +- src/lock.mli | 2 +- src/lwt/pqueue.ml | 2 +- src/lwt/pqueue.mli | 2 +- src/main.ml | 2 +- src/name.ml | 2 +- src/name.mli | 2 +- src/os.ml | 2 +- src/os.mli | 2 +- src/osx.ml | 2 +- src/osx.mli | 2 +- src/path.ml | 2 +- src/path.mli | 2 +- src/pixmaps.ml | 2 +- src/pred.ml | 2 +- src/pred.mli | 2 +- src/props.ml | 2 +- src/props.mli | 2 +- src/recon.ml | 2 +- src/recon.mli | 2 +- src/remote.ml | 2 +- src/remote.mli | 2 +- src/sortri.ml | 2 +- src/sortri.mli | 2 +- src/stasher.ml | 2 +- src/stasher.mli | 2 +- src/strings.mli | 2 +- src/system.ml | 2 +- src/system.mli | 2 +- src/system/system_generic.ml | 2 +- src/system/system_intf.ml | 2 +- src/system/system_win.ml | 2 +- src/terminal.ml | 2 +- src/test.ml | 4 +- src/test.mli | 2 +- src/transfer.ml | 2 +- src/transfer.mli | 2 +- src/transport.ml | 2 +- src/transport.mli | 2 +- src/tree.ml | 2 +- src/tree.mli | 2 +- src/ubase/proplist.ml | 2 +- src/ubase/proplist.mli | 2 +- src/ubase/rx.ml | 2 +- src/ubase/rx.mli | 2 +- src/ubase/safelist.ml | 2 +- src/ubase/safelist.mli | 2 +- src/ubase/trace.ml | 2 +- src/ubase/trace.mli | 2 +- src/ubase/uarg.ml | 2 +- src/ubase/util.ml | 2 +- src/ubase/util.mli | 2 +- src/ui.mli | 2 +- src/uicommon.ml | 2 +- src/uicommon.mli | 2 +- src/uigtk2.ml | 2 +- src/uigtk2.mli | 2 +- src/uitext.ml | 2 +- src/uitext.mli | 2 +- src/unicode.ml | 2 +- src/unicode.mli | 2 +- src/update.ml | 2 +- src/update.mli | 2 +- src/uutil.ml | 2 +- src/uutil.mli | 2 +- src/xferhint.ml | 2 +- src/xferhint.mli | 2 +- 107 files changed, 118 insertions(+), 204 deletions(-) diff --git a/doc/changes.tex b/doc/changes.tex index 6e6f8bbe9..717d63edd 100644 --- 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 index 851838faa..53b78563f 100644 --- 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 index e20fcaf95..e69de29bb 100644 --- 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 index cd4e74b62..8bf2aec66 100644 --- 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 index 6b3bc83c6..e7ea17502 100644 --- 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 index 40687138f..f643a5dcc 100644 --- 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 index b3e345f7f..04f9204da 100644 --- 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 diff --git a/src/case.ml b/src/case.ml index 95492a240..f6135cd00 100644 --- 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 index 81cf27ff8..b1bd3094a 100644 --- 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 index 0e4ae015f..d5d2931b8 100644 --- 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 index a86b147bd..bd1a777be 100644 --- 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 index 89acdb22f..827aadc3c 100644 --- 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 index 014080174..7a6de7e7c 100644 --- 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 index d73f61805..0335ab9b6 100644 --- 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 index d523bef76..2a413151d 100644 --- 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 index 5ed8b771c..be9352bcc 100644 --- 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 index 586c6e767..58646c1a0 100644 --- 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 index 0a14a2384..4304f7434 100644 --- 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 index 2653975f9..8cd9badf7 100644 --- 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 index 24f66f5ee..f3ce18900 100644 --- 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 index 5c0edff18..5ff188106 100644 --- 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 index d606c5dec..da9d09234 100644 --- 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 index 0f027310d..e59ede846 100644 --- 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 index 2216864d2..78ad22a3f 100644 --- 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 index ce384a542..54d5e6bed 100644 --- 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 index d681cde3d..692bcea10 100644 --- 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 index 18e606188..90efc8f8d 100644 --- 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 index 766700ae9..a8ee0bce0 100644 --- 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 index e5e011520..126013be1 100644 --- 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 index 9a523f9da..2e113417a 100644 --- 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 index 01573acc6..70269c257 100644 --- 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 index ae4491a11..1c1cea283 100644 --- 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 index 64ee9d0f9..7139c0a57 100644 --- 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 index fe4ac8573..5c674bb9d 100644 --- 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 index b071ce544..411593b56 100644 --- 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 index 048e72b73..d96fb63e2 100644 --- 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 index 553c54251..db8bc250d 100644 --- 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 index 1152f87fc..a516f95ec 100644 --- 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 index 984ad606c..d102922b0 100644 --- 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 index 3cdf540b3..c0bbfedab 100644 --- 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 index 8c27fcf48..7c8230510 100644 --- 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 diff --git a/src/lock.mli b/src/lock.mli index 03af2b1f3..5111953b3 100644 --- a/src/lock.mli +++ b/src/lock.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lock.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* A simple utility module for setting and releasing inter-process locks using entries in the filesystem. *) diff --git a/src/lwt/pqueue.ml b/src/lwt/pqueue.ml index 7de719d29..21bc36f4d 100644 --- a/src/lwt/pqueue.ml +++ b/src/lwt/pqueue.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lwt/pqueue.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/lwt/pqueue.mli b/src/lwt/pqueue.mli index 51a24b921..b885498d0 100644 --- a/src/lwt/pqueue.mli +++ b/src/lwt/pqueue.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lwt/pqueue.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) module type OrderedType = sig diff --git a/src/main.ml b/src/main.ml index 9d11f1c42..08a3d2200 100644 --- a/src/main.ml +++ b/src/main.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/main.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/name.ml b/src/name.ml index 125fd6aed..5c9e269ce 100644 --- a/src/name.ml +++ b/src/name.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/name.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/name.mli b/src/name.mli index d9ed4b3ca..198175f46 100644 --- a/src/name.mli +++ b/src/name.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/name.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/os.ml b/src/os.ml index e168cc0ba..991265590 100644 --- a/src/os.ml +++ b/src/os.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/os.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/os.mli b/src/os.mli index cf1a8a17f..370c02270 100644 --- a/src/os.mli +++ b/src/os.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/os.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) val myCanonicalHostName : unit -> string diff --git a/src/osx.ml b/src/osx.ml index f93879a94..1f2441df2 100644 --- a/src/osx.ml +++ b/src/osx.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/osx.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/osx.mli b/src/osx.mli index e259d0175..689c1b29c 100644 --- a/src/osx.mli +++ b/src/osx.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/osx.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) val init : bool -> unit val isMacOSX : bool diff --git a/src/path.ml b/src/path.ml index 800ed65a1..03976021d 100644 --- a/src/path.ml +++ b/src/path.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/path.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/path.mli b/src/path.mli index 483f8619f..67266a9b2 100644 --- a/src/path.mli +++ b/src/path.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/path.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Abstract type of relative pathnames *) type 'a path diff --git a/src/pixmaps.ml b/src/pixmaps.ml index 6b4444f52..2f787ebbc 100644 --- a/src/pixmaps.ml +++ b/src/pixmaps.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pixmaps.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/pred.ml b/src/pred.ml index 400a4576f..9f2d00e24 100644 --- a/src/pred.ml +++ b/src/pred.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pred.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/pred.mli b/src/pred.mli index 092bbe084..487aac4d5 100644 --- a/src/pred.mli +++ b/src/pred.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pred.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Predicates over paths. diff --git a/src/props.ml b/src/props.ml index 4b82c0771..29c234cd1 100644 --- a/src/props.ml +++ b/src/props.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/props.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/props.mli b/src/props.mli index e9e3ac995..d591b9641 100644 --- a/src/props.mli +++ b/src/props.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/props.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* File properties: time, permission, length, etc. *) diff --git a/src/recon.ml b/src/recon.ml index 0b41e5140..2c619bb81 100644 --- a/src/recon.ml +++ b/src/recon.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/recon.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/recon.mli b/src/recon.mli index 09258e90c..b5dc4a350 100644 --- a/src/recon.mli +++ b/src/recon.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/recon.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) val reconcileAll : ?allowPartial:bool (* whether we allow partial synchronization diff --git a/src/remote.ml b/src/remote.ml index 8551bd03f..0e9d4d3e1 100644 --- a/src/remote.ml +++ b/src/remote.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/remote.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/remote.mli b/src/remote.mli index f1358c2cb..4fe4b675d 100644 --- a/src/remote.mli +++ b/src/remote.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/remote.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) module Thread : sig val unwindProtect : (unit -> 'a Lwt.t) -> (exn -> unit Lwt.t) -> 'a Lwt.t diff --git a/src/sortri.ml b/src/sortri.ml index 927496377..0a660300a 100644 --- a/src/sortri.ml +++ b/src/sortri.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/sortri.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/sortri.mli b/src/sortri.mli index f6663dba1..7f2a84bcc 100644 --- a/src/sortri.mli +++ b/src/sortri.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/sortri.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, 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 diff --git a/src/stasher.ml b/src/stasher.ml index cfc7185db..f306f89ff 100644 --- a/src/stasher.ml +++ b/src/stasher.ml @@ -1,6 +1,6 @@ (* Unison file synchronizer: src/stasher.ml *) (* $I2: Last modified by lescuyer *) -(* 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/stasher.mli b/src/stasher.mli index eee4a70e6..c7c1a0790 100644 --- a/src/stasher.mli +++ b/src/stasher.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/stasher.mli *) -(* Copyright 1999-2017 (see COPYING for details) *) +(* Copyright 1999-2018 (see COPYING for details) *) (* This module maintains backups for general purpose and *) (* as archives for mergeable files. *) diff --git a/src/strings.mli b/src/strings.mli index b39cddf18..af968d3c5 100644 --- a/src/strings.mli +++ b/src/strings.mli @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/strings.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) val docs : (string * (string * string)) list diff --git a/src/system.ml b/src/system.ml index d5b9474fd..1f4e20a04 100644 --- a/src/system.ml +++ b/src/system.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system.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/system.mli b/src/system.mli index 600dc4b64..99c85a919 100644 --- a/src/system.mli +++ b/src/system.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Operations on filesystem path *) diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml index 648bbf950..453027d06 100755 --- a/src/system/system_generic.ml +++ b/src/system/system_generic.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_generic.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/system/system_intf.ml b/src/system/system_intf.ml index 9c375e57b..209826d61 100644 --- a/src/system/system_intf.ml +++ b/src/system/system_intf.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_intf.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/system/system_win.ml b/src/system/system_win.ml index 0701dcb29..4b64398d6 100755 --- a/src/system/system_win.ml +++ b/src/system/system_win.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_win.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/terminal.ml b/src/terminal.ml index 9ac465f56..7aa65c95a 100644 --- a/src/terminal.ml +++ b/src/terminal.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/terminal.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/test.ml b/src/test.ml index e64755ea4..3d480409a 100644 --- a/src/test.ml +++ b/src/test.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/test.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 @@ -526,7 +526,7 @@ let test() = check "1" R2 orig; ); - (* Check for the bug reported by Sebastian Elsner (Jan 2017) *) + (* Check for the bug reported by Sebastian Elsner (Jan 2018) *) (* NOT POSSIBLE because the test API does not enable one to play with file owners, but I put the test here anyway. *) (* diff --git a/src/test.mli b/src/test.mli index 259a3390f..c64f571a3 100644 --- a/src/test.mli +++ b/src/test.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/test.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Internal self-tests *) diff --git a/src/transfer.ml b/src/transfer.ml index 80b47ea7d..17f57712f 100644 --- a/src/transfer.ml +++ b/src/transfer.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transfer.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/transfer.mli b/src/transfer.mli index 54e748f14..61fdb3002 100644 --- a/src/transfer.mli +++ b/src/transfer.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transfer.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Rsync : general algorithm description diff --git a/src/transport.ml b/src/transport.ml index 3cd836ac3..ee55854fe 100644 --- a/src/transport.ml +++ b/src/transport.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transport.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/transport.mli b/src/transport.mli index 3c28b41ea..54b467c19 100644 --- a/src/transport.mli +++ b/src/transport.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transport.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Executes the actions implied by the reconItem list. *) val transportItem : diff --git a/src/tree.ml b/src/tree.ml index ae10cbbb2..04db5f279 100644 --- a/src/tree.ml +++ b/src/tree.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/tree.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/tree.mli b/src/tree.mli index 740741954..39a74042d 100644 --- a/src/tree.mli +++ b/src/tree.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/tree.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, 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 *) diff --git a/src/ubase/proplist.ml b/src/ubase/proplist.ml index f75ecf7a2..2377a7e42 100644 --- a/src/ubase/proplist.ml +++ b/src/ubase/proplist.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/proplist.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/ubase/proplist.mli b/src/ubase/proplist.mli index 585c6e3a1..992d9e1f2 100644 --- a/src/ubase/proplist.mli +++ b/src/ubase/proplist.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/proplist.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) type 'a key type t diff --git a/src/ubase/rx.ml b/src/ubase/rx.ml index 290bfb1df..0003e43fc 100644 --- a/src/ubase/rx.ml +++ b/src/ubase/rx.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/rx.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/ubase/rx.mli b/src/ubase/rx.mli index 8825ee9da..7018fd2c8 100644 --- a/src/ubase/rx.mli +++ b/src/ubase/rx.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/rx.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/ubase/safelist.ml b/src/ubase/safelist.ml index e6f0b53a7..678a8b551 100644 --- a/src/ubase/safelist.ml +++ b/src/ubase/safelist.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/safelist.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/ubase/safelist.mli b/src/ubase/safelist.mli index a7711894b..21aa94ac1 100644 --- a/src/ubase/safelist.mli +++ b/src/ubase/safelist.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/safelist.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, 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 diff --git a/src/ubase/trace.ml b/src/ubase/trace.ml index 36f2dc171..08caddf77 100644 --- a/src/ubase/trace.ml +++ b/src/ubase/trace.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/trace.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/ubase/trace.mli b/src/ubase/trace.mli index 4b83b2e69..d9bb10d0e 100644 --- a/src/ubase/trace.mli +++ b/src/ubase/trace.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/trace.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* ---------------------------------------------------------------------- *) (* Debugging support *) diff --git a/src/ubase/uarg.ml b/src/ubase/uarg.ml index 9c643ef66..5ffd92412 100644 --- a/src/ubase/uarg.ml +++ b/src/ubase/uarg.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/uarg.ml *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* by Xavier Leroy, projet Cristal, INRIA Rocquencourt *) (* Slightly modified by BCP, July 1999 *) diff --git a/src/ubase/util.ml b/src/ubase/util.ml index 9f4fe66a3..8af471432 100644 --- a/src/ubase/util.ml +++ b/src/ubase/util.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/util.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/ubase/util.mli b/src/ubase/util.mli index d7409c8bb..b213560ff 100644 --- a/src/ubase/util.mli +++ b/src/ubase/util.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/util.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Miscellaneous utility functions and datatypes *) diff --git a/src/ui.mli b/src/ui.mli index 9b108fe1e..b67fb7710 100644 --- a/src/ui.mli +++ b/src/ui.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ui.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* The module Ui provides only the user interface signature. Implementations are provided by Uitext and Uitk. *) diff --git a/src/uicommon.ml b/src/uicommon.ml index 14184775a..9fa94cf54 100644 --- a/src/uicommon.ml +++ b/src/uicommon.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uicommon.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/uicommon.mli b/src/uicommon.mli index bfad7a78b..ad3771b30 100644 --- a/src/uicommon.mli +++ b/src/uicommon.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uicommon.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* Kinds of UI *) type interface = diff --git a/src/uigtk2.ml b/src/uigtk2.ml index 6af53f75a..fbc5d8f49 100644 --- a/src/uigtk2.ml +++ b/src/uigtk2.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uigtk2.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/uigtk2.mli b/src/uigtk2.mli index b4f757de4..60f7a9fa8 100644 --- a/src/uigtk2.mli +++ b/src/uigtk2.mli @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/uigtk2.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI diff --git a/src/uitext.ml b/src/uitext.ml index 8526d03a2..c6bcf0be6 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uitext.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/uitext.mli b/src/uitext.mli index 241e7a66f..e8d74bd1a 100644 --- a/src/uitext.mli +++ b/src/uitext.mli @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/uitext.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI diff --git a/src/unicode.ml b/src/unicode.ml index c3921053a..0ec3e9330 100644 --- a/src/unicode.ml +++ b/src/unicode.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/unicode.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/unicode.mli b/src/unicode.mli index 5cd8f4518..d002b01c7 100644 --- a/src/unicode.mli +++ b/src/unicode.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/unicode.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) exception Invalid diff --git a/src/update.ml b/src/update.ml index fc5add890..d2e96b1d3 100644 --- a/src/update.ml +++ b/src/update.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/update.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/update.mli b/src/update.mli index d20bf9cc1..76424344c 100644 --- a/src/update.mli +++ b/src/update.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/update.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) module NameMap : MyMap.S with type key = Name.t diff --git a/src/uutil.ml b/src/uutil.ml index 9d930dc4e..2f603aa09 100644 --- a/src/uutil.ml +++ b/src/uutil.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uutil.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/uutil.mli b/src/uutil.mli index 937cf2e74..6f99b49ed 100644 --- a/src/uutil.mli +++ b/src/uutil.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uutil.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, 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 diff --git a/src/xferhint.ml b/src/xferhint.ml index 37da243a8..5c543d1b2 100644 --- a/src/xferhint.ml +++ b/src/xferhint.ml @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/xferhint.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/xferhint.mli b/src/xferhint.mli index 822d57d83..6073a49d2 100644 --- a/src/xferhint.mli +++ b/src/xferhint.mli @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/xferhint.mli *) -(* Copyright 1999-2017, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2018, Benjamin C. Pierce (see COPYING for details) *) (* This module maintains a cache that can be used to map an Os.fullfingerprint to a (Fspath.t * Path.t) naming a file that *may* From 1536c9d37a33656a27b86c07a4fb2948a9758412 Mon Sep 17 00:00:00 2001 From: Benjamin Pierce Date: Sat, 27 Jan 2018 15:49:39 -0500 Subject: [PATCH 4/4] Small improvement to doc string --- src/remote.ml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/remote.ml b/src/remote.ml index 0e9d4d3e1..a02e696bf 100644 --- a/src/remote.ml +++ b/src/remote.ml @@ -513,8 +513,9 @@ let addversionno = Prefs.createBool "addversionno" false ("!add version number to name of " ^ Uutil.myName ^ " on server") ("When this flag is set to {\\tt true}, Unison " - ^ "will use \\texttt{unison-\\ARG{currentversionnumber}} instead of " - ^ "just \\verb|unison| as the remote server command. This allows " + ^ "will use \\texttt{unison-\\ARG{currentmajorversionnumber}} instead of " + ^ "just \\verb|unison| as the remote server command (note that the minor " + ^ "version number is dropped -- e.g., unison-2.51). This allows " ^ "multiple binaries for different versions of unison to coexist " ^ "conveniently on the same server: whichever version is run " ^ "on the client, the same version will be selected on the server.")