]>
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:
=head1 FILES
B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
=head1 FILES
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.
+file in your home directory, and this can in turn chain load .mrconfig files
+from repositories.
+
+Here is an example .mrconfig file:
+
+ [src]
+ checkout = svn co svn://svn.example.com/src/trunk src
+ chain = true
+
+ [src/linux-2.6]
+ checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
The .mrconfig file uses a variant of the INI file format. Lines starting with
"#" are comments. Lines ending with "\" are continued on to the next line.
The .mrconfig file uses a variant of the INI file format. Lines starting with
"#" are comments. Lines ending with "\" are continued on to the next line.
-The "default " section allows setting default values for the sections that
+The "DEFAULT " section allows setting default values for the sections that
-The "alias " section allows adding aliases for actions. Each parameter
+The "ALIAS " section allows adding aliases for actions. Each parameter
is an alias, and its value is the action to use.
is an alias, and its value is the action to use.
-All other sections specify where each repository is located, relative to the
-directory that contains the .mrconfig file.
+All other sections add repositories. The section header specifies the
+directory where the repository is located. This is relative to the directory
+that contains the mrconfig file, but you can also choose to use absolute
+paths.
Within a section, each parameter defines a shell command to run to handle a
given action. mr contains default handlers for the "update", "status", and
Within a section, each parameter defines a shell command to run to handle a
given action. mr contains default handlers for the "update", "status", and
The "MR_REPO" environment variable is set to the path to the top of the
repository.
The "MR_REPO" environment variable is set to the path to the top of the
repository.
-There are three special parameters. If the "skip" parameter is set and
-its command returns nonzero, then B<mr> will skip acting on that repository.
+A few parameters have special meanings:
+
+=over 4
+
+=item skip
+
+If the "skip" parameter is set and its command returns nonzero, then B<mr>
+will skip acting on that repository.
+
+=item chain
+
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
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
-"lib" parameter can specify some shell code that will be run before each
-command, this can be a useful way to define shell functions for other commands
-to use.
+should avoid chaining from repositories with untrusted committers.)
-For example:
-
- [src]
- checkout = svn co svn://svn.example.com/src/trunk src
- chain = true
- [src/linux-2.6]
- skip = small
- checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+The "lib" parameter can specify some shell code that will be run before each
+command, this can be a useful way to define shell functions for other commands
+to use.
- [default]
- lib = \
- small() {
- case "$(hostname)" in; \
- slug|snail); \
- return 0; ;; ; \
- esac; \
- return 1; \
- }
Getopt::Long::Configure("no_permute");
my $result=GetOptions(
Getopt::Long::Configure("no_permute");
my $result=GetOptions(
- "d=s" => sub { $directory=abs_path($_[1]) },
- "c=s" => \$config,
- "v" => \$verbose,
+ "d|directory =s" => sub { $directory=abs_path($_[1]) },
+ "c|config =s" => \$config,
+ "verbose " => \$verbose,
);
if (! $result || @ARGV < 1) {
die("Usage: mr [-d directory] action [params ...]\n".
);
if (! $result || @ARGV < 1) {
die("Usage: mr [-d directory] action [params ...]\n".
}
if ($action eq 'help') {
}
if ($action eq 'help') {
- exec($config{''}{default }{help});
+ exec($config{''}{DEFAULT }{help});
}
# work out what repos to act on
}
# work out what repos to act on
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\//;
+ next if $subdir eq 'DEFAULT';
+ my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+ my $d=$directory;
+ $dir.="/" unless $dir=~/\/$/;
+ $d.="/" unless $d=~/\/$/;
+ next if $dir ne $directory && $dir !~ /^\Q$directory\E/;
push @repos, [$dir, $topdir, $subdir];
}
}
push @repos, [$dir, $topdir, $subdir];
}
}
# fallback to find a leaf repo
LEAF: foreach my $topdir (reverse sort keys %config) {
foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
# fallback to find a leaf repo
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;
+ next if $subdir eq 'DEFAULT ';
+ my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
my $d=$directory;
$dir.="/" unless $dir=~/\/$/;
$d.="/" unless $d=~/\/$/;
my $d=$directory;
$dir.="/" unless $dir=~/\/$/;
$d.="/" unless $d=~/\/$/;
my $ret=system($command);
if ($ret != 0) {
print STDERR "mr $action: failed ($ret)\n" if $verbose;
my $ret=system($command);
if ($ret != 0) {
print STDERR "mr $action: failed ($ret)\n" if $verbose;
- push @failed, $topdir.$sub dir;
if ($ret >> 8 != 0) {
print STDERR "mr $action: command failed\n";
}
if ($ret >> 8 != 0) {
print STDERR "mr $action: command failed\n";
}
my $parent=$dir;
while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
if (exists $config{$parent} &&
my $parent=$dir;
while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
if (exists $config{$parent} &&
- exists $config{$parent}{default }) {
- $config{$dir}{default}={ %{$config{$parent}{default }} };
+ exists $config{$parent}{DEFAULT }) {
+ $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT }} };
if (! defined $section) {
die "$f line $.: parameter ($parameter) not in section\n";
}
if (! defined $section) {
die "$f line $.: parameter ($parameter) not in section\n";
}
- if ($section ne 'alias ' &&
+ if ($section ne 'ALIAS ' &&
! exists $config{$dir}{$section} &&
! exists $config{$dir}{$section} &&
- exists $config{$dir}{default }) {
+ exists $config{$dir}{DEFAULT }) {
- $config{$dir}{$section}={ %{$config{$dir}{default }} };
+ $config{$dir}{$section}={ %{$config{$dir}{DEFAULT }} };
- if ($section eq 'alias ') {
+ if ($section eq 'ALIAS ') {
$alias{$parameter}=$value;
}
elsif ($parameter eq 'lib') {
$alias{$parameter}=$value;
}
elsif ($parameter eq 'lib') {
$config{$dir}{$section}{$parameter}=$value;
$knownactions{$parameter}=1;
if ($parameter eq 'chain' &&
$config{$dir}{$section}{$parameter}=$value;
$knownactions{$parameter}=1;
if ($parameter eq 'chain' &&
- length $dir && $section ne "default " &&
+ length $dir && $section ne "DEFAULT " &&
-e $dir.$section."/.mrconfig" &&
system($value) >> 8 == 0) {
push @toload, $dir.$section."/.mrconfig";
-e $dir.$section."/.mrconfig" &&
system($value) >> 8 == 0) {
push @toload, $dir.$section."/.mrconfig";
# Finally, some useful actions that mr knows about by default.
# These can be overridden in ~/.mrconfig.
__DATA__
# Finally, some useful actions that mr knows about by default.
# These can be overridden in ~/.mrconfig.
__DATA__
co = checkout
ci = commit
ls = list
co = checkout
ci = commit
ls = list
lib = \
error() { \
echo "mr: $@" >&2; \
lib = \
error() { \
echo "mr: $@" >&2; \
svn update "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git pull origin master "$@"; \
svn update "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git pull origin master "$@"; \
+ elif [ -d "$MR_REPO"/.bzr ]; then \
+ bzr merge "$@"; \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs update "$@"; \
else \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs update "$@"; \
else \
svn status "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git status "$@" || true; \
svn status "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git status "$@" || true; \
+ elif [ -d "$MR_REPO"/.bzr ]; then \
+ bzr status "$@"; \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs status "$@"; \
else \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs status "$@"; \
else \
svn commit "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git commit -a "$@" && git push --all; \
svn commit "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git commit -a "$@" && git push --all; \
+ elif [ -d "$MR_REPO"/.bzr ]; then \
+ bzr commit "$@" && bzr push; \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs commit "$@"; \
else \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs commit "$@"; \
else \
svn diff "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git diff "$@"; \
svn diff "$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git diff "$@"; \
+ elif [ -d "$MR_REPO"/.bzr ]; then \
+ bzr diff "$@"; \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs diff "$@"; \
else \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs diff "$@"; \
else \
svn log"$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git log "$@"; \
svn log"$@"; \
elif [ -d "$MR_REPO"/.git ]; then \
git log "$@"; \
+ elif [ -d "$MR_REPO"/.bzr ]; then \
+ bzr log "$@"; \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs log "$@"; \
else \
elif [ -d "$MR_REPO"/CVS ]; then \
cvs log "$@"; \
else \
projects / code / myrepos.git / blobdiff