]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / myrepos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* Patch from Simon McVittie, to pass -a to darcs commands to avoid
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 1aee75afa54ed0c40eb5811b034774af234917f5..1253102e5e05f6d71f15dd0eb14ab19341ac9b52 100755 (executable)
--- a/mr
+++ b/mr
@@ -30,9 +30,9 @@ B<mr> [options] action [params ...]
 
 B<mr> 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
 
 B<mr> 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<mr> 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
 
 B<mr> 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
@@ -229,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
 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
 
 
 =item chain
 
@@ -276,7 +286,6 @@ $SIG{INT}=sub {
 
 $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 my $config_overridden=0;
 
 $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 my $config_overridden=0;
-my $directory=getcwd();
 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;
 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;
@@ -285,6 +294,7 @@ my %config;
 my %configfiles;
 my %knownactions;
 my %alias;
 my %configfiles;
 my %knownactions;
 my %alias;
+my $directory=getcwd();
 
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
 
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
@@ -300,6 +310,9 @@ if (! $result || @ARGV < 1) {
            "(Use mr help for man page.)\n");
 
 }
            "(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
 
 # 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
@@ -400,34 +413,55 @@ elsif ($action eq 'register') {
        exec($command) || die "exec: $!";
 }
 
        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;
 # 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 $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;
                }
        }
        $nochdir=1;
@@ -441,7 +475,6 @@ if ($jobs > 1) {
 else {
        foreach my $repo (@repos) {
                record($repo, action($action, @$repo));
 else {
        foreach my $repo (@repos) {
                record($repo, action($action, @$repo));
-               print "\n";
        }
 }
 if (! @ok && ! @failed && ! @skipped) {
        }
 }
 if (! @ok && ! @failed && ! @skipped) {
@@ -488,7 +521,7 @@ sub action { #{{{
                        system("mkdir", "-p", $dir);
                }
        }
                        system("mkdir", "-p", $dir);
                }
        }
-       elsif ($action eq 'update') {
+       elsif ($action =~ /update/) {
                if (! -d $dir) {
                        return action("checkout", $dir, $topdir, $subdir);
                }
                if (! -d $dir) {
                        return action("checkout", $dir, $topdir, $subdir);
                }
@@ -530,7 +563,9 @@ sub action { #{{{
                        print "mr $action: $topdir$subdir\n";
                }
                else {
                        print "mr $action: $topdir$subdir\n";
                }
                else {
-                       print "mr $action: $topdir$subdir (in subdir $directory)\n";
+                       my $s=$directory;
+                       $s=~s/^\Q$topdir$subdir\E\/?//;
+                       print "mr $action: $topdir$subdir (in subdir $s)\n";
                }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
                }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
@@ -579,10 +614,11 @@ sub mrs { #{{{
                        my $repo = shift @repos;
                        pipe(my $outfh, CHILD_STDOUT);
                        pipe(my $errfh, CHILD_STDERR);
                        my $repo = shift @repos;
                        pipe(my $outfh, CHILD_STDOUT);
                        pipe(my $errfh, CHILD_STDERR);
-                       unless (my $pid = fork) {
-                               die "cannot fork: $!" unless defined $pid;
-                               open(STDOUT, ">&CHILD_STDOUT") || die "reopen stdout: $!";
-                               open(STDERR, ">&CHILD_STDERR") || die "reopen 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 CHILD_STDOUT;
                                close CHILD_STDERR;
                                close $outfh;
@@ -591,7 +627,7 @@ sub mrs { #{{{
                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;
                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;
-                       push @active, $repo;
+                       push @active, [$pid, $repo];
                        push @fhs, [$outfh, $errfh];
                        push @out, ['',     ''];
                }
                        push @fhs, [$outfh, $errfh];
                        push @out, ['',     ''];
                }
@@ -615,10 +651,10 @@ sub mrs { #{{{
                                                $fhs[$i][$channel] = undef;
                                                if (! defined $fhs[$i][0] &&
                                                    ! defined $fhs[$i][1]) {
                                                $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];
                                                        print STDOUT $out[$i][0];
                                                        print STDERR $out[$i][1];
-                                                       print "\n";
-                                                       record($active[$i], $? >> 8);
+                                                       record($active[$i][1], $? >> 8);
                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);
                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);
@@ -638,9 +674,11 @@ sub record { #{{{
 
        if ($ret == OK) {
                push @ok, $dir;
 
        if ($ret == OK) {
                push @ok, $dir;
+               print "\n";
        }
        elsif ($ret == FAILED) {
                push @failed, $dir;
        }
        elsif ($ret == FAILED) {
                push @failed, $dir;
+               print "\n";
        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;
        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;
@@ -891,13 +929,17 @@ ci = commit
 ls = list
 
 [DEFAULT]
 ls = list
 
 [DEFAULT]
+order = 10
 lib =
        error() {
                echo "mr: $@" >&2
                exit 1
        }
        hours_since() {
 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
                        if [ -e "$MR_REPO/$dir" ]; then
                                flagfile="$MR_REPO/$dir/.mr_last$1"
                                break
@@ -906,8 +948,13 @@ lib =
                if [ -z "$flagfile" ]; then
                        error "cannot determine flag filename"
                fi
                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 =
        }
 
 update =
@@ -925,6 +972,8 @@ update =
                cvs update "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg pull "$@" && hg update "$@"
                cvs update "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg pull "$@" && hg update "$@"
+       elif [ -d "$MR_REPO"/_darcs ]; then
+               darcs pull -a "$@"
        else
                error "unknown repo type"
        fi
        else
                error "unknown repo type"
        fi
@@ -939,6 +988,8 @@ status =
                cvs status "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg 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
        else
                error "unknown repo type"
        fi
@@ -953,6 +1004,8 @@ commit =
                cvs commit "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg commit -m "$@" && hg push
                cvs commit "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg commit -m "$@" && hg push
+       elif [ -d "$MR_REPO"/_darcs ]; then
+               darcs commit -a -m "$@" && darcs push -a
        else
                error "unknown repo type"
        fi
        else
                error "unknown repo type"
        fi
@@ -967,6 +1020,8 @@ diff =
                cvs diff "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg 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
        else
                error "unknown repo type"
        fi
@@ -981,6 +1036,8 @@ log =
                cvs log "$@"
        elif [ -d "$MR_REPO"/.hg ]; then
                hg 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
        else
                error "unknown repo type"
        fi
@@ -1024,6 +1081,11 @@ register =
                echo "Registering mercurial repo url: $url in $MR_CONFIG"
                mr -c "$MR_CONFIG" config "$(pwd)" \
                        checkout="hg clone $url $basedir"
                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
        else
                error "unable to register this repo type"
        fi
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.