Revert "fix a few more messages for absolute paths"

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 613f86a0d8853a518c3959de7725c40177b41497..e274670d8ef580af84e1cbf4b7c07415e8ce06aa 100755 (executable)
--- a/mr
+++ b/mr
@@ -418,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) {


@@ -511,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 ".