From bcpierce at seas.upenn.edu Tue Dec 1 15:49:45 2015 From: bcpierce at seas.upenn.edu (bcpierce at seas.upenn.edu) Date: Tue, 1 Dec 2015 15:49:45 -0500 Subject: [Unison-hackers] [unison-svn] r550 - trunk/src Message-ID: <201512012049.tB1Knj2N009084@yaws.seas.upenn.edu> Author: bcpierce Date: 2015-12-01 15:49:45 -0500 (Tue, 01 Dec 2015) New Revision: 550 Modified: trunk/src/RECENTNEWS trunk/src/files.ml trunk/src/mkProjectInfo.ml Log: * 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 Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2015-11-02 01:35:17 UTC (rev 549) +++ trunk/src/RECENTNEWS 2015-12-01 20:49:45 UTC (rev 550) @@ -1,3 +1,13 @@ +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 Modified: trunk/src/files.ml =================================================================== --- trunk/src/files.ml 2015-11-02 01:35:17 UTC (rev 549) +++ trunk/src/files.ml 2015-12-01 20:49:45 UTC (rev 550) @@ -82,7 +82,10 @@ with the \\verb|-repeat watch| and \\verb|-prefer newer| preferences." let prepareCopy workingDir path notDefault = - if notDefault && Prefs.read copyOnConflict then begin + if notDefault + && Prefs.read copyOnConflict + && (Fileinfo.get true workingDir path).Fileinfo.typ <> `ABSENT + then begin let tmpPath = Os.tempPath workingDir path in Copy.recursively workingDir path workingDir tmpPath; Some (workingDir, path, tmpPath) Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2015-11-02 01:35:17 UTC (rev 549) +++ trunk/src/mkProjectInfo.ml 2015-12-01 20:49:45 UTC (rev 550) @@ -107,3 +107,4 @@ + From bcpierce at seas.upenn.edu Wed Dec 2 16:26:19 2015 From: bcpierce at seas.upenn.edu (bcpierce at seas.upenn.edu) Date: Wed, 2 Dec 2015 16:26:19 -0500 Subject: [Unison-hackers] [unison-svn] r551 - trunk/src Message-ID: <201512022126.tB2LQJHU022964@yaws.seas.upenn.edu> Author: bcpierce Date: 2015-12-02 16:26:19 -0500 (Wed, 02 Dec 2015) New Revision: 551 Modified: trunk/src/RECENTNEWS trunk/src/mkProjectInfo.ml trunk/src/uigtk2.ml Log: * Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scan profiles before main window is created. (second try) Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2015-12-01 20:49:45 UTC (rev 550) +++ trunk/src/RECENTNEWS 2015-12-02 21:26:19 UTC (rev 551) @@ -1,3 +1,10 @@ +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 Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2015-12-01 20:49:45 UTC (rev 550) +++ trunk/src/mkProjectInfo.ml 2015-12-02 21:26:19 UTC (rev 551) @@ -108,3 +108,4 @@ + Modified: trunk/src/uigtk2.ml =================================================================== --- trunk/src/uigtk2.ml 2015-12-01 20:49:45 UTC (rev 550) +++ trunk/src/uigtk2.ml 2015-12-02 21:26:19 UTC (rev 551) @@ -4265,6 +4265,8 @@ in ignore_result (tick ()); + Os.createUnisonDir(); + scanProfiles(); let detectCmd = createToplevelWindow() in Uicommon.uiInit @@ -4275,7 +4277,6 @@ getFirstRoot getSecondRoot termInteract; - scanProfiles(); detectCmd (); (* Display the ui *) From bcpierce at seas.upenn.edu Tue Dec 8 09:10:15 2015 From: bcpierce at seas.upenn.edu (bcpierce at seas.upenn.edu) Date: Tue, 8 Dec 2015 09:10:15 -0500 Subject: [Unison-hackers] [unison-svn] r552 - in trunk/src: . lwt system ubase uimac14 uimac14/English.lproj Message-ID: <201512081410.tB8EAGn4009051@yaws.seas.upenn.edu> Author: bcpierce Date: 2015-12-08 09:10:15 -0500 (Tue, 08 Dec 2015) New Revision: 552 Modified: trunk/src/RECENTNEWS trunk/src/abort.ml trunk/src/bytearray.ml trunk/src/bytearray.mli trunk/src/bytearray_stubs.c 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/fpcache.ml trunk/src/fpcache.mli trunk/src/fs.ml trunk/src/fs.mli trunk/src/fspath.ml trunk/src/fspath.mli trunk/src/fswatch.ml trunk/src/fswatch.mli trunk/src/fswatchold.ml trunk/src/globals.ml trunk/src/globals.mli trunk/src/linkgtk.ml trunk/src/linkgtk2.ml trunk/src/linktext.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/system.ml trunk/src/system.mli trunk/src/system/system_generic.ml trunk/src/system/system_intf.ml trunk/src/system/system_win.ml trunk/src/terminal.ml 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/proplist.ml trunk/src/ubase/proplist.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/uimac14/English.lproj/MainMenu.xib trunk/src/uimac14/Info.plist trunk/src/uimac14/MyController.m trunk/src/uimac14/ProgressCell.m trunk/src/uimac14/ReconTableView.h trunk/src/uimac14/ReconTableView.m trunk/src/uitext.ml trunk/src/uitext.mli trunk/src/unicode.ml trunk/src/unicode.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 dates to 2016 Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/RECENTNEWS 2015-12-08 14:10:15 UTC (rev 552) @@ -1,3 +1,10 @@ +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 Modified: trunk/src/abort.ml =================================================================== --- trunk/src/abort.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/abort.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/abort.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/bytearray.ml =================================================================== --- trunk/src/bytearray.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/bytearray.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/bytearray.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/bytearray.mli =================================================================== --- trunk/src/bytearray.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/bytearray.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/bytearray.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type t = (char, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t Modified: trunk/src/bytearray_stubs.c =================================================================== --- trunk/src/bytearray_stubs.c 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/bytearray_stubs.c 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ /* Unison file synchronizer: src/bytearray_stubs.c */ -/* Copyright 1999-2015 (see COPYING for details) */ +/* Copyright 1999-2016 (see COPYING for details) */ #include Modified: trunk/src/case.ml =================================================================== --- trunk/src/case.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/case.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/case.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/case.mli =================================================================== --- trunk/src/case.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/case.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/case.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) val caseInsensitiveMode : [`True|`False|`Default] Prefs.t val unicodeEncoding : bool Prefs.t Modified: trunk/src/checksum.ml =================================================================== --- trunk/src/checksum.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/checksum.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/checksum.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/checksum.mli =================================================================== --- trunk/src/checksum.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/checksum.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/checksum.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type t = int type u = int array Modified: trunk/src/clroot.ml =================================================================== --- trunk/src/clroot.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/clroot.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/clroot.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/clroot.mli =================================================================== --- trunk/src/clroot.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/clroot.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/clroot.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Command-line roots *) type clroot = Modified: trunk/src/common.ml =================================================================== --- trunk/src/common.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/common.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/common.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/common.mli =================================================================== --- trunk/src/common.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/common.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/common.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (***************************************************************************) (* COMMON TYPES USED BY ALL MODULES *) Modified: trunk/src/copy.ml =================================================================== --- trunk/src/copy.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/copy.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/copy.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/external.ml =================================================================== --- trunk/src/external.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/external.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/external.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/external.mli =================================================================== --- trunk/src/external.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/external.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/external.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) val runExternalProgram : string -> (Unix.process_status * string) Lwt.t val readChannelTillEof : in_channel -> string Modified: trunk/src/fileinfo.ml =================================================================== --- trunk/src/fileinfo.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fileinfo.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileinfo.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fileinfo.mli =================================================================== --- trunk/src/fileinfo.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fileinfo.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileinfo.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/files.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/files.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/files.mli =================================================================== --- trunk/src/files.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/files.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/files.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fileutil.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileutil.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fileutil.mli =================================================================== --- trunk/src/fileutil.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fileutil.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileutil.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fingerprint.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fingerprint.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fingerprint.mli =================================================================== --- trunk/src/fingerprint.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fingerprint.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fingerprint.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type t Modified: trunk/src/fpcache.ml =================================================================== --- trunk/src/fpcache.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fpcache.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fpcache.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fpcache.mli =================================================================== --- trunk/src/fpcache.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fpcache.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fpcache.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Initialize the cache *) val init : bool -> bool -> System.fspath -> unit Modified: trunk/src/fs.ml =================================================================== --- trunk/src/fs.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fs.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fs.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fs.mli =================================================================== --- trunk/src/fs.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fs.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fs.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Operations on fspaths *) Modified: trunk/src/fspath.ml =================================================================== --- trunk/src/fspath.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fspath.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fspath.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fspath.mli =================================================================== --- trunk/src/fspath.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fspath.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fspath.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Defines an abstract type of absolute filenames (fspaths) *) Modified: trunk/src/fswatch.ml =================================================================== --- trunk/src/fswatch.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fswatch.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fswatch.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/fswatch.mli =================================================================== --- trunk/src/fswatch.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fswatch.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fswatch.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type archiveHash = string Modified: trunk/src/fswatchold.ml =================================================================== --- trunk/src/fswatchold.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/fswatchold.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fswatcherold.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/globals.ml =================================================================== --- trunk/src/globals.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/globals.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/globals.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/globals.mli =================================================================== --- trunk/src/globals.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/globals.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/globals.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/linkgtk.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/linkgtk.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/linkgtk2.ml =================================================================== --- trunk/src/linkgtk2.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/linkgtk2.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/linkgtk2.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/linktext.ml =================================================================== --- trunk/src/linktext.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/linktext.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/linktext.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/lock.ml =================================================================== --- trunk/src/lock.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/lock.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lock.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/lock.mli =================================================================== --- trunk/src/lock.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/lock.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lock.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/lwt/pqueue.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lwt/pqueue.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/lwt/pqueue.mli =================================================================== --- trunk/src/lwt/pqueue.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/lwt/pqueue.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lwt/pqueue.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) module type OrderedType = sig Modified: trunk/src/main.ml =================================================================== --- trunk/src/main.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/main.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/main.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/mkProjectInfo.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -109,3 +109,4 @@ + Modified: trunk/src/name.ml =================================================================== --- trunk/src/name.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/name.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/name.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/name.mli =================================================================== --- trunk/src/name.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/name.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/name.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type t Modified: trunk/src/os.ml =================================================================== --- trunk/src/os.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/os.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/os.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/os.mli =================================================================== --- trunk/src/os.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/os.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/os.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) val myCanonicalHostName : unit -> string Modified: trunk/src/osx.ml =================================================================== --- trunk/src/osx.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/osx.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/osx.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/osx.mli =================================================================== --- trunk/src/osx.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/osx.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/osx.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) val init : bool -> unit val isMacOSX : bool Modified: trunk/src/path.ml =================================================================== --- trunk/src/path.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/path.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/path.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/path.mli =================================================================== --- trunk/src/path.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/path.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/path.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Abstract type of relative pathnames *) type 'a path Modified: trunk/src/pixmaps.ml =================================================================== --- trunk/src/pixmaps.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/pixmaps.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pixmaps.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/pred.ml =================================================================== --- trunk/src/pred.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/pred.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pred.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/pred.mli =================================================================== --- trunk/src/pred.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/pred.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pred.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Predicates over paths. Modified: trunk/src/props.ml =================================================================== --- trunk/src/props.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/props.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/props.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/props.mli =================================================================== --- trunk/src/props.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/props.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/props.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* File properties: time, permission, length, etc. *) Modified: trunk/src/recon.ml =================================================================== --- trunk/src/recon.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/recon.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/recon.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/recon.mli =================================================================== --- trunk/src/recon.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/recon.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/recon.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) val reconcileAll : ?allowPartial:bool (* whether we allow partial synchronization Modified: trunk/src/remote.ml =================================================================== --- trunk/src/remote.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/remote.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/remote.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/remote.mli =================================================================== --- trunk/src/remote.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/remote.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/remote.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/sortri.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/sortri.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/sortri.mli =================================================================== --- trunk/src/sortri.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/sortri.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/sortri.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/stasher.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,6 +1,6 @@ (* Unison file synchronizer: src/stasher.ml *) (* $I2: Last modified by lescuyer *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/strings.mli =================================================================== --- trunk/src/strings.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/strings.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/strings.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) val docs : (string * (string * string)) list Modified: trunk/src/system/system_generic.ml =================================================================== --- trunk/src/system/system_generic.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/system/system_generic.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_generic.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/system/system_intf.ml =================================================================== --- trunk/src/system/system_intf.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/system/system_intf.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_intf.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/system/system_win.ml =================================================================== --- trunk/src/system/system_win.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/system/system_win.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_win.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/system.ml =================================================================== --- trunk/src/system.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/system.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/system.mli =================================================================== --- trunk/src/system.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/system.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Operations on filesystem path *) Modified: trunk/src/terminal.ml =================================================================== --- trunk/src/terminal.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/terminal.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/terminal.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/test.ml =================================================================== --- trunk/src/test.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/test.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/test.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/test.mli =================================================================== --- trunk/src/test.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/test.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/test.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Internal self-tests *) Modified: trunk/src/transfer.ml =================================================================== --- trunk/src/transfer.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/transfer.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transfer.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/transfer.mli =================================================================== --- trunk/src/transfer.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/transfer.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transfer.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Rsync : general algorithm description Modified: trunk/src/transport.ml =================================================================== --- trunk/src/transport.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/transport.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transport.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/transport.mli =================================================================== --- trunk/src/transport.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/transport.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transport.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/tree.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/tree.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/tree.mli =================================================================== --- trunk/src/tree.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/tree.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/tree.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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/proplist.ml =================================================================== --- trunk/src/ubase/proplist.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/proplist.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/proplist.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/ubase/proplist.mli =================================================================== --- trunk/src/ubase/proplist.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/proplist.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/proplist.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type 'a key type t Modified: trunk/src/ubase/rx.ml =================================================================== --- trunk/src/ubase/rx.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/rx.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/rx.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/ubase/rx.mli =================================================================== --- trunk/src/ubase/rx.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/rx.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/rx.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) type t Modified: trunk/src/ubase/safelist.ml =================================================================== --- trunk/src/ubase/safelist.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/safelist.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/safelist.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/ubase/safelist.mli =================================================================== --- trunk/src/ubase/safelist.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/safelist.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/safelist.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/trace.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/trace.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/ubase/trace.mli =================================================================== --- trunk/src/ubase/trace.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/trace.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/trace.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* ---------------------------------------------------------------------- *) (* Debugging support *) Modified: trunk/src/ubase/uarg.ml =================================================================== --- trunk/src/ubase/uarg.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/uarg.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/uarg.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/util.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/util.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/ubase/util.mli =================================================================== --- trunk/src/ubase/util.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ubase/util.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/util.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Miscellaneous utility functions and datatypes *) Modified: trunk/src/ui.mli =================================================================== --- trunk/src/ui.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/ui.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ui.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uicommon.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uicommon.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/uicommon.mli =================================================================== --- trunk/src/uicommon.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uicommon.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uicommon.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) (* Kinds of UI *) type interface = Modified: trunk/src/uigtk2.ml =================================================================== --- trunk/src/uigtk2.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uigtk2.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uigtk2.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 @@ -209,7 +209,7 @@ 0x0078; 0x0079; 0x007A; 0x007B; 0x007C; 0x007D; 0x007E; 0x007F; 0x20AC; 0x1234; 0x201A; 0x0192; 0x201E; 0x2026; 0x2020; 0x2021; 0x02C6; 0x2030; 0x0160; 0x2039; 0x0152; 0x1234; 0x017D; 0x1234; - 0x1234; 0x2018; 0x2019; 0x201C; 0x201D; 0x2022; 0x2013; 0x2015; + 0x1234; 0x2018; 0x2019; 0x201C; 0x201D; 0x2022; 0x2013; 0x2016; 0x02DC; 0x2122; 0x0161; 0x203A; 0x0153; 0x1234; 0x017E; 0x0178; 0x00A0; 0x00A1; 0x00A2; 0x00A3; 0x00A4; 0x00A5; 0x00A6; 0x00A7; 0x00A8; 0x00A9; 0x00AA; 0x00AB; 0x00AC; 0x00AD; 0x00AE; 0x00AF; Modified: trunk/src/uigtk2.mli =================================================================== --- trunk/src/uigtk2.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uigtk2.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/uigtk2.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI Modified: trunk/src/uimac14/English.lproj/MainMenu.xib =================================================================== --- trunk/src/uimac14/English.lproj/MainMenu.xib 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uimac14/English.lproj/MainMenu.xib 2015-12-08 14:10:15 UTC (rev 552) @@ -763,7 +763,7 @@ - ? Copyright 1999-2014. + ? Copyright 1999-2016. This software is licensed under the GNU General Public License. Modified: trunk/src/uimac14/Info.plist =================================================================== --- trunk/src/uimac14/Info.plist 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uimac14/Info.plist 2015-12-08 14:10:15 UTC (rev 552) @@ -21,9 +21,9 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleGetInfoString - ${MARKETING_VERSION}, ?1999-2014, licensed under GNU GPL. + ${MARKETING_VERSION}, ?1999-2016, licensed under GNU GPL. NSHumanReadableCopyright - ?1999-2014, licensed under GNU GPL v3. + ?1999-2016, licensed under GNU GPL v3. NSMainNibFile MainMenu NSPrincipalClass Modified: trunk/src/uimac14/MyController.m =================================================================== --- trunk/src/uimac14/MyController.m 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uimac14/MyController.m 2015-12-08 14:10:15 UTC (rev 552) @@ -1,4 +1,4 @@ -/* Copyright (c) 2003, 2015, see file COPYING for details. */ +/* Copyright (c) 2003, 2016, see file COPYING for details. */ #import "MyController.h" @@ -182,7 +182,7 @@ /* unless user has clicked Don't ask me again, ask about cltool */ if ( ([[NSUserDefaults standardUserDefaults] boolForKey:@"CheckCltool"]) && (![[NSFileManager defaultManager] - /* BCP 6/2015: Changed from /usr/bin/unison for El Capitan, per + /* BCP 6/2016: Changed from /usr/bin/unison for El Capitan, per suggestion from Alan Shutko */ fileExistsAtPath:@"/usr/local/bin/unison"]) ) [self raiseCltoolWindow:nil]; Modified: trunk/src/uimac14/ProgressCell.m =================================================================== --- trunk/src/uimac14/ProgressCell.m 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uimac14/ProgressCell.m 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright 2008, 2015 (see file COPYING for more information) + * Copyright 2008, 2016 (see file COPYING for more information) * * Loosely based on TorrentCell from Transmission (.png files are from * the original). Modified: trunk/src/uimac14/ReconTableView.h =================================================================== --- trunk/src/uimac14/ReconTableView.h 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uimac14/ReconTableView.h 2015-12-08 14:10:15 UTC (rev 552) @@ -5,7 +5,7 @@ // The keyDown: method is redefined. // // Created by Trevor Jim on Wed Aug 27 2003. -// Copyright (c) 2003, 2014, licensed under GNU GPL. +// Copyright (c) 2003, 2016, licensed under GNU GPL. // #import Modified: trunk/src/uimac14/ReconTableView.m =================================================================== --- trunk/src/uimac14/ReconTableView.m 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uimac14/ReconTableView.m 2015-12-08 14:10:15 UTC (rev 552) @@ -3,7 +3,7 @@ // Unison // // Created by Trevor Jim on Wed Aug 27 2003. -// Copyright (c) 2003, 2015. See file COPYING for details. +// Copyright (c) 2003, 2016. See file COPYING for details. // #import "ReconTableView.h" Modified: trunk/src/uitext.ml =================================================================== --- trunk/src/uitext.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uitext.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uitext.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/uitext.mli =================================================================== --- trunk/src/uitext.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uitext.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/uitext.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI Modified: trunk/src/unicode.ml =================================================================== --- trunk/src/unicode.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/unicode.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/unicode.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/unicode.mli =================================================================== --- trunk/src/unicode.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/unicode.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/unicode.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) exception Invalid Modified: trunk/src/update.ml =================================================================== --- trunk/src/update.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/update.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/update.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/update.mli =================================================================== --- trunk/src/update.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/update.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/update.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, Benjamin C. Pierce (see COPYING for details) *) module NameMap : MyMap.S with type key = Name.t Modified: trunk/src/uutil.ml =================================================================== --- trunk/src/uutil.ml 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uutil.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uutil.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/uutil.mli =================================================================== --- trunk/src/uutil.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/uutil.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uutil.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/xferhint.ml 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/xferhint.ml *) -(* Copyright 1999-2015, Benjamin C. Pierce +(* Copyright 1999-2016, 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 Modified: trunk/src/xferhint.mli =================================================================== --- trunk/src/xferhint.mli 2015-12-02 21:26:19 UTC (rev 551) +++ trunk/src/xferhint.mli 2015-12-08 14:10:15 UTC (rev 552) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/xferhint.mli *) -(* Copyright 1999-2015, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2016, 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 dfilip at colornet.com Mon Dec 14 18:18:23 2015 From: dfilip at colornet.com (David E. Filip) Date: Mon, 14 Dec 2015 18:18:23 -0500 Subject: [Unison-hackers] Unison on El Capitan Message-ID: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> Dear Unison Hackers, Can someone please advise how to install Unison command line on OS X 10.11 / El Capitan? I have tried installing Unison 2.40.69 (binary). Everything works fine and as expected on several OS X 10.9 / Mavericks systems. However, on 10.11 / El Capitan the command line version cannot be installed in /usr/bin because of System Integrity Protection (SIP). However, although I cannot write files to /usr/bin with SIP, I can write files to /usr/local/bin. So the question is which file? Copying Unison.app/Contents/MacOS/Unison to /usr/local/bin/unison does not work (I get an error trying to execute it). And it looks like cltool is too small and the wrong file. And neither one match the size of /usr/bin/unison installed on Mavericks. So I tried copying the binary (/usr/bin/unison) from a Mavericks system to my El Capitan system as /usr/local/bin/unison. However, when I try to sync from a remote system, I get an immediate ?Lost connection with server? pop-up. And if I run unison from the command like I see the error ?bash: unison: command not found?. However, if I login to the El Capitan system and type ?which unison? it finds it in /usr/local/bin. And if I open terminal on the El Capitan system and type ?unison? it launches the Unison GUI. So why doesn?t it find it when sync?ing from a remote system (Mac OS 10.9 / Mavericks, also Unison 2.40.69)? So in addition to the annoying question about ?Do you want to install the command line?? every time I start Unison on El Capitan, I need to be able to sync from a remote system (actually several, all currently on 10/9 / Mavericks). Thanks, Dave Filip From alan.schmitt at polytechnique.org Tue Dec 15 08:59:33 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Tue, 15 Dec 2015 14:59:33 +0100 Subject: [Unison-hackers] Unison on El Capitan In-Reply-To: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> (David E. Filip's message of "Mon, 14 Dec 2015 18:18:23 -0500") References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> Message-ID: Hello, On 2015-12-15 00:18, "David E. Filip" writes: > Dear Unison Hackers, > > Can someone please advise how to install Unison command line on OS > X 10.11 / El Capitan? You can try this one: http://alan.petitepomme.net/unison/assets/Unison-OS-X-2.48.15.zip It has been modified to install the command line tool in the correct place. > So the question is which file? Copying Unison.app/Contents/MacOS/Unison to > /usr/local/bin/unison does not work (I get an error trying to execute it). And > it looks like cltool is too small and the wrong file. And neither one match > the size of /usr/bin/unison installed on Mavericks. The cltool binary is small because all it does is ask the Finder about where the Unison app is, and start is. What you could do is copy cltool as /usr/local/bin/unison. The simplest approach may be to recompile the command line version of unison. It's available in homebrew, for instance: % brew info unison unison: stable 2.48.3 (bottled) Unison file synchronizer https://www.cis.upenn.edu/~bcpierce/unison/ Not installed From: https://github.com/Homebrew/homebrew/blob/master/Library/Formula/unison.rb ==> Dependencies Build: ocaml ? Hope this helps, Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 472 bytes Desc: not available URL: From dfilip at colornet.com Tue Dec 15 09:06:14 2015 From: dfilip at colornet.com (David E. Filip) Date: Tue, 15 Dec 2015 09:06:14 -0500 Subject: [Unison-hackers] Unison on El Capitan In-Reply-To: References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> Message-ID: <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> Alan, Thanks for the feedback: > You can try this one: > http://alan.petitepomme.net/unison/assets/Unison-OS-X-2.48.15.zip > > It has been modified to install the command line tool in the correct > place. Unfortunately, I don?t believe 2.48 will work with my CentOS 6 Linux servers, since the latest version in the yum repository is 2.40. I know that mixing and matching different Unison versions usually doesn?t work. > The cltool binary is small because all it does is ask the Finder about > where the Unison app is, and start is. What you could do is copy cltool > as /usr/local/bin/unison. OK, if I copy that from one of my Mavericks systems to /usr/local/bin on El Capitan, should that also work? I know that /usr/bin/unison on my Mavericks systems is much larger. Thanks, Dave. On Dec 15, 2015, at 8:59 AM, Alan Schmitt wrote: > Hello, > > On 2015-12-15 00:18, "David E. Filip" writes: > >> Dear Unison Hackers, >> >> Can someone please advise how to install Unison command line on OS >> X 10.11 / El Capitan? > > You can try this one: > http://alan.petitepomme.net/unison/assets/Unison-OS-X-2.48.15.zip > > It has been modified to install the command line tool in the correct > place. > >> So the question is which file? Copying Unison.app/Contents/MacOS/Unison to >> /usr/local/bin/unison does not work (I get an error trying to execute it). And >> it looks like cltool is too small and the wrong file. And neither one match >> the size of /usr/bin/unison installed on Mavericks. > > The cltool binary is small because all it does is ask the Finder about > where the Unison app is, and start is. What you could do is copy cltool > as /usr/local/bin/unison. > > The simplest approach may be to recompile the command line version of > unison. It's available in homebrew, for instance: > > % brew info unison > unison: stable 2.48.3 (bottled) > Unison file synchronizer > https://www.cis.upenn.edu/~bcpierce/unison/ > Not installed > From: https://github.com/Homebrew/homebrew/blob/master/Library/Formula/unison.rb > ==> Dependencies > Build: ocaml ? > > Hope this helps, > > Alan > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm From alan.schmitt at polytechnique.org Tue Dec 15 09:23:59 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Tue, 15 Dec 2015 15:23:59 +0100 Subject: [Unison-hackers] Unison on El Capitan In-Reply-To: <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> (David E. Filip's message of "Tue, 15 Dec 2015 09:06:14 -0500") References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> Message-ID: On 2015-12-15 15:06, "David E. Filip" writes: >> You can try this one: >> http://alan.petitepomme.net/unison/assets/Unison-OS-X-2.48.15.zip >> >> It has been modified to install the command line tool in the correct >> place. > > Unfortunately, I don?t believe 2.48 will work with my CentOS 6 Linux servers, > since the latest version in the yum repository is 2.40. I know that mixing and > matching different Unison versions usually doesn?t work. Yes, it would not work. >> The cltool binary is small because all it does is ask the Finder about >> where the Unison app is, and start is. What you could do is copy cltool >> as /usr/local/bin/unison. > > OK, if I copy that from one of my Mavericks systems to /usr/local/bin > on El Capitan, should that also work? I know that /usr/bin/unison on > my Mavericks systems is much larger. It should also work, yes. Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 472 bytes Desc: not available URL: From dfilip at colornet.com Tue Dec 15 10:06:09 2015 From: dfilip at colornet.com (David E. Filip) Date: Tue, 15 Dec 2015 10:06:09 -0500 Subject: [Unison-hackers] Unison on El Capitan In-Reply-To: References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> Message-ID: Alan, Unfortunately, that does not work, but I think I?m missing another piece here. I have tried copying the /usr/bin/unison from Mavericks to El Capitan: -rwxr-xr-x@ 1 root wheel 29880 Dec 14 17:51 /usr/local/bin/unison I also tried copying /Applications/Unison.app/Contents/MacOS/cltool to /usr/local/bin/unison: -rwxr-xr-x@ 1 root wheel 9344 Dec 15 09:54 /usr/local/bin/unison In both cases, if I am ON THE EL CAPITAN system and type ?unison? from a terminal window, the Unison app launches. In both cases, if I try to sync from a remote system, I receive an error: $ unison iTunes 2015-12-15 10:00:42.602 Unison[98002:1307] Connecting to iTunes... bash: unison: command not found Here is the profile that I?m using: # Unison preferences file root = /Users/dfilip/Music/iTunes root = ssh://minerva.colornet.com//Volumes/BACKUP500GB/iTunes ignore = Name {.DS_Store} ignore = Name {._*} However, if I ssh from the remote system that I?m trying to sync from, it works: $ ssh minerva.colornet.com Last login: Tue Dec 15 09:54:10 2015 minerva:~ dfilip$ hostname minerva.colornet.com minerva:~ dfilip$ exit logout Connection to minerva.colornet.com closed. So is there some other piece that I?m missing which is preventing the unison command from being found on the El Capitan (minerva.colornet.com) system? I?m wondering if SIP is still getting in the way somehow? Thanks, Dave. On Dec 15, 2015, at 9:23 AM, Alan Schmitt wrote: > On 2015-12-15 15:06, "David E. Filip" writes: > >>> You can try this one: >>> http://alan.petitepomme.net/unison/assets/Unison-OS-X-2.48.15.zip >>> >>> It has been modified to install the command line tool in the correct >>> place. >> >> Unfortunately, I don?t believe 2.48 will work with my CentOS 6 Linux servers, >> since the latest version in the yum repository is 2.40. I know that mixing and >> matching different Unison versions usually doesn?t work. > > Yes, it would not work. > >>> The cltool binary is small because all it does is ask the Finder about >>> where the Unison app is, and start is. What you could do is copy cltool >>> as /usr/local/bin/unison. >> >> OK, if I copy that from one of my Mavericks systems to /usr/local/bin >> on El Capitan, should that also work? I know that /usr/bin/unison on >> my Mavericks systems is much larger. > > It should also work, yes. > > Alan > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: PastedGraphic-1.tiff Type: image/tiff Size: 23886 bytes Desc: not available URL: From alan.schmitt at polytechnique.org Tue Dec 15 10:21:34 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Tue, 15 Dec 2015 16:21:34 +0100 Subject: [Unison-hackers] Unison on El Capitan In-Reply-To: (David E. Filip's message of "Tue, 15 Dec 2015 10:06:09 -0500") References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> Message-ID: On 2015-12-15 16:06, David E. Filip writes: > Here is the profile that I?m using: > > # Unison preferences file > root = /Users/dfilip/Music/iTunes > root = ssh://minerva.colornet.com//Volumes/BACKUP500GB/iTunes > ignore = Name {.DS_Store} > ignore = Name {._*} You need to add: servercmd = /usr/local/bin/unison > So is there some other piece that I?m missing which is preventing the unison > command from being found on the El Capitan (minerva.colornet.com) system? ssh does not put /usr/local/bin in the PATH by default, so it does not find the unison binary there. Best, Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 472 bytes Desc: not available URL: From dfilip at colornet.com Tue Dec 15 10:30:35 2015 From: dfilip at colornet.com (David E. Filip) Date: Tue, 15 Dec 2015 10:30:35 -0500 Subject: [Unison-hackers] Unison on El Capitan In-Reply-To: References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> Message-ID: Ah, yes, thanks, that worked! Much appreciated! What was throwing me off was that if I ssh to a shell, I do have /usr/local/bin in my path, which I am not adding myself. In a slap-to-the-forehead ?duh? moment, I went back through my history, as I thought that I verified the path last night by using: $ ssh minerva.colornet.com echo $PATH which of course just displays the LOCAL PATH, and should have been: $ ssh minerva.colornet.com echo \$PATH which reveals that the REMOTE PATH is just: /usr/bin:/bin:/usr/sbin:/sbin So thanks for pointing that out! On Dec 15, 2015, at 10:21 AM, Alan Schmitt wrote: > On 2015-12-15 16:06, David E. Filip writes: > >> Here is the profile that I?m using: >> >> # Unison preferences file >> root = /Users/dfilip/Music/iTunes >> root = ssh://minerva.colornet.com//Volumes/BACKUP500GB/iTunes >> ignore = Name {.DS_Store} >> ignore = Name {._*} > > You need to add: > servercmd = /usr/local/bin/unison > >> So is there some other piece that I?m missing which is preventing the unison >> command from being found on the El Capitan (minerva.colornet.com) system? > > ssh does not put /usr/local/bin in the PATH by default, so it does not > find the unison binary there. > > Best, > > Alan > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm -------------- next part -------------- An HTML attachment was scrubbed... URL: From frederik at ofb.net Wed Dec 16 02:42:55 2015 From: frederik at ofb.net (frederik at ofb.net) Date: Tue, 15 Dec 2015 23:42:55 -0800 Subject: [Unison-hackers] unison-hackers mail issues In-Reply-To: References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> <20151215233050.GF981@ofb.net> Message-ID: <20151216074255.GH981@ofb.net> Hi Alan, Thanks! FYI I got a bounce when I sent to Unison-hackers at lists.seas.upenn.edu I think it needs to be lowercase unison-hackers at lists.seas.upenn.edu (even though it's capitalized on the bottom of each list message :/ ) Thanks, Frederick On Wed, Dec 16, 2015 at 07:53:32AM +0100, Alan Schmitt wrote: > Hello Frederik, > > I'm leaving unison-hackers in copy of this email, hopefully it will make > it there. Unfortunately I am not managing this list and I cannot help > you with this. > > Best, > > Alan > > On 2015-12-16 00:30, frederik at ofb.net writes: > > > Hi Alan, > > > > I wanted to ask the unison-hackers list about a problem I was > > experiencing with Unison a few months ago. My message was classified > > as spam by seas.upenn.edu, and bounced back to me. I tried to get > > through to postmaster at seas.upenn.edu, as suggested by the contents of > > the bounce, and to Benjamin Pierce, but my message was ignored both > > times. > > > > Since you can send email to the list, I wonder if you could forward > > this message for me? I've seen some more effective ways of queuing > > spam, such as this JMBA (http://www.ivarch.com/programs/jmba.shtml) - > > perhaps UPenn could use something like this, or simply read what > > people send to postmaster at seas.upenn.edu, I'm not sure which is > > easiest... > > > > Thanks! > > > > Frederick > > > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm From alan.schmitt at polytechnique.org Wed Dec 16 01:53:32 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Wed, 16 Dec 2015 07:53:32 +0100 Subject: [Unison-hackers] unison-hackers mail issues In-Reply-To: <20151215233050.GF981@ofb.net> (frederik@ofb.net's message of "Tue, 15 Dec 2015 15:30:50 -0800") References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> <20151215233050.GF981@ofb.net> Message-ID: Hello Frederik, I'm leaving unison-hackers in copy of this email, hopefully it will make it there. Unfortunately I am not managing this list and I cannot help you with this. Best, Alan On 2015-12-16 00:30, frederik at ofb.net writes: > Hi Alan, > > I wanted to ask the unison-hackers list about a problem I was > experiencing with Unison a few months ago. My message was classified > as spam by seas.upenn.edu, and bounced back to me. I tried to get > through to postmaster at seas.upenn.edu, as suggested by the contents of > the bounce, and to Benjamin Pierce, but my message was ignored both > times. > > Since you can send email to the list, I wonder if you could forward > this message for me? I've seen some more effective ways of queuing > spam, such as this JMBA (http://www.ivarch.com/programs/jmba.shtml) - > perhaps UPenn could use something like this, or simply read what > people send to postmaster at seas.upenn.edu, I'm not sure which is > easiest... > > Thanks! > > Frederick > -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 472 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 472 bytes Desc: not available URL: From bcpierce at cis.upenn.edu Wed Dec 16 16:15:36 2015 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Wed, 16 Dec 2015 16:15:36 -0500 Subject: [Unison-hackers] strange out of memory error Message-ID: [Forwarding to the list on Frederik?s behalf, since he seems to be having trouble posting? -B] Date: Wed, 11 Nov 2015 13:57:34 -0800 From: frederik at ofb.net To: Unison hackers > Subject: strange out of memory error User-Agent: Mutt/1.5.24 (2015-08-30) X-My-Tags: inbox (I'm resending this message of October 31, 2015 which was misclassified as spam by seas.upenn.edu ; I did not get a reply from postmaster at seas.upenn.edu when I enquired as to the reason) Hello Hackers, I ran into a strange error after some updates on a remote account (ofb.net ). Basically, I propagated a new .zprofile to ofb.net which changed my PATH to exclude unison, so that it didn't work when I invoked it locally (complaining that the version was different on the server, since there is an old version in ofb.net :/usr/bin/), and then when I put $HOME/bin back in PATH (on ofb.net ), I got this error. There may have been other changes which caused the error, but I'm curious because when I search Google for "unison out of memory", the only thing that comes up is about when you have huge directories, which I don't think is the case here: $ unison home-config . ssh://ofb.net/ Contacting server... Connected [//ofb.net//home/frederik -> //thutmose//home/frederik] Looking for changes Waiting for changes from server Reconciling changes Unison failed: Uncaught exception Out of memory Raised at file "/build/unison/src/unison-2.48.3/lwt/lwt.ml", line 135, characters 12-13 Called from file "list.ml", line 73, characters 12-15 Called from file "/build/unison/src/unison-2.48.3/lwt/lwt.ml", line 31, characters 2-37 Called from file "/build/unison/src/unison-2.48.3/lwt/lwt.ml", line 83, characters 17-46 Called from file "/build/unison/src/unison-2.48.3/lwt/generic/lwt_unix_impl.ml", line 147, characters 6-40 Called from file "/build/unison/src/unison-2.48.3/main.ml", line 202, characters 6-24 Called from file "/build/unison/src/unison-2.48.3/main.ml", line 131, characters 4-9 Fatal error: Lost connection with the server Any ideas? Thank you, Frederick ----- End forwarded message ----- -------------- next part -------------- An HTML attachment was scrubbed... URL: From bcpierce at cis.upenn.edu Wed Dec 16 16:25:05 2015 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Wed, 16 Dec 2015 16:25:05 -0500 Subject: [Unison-hackers] unison-hackers mail issues In-Reply-To: References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> <20151215233050.GF981@ofb.net> Message-ID: <5D3E3800-DE25-43F7-B3E9-430390CBC8F4@cis.upenn.edu> Sorry for missing this the first time. I?ve forwarded your message to unison-hackers. And I?ll investigate why it was classified as spam in the first place. - B > On Dec 16, 2015, at 1:53 AM, Alan Schmitt wrote: > > Hello Frederik, > > I'm leaving unison-hackers in copy of this email, hopefully it will make > it there. Unfortunately I am not managing this list and I cannot help > you with this. > > Best, > > Alan > > On 2015-12-16 00:30, frederik at ofb.net writes: > >> Hi Alan, >> >> I wanted to ask the unison-hackers list about a problem I was >> experiencing with Unison a few months ago. My message was classified >> as spam by seas.upenn.edu, and bounced back to me. I tried to get >> through to postmaster at seas.upenn.edu, as suggested by the contents of >> the bounce, and to Benjamin Pierce, but my message was ignored both >> times. >> >> Since you can send email to the list, I wonder if you could forward >> this message for me? I've seen some more effective ways of queuing >> spam, such as this JMBA (http://www.ivarch.com/programs/jmba.shtml) - >> perhaps UPenn could use something like this, or simply read what >> people send to postmaster at seas.upenn.edu, I'm not sure which is >> easiest... >> >> Thanks! >> >> Frederick >> > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From frederik at ofb.net Fri Dec 18 20:39:02 2015 From: frederik at ofb.net (frederik at ofb.net) Date: Fri, 18 Dec 2015 17:39:02 -0800 Subject: [Unison-hackers] unison-hackers mail issues In-Reply-To: <5D3E3800-DE25-43F7-B3E9-430390CBC8F4@cis.upenn.edu> References: <866B767C-0446-41DC-BC02-EC9CE2BCE9D7@colornet.com> <85C62EF0-E79D-4C84-AF7D-E4435743F1D7@colornet.com> <20151215233050.GF981@ofb.net> <5D3E3800-DE25-43F7-B3E9-430390CBC8F4@cis.upenn.edu> Message-ID: <20151219013902.GL981@ofb.net> Thank you for your time. Frederick On Wed, Dec 16, 2015 at 04:25:05PM -0500, Benjamin C. Pierce wrote: > Sorry for missing this the first time. I?ve forwarded your message to unison-hackers. And I?ll investigate why it was classified as spam in the first place. > > - B > > > On Dec 16, 2015, at 1:53 AM, Alan Schmitt wrote: > > > > Hello Frederik, > > > > I'm leaving unison-hackers in copy of this email, hopefully it will make > > it there. Unfortunately I am not managing this list and I cannot help > > you with this. > > > > Best, > > > > Alan > > > > On 2015-12-16 00:30, frederik at ofb.net writes: > > > >> Hi Alan, > >> > >> I wanted to ask the unison-hackers list about a problem I was > >> experiencing with Unison a few months ago. My message was classified > >> as spam by seas.upenn.edu, and bounced back to me. I tried to get > >> through to postmaster at seas.upenn.edu, as suggested by the contents of > >> the bounce, and to Benjamin Pierce, but my message was ignored both > >> times. > >> > >> Since you can send email to the list, I wonder if you could forward > >> this message for me? I've seen some more effective ways of queuing > >> spam, such as this JMBA (http://www.ivarch.com/programs/jmba.shtml) - > >> perhaps UPenn could use something like this, or simply read what > >> people send to postmaster at seas.upenn.edu, I'm not sure which is > >> easiest... > >> > >> Thanks! > >> > >> Frederick > >> > > > > -- > > OpenPGP Key ID : 040D0A3B4ED2E5C7 > > Athmospheric CO? (Updated December 13, 2015, Mauna Loa Obs.): 401.31 ppm > > _______________________________________________ > > Unison-hackers mailing list > > Unison-hackers at lists.seas.upenn.edu > > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers > From chris at stankevitz.com Thu Dec 31 02:01:31 2015 From: chris at stankevitz.com (Chris Stankevitz) Date: Wed, 30 Dec 2015 23:01:31 -0800 Subject: [Unison-hackers] Discrepancy in fswatch.ml and fsmonitor.py Message-ID: <5684D2CB.5010308@stankevitz.com> Can someone explain this discrepancy in the 2.48.3 source distribution: 1. fswatch.ml describes (and implements) a notification protocol in which stdin/stdout is used to communicate messages such as VERSION, OK, DIR, LINK, CHANGE, etc 2. fsmonitor.py implements a notification protocol but it does not send or receive any of the commands in (1). Furthermore it does not send commands to stdout, rather it writes them to a file called "changes" in a way that does not agree with (1). What I was expecting to see: 3. fswatch.ml describe a protocol 4. fsmonitor.py implements the protocol in (3) The reason I am asking: I would like to add freebsd support to the fsmonitor process.... but I am not confident that fsmonitor.py is the correct starting place. Thank you, Chris