[Unison-hackers] [unison-svn] r524 - in trunk: . src

[schmitta at seas.upenn.edu]

Author: schmitta
Date: 2013-07-15 09:04:29 -0400 (Mon, 15 Jul 2013)
New Revision: 524

Modified:
   trunk/Makefile
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/uigtk2.ml
Log:
tweaking git_checkin in Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2013-03-11 08:43:14 UTC (rev 523)
+++ trunk/Makefile	2013-07-15 13:04:29 UTC (rev 524)
@@ -39,9 +39,9 @@
 
 git_checkin: remembernews
 	echo >> src/mkProjectInfo.ml # so the Rev keyword gets updated
-  git add src/RECENTNEWS src/mkProjectInfo.ml
-  git commit --amend --no-edit
-  $(RM) logmsg
+	git add src/RECENTNEWS src/mkProjectInfo.ml
+	git commit --amend --no-edit
+	$(RM) logmsg
 	git svn dcommit # no logmsg here: the changes are in the commits
 
 remembernews: logmsg

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2013-03-11 08:43:14 UTC (rev 523)
+++ trunk/src/RECENTNEWS	2013-07-15 13:04:29 UTC (rev 524)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.46.18
+
+Adapting the GTK ui to the new Conflict type. For the moment the string carried is not used.
+
+-------------------------------
 CHANGES FROM VERSION 2.46.13
 
 * Log conflicts and problems in the text UI even if nothing is propagated.

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2013-03-11 08:43:14 UTC (rev 523)
+++ trunk/src/mkProjectInfo.ml	2013-07-15 13:04:29 UTC (rev 524)
@@ -42,7 +42,7 @@
 (* ---------------------------------------------------------------------- *)
 (* You shouldn't need to edit below. *)
 
-let revisionString = "$Rev$";;
+let revisionString = "$Rev: 522 $";;
 
 let pointVersion = 
   Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;;
@@ -90,3 +90,4 @@
 
 
 
+

Modified: trunk/src/uigtk2.ml
===================================================================
--- trunk/src/uigtk2.ml	2013-03-11 08:43:14 UTC (rev 523)
+++ trunk/src/uigtk2.ml	2013-07-15 13:04:29 UTC (rev 524)
@@ -3062,7 +3062,7 @@
       if i < l then
         match !theState.(i).ri.replicas with
           Different {direction = dir}
-              when not (Prefs.read Uicommon.auto) || dir = Conflict ->
+              when not (Prefs.read Uicommon.auto) || isConflict dir ->
             select i true
         | _ ->
             loop (i + 1) in
@@ -3074,7 +3074,7 @@
     let oldPath = if i = 0 then Path.empty else !theState.(i-1).ri.path1 in
     let status =
       match !theState.(i).ri.replicas with
-        Different {direction = Conflict} | Problem _ ->
+        Different {direction = Conflict _} | Problem _ ->
           NoStatus
       | _ ->
           match !theState.(i).whatHappened with
@@ -3297,7 +3297,7 @@
               clientWritten := !clientWritten +. Uutil.Filesize.toFloat bytes
             else
               serverWritten := !serverWritten +. Uutil.Filesize.toFloat bytes
-        | Conflict | Merge ->
+        | Conflict _ | Merge ->
             (* Diff / merge *)
             clientWritten := !clientWritten +. Uutil.Filesize.toFloat bytes
         end
@@ -3634,9 +3634,9 @@
              match si.ri.replicas with
                Problem err ->
                  (si, [err], "error during update detection") :: l
-             | Different diff when diff.direction = Conflict ->
+             | Different diff when isConflict diff.direction ->
                  (si, [],
-                  if diff.default_direction = Conflict then
+                  if isConflict diff.default_direction then
                     "conflict"
                   else "skipped") :: l
              | _ ->
@@ -3778,7 +3778,7 @@
     doAction (fun _ diff -> diff.direction <- Replica2ToReplica1) in
   let rightAction _ =
     doAction (fun _ diff -> diff.direction <- Replica1ToReplica2) in
-  let questionAction _ = doAction (fun _ diff -> diff.direction <- Conflict) in
+  let questionAction _ = doAction (fun _ diff -> diff.direction <- Conflict "") in
   let mergeAction    _ = doAction (fun _ diff -> diff.direction <- Merge) in
 
 (*  actionBar#insert_space ();*)
@@ -4117,7 +4117,7 @@
                  | Some(Util.Succeeded, _) -> false)
               || match !theState.(i).ri.replicas with
                    Problem _ -> true
-                 | Different diff -> diff.direction = Conflict in
+                 | Different diff -> isConflict diff.direction in
              if notok then loop (i+1) (i::acc)
              else loop (i+1) (acc) in
            let failedindices = loop 0 [] in