X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/c3ee87e2ac7bce77e805815bcfc31f7010a86086..2ded5178cf51094117cd0250de3b2f3e97f62e45:/mr diff --git a/mr b/mr index 9a33d40..0a50a33 100755 --- a/mr +++ b/mr @@ -30,9 +30,9 @@ B [options] 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 -respository. It supports any combination of subversion, git, cvs, mecurial and -bzr repositories, and support for other revision control systems can easily be -added. +respository. It supports any combination of subversion, git, cvs, mecurial, +bzr and darcs 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 @@ -160,10 +160,8 @@ recurse into deeper repositories. =item -j number Run the specified number of jobs in parallel. This can greatly speed up -operations such as updates. - -Note that in -j mode, all output of the jobs goes to standard output, even -output that would normally go to standard error. +operations such as updates. It is not recommended for interactive +operations. =back @@ -231,7 +229,17 @@ mr is run by joey. The second uses the hours_since function been at least 12 hours since the last update. skip = test $(whoami) != joey - skip = [ "$1" = update ] && [ $(hours_since "$1") -lt 12 ] + skip = [ "$1" = update ] && ! hours_since "$1" 12 + +=item order + +The "order" parameter can be used to override the default ordering of +repositories. The default order value is 10. Use smaller values to make +repositories be processed earlier, and larger values to make repositories +be processed later. + +Note that if a repository is located in a subdirectory of another +repository, ordering it to be processed earlier is not recommended. =item chain @@ -278,7 +286,6 @@ $SIG{INT}=sub { $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig"; my $config_overridden=0; -my $directory=getcwd(); my $verbose=0; my $stats=0; my $no_recurse=0; @@ -287,6 +294,7 @@ my %config; my %configfiles; my %knownactions; my %alias; +my $directory=getcwd(); Getopt::Long::Configure("no_permute"); my $result=GetOptions( @@ -302,6 +310,9 @@ if (! $result || @ARGV < 1) { "(Use mr help for man page.)\n"); } +if (! defined $directory) { + die("mr: failed to determine working directory\n"); +} # Make sure MR_CONFIG is an absolute path, but don't use abs_path since # the config file might be a symlink to elsewhere, and the directory it's @@ -402,34 +413,55 @@ elsif ($action eq 'register') { exec($command) || die "exec: $!"; } +# an ordered list of repos +my @list; +foreach my $topdir (sort keys %config) { + foreach my $subdir (sort keys %{$config{$topdir}}) { + push @list, { + topdir => $topdir, + subdir => $subdir, + order => $config{$topdir}{$subdir}{order}, + }; + } +} +@list = sort { + $a->{order} <=> $b->{order} + || + $a->{topdir} cmp $b->{topdir} + || + $a->{subdir} cmp $b->{subdir} + } @list; + # work out what repos to act on my @repos; my $nochdir=0; -foreach my $topdir (sort keys %config) { - foreach my $subdir (sort keys %{$config{$topdir}}) { +foreach my $repo (@list) { + my $topdir=$repo->{topdir}; + my $subdir=$repo->{subdir}; + + next if $subdir eq 'DEFAULT'; + my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir; + my $d=$directory; + $dir.="/" unless $dir=~/\/$/; + $d.="/" unless $d=~/\/$/; + next if $no_recurse && $d ne $dir; + next if $dir ne $d && $dir !~ /^\Q$d\E/; + push @repos, [$dir, $topdir, $subdir]; +} +if (! @repos) { + # fallback to find a leaf repo + foreach my $repo (reverse @list) { + my $topdir=$repo->{topdir}; + my $subdir=$repo->{subdir}; + next if $subdir eq 'DEFAULT'; my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir; my $d=$directory; $dir.="/" unless $dir=~/\/$/; $d.="/" unless $d=~/\/$/; - next if $no_recurse && $d ne $dir; - next if $dir ne $d && $dir !~ /^\Q$d\E/; - push @repos, [$dir, $topdir, $subdir]; - } -} -if (! @repos) { - # fallback to find a leaf repo - LEAF: foreach my $topdir (reverse sort keys %config) { - foreach my $subdir (reverse sort keys %{$config{$topdir}}) { - next if $subdir eq 'DEFAULT'; - my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir; - my $d=$directory; - $dir.="/" unless $dir=~/\/$/; - $d.="/" unless $d=~/\/$/; - if ($d=~/^\Q$dir\E/) { - push @repos, [$dir, $topdir, $subdir]; - last LEAF; - } + if ($d=~/^\Q$dir\E/) { + push @repos, [$dir, $topdir, $subdir]; + last; } } $nochdir=1; @@ -489,7 +521,7 @@ sub action { #{{{ system("mkdir", "-p", $dir); } } - elsif ($action eq 'update') { + elsif ($action =~ /update/) { if (! -d $dir) { return action("checkout", $dir, $topdir, $subdir); } @@ -538,7 +570,6 @@ sub action { #{{{ join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV); print STDERR "mr $action: running >>$command<<\n" if $verbose; my $ret=system($command); - print "\n"; if ($ret != 0) { if (($? & 127) == 2) { print STDERR "mr $action: interrupted\n"; @@ -569,72 +600,83 @@ sub action { #{{{ } #}}} # run actions on multiple repos, in parallel -my %jobs; sub mrs { #{{{ $| = 1; + my @active; my @fhs; my @out; my $running=0; while (@fhs or @repos) { while ($running < $jobs && @repos) { - $SIG{CHLD}='DEFAULT'; $running++; my $repo = shift @repos; - my $pid = open(my $fh, "-|"); - if (! $pid) { - open(STDERR, ">&STDOUT"); + pipe(my $outfh, CHILD_STDOUT); + pipe(my $errfh, CHILD_STDERR); + my $pid; + unless ($pid = fork) { + die "mr $action: cannot fork: $!" unless defined $pid; + open(STDOUT, ">&CHILD_STDOUT") || die "mr $action cannot reopen stdout: $!"; + open(STDERR, ">&CHILD_STDERR") || die "mr $action cannot reopen stderr: $!"; + close CHILD_STDOUT; + close CHILD_STDERR; + close $outfh; + close $errfh; exit action($action, @$repo); } - $jobs{$pid}=$repo; - push @fhs, $fh; - push @out, ""; - $SIG{CHLD}=\&reaper; - reaper(); + close CHILD_STDOUT; + close CHILD_STDERR; + push @active, [$pid, $repo]; + push @fhs, [$outfh, $errfh]; + push @out, ['', '']; } - my ($rin, $rout) = ('','', ''); + my ($rin, $rout) = ('',''); my $nfound; - foreach my $x (@fhs) { - next unless defined $x; - vec($rin, fileno($x), 1) = 1; + foreach my $fh (@fhs) { + next unless defined $fh; + vec($rin, fileno($fh->[0]), 1) = 1 if defined $fh->[0]; + vec($rin, fileno($fh->[1]), 1) = 1 if defined $fh->[1]; } $nfound = select($rout=$rin, undef, undef, 1); - foreach my $i (0..$#fhs) { - my $fh = $fhs[$i]; - next unless defined $fh; - if (vec($rout, fileno($fh), 1) == 1) { - my $r = ''; - if (sysread($fh, $r, 1024) == 0) { - close($fh); - $fhs[$i] = undef; - $running--; - print $out[$i]; - $out[$i]=''; + foreach my $channel (0, 1) { + foreach my $i (0..$#fhs) { + next unless defined $fhs[$i]; + my $fh = $fhs[$i][$channel]; + next unless defined $fh; + if (vec($rout, fileno($fh), 1) == 1) { + my $r = ''; + if (sysread($fh, $r, 1024) == 0) { + close($fh); + $fhs[$i][$channel] = undef; + if (! defined $fhs[$i][0] && + ! defined $fhs[$i][1]) { + waitpid($active[$i][0], 0); + print STDOUT $out[$i][0]; + print STDERR $out[$i][1]; + record($active[$i][1], $? >> 8); + splice(@fhs, $i, 1); + splice(@active, $i, 1); + splice(@out, $i, 1); + $running--; + } + } + $out[$i][$channel] .= $r; } - $out[$i] .= $r; } } - while (@fhs and !defined $fhs[0]) { - shift @fhs; - shift @out; - } } } #}}} -sub reaper { #{{{ - while ((my $pid = waitpid(-1, &WNOHANG)) > 0) { - record($jobs{$pid}, $? >> 8) if exists $jobs{$pid}; - } -} #}}} - sub record { #{{{ my $dir=shift()->[0]; my $ret=shift; if ($ret == OK) { push @ok, $dir; + print "\n"; } elsif ($ret == FAILED) { push @failed, $dir; + print "\n"; } elsif ($ret == SKIPPED) { push @skipped, $dir; @@ -885,13 +927,17 @@ ci = commit ls = list [DEFAULT] +order = 10 lib = error() { echo "mr: $@" >&2 exit 1 } hours_since() { - for dir in .git .svn .bzr CVS .hg; do + if [ -z "$1" ] || [ -z "$2" ]; then + error "mr: usage: hours_since action num" + fi + for dir in .git .svn .bzr CVS .hg _darcs; do if [ -e "$MR_REPO/$dir" ]; then flagfile="$MR_REPO/$dir/.mr_last$1" break @@ -900,8 +946,13 @@ lib = if [ -z "$flagfile" ]; then error "cannot determine flag filename" fi - perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile" - touch "$flagfile" + delta=$(perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile") + if [ "$delta" -lt "$2" ]; then + exit 0 + else + touch "$flagfile" + exit 1 + fi } update = @@ -919,6 +970,8 @@ update = cvs update "$@" elif [ -d "$MR_REPO"/.hg ]; then hg pull "$@" && hg update "$@" + elif [ -d "$MR_REPO"/_darcs ]; then + darcs pull "$@" else error "unknown repo type" fi @@ -933,6 +986,8 @@ status = cvs status "$@" elif [ -d "$MR_REPO"/.hg ]; then hg status "$@" + elif [ -d "$MR_REPO"/_darcs ]; then + darcs whatsnew -ls "$@" else error "unknown repo type" fi @@ -947,6 +1002,8 @@ commit = cvs commit "$@" elif [ -d "$MR_REPO"/.hg ]; then hg commit -m "$@" && hg push + elif [ -d "$MR_REPO"/_darcs ]; then + darcs commit -m "$@" && darcs push else error "unknown repo type" fi @@ -961,6 +1018,8 @@ diff = cvs diff "$@" elif [ -d "$MR_REPO"/.hg ]; then hg diff "$@" + elif [ -d "$MR_REPO"/_darcs ]; then + darcs diff "$@" else error "unknown repo type" fi @@ -975,6 +1034,8 @@ log = cvs log "$@" elif [ -d "$MR_REPO"/.hg ]; then hg log "$@" + elif [ -d "$MR_REPO"/_darcs ]; then + darcs changes "$@" else error "unknown repo type" fi @@ -1018,6 +1079,11 @@ register = echo "Registering mercurial repo url: $url in $MR_CONFIG" mr -c "$MR_CONFIG" config "$(pwd)" \ checkout="hg clone $url $basedir" + elif [ -d _darcs ]; then + url=$(cat _darcs/prefs/defaultrepo) + echo "Registering darcs repository $url in $MR_CONFIG" + mr -c "$MR_CONFIG" config "$(pwd)" \ + checkout="darcs get $url $basedir" else error "unable to register this repo type" fi