[Unison-hackers] [unison-svn] r399 - in trunk/src: . ubase
bcpierce@seas.upenn.edu
bcpierce at seas.upenn.edu
Sun Jan 10 10:30:19 EST 2010
Author: bcpierce
Date: 2010-01-10 10:30:18 -0500 (Sun, 10 Jan 2010)
New Revision: 399
Modified:
trunk/src/RECENTNEWS
trunk/src/mkProjectInfo.ml
trunk/src/stasher.mli
trunk/src/ubase/depend
trunk/src/uimacbridgenew.ml
trunk/src/update.ml
Log:
* Back out some minimal support we'd added for checking out Unison sources via Bazaar.
* Small fix for OSX GUI
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2010-01-08 15:18:05 UTC (rev 398)
+++ trunk/src/RECENTNEWS 2010-01-10 15:30:18 UTC (rev 399)
@@ -1,5 +1,14 @@
CHANGES FROM VERSION 2.39.0
+* Back out some minimal support we'd added for checking out Unison sources via Bazaar.
+
+* Small fix for OSX GUI
+
+
+
+-------------------------------
+CHANGES FROM VERSION 2.39.0
+
* The "ignorearchives" preference now works.
* When Unison detects that the archive case-sensitivity mode
does not match the current settings, it populates the fingerprint
Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2010-01-08 15:18:05 UTC (rev 398)
+++ trunk/src/mkProjectInfo.ml 2010-01-10 15:30:18 UTC (rev 399)
@@ -42,22 +42,7 @@
(* ---------------------------------------------------------------------- *)
(* You shouldn't need to edit below. *)
-(* run the bzr tool to get version information for bzr branches *)
-exception BzrException of Unix.process_status;;
-let bzr args =
- let bzr = (try Sys.getenv "BZR" with Not_found -> "bzr") in
- let cmd = bzr ^ " " ^ args in
- let inc = Unix.open_process_in cmd in
- let buf = Buffer.create 16 in
- (try
- while true do
- Buffer.add_channel buf inc 1
- done
- with End_of_file -> ());
- let status = Unix.close_process_in inc in
- match status with
- Unix.WEXITED 0 -> Buffer.contents buf
- | _ -> raise (BzrException status);;
+let revisionString = "$Rev: 396$";;
(* extract a substring using a regular expression *)
let extract_str re str =
@@ -65,27 +50,53 @@
Str.matched_group 1 str;;
let extract_int re str = int_of_string (extract_str re str);;
-let revisionString = "$Rev: 396$";;
-let pointVersion = if String.length revisionString > 5
-then Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin
-else (* Determining the pointVersionOrigin in bzr is kind of tricky:
- - The mentioned revision number might not be part of this branch
- - The mentioned revision number might be rhs of some merge
- - The bzr-svn plugin might be outdated or not installed at all
+(* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it
+ was never used much and I'm not confident it's working. I'll comment it out
+ for now, but if it hasn't been needed or fixed in a few months, the next
+ person that edits this file should delete it...
- On the whole, getting this to work seems too much effort for now.
- So we'll simply use the revno as is as the point version,
- and revisit offsetting them if unison should ever move its trunk to bzr.
+ (* run the bzr tool to get version information for bzr branches *)
+ exception BzrException of Unix.process_status;;
+ let bzr args =
+ let bzr = (try Sys.getenv "BZR" with Not_found -> "bzr") in
+ let cmd = bzr ^ " " ^ args in
+ let inc = Unix.open_process_in cmd in
+ let buf = Buffer.create 16 in
+ (try
+ while true do
+ Buffer.add_channel buf inc 1
+ done
+ with End_of_file -> ());
+ let status = Unix.close_process_in inc in
+ match status with
+ Unix.WEXITED 0 -> Buffer.contents buf
+ | _ -> raise (BzrException status);;
- let pvo = extract_int "^revno:[ \t]*\\([0-9]+\\)[ \t]*$"
- (bzr ("log -r svn:" ^
- string_of_int pointVersionOrigin)) in
- *)
- extract_int "^\\([0-9]+\\)$" (bzr "revno") (* - pvo *);;
+ let pointVersion = if String.length revisionString > 5
+ then Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin
+ else (* Determining the pointVersionOrigin in bzr is kind of tricky:
+ - The mentioned revision number might not be part of this branch
+ - The mentioned revision number might be rhs of some merge
+ - The bzr-svn plugin might be outdated or not installed at all
+ On the whole, getting this to work seems too much effort for now.
+ So we'll simply use the revno as is as the point version,
+ and revisit offsetting them if unison should ever move its trunk to bzr.
+
+ let pvo = extract_int "^revno:[ \t]*\\([0-9]+\\)[ \t]*$"
+ (bzr ("log -r svn:" ^
+ string_of_int pointVersionOrigin)) in
+ *)
+ extract_int "^\\([0-9]+\\)$" (bzr "revno") (* - pvo *);;
+*)
+
+let pointVersion =
+ Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;;
+
Printf.printf "MAJORVERSION=%d.%d\n" majorVersion minorVersion;;
Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;;
Printf.printf "NAME=%s\n" projectName;;
+
Modified: trunk/src/stasher.mli
===================================================================
--- trunk/src/stasher.mli 2010-01-08 15:18:05 UTC (rev 398)
+++ trunk/src/stasher.mli 2010-01-10 15:30:18 UTC (rev 399)
@@ -6,7 +6,7 @@
(* as archives for mergeable files. *)
(* Make a backup copy of a file, if needed; if the third parameter is
- `AndRemove, then the file is either backed up by renaming or
+ `AndRemove, then the file is either backed up by renaming or else
deleted if no backup is needed. *)
val backup:
Fspath.t -> Path.local ->
Modified: trunk/src/ubase/depend
===================================================================
--- trunk/src/ubase/depend 2010-01-08 15:18:05 UTC (rev 398)
+++ trunk/src/ubase/depend 2010-01-10 15:30:18 UTC (rev 399)
@@ -16,12 +16,5 @@
uprintf.cmx: uprintf.cmi
util.cmo: uprintf.cmi safelist.cmi util.cmi
util.cmx: uprintf.cmx safelist.cmx util.cmi
-myMap.cmi:
prefs.cmi: util.cmi
-proplist.cmi:
-rx.cmi:
-safelist.cmi:
trace.cmi: prefs.cmi
-uarg.cmi:
-uprintf.cmi:
-util.cmi:
Modified: trunk/src/uimacbridgenew.ml
===================================================================
--- trunk/src/uimacbridgenew.ml 2010-01-08 15:18:05 UTC (rev 398)
+++ trunk/src/uimacbridgenew.ml 2010-01-10 15:30:18 UTC (rev 399)
@@ -91,6 +91,7 @@
with
Util.Transient s | Util.Fatal s -> fatalError s
| exn -> fatalError (Uicommon.exn2string exn))
+ ()
(* Defined in MyController.m, used to redisplay the table
when the status for a row changes *)
Modified: trunk/src/update.ml
===================================================================
--- trunk/src/update.ml 2010-01-08 15:18:05 UTC (rev 398)
+++ trunk/src/update.ml 2010-01-10 15:30:18 UTC (rev 399)
@@ -693,7 +693,7 @@
^ "This can happen when both machines have the same hostname.\n"
^ "\n"
^ "If this is not the case and you get this message repeatedly, please:\n"
- ^ " a) Send a bug report to unison-users at yahoogroups.com (you may need"
+ ^ " a) Send a bug report to unison-users at yahoogroups.com (you may need\n"
^ " to join the group before you will be allowed to post).\n"
^ " b) Move the archive files on each machine to some other directory\n"
^ " (in case they may be useful for debugging).\n"
More information about the Unison-hackers
mailing list