* darcs: Use record subcommand, there is no commit subcommand. Closes: #453501

* darcs: De-p register code. Closes: #453502

diff --git a/debian/changelog b/debian/changelog
index ff79043b61ca9ffd0a221c8f70c705d84ea56a03..896355243a85c4a3839a8fa3bc8641993d1fc9aa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.18) UNRELEASED; urgency=low
+
+  * darcs: Use record subcommand, there is no commit subcommand. Closes: #453501
+  * darcs: De-p register code. Closes: #453502
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 29 Nov 2007 17:47:01 -0500
+

 mr (0.17) unstable; urgency=low
 
   * Even bigger hammer: Set LC_ALL. Closes: #453305
 mr (0.17) unstable; urgency=low
 
   * Even bigger hammer: Set LC_ALL. Closes: #453305

diff --git a/mr b/mr
index e4beac816702a927bb94c55602fa94816f48576d..ba29b40736def747049d46fd85304150520105d4 100755 (executable)
--- a/mr
+++ b/mr
@@ -1184,7 +1184,7 @@ git_commit = git commit -a "$@" && git push --all
 bzr_commit = bzr commit "$@" && bzr push
 cvs_commit = cvs commit "$@"
 hg_commit  = hg commit -m "$@" && hg push
 bzr_commit = bzr commit "$@" && bzr push
 cvs_commit = cvs commit "$@"
 hg_commit  = hg commit -m "$@" && hg push

-darcs_commit = darcs commit -a -m "$@" && darcs push -a
+darcs_commit = darcs record -a -m "$@" && darcs push -a

 
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"


@@ -1237,7 +1237,7 @@ hg_register =
 darcs_register = 
        url=`cat _darcs/prefs/defaultrepo`
        echo "Registering darcs repository $url in $MR_CONFIG"
 darcs_register = 
        url=`cat _darcs/prefs/defaultrepo`
        echo "Registering darcs repository $url in $MR_CONFIG"

-       mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url' '$MR_REPO'"

 git_bare_register = 
        url="`LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url`" || true
        if [ -z "$url" ]; then
 git_bare_register = 
        url="`LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url`" || true
        if [ -z "$url" ]; then