Merge branch 'local_bootstrap' of https://github.com/lorcap/myrepos

diff --git a/debian/changelog b/debian/changelog
index e5ae7bb03128ebfcd2d39f8f57a8af6a2fe0723a..6aa65a9240942abb6466cfda2d7d22df05a0aa87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ myrepos (1.20140228) UNRELEASED; urgency=medium
 
   * Added lib/git-annex. Thanks, martin f krafft.
     Closes: #743882
+  * Make mr help work even if the mrconfig file is busted.
+    Thanks, Lorenzo Cappelletti
+  * Support "vcsh clone url repo" as trusted checkout syntax,
+    while still supporting the old syntax.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Apr 2014 17:58:58 -0400
 

diff --git a/mr b/mr
index dba54cc63142a63e1a497db380f67e82bb3565b4..a7295f0d252799156b6d43b951a42056f8a245df 100755 (executable)
--- a/mr
+++ b/mr
@@ -1573,10 +1573,7 @@ sub dispatch {
        my $action=shift;
 
        # actions that do not operate on all repos
-       if ($action eq 'help') {
-               help(@ARGV);
-       }
-       elsif ($action eq 'config') {
+       if ($action eq 'config') {
                config(@ARGV);
        }
        elsif ($action eq 'register') {
@@ -1604,7 +1601,27 @@ sub dispatch {
 }
 
 sub help {
-       exec($config{''}{DEFAULT}{help}) || die "exec: $!";
+       my $help=q#
+               case `uname -s` in
+                       SunOS)
+                       SHOWMANFILE="man -f"
+                       ;;
+                       Darwin)
+                       SHOWMANFILE="man"
+                       ;;
+                       *)
+                       SHOWMANFILE="man"
+                       ;;
+               esac
+               if [ ! -e "$MR_PATH" ]; then
+                       error "cannot find program path"
+               fi
+               tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
+               trap "rm -f $tmp" exit
+               pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
+               $SHOWMANFILE "$tmp" || error "man failed"
+       #;
+       exec($help) || die "exec: $!";
 }
 
 sub config {
@@ -1862,6 +1879,7 @@ sub exitstats {
 sub main {
        getopts();
        init();
+       help(@ARGV) if $ARGV[0] eq 'help';
 
        startingconfig();
        loadconfig($HOME_MR_CONFIG);
@@ -2113,30 +2131,12 @@ bzr_trusted_checkout = bzr checkout|clone|branch|get $url $repo
 hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
-vcsh_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
+vcsh_old_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
+vcsh_trusted_checkout = vcsh clone $url $repo
 # fossil: messy to do
 veracity_trusted_checkout = vv clone $url $repo
 
 
-help =
-       case `uname -s` in
-               SunOS)
-               SHOWMANFILE="man -f"
-               ;;
-               Darwin)
-               SHOWMANFILE="man"
-               ;;
-               *)
-               SHOWMANFILE="man"
-               ;;
-       esac
-       if [ ! -e "$MR_PATH" ]; then
-               error "cannot find program path"
-       fi
-       tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
-       trap "rm -f $tmp" exit
-       pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
-       $SHOWMANFILE "$tmp" || error "man failed"
 list = true
 config = 
 bootstrap =