]>
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:
The optional -m parameter allows specifying a commit message.
The optional -m parameter allows specifying a commit message.
+=back
+
+Actions can be abbreviated to any unambiguous subsctring, so
+"mr st" is equivilant to "mr status".
+
-B<mr> is configured by .mrconfig files. It searches for .mrconfig files in
-your home directory, and in the root directory of each repository specified
-in a .mrconfig file. So you could have a ~/.mrconfig that registers a
+B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
+file in your home directory. Each repository specified in a .mrconfig file
+can also have its own .mrconfig file in its root directory that can
+optionally be used as well. So you could have a ~/.mrconfig that registers a
repository ~/src, that itself contains a ~/src/.mrconfig file, that in turn
registers several additional repositories.
repository ~/src, that itself contains a ~/src/.mrconfig file, that in turn
registers several additional repositories.
There are two special parameters. If the "skip" parameter is set and
its command returns nonzero, then B<mr> will skip acting on that repository.
There are two special parameters. If the "skip" parameter is set and
its command returns nonzero, then B<mr> will skip acting on that repository.
+If the "chain" parameter is set and its command returns nonzero, then B<mr>
+will try to load a .mrconfig file from the root of the repository. (You
+should avoid chaining from repositories with untrusted committers.)
The "default" section allows setting up default handlers for each action,
and is overridden by the contents of other sections. mr contains default
The "default" section allows setting up default handlers for each action,
and is overridden by the contents of other sections. mr contains default
[src]
checkout = svn co svn://svn.example.com/src/trunk src
[src]
checkout = svn co svn://svn.example.com/src/trunk src
[src/linux-2.6]
# only check this out on kodama
[src/linux-2.6]
# only check this out on kodama
my $config="$ENV{HOME}/.mrconfig";
my $verbose=0;
my %config;
my $config="$ENV{HOME}/.mrconfig";
my $verbose=0;
my %config;
Getopt::Long::Configure("no_permute");
my $result=GetOptions(
Getopt::Long::Configure("no_permute");
my $result=GetOptions(
if (! $result || @ARGV < 1) {
die("Usage: mr [-d directory] action [params ...]\n");
}
if (! $result || @ARGV < 1) {
die("Usage: mr [-d directory] action [params ...]\n");
}
loadconfig(\*DATA);
loadconfig($config);
#use Data::Dumper;
#print Dumper(\%config);
loadconfig(\*DATA);
loadconfig($config);
#use Data::Dumper;
#print Dumper(\%config);
-my (@failures, @successes, @skipped);
+my $action=shift @ARGV;
+if (! $knownactions{$action}) {
+ my @matches = grep { /^\Q$action\E/ } keys %knownactions;
+ if (@matches == 1) {
+ $action=$matches[0];
+ }
+ else {
+ die "mr: ambiguous action \"$action\" (matches @matches)\n";
+ }
+}
+
+my (@failed, @successful, @skipped);
my $first=1;
foreach my $topdir (sort keys %config) {
foreach my $subdir (sort keys %{$config{$topdir}}) {
my $first=1;
foreach my $topdir (sort keys %config) {
foreach my $subdir (sort keys %{$config{$topdir}}) {
if (-d $dir) {
print "mr $action: $dir already exists, skipping checkout\n";
push @skipped, $dir;
if (-d $dir) {
print "mr $action: $dir already exists, skipping checkout\n";
push @skipped, $dir;
}
$dir=~s/^(.*)\/[^\/]+\/?$/$1/;
}
}
$dir=~s/^(.*)\/[^\/]+\/?$/$1/;
}
}
else {
print "mr $action: in $dir\n";
}
else {
print "mr $action: in $dir\n";
- my $command="set -e; my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action @ARGV";
+ my $command="set -e; my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
+ join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
my $ret=system($command);
if ($ret != 0) {
print STDERR "mr $action: failed to run: $command\n" if $verbose;
my $ret=system($command);
if ($ret != 0) {
print STDERR "mr $action: failed to run: $command\n" if $verbose;
- push @failures , $topdir.$subdir;
+ push @failed , $topdir.$subdir;
if ($ret >> 8 != 0) {
print STDERR "mr $action: command failed\n";
}
if ($ret >> 8 != 0) {
print STDERR "mr $action: command failed\n";
}
+ push @successful , $dir;
return;
}
print "\nmr $action: finished (".join("; ",
return;
}
print "\nmr $action: finished (".join("; ",
- showstat($#successes+1, "success", "successes "),
- showstat($#failures+1, "failure", "failures "),
+ showstat($#successful+1, "successful", "successful "),
+ showstat($#failed+1, "failed", "failed "),
showstat($#skipped+1, "skipped", "skipped"),
).")\n";
showstat($#skipped+1, "skipped", "skipped"),
).")\n";
+if (@failed) {
+ exit 1;
+}
+elsif (! @successful && @skipped) {
+ exit 1;
+}
+exit 0;
my %loaded;
sub loadconfig {
my %loaded;
sub loadconfig {
next if /^\s*\#/ || /^\s*$/;
if (/^\s*\[([^\]]*)\]\s*$/) {
$section=$1;
next if /^\s*\#/ || /^\s*$/;
if (/^\s*\[([^\]]*)\]\s*$/) {
$section=$1;
- if (length $dir && $section ne "default" &&
- -e $dir.$section."/.mrconfig") {
- push @toload, $dir.$section."/.mrconfig";
- }
}
elsif (/^\s*(\w+)\s*=\s*(.*)/) {
my $parameter=$1;
}
elsif (/^\s*(\w+)\s*=\s*(.*)/) {
my $parameter=$1;
$config{$dir}{$section}={ %{$config{$dir}{default}} };
}
$config{$dir}{$section}{$parameter}=$value;
$config{$dir}{$section}={ %{$config{$dir}{default}} };
}
$config{$dir}{$section}{$parameter}=$value;
+ $knownactions{$parameter}=1;
+
+ if ($parameter eq 'chain' &&
+ length $dir && $section ne "default" &&
+ -e $dir.$section."/.mrconfig" &&
+ system($value) >> 8 == 0) {
+ push @toload, $dir.$section."/.mrconfig";
+ }
}
else {
die "$f line $.: parse error\n";
}
else {
die "$f line $.: parse error\n";
-__DATA__
-# Some useful actions that mr knows about by default.
+# Finally, some useful actions that mr knows about by default.
# These can be overridden in ~/.mrconfig.
# These can be overridden in ~/.mrconfig.
[default]
update = \
if [ -d .svn ]; then \
[default]
update = \
if [ -d .svn ]; then \
elif [ -d .git ]; then \
git pull origin master; \
else \
elif [ -d .git ]; then \
git pull origin master; \
else \
- echo "mr update: unknown RCS "; \
+ echo "mr update: unknown repo type "; \
elif [ -d .git ]; then \
git status || true; \
else \
elif [ -d .git ]; then \
git status || true; \
else \
- echo "mr status: unknown RCS "; \
+ echo "mr status: unknown repo type "; \
exit 1; \
fi
commit = \
if [ -d .svn ]; then \
svn commit "$@"; \
elif [ -d .git ]; then \
exit 1; \
fi
commit = \
if [ -d .svn ]; then \
svn commit "$@"; \
elif [ -d .git ]; then \
+ git commit -a "$@" && git push --all ; \
- echo "mr commit: unknown RCS "; \
+ echo "mr commit: unknown repo type "; \
projects / code / myrepos.git / blobdiff