Add a clean command. Thanks, Paul Wise. Closes: #702685

[code/myrepos.git] / mr

diff --git a/mr b/mr
index ba0cf0a8ac6ba4dc78a0b4f384ac29ecf89fe468..7319f985d4d88326ab3dfe2a54d3e21952f6a1e9 100755 (executable)
--- a/mr
+++ b/mr
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl

 
 =head1 NAME
 
 
 =head1 NAME
 

-mr - a Multiple Repository management tool
+mr - a tool to manage all your version control repos

 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 


@@ -12,19 +12,25 @@ B<mr> [options] update
 
 B<mr> [options] status
 
 
 B<mr> [options] status
 

+B<mr> [options] clean [-f]
+

 B<mr> [options] commit [-m "message"]
 
 B<mr> [options] record [-m "message"]
 
 B<mr> [options] commit [-m "message"]
 
 B<mr> [options] record [-m "message"]
 

+B<mr> [options] fetch
+

 B<mr> [options] push
 
 B<mr> [options] diff
 
 B<mr> [options] log
 
 B<mr> [options] push
 
 B<mr> [options] diff
 
 B<mr> [options] log
 

+B<mr> [options] grep pattern
+

 B<mr> [options] run command [param ...]
 
 B<mr> [options] run command [param ...]
 

-B<mr> [options] bootstrap url [directory]
+B<mr> [options] bootstrap src [directory]

 
 B<mr> [options] register [repository]
 
 
 B<mr> [options] register [repository]
 


@@ -38,11 +44,11 @@ B<mr> [options] remember action [params ...]
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

-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
-repository. It supports any combination of subversion, git, cvs, mercurial,
-bzr, darcs and fossil repositories, and support for other version
-control systems can easily be added.
+B<mr> is a tool to manage all your version control repos. 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, mercurial, bzr, darcs, fossil and veracity repositories, and support
+for other version 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


@@ -73,7 +79,14 @@ If a repository isn't checked out yet, it will first check it out.
 =item status
 
 Displays a status report for each repository, showing what
 =item status
 
 Displays a status report for each repository, showing what

-uncommitted changes are present in the repository.
+uncommitted changes are present in the repository. For distributed version
+control systems, also shows unpushed local branches.
+
+=item clean
+
+Print ignored files, untracked files and other cruft in the working directory.
+
+The optional -f parameter allows removing the files as well as printing them.

 
 =item commit (or ci)
 
 
 =item commit (or ci)
 


@@ -91,6 +104,12 @@ remote repository. Only supported for distributed version control systems.
 
 The optional -m parameter allows specifying a commit message.
 
 
 The optional -m parameter allows specifying a commit message.
 

+=item fetch
+
+Fetches from each repository's remote repository, but does not
+update the working copy. Only supported for some distributed version
+control systems.
+

 =item push
 
 Pushes committed local changes to the remote repository. A no-op for
 =item push
 
 Pushes committed local changes to the remote repository. A no-op for


@@ -104,6 +123,11 @@ Show a diff of uncommitted changes.
 
 Show the commit log.
 
 
 Show the commit log.
 

+=item grep pattern
+
+Searches for a pattern in each repository using the grep subcommand. Uses
+ack-grep on VCS that do not have their own.
+

 =item run command [param ...]
 
 Runs the specified command in each repository.
 =item run command [param ...]
 
 Runs the specified command in each repository.


@@ -114,15 +138,39 @@ These commands are also available:
 
 =over 4
 
 
 =over 4
 

-=item bootstrap url [directory]
+=item bootstrap src [directory]
+
+Causes mr to retrieve the source C<src> and use it as a .mrconfig file to
+checkout the repositories listed in it, into the specified directory.
+
+B<mr> understands several types of sources:
+
+=over 4
+
+=item URL for curl
+
+C<src> may be an URL understood by B<curl>.
+
+=item copy via ssh
+
+To use B<scp> to download, the C<src> may have the form
+C<ssh://[user@]host:file>.
+
+=item local file

 
 

-Causes mr to download the url, and use it as a .mrconfig file
-to checkout the repositories listed in it, into the specified directory.
+You can retrieve the config file by other means and pass its B<path> as C<src>.
+
+=item standard input
+
+If source C<src> consists in a single dash C<->, config file is read from
+standard input.
+
+=back

 
 The directory will be created if it does not exist. If no directory is
 specified, the current directory will be used.
 
 
 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
+As a special case, if source C<src> includes a repository named ".", that

 is checked out into the top of the specified directory.
 
 =item list (or ls)
 is checked out into the top of the specified directory.
 
 =item list (or ls)


@@ -212,12 +260,26 @@ Use the specified mrconfig file. The default is to use both F<~/.mrconfig>
 as well as look for a F<.mrconfig> file in the current directory, or in one
 of its parent directories.
 
 as well as look for a F<.mrconfig> file in the current directory, or in one
 of its parent directories.
 

+=item -f
+
+=item --force
+
+Force mr to act on repositories that would normally be skipped due to their
+configuration.
+

 =item -v
 
 =item --verbose
 
 Be verbose.
 
 =item -v
 
 =item --verbose
 
 Be verbose.
 

+=item -m
+
+=item --minimal
+
+Minimise output. If a command fails or there is any output then the usual
+output will be shown.
+

 =item -q
 
 =item --quiet
 =item -q
 
 =item --quiet


@@ -367,7 +429,7 @@ been at least 12 hours since the last update.
  
 Another way to use skip is for a lazy checkout. This makes mr skip
 operating on a repo unless it already exists. To enable the 
  
 Another way to use skip is for a lazy checkout. This makes mr skip
 operating on a repo unless it already exists. To enable the 

-repo, you have to explicitly check it out (using "mr -d foo checkout").
+repo, you have to explicitly check it out (using "mr --force -d foo checkout").

 
   [foo]
   checkout = ...
 
   [foo]
   checkout = ...


