From schmitta at seas.upenn.edu Mon Jul 15 09:04:30 2013 From: schmitta at seas.upenn.edu (schmitta at seas.upenn.edu) Date: Mon, 15 Jul 2013 09:04:30 -0400 Subject: [Unison-hackers] [unison-svn] r524 - in trunk: . src Message-ID: <201307151304.r6FD4Uhu015041@yaws.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 From alan.schmitt at polytechnique.org Wed Jul 17 09:25:58 2013 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Wed, 17 Jul 2013 15:25:58 +0200 Subject: [Unison-hackers] Fwd: Re: [Caml-list] lablgtk2: cannot find the Pango module? References: <20130716192129.GA8915@notk.org> Message-ID: Dear all, I was trying to compile the gtk version of unison on my machine, and was failing because I'm using lablgtk from opam (see below some messages on the caml list for context). I have been able to compile it replacing the +labgtk2 flag with `ocamlfind query lablgtk2`. Is it worth to make this change to the Makefile? This means requiring ocamlfind for unison-gtk2. Best, Alan adrien at notk.org writes: > Hi, > > On Tue, Jul 16, 2013, Thomas Gazagnaire wrote: >> > ocamlopt -g -I lwt -I ubase -I system -I fsmonitor -I fsmonitor/linux -I fsmonitor/windows -I system/generic -I lwt/generic -ccopt -mmacosx-version-min=10.5 -I +lablgtk2 -c /Users/schmitta/src/unison/trunk/src/uigtk2.ml >> > File "/Users/schmitta/src/unison/trunk/src/uigtk2.ml", line 81, characters 26-48: >> > Error: Unbound module Pango >> > >> > The strange thing is that when I launch the lablgtk2 toplevel, I can do >> > a "open Pango" with no error. >> >> I guess the -I +lablgtk2 does not use the right path. Under OPAM, files are installed in `opam config var lib`/labgtk (`opam config var labgtk:lib` in master). Or you can use the ocamlfind installation path: `ocamlfind query lablgtk`. > > I know nothing about mac os x, opam and unison but nowadays lablgtk uses > ocamlfind. Maybe unison needs to be updated. > > Lablgtk without ocamlfind might work but I'd say that if it breaks, you > get to keep the pieces. > (plus, I'm a member of the AANUOO: Association Against Non-Usage Of > Ocamlfind :-) ) From schmitta at seas.upenn.edu Thu Jul 18 05:37:09 2013 From: schmitta at seas.upenn.edu (schmitta at seas.upenn.edu) Date: Thu, 18 Jul 2013 05:37:09 -0400 Subject: [Unison-hackers] [unison-svn] r525 - trunk/src Message-ID: <201307180937.r6I9b9SZ016198@yaws.seas.upenn.edu> Author: schmitta Date: 2013-07-18 05:37:09 -0400 (Thu, 18 Jul 2013) New Revision: 525 Modified: trunk/src/Makefile Log: make clean on OS X for text interface should not clean the xcode stuff Modified: trunk/src/Makefile =================================================================== --- trunk/src/Makefile 2013-07-15 13:04:29 UTC (rev 524) +++ trunk/src/Makefile 2013-07-18 09:37:09 UTC (rev 525) @@ -366,7 +366,7 @@ $(MAKE) -C ubase clean $(MAKE) -C lwt clean -ifeq (${OSARCH},osx) +ifneq ($(strip $(UIMACDIR)),) clean:: -(cd $(UIMACDIR); xcodebuild clean) -(cd $(UIMACDIR); $(RM) -r build ExternalSettings.xcconfig) From bcpierce at cis.upenn.edu Thu Jul 18 10:06:02 2013 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Thu, 18 Jul 2013 10:06:02 -0400 Subject: [Unison-hackers] [Caml-list] lablgtk2: cannot find the Pango module? In-Reply-To: References: <20130716192129.GA8915@notk.org> Message-ID: <41956122-C107-42DD-A7C3-C8DDEA7AF5E0@cis.upenn.edu> Can't we just make this change conditionally -- i.e., use ocamlfind iff ocamlfind is installed? On Jul 17, 2013, at 9:25 AM, Alan Schmitt wrote: > Dear all, > > I was trying to compile the gtk version of unison on my machine, and was > failing because I'm using lablgtk from opam (see below some messages on > the caml list for context). I have been able to compile it replacing the > +labgtk2 flag with `ocamlfind query lablgtk2`. Is it worth to make this > change to the Makefile? This means requiring ocamlfind for unison-gtk2. > > Best, > > Alan > > > adrien at notk.org writes: > >> Hi, >> >> On Tue, Jul 16, 2013, Thomas Gazagnaire wrote: >>>> ocamlopt -g -I lwt -I ubase -I system -I fsmonitor -I fsmonitor/linux -I fsmonitor/windows -I system/generic -I lwt/generic -ccopt -mmacosx-version-min=10.5 -I +lablgtk2 -c /Users/schmitta/src/unison/trunk/src/uigtk2.ml >>>> File "/Users/schmitta/src/unison/trunk/src/uigtk2.ml", line 81, characters 26-48: >>>> Error: Unbound module Pango >>>> >>>> The strange thing is that when I launch the lablgtk2 toplevel, I can do >>>> a "open Pango" with no error. >>> >>> I guess the -I +lablgtk2 does not use the right path. Under OPAM, files are installed in `opam config var lib`/labgtk (`opam config var labgtk:lib` in master). Or you can use the ocamlfind installation path: `ocamlfind query lablgtk`. >> >> I know nothing about mac os x, opam and unison but nowadays lablgtk uses >> ocamlfind. Maybe unison needs to be updated. >> >> Lablgtk without ocamlfind might work but I'd say that if it breaks, you >> get to keep the pieces. >> (plus, I'm a member of the AANUOO: Association Against Non-Usage Of >> Ocamlfind :-) ) > > _______________________________________________ > 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 Thu Jul 18 10:38:53 2013 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Thu, 18 Jul 2013 16:38:53 +0200 Subject: [Unison-hackers] [Caml-list] lablgtk2: cannot find the Pango module? In-Reply-To: <41956122-C107-42DD-A7C3-C8DDEA7AF5E0@cis.upenn.edu> References: <20130716192129.GA8915@notk.org> <41956122-C107-42DD-A7C3-C8DDEA7AF5E0@cis.upenn.edu> Message-ID: bcpierce at cis.upenn.edu writes: > Can't we just make this change conditionally -- i.e., use ocamlfind > iff ocamlfind is installed? Sure. Is there a canonical way to detect something is installed? Alan