X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/19919a98a8382dcc8723a0fb01b4a674f2c25214..2b99538928d4c2b2021e8f3bf0de4f801475288a:/mr?ds=sidebyside

diff --git a/mr b/mr
index 0a50a33..84f1a58 100755
--- a/mr
+++ b/mr
@@ -563,7 +563,9 @@ sub action { #{{{
 			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 ".
@@ -971,7 +973,7 @@ update =
 	elif [ -d "$MR_REPO"/.hg ]; then
 		hg pull "$@" && hg update "$@"
 	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs pull "$@"
+		darcs pull -a "$@"
 	else
 		error "unknown repo type"
 	fi
@@ -1003,7 +1005,7 @@ commit =
 	elif [ -d "$MR_REPO"/.hg ]; then
 		hg commit -m "$@" && hg push
 	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs commit -m "$@" && darcs push
+		darcs commit -a -m "$@" && darcs push -a
 	else
 		error "unknown repo type"
 	fi
@@ -1099,3 +1101,5 @@ ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
 right = echo "Not found."
 #}}}
+
+# vim:sw=8:sts=0:ts=8:noet