Typo. Closes: #586233

[code/myrepos.git] / mr

diff --git a/mr b/mr
index a431e8ac82ac989fdbfe1e5b1231e449d8508682..70698aa58fd8c84f6c9c8de5abde04b40ec61514 100755 (executable)
--- a/mr
+++ b/mr
@@ -219,6 +219,12 @@ Be verbose.
 
 Be quiet.
 
+=item -k
+
+=item --insecure
+
+Accept untrusted SSL certificates when bootstrapping.
+
 =item -s
 
 =item --stats
@@ -266,7 +272,7 @@ Use with caution.
 
 =back
 
-=head1 "MRCONFIG FILES"
+=head1 MRCONFIG FILES
 
 Here is an example .mrconfig file:
 
@@ -383,10 +389,10 @@ due to being offline. You can delete or edit this file to remove commands,
 or even to add other commands for 'mr online' to run. If the file is
 present, mr assumes it is in offline mode.
 
-=head "UNTRUSTED MRCONFIG FILES"
+=head1 UNTRUSTED MRCONFIG FILES
 
 Since mrconfig files can contain arbitrary shell commands, they can do
-anything. This flexability is good, but it also allows a malicious mrconfig
+anything. This flexibility is good, but it also allows a malicious mrconfig
 file to delete your whole home directory. Such a file might be contained
 inside a repository that your main ~/.mrconfig checks out and chains to. To
 avoid worries about evil commands in a mrconfig file, mr
@@ -433,6 +439,7 @@ my $config_overridden=0;
 my $verbose=0;
 my $quiet=0;
 my $stats=0;
+my $insecure=0;
 my $interactive=0;
 my $max_depth;
 my $no_chdir=0;
