X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/dd5d92a7eea054973cbfe58987387b5eb788610e..f4bf98dfa6b9108b69dc890d0664caf6d216cfe2:/mr?ds=sidebyside diff --git a/mr b/mr index 872343b..1f01803 100755 --- a/mr +++ b/mr @@ -20,7 +20,7 @@ B [options] diff B [options] log -B [options] bootstrap url +B [options] bootstrap url [directory] B [options] register [repository] @@ -36,7 +36,7 @@ B [options] remember action [params ...] B is a Multiple Repository management tool. It can checkout, update, or perform other actions on a set of repositories as if they were one combined -repository. It supports any combination of subversion, git, cvs, mecurial, +repository. It supports any combination of subversion, git, cvs, mercurial, bzr and darcs repositories, and support for other revision control systems can easily be added. @@ -104,10 +104,16 @@ These commands are also available: =over 4 -=item bootstrap url +=item bootstrap url [directory] -Causes mr to download the url, save it to a .mrconfig file in the -current directory, and then check out all repositories listed in it. +Causes mr to download the url, and use it as a .mrconfig file +to checkout the repositories listed in it, into the specified directory. + +The directory will be created if it does not exist. If no directory is +specified, the current directory will be used. + +If the .mrconfig file includes a repository named ".", that +is checked out into the top of the specified directory. =item list (or ls) @@ -183,39 +189,61 @@ system. =item -d directory +=item --directory directory + Specifies the topmost directory that B should work in. The default is the current working directory. =item -c mrconfig +=item --config mrconfig + Use the specified mrconfig file. The default is B<~/.mrconfig> =item -p +=item --path + Search in the current directory, and its parent directories and use the first B<.mrconfig> found, instead of the default B<~/.mrconfig>. =item -v +=item --verbose + Be verbose. =item -q +=item --quiet + Be quiet. +=item -k + +=item --insecure + +Accept untrusted SSL certificates when bootstrapping. + =item -s +=item --stats + Expand the statistics line displayed at the end to include information about exactly which repositories failed and were skipped, if any. =item -i +=item --interactive + Interactive mode. If a repository fails to be processed, a subshell will be started which you can use to resolve or investigate the problem. Exit the subshell to continue the mr run. =item -n [number] +=item --no-recurse [number] + If no number if specified, just operate on the repository for the current directory, do not recurse into deeper repositories. @@ -225,6 +253,8 @@ but not ./src/packages/bar. =item -j [number] +=item --jobs [number] + Run the specified number of jobs in parallel, or an unlimited number of jobs with no number specified. This can greatly speed up operations such as updates. It is not recommended for interactive operations. @@ -235,6 +265,8 @@ a good speedup in updates without loading the machine too much. =item -t +=item --trust-all + Trust all mrconfig files even if they are not listed in ~/.mrtrust. Use with caution. @@ -357,7 +389,7 @@ 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 @@ -407,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; @@ -485,7 +518,7 @@ sub findcommand { } sub action { - my ($action, $dir, $topdir, $subdir) = @_; + my ($action, $dir, $topdir, $subdir, $force_checkout) = @_; $ENV{MR_CONFIG}=$configfiles{$topdir}; my $lib=exists $config{$topdir}{$subdir}{lib} ? @@ -495,12 +528,14 @@ sub action { $ENV{MR_REPO}=$dir; if ($is_checkout) { - if (-d $dir) { - print "mr $action: $dir already exists, skipping checkout\n" if $verbose; - return SKIPPED; + if (! $force_checkout) { + if (-d $dir) { + print "mr $action: $dir already exists, skipping checkout\n" if $verbose; + return SKIPPED; + } + + $dir=~s/^(.*)\/[^\/]+\/?$/$1/; } - - $dir=~s/^(.*)\/[^\/]+\/?$/$1/; } elsif ($action =~ /update/) { if (! -d $dir) { @@ -679,16 +714,16 @@ sub record { if ($ret == OK) { push @ok, $dir; - print "\n"; + print "\n" unless $quiet; } elsif ($ret == FAILED) { if ($interactive) { chdir($dir) unless $no_chdir; print STDERR "mr: Starting interactive shell. Exit shell to continue.\n"; - system((getpwuid($<))[8]); + system((getpwuid($<))[8], "-i"); } push @failed, $dir; - print "\n"; + print "\n" unless $quiet; } elsif ($ret == SKIPPED) { push @skipped, $dir; @@ -752,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; @@ -760,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=~/\/$/; @@ -780,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=~/\/$/; @@ -919,11 +963,11 @@ sub is_trusted_checkout { my %loaded; sub loadconfig { my $f=shift; + my $dir=shift; my @toload; my $in; - my $dir; my $trusted; if (ref $f eq 'GLOB') { $dir=""; @@ -943,10 +987,13 @@ sub loadconfig { $trusted=is_trusted_config($absf); - ($dir)=$f=~/^(.*\/)[^\/]+$/; if (! defined $dir) { - $dir="."; + ($dir)=$f=~/^(.*\/)[^\/]+$/; + if (! defined $dir) { + $dir="."; + } } + $dir=abs_path($dir)."/"; if (! exists $configfiles{$dir}) { @@ -970,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; @@ -990,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; @@ -1026,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; } @@ -1075,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 @@ -1295,21 +1349,52 @@ sub register { sub bootstrap { my $url=shift @ARGV; - + my $dir=shift @ARGV || "."; + if (! defined $url || ! length $url) { die "mr: bootstrap requires url\n"; } - - if (-e ".mrconfig") { - die "mr: .mrconfig file already exists, not overwriting with $url\n"; + + # Download the config file to a temporary location. + eval q{use File::Temp}; + die $@ if $@; + my $tmpconfig=File::Temp->new(); + 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); } + chdir($dir) || die "chdir $dir: $!"; - if (system("curl", "-s", $url, "-o", ".mrconfig") != 0) { - die "mr: download of $url failed\n"; - } + # Special case to handle checkout of the "." repo, which + # would normally be skipped. + my $topdir=abs_path(".")."/"; + my @repo=($topdir, $topdir, "."); + loadconfig($tmpconfig, $topdir); + record(\@repo, action("checkout", @repo, 1)) + if exists $config{$topdir}{"."}{"checkout"}; - exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout"); - die "failed to run mr checkout"; + if (-e ".mrconfig") { + print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n"; + } + else { + eval q{use File::Copy}; + die $@ if $@; + move($tmpconfig, ".mrconfig") || die "rename: $!"; + } + + # 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 @@ -1357,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, @@ -1397,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. @@ -1457,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 } @@ -1577,14 +1667,26 @@ hg_trusted_checkout = hg clone $url $repo darcs_trusted_checkout = darcs get $url $repo git_bare_trusted_checkout = git clone --bare $url $repo + help = + case `uname -s` in + SunOS) + SHOWMANFILE="man -f" + ;; + Darwin) + SHOWMANFILE="man" + ;; + *) + SHOWMANFILE="man -l" + ;; + 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" - man -l "$tmp" || error "man failed" + $SHOWMANFILE "$tmp" || error "man failed" list = true config = bootstrap =