]>
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> is a Multiple Repository management tool. It can checkout, update, or
perform other actions on a set of repositories as if they were one combined
repository. It supports any combination of subversion, git, cvs, mercurial,
B<mr> is a Multiple Repository management tool. It can checkout, update, or
perform other actions on a set of repositories as if they were one combined
repository. It supports any combination of subversion, git, cvs, mercurial,
-bzr, darcs and fossil repositories, and support for other revi sion
+bzr, darcs and fossil repositories, and support for other ver sion
control systems can easily be added.
B<mr> cds into and operates on all registered repositories at or below your
control systems can easily be added.
B<mr> cds into and operates on all registered repositories at or below your
looks for a .mrconfig file in the current directory, or in one of its
parent directories.
looks for a .mrconfig file in the current directory, or in one of its
parent directories.
-These predefined commands should be fairly familiar to users of any revi sion
+These predefined commands should be fairly familiar to users of any ver sion
=item record
Records changes to the local repository, but does not push them to the
=item record
Records changes to the local repository, but does not push them to the
-remote repository. Only supported for distributed revi sion control systems.
+remote repository. Only supported for distributed ver sion control systems.
The optional -m parameter allows specifying a commit message.
=item push
Pushes committed local changes to the remote repository. A no-op for
The optional -m parameter allows specifying a commit message.
=item push
Pushes committed local changes to the remote repository. A no-op for
-centralized revi sion control systems.
+centralized ver sion control systems.
update"
Additional parameters can be passed to most commands, and are passed on
update"
Additional parameters can be passed to most commands, and are passed on
-unchanged to the underlying revi sion control system. This is mostly useful
-if the repositories mr will act on all use the same revi sion control
+unchanged to the underlying ver sion control system. This is mostly useful
+if the repositories mr will act on all use the same ver sion control
-Use the specified mrconfig file. The default is to use both B <~/.mrconfig>
-as well as look for a .mrconfig file in the current directory, or in one
+Use the specified mrconfig file. The default is to use both F <~/.mrconfig>
+as well as look for a F<.mrconfig> file in the current directory, or in one
of its parent directories.
=item -v
of its parent directories.
=item -v
-Be quiet. This supresses mr's usual output, as well as any output from
+Be quiet. This supp resses mr's usual output, as well as any output from
commands that are run (including stderr output). If a command fails,
the output will be shown.
commands that are run (including stderr output). If a command fails,
the output will be shown.
-Trust all mrconfig files even if they are not listed in ~/.mrtrust .
+Trust all mrconfig files even if they are not listed in F<~/.mrtrust> .
Use with caution.
=item -p
Use with caution.
=item -p
-Here is an example .mrconfig file:
+Here is an example F<.mrconfig> file:
[src]
checkout = svn checkout svn://svn.example.com/src/trunk src
[src]
checkout = svn checkout svn://svn.example.com/src/trunk src
cd linux-2.6 &&
git checkout -b mybranch origin/master
cd linux-2.6 &&
git checkout -b mybranch origin/master
-The .mrconfig file uses a variant of the INI file format. Lines starting with
-"#" are comments. Values can be continued to the following line by
-indenting the line with whitespace.
+The F<.mrconfig> file uses a variant of the INI file format. Lines
+starting with "#" are comments. Values can be continued to the
+following line by indenting the line with whitespace.
-The "DEFAULT" section allows setting default values for the sections that
+The C<DEFAULT> section allows setting default values for the sections that
-The "ALIAS" section allows adding aliases for actions. Each parameter
+The C<ALIAS> section allows adding aliases for actions. Each parameter
is an alias, and its value is the action to use.
All other sections add repositories. The section header specifies the
is an alias, and its value is the action to use.
All other sections add repositories. The section header specifies the
that contains the mrconfig file, but you can also choose to use absolute
paths. (Note that you can use environment variables in section names; they
will be passed through the shell for expansion. For example,
that contains the mrconfig file, but you can also choose to use absolute
paths. (Note that you can use environment variables in section names; they
will be passed through the shell for expansion. For example,
-"[$HOSTNAME]", or "[${HOSTNAME}foo]")
+C<[$HOSTNAME]>, or C<[${HOSTNAME}foo]>).
Within a section, each parameter defines a shell command to run to handle a
given action. mr contains default handlers for "update", "status",
Within a section, each parameter defines a shell command to run to handle a
given action. mr contains default handlers for "update", "status",
Normally you only need to specify what to do for "checkout". Here you
specify the command to run in order to create a checkout of the repository.
The command will be run in the parent directory, and must create the
Normally you only need to specify what to do for "checkout". Here you
specify the command to run in order to create a checkout of the repository.
The command will be run in the parent directory, and must create the
-repository's directory. So use "git clone", "svn checkout", "bzr branch"
-or "bzr checkout" (for a bound branch), etc.
+repository's directory. So use C<git clone>, C<svn checkout>, C<bzr branch>
+or C<bzr checkout> (for a bound branch), etc.
-Note that these shell commands are run in a "set -e" shell
+Note that these shell commands are run in a C<set -e> shell
environment, where any additional parameters you pass are available in
environment, where any additional parameters you pass are available in
-"$@" . All commands other than "checkout" are run inside the repository,
+C<$@> . All commands other than "checkout" are run inside the repository,
though not necessarily at the top of it.
though not necessarily at the top of it.
-The "MR_REPO" environment variable is set to the path to the top of the
+The C<MR_REPO> environment variable is set to the path to the top of the
repository. (For the "register" action, "MR_REPO" is instead set to the
basename of the directory that should be created when checking the
repository out.)
repository. (For the "register" action, "MR_REPO" is instead set to the
basename of the directory that should be created when checking the
repository out.)
-The "MR_CONFIG" environment variable is set to the .mrconfig file
+The C<MR_CONFIG> environment variable is set to the .mrconfig file
that defines the repo being acted on, or, if the repo is not yet in a config
that defines the repo being acted on, or, if the repo is not yet in a config
-file, the .mrconfig file that should be modified to register the repo.
+file, the F<.mrconfig> file that should be modified to register the repo.
-The "MR_ACTION" environment variable is set to the command being run
+The C<MR_ACTION> environment variable is set to the command being run
(update, checkout, etc).
A few parameters have special meanings:
(update, checkout, etc).
A few parameters have special meanings:
If the "skip" parameter is set and its command returns true, then B<mr>
will skip acting on that repository. The command is passed the action
If the "skip" parameter is set and its command returns true, then B<mr>
will skip acting on that repository. The command is passed the action
-Here are three examples. The first skips the repo unless
+Here are two examples. The first skips the repo unless
mr is run by joey. The second uses the hours_since function
(included in mr's built-in library) to skip updating the repo unless it's
mr is run by joey. The second uses the hours_since function
(included in mr's built-in library) to skip updating the repo unless it's
-been at least 12 hours since the last update. The third skips operating
-on the repo unless it already exists (use mr checkout to enable the repo).
+been at least 12 hours since the last update.
+ [mystuff]
+ checkout = ...
skip = test `whoami` != joey
skip = test `whoami` != joey
+
+ [linux]
+ checkout = ...
skip = [ "$1" = update ] && ! hours_since "$1" 12
skip = [ "$1" = update ] && ! hours_since "$1" 12
+
+Another way to use skip is for a lazy checkout. This makes mr skip
+operating on a repo unless it already exists. To enable the
+repo, you have to explicitly check it out (using "mr -d foo checkout").
+
+ [foo]
+ checkout = ...
=item chain
If the "chain" parameter is set and its command returns true, then B<mr>
=item chain
If the "chain" parameter is set and its command returns true, then B<mr>
-will try to load a .mrconfig file from the root of the repository.
+will try to load a F<.mrconfig> file from the root of the repository.
Unlike all other parameters, this parameter does not need to be placed
within a section.
Unlike all other parameters, this parameter does not need to be placed
within a section.
+B<mr> ships several libraries that can be included to add support for
+additional version control type things (unison, git-svn, vcsh, git-fake-bare,
+git-subtree). To include them all, you could use:
+
+ include = cat /usr/share/mr/*
+
+See the individual files for details.
+
=item deleted
If the "deleted" parameter is set and its command returns true, then
B<mr> will treat the repository as deleted. It won't ever actually delete
the repository, but it will warn if it sees the repository's directory.
=item deleted
If the "deleted" parameter is set and its command returns true, then
B<mr> will treat the repository as deleted. It won't ever actually delete
the repository, but it will warn if it sees the repository's directory.
-This is useful when one mrconfig file is shared amou ng multiple machines,
+This is useful when one mrconfig file is shared among multiple machines,
to keep track of and remember to delete old repositories.
=item lib
to keep track of and remember to delete old repositories.
=item lib
When looking for a command to run for a given action, mr first looks for
a parameter with the same name as the action. If that is not found, it
When looking for a command to run for a given action, mr first looks for
a parameter with the same name as the action. If that is not found, it
-looks for a parameter named "rcs _action" (substituting in the name of the
-revision control system and the action). The name of the revi sion control
-system is itself determined by running each defined "rcs _test" action,
+looks for a parameter named "VCS _action" (substituting in the name of the
+version control system and the action). The name of the ver sion control
+system is itself determined by running each defined "VCS _test" action,
until one succeeds.
Internally, mr has settings for "git_update", "svn_update", etc. To change
until one succeeds.
Internally, mr has settings for "git_update", "svn_update", etc. To change
-the action that is performed for a given revi sion control system, you can
-override these rcs specific actions. To add a new revi sion control system,
-you can just add rcs specific actions for it.
+the action that is performed for a given ver sion control system, you can
+override these VCS specific actions. To add a new ver sion control system,
+you can just add VCS specific actions for it.
=head1 UNTRUSTED MRCONFIG FILES
Since mrconfig files can contain arbitrary shell commands, they can do
anything. This flexibility is good, but it also allows a malicious mrconfig
file to delete your whole home directory. Such a file might be contained
=head1 UNTRUSTED MRCONFIG FILES
Since mrconfig files can contain arbitrary shell commands, they can do
anything. This flexibility is good, but it also allows a malicious mrconfig
file to delete your whole home directory. Such a file might be contained
-inside a repository that your main ~/.mrconfig checks out. To
+inside a repository that your main F<~/.mrconfig> checks out. To
avoid worries about evil commands in a mrconfig file, mr defaults to
avoid worries about evil commands in a mrconfig file, mr defaults to
-reading all mrconfig files other than the main ~/.mrconfig in untrusted
+reading all mrconfig files other than the main F<~/.mrconfig> in untrusted
mode. In untrusted mode, mrconfig files are limited to running only known
safe commands (like "git clone") in a carefully checked manner.
mode. In untrusted mode, mrconfig files are limited to running only known
safe commands (like "git clone") in a carefully checked manner.
-To configure mr to trust other mrconfig files, list them in ~/.mrtrust .
+To configure mr to trust other mrconfig files, list them in F<~/.mrtrust> .
One mrconfig file should be listed per line. Either the full pathname
One mrconfig file should be listed per line. Either the full pathname
-should be listed, or the pathname can start with "~/" to specify a file
+should be listed, or the pathname can start with F<~/> to specify a file
relative to your home directory.
=head1 OFFLINE LOG FILE
relative to your home directory.
=head1 OFFLINE LOG FILE
-The ~/.mrlog file contains commands that mr has remembered to run later,
+The F<~/.mrlog> file contains commands that mr has remembered to run later,
due to being offline. You can delete or edit this file to remove commands,
or even to add other commands for 'mr online' to run. If the file is
present, mr assumes it is in offline mode.
due to being offline. You can delete or edit this file to remove commands,
or even to add other commands for 'mr online' to run. If the file is
present, mr assumes it is in offline mode.
=head1 EXTENSIONS
mr can be extended to support things such as unison and git-svn. Some
=head1 EXTENSIONS
mr can be extended to support things such as unison and git-svn. Some
-files providing such extensions are available in /usr/share/mr/ . See
+files providing such extensions are available in F</usr/share/mr/> . See
the documentation in the files for details about using them.
=head1 EXIT STATUS
the documentation in the files for details about using them.
=head1 EXIT STATUS
-my %r cs;
-sub r cs_test {
+my %v cs;
+sub v cs_test {
my ($action, $dir, $topdir, $subdir) = @_;
my ($action, $dir, $topdir, $subdir) = @_;
- if (exists $r cs{$dir}) {
- return $r cs{$dir};
+ if (exists $v cs{$dir}) {
+ return $v cs{$dir};
sort {
length $a <=> length $b
||
$a cmp $b
} grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {
sort {
length $a <=> length $b
||
$a cmp $b
} grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {
- my ($rcs)=$r cs_test=~/(.*)_test/;
- $test="my_$rcs_test() {\n$config{$topdir}{$subdir}{$r cs_test}\n}\n".$test;
- $test.="if my_$rcs_test; then echo $r cs; fi\n";
+ my ($vcs)=$v cs_test=~/(.*)_test/;
+ $test="my_$vcs_test() {\n$config{$topdir}{$subdir}{$v cs_test}\n}\n".$test;
+ $test.="if my_$vcs_test; then echo $v cs; fi\n";
}
$test=$config{$topdir}{$subdir}{lib}."\n".$test
if exists $config{$topdir}{$subdir}{lib};
}
$test=$config{$topdir}{$subdir}{lib}."\n".$test
if exists $config{$topdir}{$subdir}{lib};
- print "mr $action: running r cs test >>$test<<\n" if $verbose;
- my $r cs=`$test`;
- chomp $r cs;
- if ($r cs=~/\n/s) {
- $r cs=~s/\n/, /g;
- print STDERR "mr $action: found multiple possible repository types ($r cs) for ".fulldir($topdir, $subdir)."\n";
+ print "mr $action: running v cs test >>$test<<\n" if $verbose;
+ my $v cs=`$test`;
+ chomp $v cs;
+ if ($v cs=~/\n/s) {
+ $v cs=~s/\n/, /g;
+ print STDERR "mr $action: found multiple possible repository types ($v cs) for ".fulldir($topdir, $subdir)."\n";
- if (! length $r cs) {
- return $r cs{$dir}=undef;
+ if (! length $v cs) {
+ return $v cs{$dir}=undef;
- return $rcs{$dir}=$r cs;
+ return $vcs{$dir}=$v cs;
- if (defined $r cs &&
- exists $config{$topdir}{$subdir}{$r cs."_".$action}) {
- return $config{$topdir}{$subdir}{$r cs."_".$action};
+ if (defined $v cs &&
+ exists $config{$topdir}{$subdir}{$v cs."_".$action}) {
+ return $config{$topdir}{$subdir}{$v cs."_".$action};
my $is_checkout=($action eq 'checkout');
my $is_update=($action =~ /update/);
my $is_checkout=($action eq 'checkout');
my $is_update=($action =~ /update/);
+ ($ENV{MR_REPO}=$dir) =~ s!/$!! ;
$ENV{MR_ACTION}=$action;
foreach my $testname ("skip", "deleted") {
$ENV{MR_ACTION}=$action;
foreach my $testname ("skip", "deleted") {
return FAILED;
}
elsif (! defined $command) {
return FAILED;
}
elsif (! defined $command) {
- my $rcs=r cs_test(@_);
- if (! defined $r cs) {
+ my $vcs=v cs_test(@_);
+ if (! defined $v cs) {
print STDERR "mr $action: unknown repository type and no defined $action command for $fulldir\n";
return FAILED;
}
else {
print STDERR "mr $action: unknown repository type and no defined $action command for $fulldir\n";
return FAILED;
}
else {
- print STDERR "mr $action: no defined action for $r cs repository $fulldir, skipping\n";
+ print STDERR "mr $action: no defined action for $v cs repository $fulldir, skipping\n";
-# figure out which repos to act on
+# Figure out which repos to act on. Returns a list of array refs
+# in the format:
+#
+# [ "$full_repo_path/", "$mr_config_path/", $section_header ]
sub selectrepos {
my @repos;
foreach my $repo (repolist()) {
sub selectrepos {
my @repos;
foreach my $repo (repolist()) {
close $in unless ref $f eq 'GLOB';
my $section;
close $in unless ref $f eq 'GLOB';
my $section;
+
+ # Keep track of the current line in the config file;
+ # when a file is included track the current line from the include.
+ my $included=undef;
+ my $includeline=0;
+ my $nextline = sub {
+ if ($included) {
+ $includeline++;
+ $included--;
+ }
+ else {
+ $included=undef;
+ $includeline=0;
+ $line++;
+ }
+ my $l=shift @lines;
+ chomp $l;
+ return $l
+ };
+ my $lineerror = sub {
+ my $msg=shift;
+ if (defined $included) {
+ die "mr: $f line $line include line $includeline: $msg\n";
+ }
+ else {
+ die "mr: $f line $line: $msg\n";
+ }
+ };
+
- $_=shift @lines;
- $line++;
- chomp;
+ $_=$nextline->();
+
+ if (! $trusted && /[[:cntrl:]]/) {
+ trusterror("mr: illegal control character", $f, $line, $bootstrap_url);
+ }
+
next if /^\s*\#/ || /^\s*$/;
if (/^\[([^\]]*)\]\s*$/) {
$section=$1;
next if /^\s*\#/ || /^\s*$/;
if (/^\[([^\]]*)\]\s*$/) {
$section=$1;
# continued value
while (@lines && $lines[0]=~/^\s(.+)/) {
# continued value
while (@lines && $lines[0]=~/^\s(.+)/) {
- shift(@lines);
- $line++;
$value.="\n$1";
chomp $value;
$value.="\n$1";
chomp $value;
if ($parameter eq "include") {
print "mr: including output of \"$value\"\n" if $verbose;
if ($parameter eq "include") {
print "mr: including output of \"$value\"\n" if $verbose;
- unshift @lines, `$value`;
if ($?) {
print STDERR "mr: include command exited nonzero ($?)\n";
}
if ($?) {
print STDERR "mr: include command exited nonzero ($?)\n";
}
+ $included += @inc;
+ unshift @lines, @inc;
next;
}
if (! defined $section) {
next;
}
if (! defined $section) {
- die "$f line $.: parameter ($parameter) not in section\n" ;
+ $lineerror->("parameter ($parameter) not in section") ;
}
if ($section eq 'ALIAS') {
$alias{$parameter}=$value;
}
if ($section eq 'ALIAS') {
$alias{$parameter}=$value;
if ($parameter eq 'chain' &&
length $dir && $section ne "DEFAULT") {
my $chaindir="$section";
if ($parameter eq 'chain' &&
length $dir && $section ne "DEFAULT") {
my $chaindir="$section";
- if ($chaindir !~ m!/!) {
+ if ($chaindir !~ m!^ /!) {
$chaindir=$dir.$chaindir;
}
if (-e "$chaindir/.mrconfig") {
$chaindir=$dir.$chaindir;
}
if (-e "$chaindir/.mrconfig") {
- die "$f line $line: parse error\n" ;
+ $lineerror->("parse error") ;
projects / code / myrepos.git / blobdiff