@@ -707,7 +714,7 @@ sub record {
 
        if ($ret == OK) {
                push @ok, $dir;
-               print "\n";
+               print "\n" unless $quiet;
        }
        elsif ($ret == FAILED) {
                if ($interactive) {
@@ -716,7 +723,7 @@ sub record {
                        system((getpwuid($<))[8], "-i");
                }
                push @failed, $dir;
-               print "\n";
+               print "\n" unless $quiet;
        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;
@@ -780,6 +787,15 @@ sub repolist {
        } @list;
 }
 
+sub repodir {
+       my $repo=shift;
+       my $topdir=$repo->{topdir};
+       my $subdir=$repo->{subdir};
+       my $ret=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+       $ret=~s/\/\.$//;
+       return $ret;
+}
+
 # figure out which repos to act on
 sub selectrepos {
        my @repos;
@@ -788,7 +804,7 @@ sub selectrepos {
                my $subdir=$repo->{subdir};
 
                next if $subdir eq 'DEFAULT';
-               my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+               my $dir=repodir($repo);
                my $d=$directory;
                $dir.="/" unless $dir=~/\/$/;
                $d.="/" unless $d=~/\/$/;
@@ -808,7 +824,7 @@ sub selectrepos {
                        my $subdir=$repo->{subdir};
                        
                        next if $subdir eq 'DEFAULT';
-                       my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+                       my $dir=repodir($repo);
                        my $d=$directory;
                        $dir.="/" unless $dir=~/\/$/;
                        $d.="/" unless $d=~/\/$/;
@@ -1001,7 +1017,7 @@ sub loadconfig {
                open($in, "<", $f) || die "mr: open $f: $!\n";
        }
        my @lines=<$in>;
-       close $in;
+       close $in unless ref $f eq 'GLOB';
 
        my $section;
        my $line=0;
@@ -1021,6 +1037,12 @@ sub loadconfig {
                                }
                        }
                        $section=expandenv($section) if $trusted;
+                       if ($section ne 'ALIAS' &&
+                           ! exists $config{$dir}{$section} &&
+                           exists $config{$dir}{DEFAULT}) {
+                               # copy in defaults
+                               $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} };
+                       }
                }
                elsif (/^(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;
@@ -1057,12 +1079,6 @@ sub loadconfig {
                        if (! defined $section) {
                                die "$f line $.: parameter ($parameter) not in section\n";
                        }
-                       if ($section ne 'ALIAS' &&
-                           ! exists $config{$dir}{$section} &&
-                           exists $config{$dir}{DEFAULT}) {
-                               # copy in defaults
-                               $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} };
-                       }
                        if ($section eq 'ALIAS') {
                                $alias{$parameter}=$value;
                        }
@@ -1106,6 +1122,13 @@ sub loadconfig {
        }
 }
 
+sub startingconfig {
+       %alias=%config=%configfiles=%knownactions=%loaded=();
+       my $datapos=tell(DATA);
+       loadconfig(\*DATA);
+       seek(DATA,$datapos,0); # rewind
+}
+
 sub modifyconfig {
        my $f=shift;
        # the section to modify or add
@@ -1336,9 +1359,11 @@ sub bootstrap {
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
-       if (system("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig) != 0) {
-               die "mr: download of $url failed\n";
-       }
+       my @curlargs = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
+       push(@curlargs, "-k") if $insecure;
+       my $curlstatus = system(@curlargs);
+       die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;
+       die "mr bootstrap: download of $url failed\n" if $curlstatus != 0;
 
        if (! -e $dir) {
                system("mkdir", "-p", $dir);
@@ -1354,7 +1379,7 @@ sub bootstrap {
                if exists $config{$topdir}{"."}{"checkout"};
 
        if (-e ".mrconfig") {
-               print STDERR "mr: .mrconfig file already exists, not overwriting with $url\n";
+               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
        }
        else {
                eval q{use File::Copy};
@@ -1362,8 +1387,14 @@ sub bootstrap {
                move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
 
-       exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");
-       die "failed to run mr checkout";
+       # Reload the config file (in case we got a different version)
+       # and checkout everything else.
+       startingconfig();
+       loadconfig(".mrconfig");
+       dispatch("checkout");
+       @skipped=grep { abs_path($_) ne abs_path($topdir) } @skipped;
+       showstats("bootstrap");
+       exitstats();
 }
 
 # alias expansion and command stemming
@@ -1411,6 +1442,7 @@ sub getopts {
                "v|verbose" => \$verbose,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,
+               "k|insecure" => \$insecure,
                "i|interactive" => \$interactive,
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,
@@ -1451,28 +1483,32 @@ sub init {
                $ENV{MR_PATH}=$Bin."/".$Script;
        };
 }
+       
+sub exitstats {
+       if (@failed) {
+               exit 1;
+       }
+       elsif (! @ok && @skipped) {
+               exit 1;
+       }
+       else {
+               exit 0;
+       }
+}
 
 sub main {
        getopts();
        init();
 
-       loadconfig(\*DATA);
+       startingconfig();
        loadconfig($ENV{MR_CONFIG});
        #use Data::Dumper; print Dumper(\%config);
        
        my $action=expandaction(shift @ARGV);
        dispatch($action);
-       showstats($action);
 
-       if (@failed) {
-               exit 1;
-       }
-       elsif (! @ok && @skipped) {
-               exit 1;
-       }
-       else {
-               exit 0;
-       }
+       showstats($action);
+       exitstats();
 }
 
 # Finally, some useful actions that mr knows about by default.
@@ -1511,10 +1547,10 @@ lib =
                fi
                delta=`perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile"`
                if [ "$delta" -lt "$2" ]; then
-                       exit 0
+                       return 1
                else
                        touch "$flagfile"
-                       exit 1
+                       return 0
                fi
        }
 
@@ -1537,8 +1573,8 @@ hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 
 svn_status = svn status "$@"
-git_status = git status "$@" || true
-bzr_status = bzr status "$@"
+git_status = git status -s "$@" || true
+bzr_status = bzr status --short "$@"
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 darcs_status = darcs whatsnew -ls "$@" || true