From alan.schmitt at polytechnique.org Fri Oct 2 02:34:22 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Fri, 02 Oct 2015 08:34:22 +0200 Subject: [Unison-hackers] proposed tiny fix Message-ID: Hello, With El Capitan, we no longer can install stuff in /usr/bin. I propose that we change line 1106 of src/uimac14/MyController.m from /usr/bin/unison to /usr/local/bin/unison. We might want to release updated stable versions of Unison for OS X as well. What do you think? Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated September 27, 2015, Mauna Loa Obs.): 397.33 ppm -------------- 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 Fri Oct 2 14:12:37 2015 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Fri, 2 Oct 2015 14:12:37 -0400 Subject: [Unison-hackers] proposed tiny fix In-Reply-To: References: Message-ID: <21D268FB-B9FD-4AD5-8990-ABD0B1726F06@cis.upenn.edu> Sounds good to me. - B > On Oct 2, 2015, at 2:34 AM, Alan Schmitt wrote: > > Hello, > > With El Capitan, we no longer can install stuff in /usr/bin. I propose > that we change line 1106 of src/uimac14/MyController.m from > /usr/bin/unison to /usr/local/bin/unison. > > We might want to release updated stable versions of Unison for OS X as > well. > > What do you think? > > Alan > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated September 27, 2015, Mauna Loa Obs.): 397.33 ppm > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From alan.schmitt at polytechnique.org Sat Oct 3 05:17:58 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 03 Oct 2015 11:17:58 +0200 Subject: [Unison-hackers] proposed tiny fix In-Reply-To: <21D268FB-B9FD-4AD5-8990-ABD0B1726F06@cis.upenn.edu> (Benjamin C. Pierce's message of "Fri, 2 Oct 2015 14:12:37 -0400") References: <21D268FB-B9FD-4AD5-8990-ABD0B1726F06@cis.upenn.edu> Message-ID: On 2015-10-02 20:12, "Benjamin C. Pierce" writes: > Sounds good to me. > > - B > > >> On Oct 2, 2015, at 2:34 AM, Alan Schmitt wrote: >> >> Hello, >> >> With El Capitan, we no longer can install stuff in /usr/bin. I propose >> that we change line 1106 of src/uimac14/MyController.m from >> /usr/bin/unison to /usr/local/bin/unison. >> >> We might want to release updated stable versions of Unison for OS X as >> well. I?ll do it. To which branches should I apply this change? Best, Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated September 27, 2015, Mauna Loa Obs.): 397.33 ppm -------------- 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 Sun Oct 4 21:46:54 2015 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sun, 4 Oct 2015 21:46:54 -0400 Subject: [Unison-hackers] proposed tiny fix In-Reply-To: References: <21D268FB-B9FD-4AD5-8990-ABD0B1726F06@cis.upenn.edu> Message-ID: Not sure which branches (besides the current stable) are in widespread use on macs?? - B > On Oct 3, 2015, at 5:17 AM, Alan Schmitt wrote: > > On 2015-10-02 20:12, "Benjamin C. Pierce" > writes: > >> Sounds good to me. >> >> - B >> >> >>> On Oct 2, 2015, at 2:34 AM, Alan Schmitt wrote: >>> >>> Hello, >>> >>> With El Capitan, we no longer can install stuff in /usr/bin. I propose >>> that we change line 1106 of src/uimac14/MyController.m from >>> /usr/bin/unison to /usr/local/bin/unison. >>> >>> We might want to release updated stable versions of Unison for OS X as >>> well. > > I?ll do it. To which branches should I apply this change? > > Best, > > Alan > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > Athmospheric CO? (Updated September 27, 2015, Mauna Loa Obs.): 397.33 ppm -------------- next part -------------- An HTML attachment was scrubbed... URL: From schmitta at seas.upenn.edu Mon Oct 5 14:11:11 2015 From: schmitta at seas.upenn.edu (schmitta at seas.upenn.edu) Date: Mon, 5 Oct 2015 14:11:11 -0400 Subject: [Unison-hackers] [unison-svn] r547 - in trunk/src: . uimac14 Message-ID: <201510051811.t95IBC9s005691@yaws.seas.upenn.edu> Author: schmitta Date: 2015-10-05 14:11:11 -0400 (Mon, 05 Oct 2015) New Revision: 547 Modified: trunk/src/RECENTNEWS trunk/src/fileinfo.ml trunk/src/files.ml trunk/src/mkProjectInfo.ml trunk/src/stasher.ml trunk/src/uimac14/MyController.m Log: uimac14: install the command-line tool in /usr/local/bin Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2015-09-29 02:26:15 UTC (rev 546) +++ trunk/src/RECENTNEWS 2015-10-05 18:11:11 UTC (rev 547) @@ -1,3 +1,7 @@ +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 Modified: trunk/src/fileinfo.ml =================================================================== --- trunk/src/fileinfo.ml 2015-09-29 02:26:15 UTC (rev 546) +++ trunk/src/fileinfo.ml 2015-10-05 18:11:11 UTC (rev 547) @@ -77,7 +77,7 @@ fromRoot stats.Unix.LargeFile.st_ctime stats.Unix.LargeFile.st_mtime); let typ = match stats.Unix.LargeFile.st_kind with - Unix.S_REG -> `FILE + Unix.S_REG -> Util.debug "fileinfo+" (fun () -> Util.msg "get: FILE\n"); `FILE | Unix.S_DIR -> `DIRECTORY | Unix.S_LNK -> if not fromRoot || Prefs.read symlinksAllowed then Modified: trunk/src/files.ml =================================================================== --- trunk/src/files.ml 2015-09-29 02:26:15 UTC (rev 546) +++ trunk/src/files.ml 2015-10-05 18:11:11 UTC (rev 547) @@ -328,8 +328,9 @@ let rename root localPath workingDir pathOld pathNew ui archOpt notDefault = debug (fun() -> - Util.msg "rename(root=%s, pathOld=%s, pathNew=%s)\n" + Util.msg "rename(root=%s, localPath=%s, pathOld=%s, pathNew=%s)\n" (root2string root) + (Path.toString localPath) (Path.toString pathOld) (Path.toString pathNew)); renameOnHost root (localPath, workingDir, pathOld, pathNew, ui, archOpt, notDefault) @@ -606,6 +607,7 @@ else begin (* Rename the files to their final location and then update the archive on the destination replica *) + debugverbose (fun () -> Util.msg "rename from copy\n"); rename rootTo localPathTo workingDir tempPathTo realPathTo uiTo (Some archTo) notDefault >>= fun () -> (* Update the archive on the source replica @@ -790,6 +792,7 @@ Copy.file (Local, fspathFrom) pathFrom rootTo workingDirForCopy tempPathTo realPathTo `Copy newprops fp None stamp id >>= fun info -> + debugverbose (fun () -> Util.msg "rename from copyBack\n"); rename rootTo localPathTo workingDirForCopy tempPathTo realPathTo uiTo None false) Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2015-09-29 02:26:15 UTC (rev 546) +++ trunk/src/mkProjectInfo.ml 2015-10-05 18:11:11 UTC (rev 547) @@ -105,3 +105,4 @@ + Modified: trunk/src/stasher.ml =================================================================== --- trunk/src/stasher.ml 2015-09-29 02:26:15 UTC (rev 546) +++ trunk/src/stasher.ml 2015-10-05 18:11:11 UTC (rev 547) @@ -307,9 +307,12 @@ let rec f i = let tempPath = makeBackupName path i in + verbose (fun () -> Util.msg "backupPath f %s %d\n" (Path.toString path) i); if Os.exists sFspath tempPath then - if i < Prefs.read maxbackups then + if i < Prefs.read maxbackups then begin + verbose (fun () -> Util.msg "need to rename backup file\n"); Os.rename "backupPath" sFspath tempPath sFspath (f (i + 1)) + end else if i >= Prefs.read maxbackups then Os.delete sFspath tempPath; tempPath in Modified: trunk/src/uimac14/MyController.m =================================================================== --- trunk/src/uimac14/MyController.m 2015-09-29 02:26:15 UTC (rev 546) +++ trunk/src/uimac14/MyController.m 2015-10-05 18:11:11 UTC (rev 547) @@ -1103,7 +1103,7 @@ if (exec_path == nil) return; char *args[] = { "-f", (char *)[exec_path UTF8String], - "/usr/bin/unison", NULL }; + "/usr/local/bin/unison", NULL }; myFlags = kAuthorizationFlagDefaults; myStatus = AuthorizationExecuteWithPrivileges From schmitta at seas.upenn.edu Mon Oct 5 14:14:23 2015 From: schmitta at seas.upenn.edu (schmitta at seas.upenn.edu) Date: Mon, 5 Oct 2015 14:14:23 -0400 Subject: [Unison-hackers] [unison-svn] r548 - in branches/2.48/src: . uimac14 Message-ID: <201510051814.t95IENBA005745@yaws.seas.upenn.edu> Author: schmitta Date: 2015-10-05 14:14:23 -0400 (Mon, 05 Oct 2015) New Revision: 548 Modified: branches/2.48/src/RECENTNEWS branches/2.48/src/mkProjectInfo.ml branches/2.48/src/uimac14/MyController.m Log: uimac14: install the command-line tool in /usr/local/bin Modified: branches/2.48/src/RECENTNEWS =================================================================== --- branches/2.48/src/RECENTNEWS 2015-10-05 18:11:11 UTC (rev 547) +++ branches/2.48/src/RECENTNEWS 2015-10-05 18:14:23 UTC (rev 548) @@ -1,3 +1,7 @@ +CHANGES FROM VERSION 2.48.1 + +uimac14: install the command-line tool in /usr/local/bin +------------------------------- CHANGES FROM VERSION 2.48.-1 * Preparing for new beta release Modified: branches/2.48/src/mkProjectInfo.ml =================================================================== --- branches/2.48/src/mkProjectInfo.ml 2015-10-05 18:11:11 UTC (rev 547) +++ branches/2.48/src/mkProjectInfo.ml 2015-10-05 18:14:23 UTC (rev 548) @@ -98,3 +98,4 @@ + Modified: branches/2.48/src/uimac14/MyController.m =================================================================== --- branches/2.48/src/uimac14/MyController.m 2015-10-05 18:11:11 UTC (rev 547) +++ branches/2.48/src/uimac14/MyController.m 2015-10-05 18:14:23 UTC (rev 548) @@ -1101,7 +1101,7 @@ if (exec_path == nil) return; char *args[] = { "-f", (char *)[exec_path UTF8String], - "/usr/bin/unison", NULL }; + "/usr/local/bin/unison", NULL }; myFlags = kAuthorizationFlagDefaults; myStatus = AuthorizationExecuteWithPrivileges From alan.schmitt at polytechnique.org Mon Oct 5 14:26:17 2015 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Mon, 05 Oct 2015 20:26:17 +0200 Subject: [Unison-hackers] proposed tiny fix In-Reply-To: (Benjamin C. Pierce's message of "Sun, 4 Oct 2015 21:46:54 -0400") References: <21D268FB-B9FD-4AD5-8990-ABD0B1726F06@cis.upenn.edu>

Message-ID: On 2015-10-05 03:46, "Benjamin C. Pierce" writes: > Not sure which branches (besides the current stable) are in widespread use on > macs?? I committed on trunk and 2.48. A new 2.48.15 is available on my page (http://alan.petitepomme.net/unison/index.html) if someone else wants to test it. Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 Athmospheric CO? (Updated September 27, 2015, Mauna Loa Obs.): 397.33 ppm -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 472 bytes Desc: not available URL: