[Unison-hackers] [unison-svn] r547 - in trunk/src: . uimac14

[schmitta at 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