X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/02f8856f7d52ec972d6ab7704f612446013572a5..4c3dcb350066802311b52151f0f73c5bbe2603e0:/mr diff --git a/mr b/mr index 0c34e46..e73f3c8 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,9 +36,9 @@ 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, -bzr and darcs repositories, and support for other revision control systems can -easily be added. +repository. It supports any combination of subversion, git, cvs, mercurial, +bzr, darcs and fossil repositories, and support for other revision +control systems can easily be added. B cds into and operates on all registered repositories at or below your working directory. Or, if you are in a subdirectory of a repository that @@ -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. @@ -233,9 +263,16 @@ Note that running more than 10 jobs at a time is likely to run afoul of ssh connection limits. Running between 3 and 5 jobs at a time will yield 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. + =back -=head1 "MRCONFIG FILES" +=head1 MRCONFIG FILES Here is an example .mrconfig file: @@ -333,6 +370,20 @@ The "lib" parameter can specify some shell code that will be run before each command, this can be a useful way to define shell functions for other commands to use. +=item fixups + +If the "fixups" parameter is set, its command is run whenever a repository +is checked out, or updated. This provides an easy way to do things +like permissions fixups, or other tweaks to the repository content, +whenever the repository is changed. + +=item pre_ and post_ + +If a "pre_action" parameter is set, its command is run before mr performs the +specified action. Similarly, "post_action" parameters are run after mr +successfully performs the specified action. For example, "pre_commit" is +run before committing; "post_update" is run after updating. + =back When looking for a command to run for a given action, mr first looks for @@ -352,15 +403,16 @@ 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. To avoid worries -about a malicious change being committed to such a file, mr has the ability -to read mrconfig files in untrusted mode. Such files are limited to running -only known safe commands (like "git clone"). +inside a repository that your main ~/.mrconfig checks out and chains to. To +avoid worries about evil commands in a mrconfig file, mr +has the ability to read mrconfig files in untrusted mode. Such files are +limited to running only known safe commands (like "git clone") in a +carefully checked manner. By default, mr trusts all mrconfig files. (This default will change in a future release!) But if you have a ~/.mrtrust file, mr will only trust @@ -375,7 +427,7 @@ the documentation in the files for details about using them. =head1 AUTHOR -Copyright 2007-2009 Joey Hess +Copyright 2007-2010 Joey Hess Licensed under the GNU GPL version 2 or higher. @@ -401,10 +453,12 @@ 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; my $jobs=1; +my $trust_all=0; my $directory=getcwd(); $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig"; @@ -478,24 +532,27 @@ 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} ? $config{$topdir}{$subdir}{lib}."\n" : ""; my $is_checkout=($action eq 'checkout'); + my $is_update=($action =~ /update/); $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/) { + elsif ($is_update) { if (! -d $dir) { return action("checkout", $dir, $topdir, $subdir); } @@ -554,6 +611,10 @@ sub action { $s=~s/^\Q$topdir$subdir\E\/?//; print "mr $action: $topdir$subdir (in subdir $s)\n" unless $quiet; } + + my $hookret=hook("pre_$action", $topdir, $subdir); + return $hookret if $hookret != OK; + $command="set -e; ".$lib. "my_action(){ $command\n }; my_action ". join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV); @@ -586,16 +647,49 @@ sub action { return FAILED; } else { - if ($action eq 'checkout' && ! -d $dir) { + if ($is_checkout && ! -d $dir) { print STDERR "mr $action: $dir missing after checkout\n";; return FAILED; } + my $ret=hook("post_$action", $topdir, $subdir); + return $ret if $ret != OK; + + if (($is_checkout || $is_update)) { + my $ret=hook("fixups", $topdir, $subdir); + return $ret if $ret != OK; + } + return OK; } } } +sub hook { + my ($hook, $topdir, $subdir) = @_; + + my $command=$config{$topdir}{$subdir}{$hook}; + return OK unless defined $command; + my $lib=exists $config{$topdir}{$subdir}{lib} ? + $config{$topdir}{$subdir}{lib}."\n" : ""; + my $shell="set -e;".$lib. + "my_hook(){ $command\n }; my_hook"; + print "mr $hook: running >>$shell<<\n" if $verbose; + my $ret=system($shell); + if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $hook: interrupted\n"; + return ABORT; + } + elsif ($? & 127) { + print STDERR "mr $hook: received signal ".($? & 127)."\n"; + return ABORT; + } + } + + return OK; +} + # run actions on multiple repos, in parallel sub mrs { my $action=shift; @@ -672,16 +766,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; @@ -745,6 +839,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; @@ -753,7 +856,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=~/\/$/; @@ -773,7 +876,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=~/\/$/; @@ -806,6 +909,8 @@ sub is_trusted_config { # We always trust ~/.mrconfig. return 1 if $config eq abs_path("$ENV{HOME}/.mrconfig"); + return 1 if $trust_all; + my $trustfile=$ENV{HOME}."/.mrtrust"; if (! -e $trustfile) { @@ -910,11 +1015,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=""; @@ -934,10 +1039,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}) { @@ -961,7 +1069,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; @@ -981,6 +1089,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; @@ -1017,12 +1131,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; } @@ -1066,6 +1174,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 @@ -1286,21 +1401,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 @@ -1348,9 +1494,11 @@ 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, + "t|trust-all" => \$trust_all, ); if (! $result || @ARGV < 1) { die("Usage: mr [options] action [params ...]\n". @@ -1387,28 +1535,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. @@ -1436,7 +1588,7 @@ lib = if [ -z "$1" ] || [ -z "$2" ]; then error "mr: usage: hours_since action num" fi - for dir in .git .svn .bzr CVS .hg _darcs; do + for dir in .git .svn .bzr CVS .hg _darcs _FOSSIL_; do if [ -e "$MR_REPO/$dir" ]; then flagfile="$MR_REPO/$dir/.mr_last$1" break @@ -1447,10 +1599,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 } @@ -1460,6 +1612,7 @@ bzr_test = test -d "$MR_REPO"/.bzr cvs_test = test -d "$MR_REPO"/CVS hg_test = test -d "$MR_REPO"/.hg darcs_test = test -d "$MR_REPO"/_darcs +fossil_test = test -f "$MR_REPO"/_FOSSIL_ git_bare_test = test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags && test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config && @@ -1471,13 +1624,15 @@ bzr_update = bzr merge --pull "$@" cvs_update = cvs update "$@" hg_update = hg pull "$@" && hg update "$@" darcs_update = darcs pull -a "$@" +fossil_update = fossil pull "$@" 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 +fossil_status = fossil changes "$@" svn_commit = svn commit "$@" git_commit = git commit -a "$@" && git push --all @@ -1485,11 +1640,13 @@ bzr_commit = bzr commit "$@" && bzr push cvs_commit = cvs commit "$@" hg_commit = hg commit -m "$@" && hg push darcs_commit = darcs record -a -m "$@" && darcs push -a +fossil_commit = fossil commit "$@" git_record = git commit -a "$@" bzr_record = bzr commit "$@" hg_record = hg commit -m "$@" darcs_record = darcs record -a -m "$@" +fossil_record = fossil commit "$@" svn_push = : git_push = git push "$@" @@ -1497,6 +1654,7 @@ bzr_push = bzr push "$@" cvs_push = : hg_push = hg push "$@" darcs_push = darcs push -a "$@" +fossil_push = fossil push "$@" svn_diff = svn diff "$@" git_diff = git diff "$@" @@ -1504,6 +1662,7 @@ bzr_diff = bzr diff "$@" cvs_diff = cvs diff "$@" hg_diff = hg diff "$@" darcs_diff = darcs diff -u "$@" +fossil_diff = fossil diff "$@" svn_log = svn log "$@" git_log = git log "$@" @@ -1512,6 +1671,7 @@ cvs_log = cvs log "$@" hg_log = hg log "$@" darcs_log = darcs changes "$@" git_bare_log = git log "$@" +fossil_log = fossil timeline "$@" svn_register = url=`LC_ALL=C svn info . | grep -i '^URL:' | cut -d ' ' -f 2` @@ -1557,6 +1717,11 @@ git_bare_register = fi echo "Registering git url: $url in $MR_CONFIG" mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'" +fossil_register = + url=`fossil remote-url` + repo=`fossil info | grep repository | sed -e 's/repository:*.//g' -e 's/ //g'` + echo "Registering fossil repository $url in $MR_CONFIG" + mr -c "$MR_CONFIG" config "`pwd`" checkout="mkdir -p '$MR_REPO' && cd '$MR_REPO' && fossil open '$repo'" svn_trusted_checkout = svn co $url $repo svn_alt_trusted_checkout = svn checkout $url $repo @@ -1566,15 +1731,28 @@ bzr_trusted_checkout = bzr clone $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 +# fossil: messy to do + 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 =