@@ -398,7 +460,7 @@ Unlike all other parameters, this parameter does not need to be placed
 within a section.
 
 B<mr> ships several libraries that can be included to add support for
 within a section.
 
 B<mr> ships several libraries that can be included to add support for

-additional version control type things (unison, git-svn, vcsh, git-fake-bare,
+additional version control type things (unison, git-svn, git-fake-bare,

 git-subtree). To include them all, you could use:
 
   include = cat /usr/share/mr/*
 git-subtree). To include them all, you could use:
 
   include = cat /usr/share/mr/*


@@ -417,12 +479,11 @@ to keep track of and remember to delete old repositories.
 
 The "lib" parameter can specify some shell code that will be run
 before each command, this can be a useful way to define shell
 
 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.  Unlike most other parameters,
-this can be specified multiple times, in which case the chunks of
-shell code are accumulatively concatenated together.  This is
-particularly useful because it allows the user to build a library of
-shell functions defined in the [DEFAULT] section scattered across
-various mr modules (files referenced by an C<include> directive).
+functions for other commands to use. 
+
+Unlike most other parameters, this can be specified multiple times, in
+which case the chunks of shell code are accumulatively concatenated
+together.

 
 =item fixups
 
 
 =item fixups
 


@@ -431,31 +492,37 @@ 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.
 
 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
+=item VCS_action

 
 When looking for a command to run for a given action, mr first looks for
 a parameter with the same name as the action. If that is not found, it
 looks for a parameter named "VCS_action" (substituting in the name of the
 
 When looking for a command to run for a given action, mr first looks for
 a parameter with the same name as the action. If that is not found, it
 looks for a parameter named "VCS_action" (substituting in the name of the

-version control system and the action). The name of the version control
-system is itself determined by running each defined "VCS_test" action,
-until one succeeds.
+version control system and the action).

 
 Internally, mr has settings for "git_update", "svn_update", etc. To change
 the action that is performed for a given version control system, you can
 override these VCS specific actions. To add a new version control system,
 you can just add VCS specific actions for it.
 
 
 Internally, mr has settings for "git_update", "svn_update", etc. To change
 the action that is performed for a given version control system, you can
 override these VCS specific actions. To add a new version control system,
 you can just add VCS specific actions for it.
 

-As with the C<lib> parameter, if a parameter is suffixed with
-C<_append>, its value is concatenated to the existing value of the
-parameter for that config block, rather than overwriting it.  In this
-way, actions such as C<fixup> can be constructed accumulatively.
+=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.
+
+=item _append
+
+Any parameter can be suffixed with C<_append>, to add an additional value
+to the existing value of the parameter. In this way, actions 
+can be constructed accumulatively.
+
+=item VCS_test
+
+The name of the version control system is itself determined by
+running each defined "VCS_test" action, until one succeeds.
+
+=back

 
 =head1 UNTRUSTED MRCONFIG FILES
 
 
 =head1 UNTRUSTED MRCONFIG FILES
 


@@ -496,7 +563,7 @@ Copyright 2007-2011 Joey Hess <joey@kitenet.net>
 
 Licensed under the GNU GPL version 2 or higher.
 
 
 Licensed under the GNU GPL version 2 or higher.
 

-http://kitenet.net/~joey/code/mr/
+http://myrepos.branchable.com/

 
 =cut
 
 
 =cut
 


@@ -516,8 +583,10 @@ use constant {
 # configurables
 my $config_overridden=0;
 my $verbose=0;
 # configurables
 my $config_overridden=0;
 my $verbose=0;

+my $minimal=0;

 my $quiet=0;
 my $stats=0;
 my $quiet=0;
 my $stats=0;

+my $force=0;

 my $insecure=0;
 my $interactive=0;
 my $max_depth;
 my $insecure=0;
 my $interactive=0;
 my $max_depth;


@@ -525,7 +594,9 @@ my $no_chdir=0;
 my $jobs=1;
 my $trust_all=0;
 my $directory=getcwd();
 my $jobs=1;
 my $trust_all=0;
 my $directory=getcwd();

+my $terminal=-t STDOUT && eval{require IO::Pty::Easy;IO::Pty::Easy->import();1;};

 
 

+my $HOME_MR_CONFIG = "$ENV{HOME}/.mrconfig";

 $ENV{MR_CONFIG}=find_mrconfig();
 
 # globals :-(
 $ENV{MR_CONFIG}=find_mrconfig();
 
 # globals :-(


@@ -537,6 +608,57 @@ my (@ok, @failed, @skipped);
 
 main();
 
 
 main();
 

+sub shellquote {
+       my $i=shift;
+       $i=~s/'/'"'"'/g;
+       return "'$i'";
+}
+
+# Runs a shell command using a supplied function.
+# The lib will be included in the shell command line, and any params
+# will be available in the shell as $1, $2, etc.
+my $lastlib;
+sub runsh {
+       my ($action, $topdir, $subdir, $command, $params, $runner) = @_;
+
+       # optimisation: avoid running the shell for true and false
+       if ($command =~ /^\s*true\s*$/) {
+               $?=0;
+               return 0;
+       }
+       elsif ($command =~ /^\s*false\s*$/) {
+               $?=0;
+               return 1;
+       }
+       
+       my $quotedparams=join(" ", (map { shellquote($_) } @$params));
+       my $lib=exists $config{$topdir}{$subdir}{lib} ?
+                      $config{$topdir}{$subdir}{lib}."\n" : "";
+       if ($verbose && (! defined $lastlib || $lastlib ne $lib)) {
+               print "mr library now: >>$lib<<\n";
+               $lastlib=$lib;
+       }
+       my $shellcode="set -e;".$lib.
+               "my_sh(){ $command\n }; my_sh $quotedparams";
+       print "mr $action: running $action >>$command<<\n" if $verbose;
+       $runner->($shellcode);
+}
+
+my %perl_cache;
+sub perl {
+       my $id=shift;
+       my $s=shift;
+       if ($s =~ m/^perl:\s+(.*)/s) {
+               return $perl_cache{$1} if exists $perl_cache{$1};
+               my $sub=eval "sub {$1}";
+               if (! defined $sub) {
+                       print STDERR "mr: bad perl code in $id: $@\n";
+               }
+               return $perl_cache{$1} = $sub;
+       }
+       return undef;
+}
+

 my %vcs;
 sub vcs_test {
        my ($action, $dir, $topdir, $subdir) = @_;
 my %vcs;
 sub vcs_test {
        my ($action, $dir, $topdir, $subdir) = @_;


@@ -545,33 +667,47 @@ sub vcs_test {
                return $vcs{$dir};
        }
 
                return $vcs{$dir};
        }
 

-       my $test="set -e\n";
+       my $test="";
+       my %perltest;

        foreach my $vcs_test (
                        sort {
                                length $a <=> length $b 
                                          ||
                                       $a cmp $b
                        } grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {
        foreach my $vcs_test (
                        sort {
                                length $a <=> length $b 
                                          ||
                                       $a cmp $b
                        } grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {

-               my ($vcs)=$vcs_test=~/(.*)_test/;
-               $test="my_$vcs_test() {\n$config{$topdir}{$subdir}{$vcs_test}\n}\n".$test;
-               $test.="if my_$vcs_test; then echo $vcs; fi\n";
+               my ($vcs)=$vcs_test =~ /(.*)_test/;
+               my $p=perl($vcs_test, $config{$topdir}{$subdir}{$vcs_test});
+               if (defined $p) {
+                       $perltest{$vcs}=$p;
+               }
+               else {
+                       $test="my_$vcs_test() {\n$config{$topdir}{$subdir}{$vcs_test}\n}\n".$test;
+                       $test.="if my_$vcs_test; then echo $vcs; fi\n";
+               }

        }
        }

-       $test=$config{$topdir}{$subdir}{lib}."\n".$test
-               if exists $config{$topdir}{$subdir}{lib};
-       
-       print "mr $action: running vcs test >>$test<<\n" if $verbose;
-       my $vcs=`$test`;
-       chomp $vcs;
-       if ($vcs=~/\n/s) {
-               $vcs=~s/\n/, /g;
-               print STDERR "mr $action: found multiple possible repository types ($vcs) for ".fulldir($topdir, $subdir)."\n";
+
+       my @vcs;
+       foreach my $vcs (keys %perltest) {
+               if ($perltest{$vcs}->()) {
+                       push @vcs, $vcs;
+               }
+       }
+
+       push @vcs, split(/\n/,
+               runsh("vcs test", $topdir, $subdir, $test, [], sub {
+                       my $sh=shift;
+                       my $ret=`$sh`;
+                       return $ret;
+               })) if length $test;
+       if (@vcs > 1) {
+               print STDERR "mr $action: found multiple possible repository types (@vcs) for ".fulldir($topdir, $subdir)."\n";

                return undef;
        }
                return undef;
        }

-       if (! length $vcs) {
+       if (! @vcs) {

                return $vcs{$dir}=undef;
        }
        else {
                return $vcs{$dir}=undef;
        }
        else {

-               return $vcs{$dir}=$vcs;
+               return $vcs{$dir}=$vcs[0];

        }
 }
        
        }
 }
        


@@ -602,13 +738,40 @@ sub fulldir {
        return $subdir =~ /^\// ? $subdir : $topdir.$subdir;
 }
 
        return $subdir =~ /^\// ? $subdir : $topdir.$subdir;
 }
 

+sub terminal_friendly_spawn {
+       my $actionmsg = shift;
+       my $sh = shift;
+       my $quiet = shift;
+       my $minimal = shift;
+       my $output = "";
+       if ($terminal) {
+               my $pty = IO::Pty::Easy->new;
+               $pty->spawn($sh);
+               while ($pty->is_active) {
+                       my $data = $pty->read();
+                       $output .= $data if defined $data;
+               }
+               $pty->close;
+       } else {
+               $output = qx/$sh 2>&1/;
+       }
+       my $ret = $?;
+       if ($quiet && $ret != 0) {
+               print "$actionmsg\n" if $actionmsg;
+               print STDERR $output;
+       } elsif (!$quiet && (!$minimal || $output)) {
+               print "$actionmsg\n" if $actionmsg;
+               print $output;
+       }
+       return ($ret, $output ? 1 : 0);
+}
+

 sub action {
        my ($action, $dir, $topdir, $subdir, $force_checkout) = @_;
        my $fulldir=fulldir($topdir, $subdir);
 sub action {
        my ($action, $dir, $topdir, $subdir, $force_checkout) = @_;
        my $fulldir=fulldir($topdir, $subdir);

+       my $checkout_dir;

 
        $ENV{MR_CONFIG}=$configfiles{$topdir};
 
        $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/);
 
        my $is_checkout=($action eq 'checkout');
        my $is_update=($action =~ /update/);
 


@@ -616,13 +779,14 @@ sub action {
        $ENV{MR_ACTION}=$action;
        
        foreach my $testname ("skip", "deleted") {
        $ENV{MR_ACTION}=$action;
        
        foreach my $testname ("skip", "deleted") {

+               next if $force && $testname eq "skip";
+

                my $testcommand=findcommand($testname, $dir, $topdir, $subdir, $is_checkout);
 
                if (defined $testcommand) {
                my $testcommand=findcommand($testname, $dir, $topdir, $subdir, $is_checkout);
 
                if (defined $testcommand) {

-                       my $test="set -e;".$lib.
-                               "my_action(){ $testcommand\n }; my_action '$action'";
-                       print "mr $action: running $testname test >>$test<<\n" if $verbose;
-                       my $ret=system($test);
+                       my $ret=runsh "$testname test", $topdir, $subdir,
+                               $testcommand, [$action],
+                               sub { system(shift()) };

                        if ($ret != 0) {
                                if (($? & 127) == 2) {
                                        print STDERR "mr $action: interrupted\n";
                        if ($ret != 0) {
                                if (($? & 127) == 2) {
                                        print STDERR "mr $action: interrupted\n";


@@ -647,6 +811,7 @@ sub action {
        }
 
        if ($is_checkout) {
        }
 
        if ($is_checkout) {

+               $checkout_dir=$dir;

                if (! $force_checkout) {
                        if (-d $dir) {
                                print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
                if (! $force_checkout) {
                        if (-d $dir) {
                                print "mr $action: $dir already exists, skipping checkout\n" if $verbose;


@@ -680,7 +845,7 @@ sub action {
                        return FAILED;
                }
                else {
                        return FAILED;
                }
                else {

-                       print STDERR "mr $action: no defined action for $vcs repository $fulldir, skipping\n";
+                       print STDERR "mr $action: no defined action for $vcs repository $fulldir, skipping\n" unless $minimal;

                        return SKIPPED;
                }
        }
                        return SKIPPED;
                }
        }


@@ -694,27 +859,21 @@ sub action {
                        $s=~s/^\Q$fulldir\E\/?//;
                        $actionmsg="mr $action: $fulldir (in subdir $s)";
                }
                        $s=~s/^\Q$fulldir\E\/?//;
                        $actionmsg="mr $action: $fulldir (in subdir $s)";
                }

-               print "$actionmsg\n" unless $quiet;
+               print "$actionmsg\n" unless $quiet || $minimal;

 
 

-               my $hookret=hook("pre_$action", $topdir, $subdir);
+               my ($hookret, $hook_out)=hook("pre_$action", $topdir, $subdir);

                return $hookret if $hookret != OK;
 
                return $hookret if $hookret != OK;
 

-               $command="set -e; ".$lib.
-                       "my_action(){ $command\n }; my_action ".
-                       join(" ", map { s/\\/\\\\/g; s/"/\"/g; '"'.$_.'"' } @ARGV);
-               print "mr $action: running >>$command<<\n" if $verbose;
-               my $ret;
-               if ($quiet) {
-                       my $output = qx/$command 2>&1/;
-                       $ret = $?;
-                       if ($ret != 0) {
-                               print "$actionmsg\n";
-                               print STDERR $output;
-                       }
-               }
-               else {
-                       $ret=system($command);
-               }
+               my ($ret, $out)=runsh $action, $topdir, $subdir,
+                       $command, \@ARGV, sub {
+                               my $sh=shift;
+                               if (!$jobs || $jobs > 1 || $quiet || $minimal) {
+                                       return terminal_friendly_spawn($actionmsg, $sh, $quiet, $minimal);
+                               }
+                               else {
+                                       system($sh);
+                               }
+                       };

                if ($ret != 0) {
                        if (($? & 127) == 2) {
                                print STDERR "mr $action: interrupted\n";
                if ($ret != 0) {
                        if (($? & 127) == 2) {
                                print STDERR "mr $action: interrupted\n";


@@ -747,15 +906,21 @@ sub action {
                                return FAILED;
                        }
 
                                return FAILED;
                        }
 

-                       my $ret=hook("post_$action", $topdir, $subdir);
+                       my ($ret, $hook_out)=hook("post_$action", $topdir, $subdir);

                        return $ret if $ret != OK;
                        
                        return $ret if $ret != OK;
                        

-                       if (($is_checkout || $is_update)) {
-                               my $ret=hook("fixups", $topdir, $subdir);
+                       if ($is_checkout || $is_update) {
+                               if ($is_checkout && ! $no_chdir) {
+                                       if (! chdir($checkout_dir)) {
+                                               print STDERR "mr $action: failed to chdir to $checkout_dir: $!\n";
+                                               return FAILED;
+                                       }
+                               }
+                               my ($ret, $hook_out)=hook("fixups", $topdir, $subdir);

                                return $ret if $ret != OK;
                        }
                        
                                return $ret if $ret != OK;
                        }
                        

-                       return OK;
+                       return (OK, $out || $hook_out);

                }
        }
 }
                }
        }
 }


@@ -765,22 +930,15 @@ sub hook {
 
        my $command=$config{$topdir}{$subdir}{$hook};
        return OK unless defined $command;
 
        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;
-       if ($quiet) {
-               my $output = qx/$shell 2>&1/;
-               $ret = $?;
-               if ($ret != 0) {
-                       print STDERR $output;
-               }
-       }
-       else {
-               $ret=system($shell);
-       }
+       my ($ret,$out)=runsh $hook, $topdir, $subdir, $command, [], sub {
+                       my $sh=shift;
+                       if (!$jobs || $jobs > 1 || $quiet || $minimal) {
+                               return terminal_friendly_spawn(undef, $sh, $quiet, $minimal);
+                       }
+                       else {
+                               system($sh);
+                       }
+               };

        if ($ret != 0) {
                if (($? & 127) == 2) {
                        print STDERR "mr $hook: interrupted\n";
        if ($ret != 0) {
                if (($? & 127) == 2) {
                        print STDERR "mr $hook: interrupted\n";


@@ -795,7 +953,7 @@ sub hook {
                }
        }
 
                }
        }
 

-       return OK;
+       return (OK, $out);

 }
 
 # run actions on multiple repos, in parallel
 }
 
 # run actions on multiple repos, in parallel


@@ -823,7 +981,7 @@ sub mrs {
                                close CHILD_STDERR;
                                close $outfh;
                                close $errfh;
                                close CHILD_STDERR;
                                close $outfh;
                                close $errfh;

-                               exit action($action, @$repo);
+                               exit +(action($action, @$repo))[0];

                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;
                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;


@@ -854,7 +1012,7 @@ sub mrs {
                                                        waitpid($active[$i][0], 0);
                                                        print STDOUT $out[$i][0];
                                                        print STDERR $out[$i][1];
                                                        waitpid($active[$i][0], 0);
                                                        print STDOUT $out[$i][0];
                                                        print STDERR $out[$i][1];

-                                                       record($active[$i][1], $? >> 8);
+                                                       record($active[$i][1], $? >> 8, $out[$i][0] || $out[$i][1]);

                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);
                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);


@@ -871,10 +1029,11 @@ sub mrs {
 sub record {
        my $dir=shift()->[0];
        my $ret=shift;
 sub record {
        my $dir=shift()->[0];
        my $ret=shift;

+       my $out=shift;

 
        if ($ret == OK) {
                push @ok, $dir;
 
        if ($ret == OK) {
                push @ok, $dir;

-               print "\n" unless $quiet;
+               print "\n" unless $quiet || ($minimal && !$out);

        }
        elsif ($ret == FAILED) {
                if ($interactive) {
        }
        elsif ($ret == FAILED) {
                if ($interactive) {


@@ -883,7 +1042,7 @@ sub record {
                        system((getpwuid($<))[8], "-i");
                }
                push @failed, $dir;
                        system((getpwuid($<))[8], "-i");
                }
                push @failed, $dir;

-               print "\n" unless $quiet;
+               print "\n";

        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;
        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;


@@ -905,10 +1064,10 @@ sub showstats {
                showstat($#ok+1, "ok", "ok"),
                showstat($#failed+1, "failed", "failed"),
                showstat($#skipped+1, "skipped", "skipped"),
                showstat($#ok+1, "ok", "ok"),
                showstat($#failed+1, "failed", "failed"),
                showstat($#skipped+1, "skipped", "skipped"),

-       ).")\n" unless $quiet;
+       ).")\n" unless $quiet || $minimal;

        if ($stats) {
                if (@skipped) {
        if ($stats) {
                if (@skipped) {

-                       print "mr $action: (skipped: ".join(" ", @skipped).")\n" unless $quiet;
+                       print "mr $action: (skipped: ".join(" ", @skipped).")\n" unless $quiet || $minimal;

                }
                if (@failed) {
                        print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
                }
                if (@failed) {
                        print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";


@@ -1018,19 +1177,20 @@ sub is_trusted_config {
        my $config=shift; # must be abs_pathed already
 
        # We always trust ~/.mrconfig.
        my $config=shift; # must be abs_pathed already
 
        # We always trust ~/.mrconfig.

-       return 1 if $config eq abs_path("$ENV{HOME}/.mrconfig");
+       return 1 if $config eq abs_path($HOME_MR_CONFIG);

 
        return 1 if $trust_all;
 
        my $trustfile=$ENV{HOME}."/.mrtrust";
 
        if (! %trusted) {
 
        return 1 if $trust_all;
 
        my $trustfile=$ENV{HOME}."/.mrtrust";
 
        if (! %trusted) {

-               $trusted{"$ENV{HOME}/.mrconfig"}=1;
+               $trusted{$HOME_MR_CONFIG}=1;

                if (open (TRUST, "<", $trustfile)) {
                        while (<TRUST>) {
                                chomp;
                                s/^~\//$ENV{HOME}\//;
                if (open (TRUST, "<", $trustfile)) {
                        while (<TRUST>) {
                                chomp;
                                s/^~\//$ENV{HOME}\//;

-                               $trusted{abs_path($_)}=1;
+                               my $d=abs_path($_);
+                               $trusted{$d}=1 if defined $d;

                        }
                        close TRUST;
                }
                        }
                        close TRUST;
                }


@@ -1117,25 +1277,11 @@ sub is_trusted_checkout {
        return 0;
 }
 
        return 0;
 }
 

-sub trusterror {
-       my ($err, $file, $line, $url)=@_;
-       
-       if (defined $url) {
-               die "$err in untrusted $url line $line\n".
-                       "(To trust this url, --trust-all can be used; but please use caution;\n".
-                       "this can allow arbitrary code execution!)\n";
-       }
-       else {
-               die "$err in untrusted $file line $line\n".
-                       "(To trust this file, list it in ~/.mrtrust.)\n";
-       }
-}
-

 my %loaded;
 sub loadconfig {
        my $f=shift;
        my $dir=shift;
 my %loaded;
 sub loadconfig {
        my $f=shift;
        my $dir=shift;

-       my $bootstrap_url=shift;
+       my $bootstrap_src=shift;

 
        my @toload;
 
 
        my @toload;
 


@@ -1195,41 +1341,54 @@ sub loadconfig {
 
        # Keep track of the current line in the config file;
        # when a file is included track the current line from the include.
 
        # Keep track of the current line in the config file;
        # when a file is included track the current line from the include.

-       my $line=0;
+       my $lineno=0;

        my $included=undef;
        my $included=undef;

-       my $includeline=0;
+
+       my $line;

        my $nextline = sub {
                if ($included) {
        my $nextline = sub {
                if ($included) {

-                       $includeline++;

                        $included--;
                }
                else {
                        $included=undef;
                        $included--;
                }
                else {
                        $included=undef;

-                       $includeline=0;
-                       $line++;
+                       $lineno++;

                }
                }

-               my $l=shift @lines;
-               chomp $l;
-               return $l
+               $line=shift @lines;
+               chomp $line;
+               return $line;

        };
        my $lineerror = sub {
                my $msg=shift;
                if (defined $included) {
        };
        my $lineerror = sub {
                my $msg=shift;
                if (defined $included) {

-                       die "mr: $f line $line include line $includeline: $msg\n";
+                       die "mr: $msg at $f line $lineno, included line: $line\n";

                }
                else {
                }
                else {

-                       die "mr: $f line $line: $msg\n";
+                       die "mr: $msg at $f line $lineno\n";
+               }
+       };
+       my $trusterror = sub {
+               my $msg=shift;
+       
+               if (defined $bootstrap_src) {
+                       die "mr: $msg in untrusted $bootstrap_src line $lineno\n".
+                               "(To trust this url, --trust-all can be used; but please use caution;\n".
+                               "this can allow arbitrary code execution!)\n";
+               }
+               else {
+                       die "mr: $msg in untrusted $f line $lineno\n".
+                               "(To trust this file, list it in ~/.mrtrust.)\n";

                }
        };
 
        while (@lines) {
                $_=$nextline->();
 
                }
        };
 
        while (@lines) {
                $_=$nextline->();
 

+               next if /^\s*\#/ || /^\s*$/;
+

                if (! $trusted && /[[:cntrl:]]/) {
                if (! $trusted && /[[:cntrl:]]/) {

-                       trusterror("mr: illegal control character", $f, $line, $bootstrap_url);
+                       $trusterror->("illegal control character");

                }
 
                }
 

-               next if /^\s*\#/ || /^\s*$/;

                if (/^\[([^\]]*)\]\s*$/) {
                        $section=$1;
 
                if (/^\[([^\]]*)\]\s*$/) {
                        $section=$1;
 


@@ -1237,7 +1396,7 @@ sub loadconfig {
                                if (! is_trusted_repo($section) ||
                                    $section eq 'ALIAS' ||
                                    $section eq 'DEFAULT') {
                                if (! is_trusted_repo($section) ||
                                    $section eq 'ALIAS' ||
                                    $section eq 'DEFAULT') {

-                                       trusterror("mr: illegal section \"[$section]\"", $f, $line, $bootstrap_url)
+                                       $trusterror->("illegal section \"[$section]\"");

                                }
                        }
                        $section=expandenv($section) if $trusted;
                                }
                        }
                        $section=expandenv($section) if $trusted;


@@ -1264,7 +1423,7 @@ sub loadconfig {
                                # settings in specific known-safe formats.
                                if ($parameter eq 'checkout') {
                                        if (! is_trusted_checkout($value)) {
                                # settings in specific known-safe formats.
                                if ($parameter eq 'checkout') {
                                        if (! is_trusted_checkout($value)) {

-                                               trusterror("mr: illegal checkout command \"$value\"", $f, $line, $bootstrap_url);
+                                               $trusterror->("illegal checkout command \"$value\"");

                                        }
                                }
                                elsif ($parameter eq 'order') {
                                        }
                                }
                                elsif ($parameter eq 'order') {


@@ -1276,7 +1435,7 @@ sub loadconfig {
                                        # safe.
                                }
                                else {
                                        # safe.
                                }
                                else {

-                                       trusterror("mr: illegal setting \"$parameter=$value\"", $f, $line, $bootstrap_url);
+                                       $trusterror->("illegal setting \"$parameter=$value\"");

                                }
                        }
 
                                }
                        }
 


@@ -1450,10 +1609,7 @@ sub dispatch {
        my $action=shift;
 
        # actions that do not operate on all repos
        my $action=shift;
 
        # actions that do not operate on all repos

-       if ($action eq 'help') {
-               help(@ARGV);
-       }
-       elsif ($action eq 'config') {
+       if ($action eq 'config') {

                config(@ARGV);
        }
        elsif ($action eq 'register') {
                config(@ARGV);
        }
        elsif ($action eq 'register') {


@@ -1481,7 +1637,27 @@ sub dispatch {
 }
 
 sub help {
 }
 
 sub help {

-       exec($config{''}{DEFAULT}{help}) || die "exec: $!";
+       my $help=q#
+               case `uname -s` in
+                       SunOS)
+                       SHOWMANFILE="man -f"
+                       ;;
+                       Darwin)
+                       SHOWMANFILE="man"
+                       ;;
+                       *)
+                       SHOWMANFILE="man"
+                       ;;
+               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"
+               $SHOWMANFILE "$tmp" || error "man failed"
+       #;
+       exec($help) || die "exec: $!";

 }
 
 sub config {
 }
 
 sub config {


@@ -1568,23 +1744,47 @@ sub register {
 }
 
 sub bootstrap {
 }
 
 sub bootstrap {

-       my $url=shift @ARGV;
+       eval q{use File::Copy};
+       die $@ if $@;
+
+       my $src=shift @ARGV;

        my $dir=shift @ARGV || ".";
        
        my $dir=shift @ARGV || ".";
        

-       if (! defined $url || ! length $url) {
-               die "mr: bootstrap requires url\n";
+       if (! defined $src || ! length $src) {
+               die "mr: bootstrap requires source\n";

        }
        }

-       
-       # Download the config file to a temporary location.
+
+       # Retrieve config file.

        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
        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 ($src =~ m!^[\w\d]+://!) {
+               # Download the config file to a temporary location.
+               my @downloader;
+               if ($src =~ m!^ssh://(.*)!) {
+                       @downloader = ("scp", $1, $tmpconfig);
+               }
+               else {
+                       @downloader = ("curl", "-A", "mr", "-L", "-s", $src, "-o", $tmpconfig);
+                       push(@downloader, "-k") if $insecure;
+               }
+               my $status = system(@downloader);
+               die "mr bootstrap: invalid SSL certificate for $src (consider -k)\n"
+                       if $downloader[0] eq 'curl' && $status >> 8 == 60;
+               die "mr bootstrap: download of $src failed\n" if $status != 0;
+       }
+       elsif ($src eq '-') {
+               # Config file is read from stdin.
+               copy(\*STDIN, $tmpconfig) || die "stdin: $!";
+       }
+       else {
+               # Config file is local.
+               die "mr bootstrap: cannot read file '$src'"
+                       unless -r $src;
+               copy($src, $tmpconfig) || die "copy: $!";
+       }

 
 

+       # Sanity check on destination directory.

        if (! -e $dir) {
                system("mkdir", "-p", $dir);
        }
        if (! -e $dir) {
                system("mkdir", "-p", $dir);
        }


@@ -1594,16 +1794,14 @@ sub bootstrap {
        # would normally be skipped.
        my $topdir=abs_path(".")."/";
        my @repo=($topdir, $topdir, ".");
        # would normally be skipped.
        my $topdir=abs_path(".")."/";
        my @repo=($topdir, $topdir, ".");

-       loadconfig($tmpconfig, $topdir, $url);
+       loadconfig($tmpconfig, $topdir, $src);

        record(\@repo, action("checkout", @repo, 1))
                if exists $config{$topdir}{"."}{"checkout"};
 
        if (-e ".mrconfig") {
        record(\@repo, action("checkout", @repo, 1))
                if exists $config{$topdir}{"."}{"checkout"};
 
        if (-e ".mrconfig") {

-               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
+               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $src\n";

        }
        else {
        }
        else {

-               eval q{use File::Copy};
-               die $@ if $@;

                move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
 
                move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
 


@@ -1649,7 +1847,7 @@ sub find_mrconfig {
                }
                $dir=~s/\/[^\/]*$//;
        }
                }
                $dir=~s/\/[^\/]*$//;
        }

-       return "$ENV{HOME}/.mrconfig";
+       return $HOME_MR_CONFIG;

 }
 
 sub getopts {
 }
 
 sub getopts {


@@ -1659,7 +1857,9 @@ sub getopts {
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
                "p|path" => sub { }, # now default, ignore
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
                "p|path" => sub { }, # now default, ignore

+               "f|force" => \$force,

                "v|verbose" => \$verbose,
                "v|verbose" => \$verbose,

+               "m|minimal" => \$minimal,

                "q|quiet" => \$quiet,
                "s|stats" => \$stats,
                "k|insecure" => \$insecure,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,
                "k|insecure" => \$insecure,


@@ -1716,9 +1916,10 @@ sub exitstats {
 sub main {
        getopts();
        init();
 sub main {
        getopts();
        init();

+       help(@ARGV) if $ARGV[0] eq 'help';

 
        startingconfig();
 
        startingconfig();

-       loadconfig("$ENV{HOME}/.mrconfig");
+       loadconfig($HOME_MR_CONFIG);

        loadconfig($ENV{MR_CONFIG});
        #use Data::Dumper; print Dumper(\%config);
        
        loadconfig($ENV{MR_CONFIG});
        #use Data::Dumper; print Dumper(\%config);
        


@@ -1775,24 +1976,29 @@ lib =
                LANG=C bzr info | egrep -q '^Checkout'
        }
        lazy() {
                LANG=C bzr info | egrep -q '^Checkout'
        }
        lazy() {

-               if [ "$MR_ACTION" = checkout ] || [ -d "$MR_REPO" ]; then
+               if [ -d "$MR_REPO" ]; then

                        return 1
                else
                        return 0
                fi
        }
 
                        return 1
                else
                        return 0
                fi
        }
 

-svn_test = test -d "$MR_REPO"/.svn
-git_test = test -d "$MR_REPO"/.git
-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 &&
-       test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
+svn_test = perl: -d "$ENV{MR_REPO}/.svn"
+git_test = perl: -e "$ENV{MR_REPO}/.git"
+bzr_test = perl: -d "$ENV{MR_REPO}/.bzr"
+cvs_test = perl: -d "$ENV{MR_REPO}/CVS"
+hg_test  = perl: -d "$ENV{MR_REPO}/.hg"
+darcs_test = perl: -d "$ENV{MR_REPO}/_darcs"
+fossil_test = perl: -f "$ENV{MR_REPO}/_FOSSIL_"
+git_bare_test = perl: 
+       -d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+       -d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/config git config --get core.bare` =~ /true/
+vcsh_test = perl:
+       -d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+       -d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/config git config --get vcsh.vcsh` =~ /true/
+veracity_test  = perl: -d "$ENV{MR_REPO}/.sgdrawer"

 
 svn_update = svn update "$@"
 git_update = git pull "$@"
 
 svn_update = svn update "$@"
 git_update = git pull "$@"


@@ -1802,18 +2008,85 @@ bzr_update =
        else
                bzr merge --pull "$@"
        fi
        else
                bzr merge --pull "$@"
        fi

-cvs_update = cvs update "$@"
-hg_update  = hg pull "$@" && hg update "$@"
+cvs_update = cvs -q update "$@"
+hg_update  = hg pull "$@"; hg update "$@"

 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"
 darcs_update = darcs pull -a "$@"
 fossil_update = fossil pull "$@"

+vcsh_update = vcsh run "$MR_REPO" git pull "$@"
+veracity_update = vv pull "$@" && vv update "$@"
+
+git_fetch = git fetch --all --prune --tags
+git_svn_fetch = git svn fetch
+darcs_fetch = darcs fetch
+hg_fetch = hg pull
+
+svn_clean = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               svn-clean "$@"
+       else
+               svn-clean --print "$@"
+       fi
+git_clean = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               git clean -dx --force "$@"
+       else
+               git clean -dx --dry-run "$@"
+       fi
+git_svn_clean = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               git clean -dx --force "$@"
+       else
+               git clean -dx --dry-run "$@"
+       fi
+bzr_clean = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               bzr clean-tree --verbose --force --ignored --unknown --detritus "$@"
+       else
+               bzr clean-tree --verbose --dry-run --ignored --unknown --detritus "$@"
+       fi
+cvs_clean = 
+        if [ "x$1" = x-f ] ; then
+               shift
+               cvs-clean "$@"
+       else
+               cvs-clean --dry-run "$@"
+       fi
+hg_clean = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               hg purge --print --all "$@"
+               hg purge --all "$@"
+       else
+               hg purge --print --all "$@"
+       fi
+fossil_clean = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               fossil clean --dry-run --dotfiles --emptydirs "$@"
+       else
+               fossil clean --force --dotfiles --emptydirs "$@"
+       fi
+vcsh_commit = 
+       if [ "x$1" = x-f ] ; then
+               shift
+               vcsh run "$MR_REPO" git clean -dx "$@"
+       else
+               vcsh run "$MR_REPO" git clean -dx --dry-run "$@"
+       fi

 
 svn_status = svn status "$@"
 
 svn_status = svn status "$@"

-git_status = git status -s "$@" || true
-bzr_status = bzr status --short "$@"
-cvs_status = cvs status "$@"
-hg_status  = hg status "$@"
+git_status = git status -s "$@" || true; git --no-pager log --branches --not --remotes --simplify-by-decoration --decorate --oneline || true
+bzr_status = bzr status --short "$@"; bzr missing
+cvs_status = cvs -q status | grep -E '^(File:.*Status:|\?)' | grep -v 'Status: Up-to-date'
+hg_status  = hg status "$@"; hg summary --quiet | grep -v 'parent: 0:'

 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"
 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"

+vcsh_status = vcsh run "$MR_REPO" git -c status.relativePaths=false status -s "$@" || true
+veracity_status = vv status "$@"

 
 svn_commit = svn commit "$@"
 git_commit = git commit -a "$@" && git push --all
 
 svn_commit = svn commit "$@"
 git_commit = git commit -a "$@" && git push --all


@@ -1824,9 +2097,11 @@ bzr_commit =
                bzr commit "$@" && bzr push
        fi
 cvs_commit = cvs commit "$@"
                bzr commit "$@" && bzr push
        fi
 cvs_commit = cvs commit "$@"

-hg_commit  = hg commit -m "$@" && hg push
-darcs_commit = darcs record -a -m "$@" && darcs push -a
+hg_commit  = hg commit "$@" && hg push
+darcs_commit = darcs record -a "$@" && darcs push -a

 fossil_commit = fossil commit "$@"
 fossil_commit = fossil commit "$@"

+vcsh_commit = vcsh run "$MR_REPO" git commit -a "$@" && vcsh run "$MR_REPO" git push --all
+veracity_commit = vv commit "$@" && vv push

 
 git_record = git commit -a "$@"
 bzr_record =
 
 git_record = git commit -a "$@"
 bzr_record =


@@ -1835,9 +2110,11 @@ bzr_record =
        else
                bzr commit "$@"
        fi
        else
                bzr commit "$@"
        fi

-hg_record  = hg commit -m "$@"
-darcs_record = darcs record -a -m "$@"
+hg_record  = hg commit "$@"
+darcs_record = darcs record -a "$@"

 fossil_record = fossil commit "$@"
 fossil_record = fossil commit "$@"

+vcsh_record = vcsh run "$MR_REPO" git commit -a "$@"
+veracity_record = vv commit "$@"

 
 svn_push = :
 git_push = git push "$@"
 
 svn_push = :
 git_push = git push "$@"


@@ -1846,14 +2123,18 @@ cvs_push = :
 hg_push = hg push "$@"
 darcs_push = darcs push -a "$@"
 fossil_push = fossil push "$@"
 hg_push = hg push "$@"
 darcs_push = darcs push -a "$@"
 fossil_push = fossil push "$@"

+vcsh_push = vcsh run "$MR_REPO" git push "$@"
+veracity_push = vv push "$@"

 
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"
 
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"

-cvs_diff = cvs diff "$@"
+cvs_diff = cvs -q diff "$@"

 hg_diff  = hg diff "$@"
 darcs_diff = darcs diff -u "$@"
 fossil_diff = fossil diff "$@"
 hg_diff  = hg diff "$@"
 darcs_diff = darcs diff -u "$@"
 fossil_diff = fossil diff "$@"

+vcsh_diff = vcsh run "$MR_REPO" git diff "$@"
+veracity_diff = vv diff "$@"

 
 svn_log = svn log "$@"
 git_log = git log "$@"
 
 svn_log = svn log "$@"
 git_log = git log "$@"


@@ -1863,6 +2144,16 @@ hg_log  = hg log "$@"
 darcs_log = darcs changes "$@"
 git_bare_log = git log "$@"
 fossil_log = fossil timeline "$@"
 darcs_log = darcs changes "$@"
 git_bare_log = git log "$@"
 fossil_log = fossil timeline "$@"

+vcsh_log = vcsh run "$MR_REPO" git log "$@"
+veracity_log = vv log "$@"
+
+hg_grep = hg grep "$@"
+cvs_grep = ack-grep "$@"
+svn_grep = ack-grep "$@"
+git_svn_grep = git grep "$@"
+git_grep = git grep "$@"
+bzr_grep = ack-grep "$@"
+darcs_grep = ack-grep "$@"

 
 run = "$@"
 
 
 run = "$@"
 


@@ -1881,7 +2172,7 @@ git_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =

-       url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
+       url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}' | head -n 1`"

        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi


@@ -1910,11 +2201,23 @@ 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'"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"

+vcsh_register =
+       url="`LC_ALL=C vcsh run "$MR_REPO" git config --get remote.origin.url`" || true
+       if [ -z "$url" ]; then
+               error "cannot determine git url"
+       fi
+       echo "Registering git url: $url in $MR_CONFIG"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="vcsh clone '$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'"
 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'"

+veracity_register =
+       url=`vv config | grep sync_targets | sed -e 's/sync_targets:*.//g' -e 's/ //g'`
+       repo=`vv repo info | grep repository | sed -e 's/Current repository:*.//g' -e 's/ //g'`
+       echo "Registering veracity repository $url in $MR_CONFIG"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="mkdir -p '$MR_REPO' && cd '$MR_REPO' && vv checkout '$repo'"

 
 svn_trusted_checkout = svn co $url $repo
 svn_alt_trusted_checkout = svn checkout $url $repo
 
 svn_trusted_checkout = svn co $url $repo
 svn_alt_trusted_checkout = svn checkout $url $repo


@@ -1924,28 +2227,12 @@ bzr_trusted_checkout = bzr checkout|clone|branch|get $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
 hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo

+vcsh_old_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
+vcsh_trusted_checkout = vcsh clone $url $repo

 # fossil: messy to do
 # fossil: messy to do

+veracity_trusted_checkout = vv clone $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"
-       $SHOWMANFILE "$tmp" || error "man failed"

 list = true
 config = 
 bootstrap = 
 list = true
 config = 
 bootstrap =