Revert "fix a few more messages for absolute paths"

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 72cd5c895978cc673662050b0b356ae044062cd8..e274670d8ef580af84e1cbf4b7c07415e8ce06aa 100755 (executable)
--- a/mr
+++ b/mr
@@ -214,7 +214,7 @@ with no number specified. This can greatly speed up operations such as updates.
 It is not recommended for interactive operations.
 
 Note that running more than 10 jobs at a time is likely to run afoul of
 It is not recommended for interactive operations.
 
 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 yeild
+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.
 
 =back
 a good speedup in updates without loading the machine too much.
 
 =back


@@ -341,6 +341,12 @@ the action that is performed for a given revision control system, you can
 override these rcs specific actions. To add a new revision control system,
 you can just add rcs specific actions for it.
 
 override these rcs specific actions. To add a new revision control system,
 you can just add rcs specific actions for it.
 

+=head1 EXTENSIONS
+
+mr can be extended to support things such as unison and git-svn. Some
+files providing such extensions are available in /usr/share/mr/. See
+the documentation in the files for details about using them.
+

 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>
 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>


@@ -412,7 +418,7 @@ sub rcs_test {
        chomp $rcs;
        if ($rcs=~/\n/s) {
                $rcs=~s/\n/, /g;
        chomp $rcs;
        if ($rcs=~/\n/s) {
                $rcs=~s/\n/, /g;

-               print STDERR "mr $action: found multiple possible repository types ($rcs) for $dir\n";
+               print STDERR "mr $action: found multiple possible repository types ($rcs) for $topdir$subdir\n";

                return undef;
        }
        if (! length $rcs) {
                return undef;
        }
        if (! length $rcs) {


@@ -505,22 +511,22 @@ sub action {
        elsif (! defined $command) {
                my $rcs=rcs_test(@_);
                if (! defined $rcs) {
        elsif (! defined $command) {
                my $rcs=rcs_test(@_);
                if (! defined $rcs) {

-                       print STDERR "mr $action: unknown repository type and no defined $action command for $dir\n";
+                       print STDERR "mr $action: unknown repository type and no defined $action command for $topdir$subdir\n";

                        return FAILED;
                }
                else {
                        return FAILED;
                }
                else {

-                       print STDERR "mr $action: no defined action for $rcs repository $dir, skipping\n";
+                       print STDERR "mr $action: no defined action for $rcs repository $topdir$subdir, skipping\n";

                        return SKIPPED;
                }
        }
        else {
                if (! $no_chdir) {
                        return SKIPPED;
                }
        }
        else {
                if (! $no_chdir) {

-                       print "mr $action: $dir\n" unless $quiet;
+                       print "mr $action: $topdir$subdir\n" unless $quiet;

                }
                else {
                        my $s=$directory;
                }
                else {
                        my $s=$directory;

-                       $s=~s/^\Q$dir\E\/?//;
-                       print "mr $action: $dir (in subdir $s)\n" unless $quiet;
+                       $s=~s/^\Q$topdir$subdir\E\/?//;
+                       print "mr $action: $topdir$subdir (in subdir $s)\n" unless $quiet;

                }
                $command="set -e; ".$lib.
                        "my_action(){ $command\n }; my_action ".
                }
                $command="set -e; ".$lib.
                        "my_action(){ $command\n }; my_action ".