]>
git.madduck.net Git - code/myrepos.git/blobdiff - mr
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:
B<mr> [options] action [params ...]
=head1 DESCRIPTION
B<mr> [options] action [params ...]
=head1 DESCRIPTION
Any mix of revision control systems can be used with B<mr>, and you can
define arbitrary actions for commands like "update", "checkout", or "commit".
Any mix of revision control systems can be used with B<mr>, and you can
define arbitrary actions for commands like "update", "checkout", or "commit".
+B<mr> cds into and operates on all registered repsitories at or below your
+working directory. Or, if you are in a subdirectory of a repository that
+contains no other registered repositories, it will stay in that directory,
+and work on only that repository,
+
The predefined commands should be fairly familiar to users of any revision
control system:
The predefined commands should be fairly familiar to users of any revision
control system:
Show a diff of uncommitted changes.
Show a diff of uncommitted changes.
+=item log
+
+Show the commit log.
+
+=item list (or ls)
List the repositories that mr will act on.
List the repositories that mr will act on.
=back
Actions can be abbreviated to any unambiguous subsctring, so
=back
Actions can be abbreviated to any unambiguous subsctring, so
-"mr st" is equivilant to "mr status".
-
-B<mr> operates on all registered repsitories at or below your working
-directory. Or, if you are in a subdirectory of a repository that contains
-no other registered repositories, it will act on only that repository.
+"mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
+update"
Additional parameters can be passed to other commands than "commit", they
will be passed on unchanged to the underlying revision control system.
Additional parameters can be passed to other commands than "commit", they
will be passed on unchanged to the underlying revision control system.
-Use the specified mrconfig file, instead of looking for on in your home
+Use the specified mrconfig file, instead of looking for one in your home
if (@matches == 1) {
$action=$matches[0];
}
if (@matches == 1) {
$action=$matches[0];
}
+ elsif (@matches == 0) {
+ die "mr: unknown action \"$action\" (known actions: ".
+ join(", ", sort keys %knownactions).")\n";
+ }
- die "mr: ambiguous action \"$action\" (matches @matches)\n";
+ die "mr: ambiguous action \"$action\" (matches: ".
+ join(", ", @matches).")\n";
my $nochdir=0;
foreach my $topdir (sort keys %config) {
foreach my $subdir (sort keys %{$config{$topdir}}) {
my $nochdir=0;
foreach my $topdir (sort keys %config) {
foreach my $subdir (sort keys %{$config{$topdir}}) {
+ next if $subdir eq 'default';
my $dir=$topdir.$subdir;
next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
push @repos, [$dir, $topdir, $subdir];
my $dir=$topdir.$subdir;
next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
push @repos, [$dir, $topdir, $subdir];
}
if (! @repos) {
# fallback to find a leaf repo
}
if (! @repos) {
# fallback to find a leaf repo
- foreach my $topdir (sort keys %config) {
- foreach my $subdir (sort keys %{$config{$topdir}}) {
+ LEAF: foreach my $topdir (reverse sort keys %config) {
+ foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
+ next if $subdir eq 'default';
my $dir=$topdir.$subdir;
my $d=$directory;
$dir.="/" unless $dir=~/\/$/;
$d.="/" unless $d=~/\/$/;
if ($d=~/^\Q$dir\E/) {
push @repos, [$dir, $topdir, $subdir];
my $dir=$topdir.$subdir;
my $d=$directory;
$dir.="/" unless $dir=~/\/$/;
$d.="/" unless $d=~/\/$/;
if ($d=~/^\Q$dir\E/) {
push @repos, [$dir, $topdir, $subdir];
- if (@repos > 1) {
- die "mr: found multiple leaf repos (should never happen)";
- }
}
my (@failed, @successful, @skipped);
}
my (@failed, @successful, @skipped);
push @skipped, $dir;
}
else {
push @skipped, $dir;
}
else {
- print "mr $action: $dir\n";
+ if (! $nochdir) {
+ print "mr $action: $dir\n";
+ }
+ else {
+ print "mr $action: $dir (in subdir $directory)\n";
+ }
my $command="set -e; ".$lib.
"my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
my $command="set -e; ".$lib.
"my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
[alias]
co = checkout
ci = commit
[alias]
co = checkout
ci = commit
[default]
lib = \
error() { \
[default]
lib = \
error() { \
else \
error "unknown repo type"; \
fi
else \
error "unknown repo type"; \
fi
+log = \
+ if [ -d "$MR_REPO"/.svn ]; then \
+ svn log"$@"; \
+ elif [ -d "$MR_REPO"/.git ]; then \
+ git log "$@"; \
+ else \
+ error "unknown repo type"; \
+ fi
list = true
help = \
if [ ! -e "$MR_PATH" ]; then \
list = true
help = \
if [ ! -e "$MR_PATH" ]; then \