]> git.madduck.net Git - code/myrepos.git/commitdiff

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:

* Improve "in subdir" message.
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 24 Oct 2007 22:18:10 +0000 (18:18 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 24 Oct 2007 22:18:10 +0000 (18:18 -0400)
debian/changelog
mr

index 3158a891c1fb5273d744c3de89cb6e74277e595e..f45e80c57bb857c96d3544cf3d3d2de5546572ec 100644 (file)
@@ -1,3 +1,9 @@
+mr (0.8) UNRELEASED; urgency=low
+
+  * Improve "in subdir" message.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 24 Oct 2007 18:17:45 -0400
+
 mr (0.7) unstable; urgency=low
 
   * Fix inverted tests in tags command. (madduck)
 mr (0.7) unstable; urgency=low
 
   * Fix inverted tests in tags command. (madduck)
diff --git a/mr b/mr
index 0a50a335e39e7e4ad937ca9bcdc91f4acd49396d..3dbd7e974dc173573539722f09ee0ad8d2b98ddd 100755 (executable)
--- a/mr
+++ b/mr
@@ -563,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 ".