* Improve unison support.

diff --git a/debian/changelog b/debian/changelog
index cca62ecefd4285cef461cff7b56beb19b011c0e3..9f4729f0ae0e8e7383fec037299657f420738d07 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-mr (0.20) UNRELEASED; urgency=low
+mr (0.20) unstable; urgency=low
 
   * Add -q flag.
   * darcs: Add -u to diff to get a more usual unified diff.
   * Add a "record" subcommand, borrowing termonology from darcs. This does a
     local commit, but does not push changes to remote repos.
+  * Improve unison support.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2007 13:53:31 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Jan 2008 22:49:53 -0500
 
 mr (0.19) unstable; urgency=low
 

diff --git a/lib/unison b/lib/unison
index abe9584e6a247570d50f083c35fd1d550a6cb4d1..d2a784f81dcf56b41b121d68b3d3574eab04ff85 100644 (file)
--- a/lib/unison
+++ b/lib/unison
@@ -15,6 +15,7 @@
 # And an example repo using it would look something like:
 #[music]
 #unison_test = true
+#checkout = unison_checkout music
 
 lib =
        # The name of the directory containing the repo is assumed to
@@ -22,10 +23,15 @@ lib =
        unison_config() {
                basename "$MR_REPO"
        }
+       unison_batch() {
+               unison -batch $(unison_config)
+       }
+       unison_checkout() {
+               mkdir "$1" && cd "$1" && unison -batch "$1"
+       }
 
-unison_checkout = unison -batch $(unison_config)
-unison_update   = unison -batch $(unison_config)
-unison_push     = unison -batch $(unison_config)
+unison_update   = unison_batch
+unison_push     = unison_batch
 unison_commit   = unison $(unison_config)
 
 # vim:sw=8:sts=0:ts=8:noet