add news item for myrepos 1.20140613

[code/myrepos.git] / mr

diff --git a/mr b/mr
index b60673622449fa45a097fa0e99a37b742b4cfd6c..a7295f0d252799156b6d43b951a42056f8a245df 100755 (executable)
--- a/mr
+++ b/mr
@@ -152,6 +152,11 @@ C<ssh://[user@]host:file>.
 
 You can retrieve the config file by other means and pass its B<path> as C<src>.
 
+=item standard input
+
+If source C<src> consists in a single dash C<->, config file is read from
+standard input.
+
 =back
 
 The directory will be created if it does not exist. If no directory is
@@ -1240,7 +1245,7 @@ my %loaded;
 sub loadconfig {
        my $f=shift;
        my $dir=shift;
-       my $bootstrap_url=shift;
+       my $bootstrap_src=shift;
 
        my @toload;
 
@@ -1328,8 +1333,8 @@ sub loadconfig {
        my $trusterror = sub {
                my $msg=shift;
        
-               if (defined $bootstrap_url) {
-                       die "mr: $msg in untrusted $bootstrap_url line $lineno\n".
+               if (defined $bootstrap_src) {
+                       die "mr: $msg in untrusted $bootstrap_src line $lineno\n".
                                "(To trust this url, --trust-all can be used; but please use caution;\n".
                                "this can allow arbitrary code execution!)\n";
                }
@@ -1568,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') {
@@ -1599,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 {
@@ -1689,10 +1711,10 @@ sub bootstrap {
        eval q{use File::Copy};
        die $@ if $@;
 
-       my $url=shift @ARGV;
+       my $src=shift @ARGV;
        my $dir=shift @ARGV || ".";
        
-       if (! defined $url || ! length $url) {
+       if (! defined $src || ! length $src) {
                die "mr: bootstrap requires source\n";
        }
 
@@ -1700,26 +1722,30 @@ sub bootstrap {
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
-       if ($url =~ m!^[\w\d]+://!) {
+       if ($src =~ m!^[\w\d]+://!) {
                # Download the config file to a temporary location.
                my @downloader;
-               if ($url =~ m!^ssh://(.*)!) {
+               if ($src =~ m!^ssh://(.*)!) {
                        @downloader = ("scp", $1, $tmpconfig);
                }
                else {
-                       @downloader = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
+                       @downloader = ("curl", "-A", "mr", "-L", "-s", $src, "-o", $tmpconfig);
                        push(@downloader, "-k") if $insecure;
                }
                my $status = system(@downloader);
-               die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n"
+               die "mr bootstrap: invalid SSL certificate for $src (consider -k)\n"
                        if $downloader[0] eq 'curl' && $status >> 8 == 60;
-               die "mr bootstrap: download of $url failed\n" if $status != 0;
+               die "mr bootstrap: download of $src failed\n" if $status != 0;
+       }
+       elsif ($src eq '-') {
+               # Config file is read from stdin.
+               copy(\*STDIN, $tmpconfig) || die "stdin: $!";
        }
        else {
                # Config file is local.
-               die "mr bootstrap: cannot read file '$url'"
-                       unless -r $url;
-               copy($url, $tmpconfig) || die "copy: $!";
+               die "mr bootstrap: cannot read file '$src'"
+                       unless -r $src;
+               copy($src, $tmpconfig) || die "copy: $!";
        }
 
        # Sanity check on destination directory.
@@ -1732,12 +1758,12 @@ sub bootstrap {
        # would normally be skipped.
        my $topdir=abs_path(".")."/";
        my @repo=($topdir, $topdir, ".");
-       loadconfig($tmpconfig, $topdir, $url);
+       loadconfig($tmpconfig, $topdir, $src);
        record(\@repo, action("checkout", @repo, 1))
                if exists $config{$topdir}{"."}{"checkout"};
 
        if (-e ".mrconfig") {
-               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
+               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $src\n";
        }
        else {
                move($tmpconfig, ".mrconfig") || die "rename: $!";
@@ -1853,6 +1879,7 @@ sub exitstats {
 sub main {
        getopts();
        init();
+       help(@ARGV) if $ARGV[0] eq 'help';
 
        startingconfig();
        loadconfig($HOME_MR_CONFIG);
@@ -2104,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 =