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.
5 mr - a Multiple Repository management tool
9 B<mr> [options] checkout
11 B<mr> [options] update
13 B<mr> [options] status
15 B<mr> [options] commit [-m "message"]
17 B<mr> [options] action [params ...]
21 B<mr> is a Multiple Repository management tool. It allows you to register a
22 set of repositories in a .mrconfig file, and then checkout, update, or
23 perform other actions on all of the repositories at once.
25 Any mix of revision control systems can be used with B<mr>, and you can
26 define arbitrary actions for commands like "update", "checkout", or "commit".
28 The predefined commands should be fairly familiar to users of any revision
35 Checks out all the registered repositories that are not already checked
40 Updates each registered repository from its configured remote repository.
42 If a repository isn't checked out yet, it will first check it out.
46 Displays a status report for each registered repository, showing what
47 uncommitted changes are present in the repository.
51 Commits changes to each registered repository. (By default, changes
52 are pushed to the remote repository too, when using distributed systems
55 The optional -m parameter allows specifying a commit message.
59 Actions can be abbreviated to any unambiguous subsctring, so
60 "mr st" is equivilant to "mr status".
68 Specifies the topmost directory that B<mr> should work in. The default is
69 the current working directory. B<mr> will operate on all registered
70 repositories at or under the directory.
74 Use the specified mrconfig file, instead of looking for on in your home
85 B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
86 file in your home directory. Each repository specified in a .mrconfig file
87 can also have its own .mrconfig file in its root directory that can
88 optionally be used as well. So you could have a ~/.mrconfig that registers a
89 repository ~/src, that itself contains a ~/src/.mrconfig file, that in turn
90 registers several additional repositories.
92 The .mrconfig file uses a variant of the INI file format. Lines starting with
93 "#" are comments. Lines ending with "\" are continued on to the next line.
94 Sections specify where each repository is located, relative to the
95 directory that contains the .mrconfig file.
97 Within a section, each parameter defines a shell command to run to handle a
98 given action. Note that these shell commands are run in a "set -e" shell
99 environment, where any additional parameters you pass are available in
100 "$@". B<mr> cds into the repository directory before running
101 a command, except for the "checkout" command, which is run in the parent
102 of the repository directory, since the repository isn't checked out yet.
104 There are three special parameters. If the "skip" parameter is set and
105 its command returns nonzero, then B<mr> will skip acting on that repository.
106 If the "chain" parameter is set and its command returns nonzero, then B<mr>
107 will try to load a .mrconfig file from the root of the repository. (You
108 should avoid chaining from repositories with untrusted committers.) The
109 "lib" parameter can specify some shell code that will be run before each
110 command, this can be a useful way to define shell functions other commands
113 The "default" section allows setting up default handlers for each action,
114 and is overridden by the contents of other sections. mr contains default
115 handlers for the "update", "status", and "commit" actions, so normally
116 you only need to specify what to do for "checkout".
121 checkout = svn co svn://svn.example.com/src/trunk src
126 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
131 case "$(hostname)" in; \
140 Copyright 2007 Joey Hess <joey@kitenet.net>
142 Licensed under the GNU GPL version 2 or higher.
144 http://kitenet.net/~joey/code/mr/
151 use Cwd qw(getcwd abs_path);
153 my $directory=getcwd();
154 my $config="$ENV{HOME}/.mrconfig";
159 Getopt::Long::Configure("no_permute");
160 my $result=GetOptions(
161 "d=s" => sub { $directory=abs_path($_[1]) },
165 if (! $result || @ARGV < 1) {
166 die("Usage: mr [-d directory] action [params ...]\n");
172 #print Dumper(\%config);
174 my $action=shift @ARGV;
175 if (! $knownactions{$action}) {
176 my @matches = grep { /^\Q$action\E/ } keys %knownactions;
181 die "mr: ambiguous action \"$action\" (matches @matches)\n";
185 my (@failed, @successful, @skipped);
187 foreach my $topdir (sort keys %config) {
188 foreach my $subdir (sort keys %{$config{$topdir}}) {
189 next if $subdir eq 'default';
191 my $dir=$topdir.$subdir;
193 if (defined $directory &&
194 $dir ne $directory &&
195 $dir !~ /^\Q$directory\E\//) {
196 print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose;
201 print "\n" unless $first;
204 if (exists $config{$topdir}{$subdir}{skip}) {
205 my $ret=system($config{$topdir}{$subdir}{skip});
206 if ($ret >> 8 == 0) {
207 print "mr $action: $dir skipped per config file\n" if $verbose;
213 action($action, $dir, $topdir, $subdir);
219 my ($action, $dir, $topdir, $subdir) = @_;
221 if ($action eq 'checkout') {
223 print "mr $action: $dir already exists, skipping checkout\n";
227 $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
229 if ($action eq 'update') {
231 return action("checkout", $dir, $topdir, $subdir);
236 print STDERR "mr $action: failed to chdir to $dir: $!\n";
239 elsif (! exists $config{$topdir}{$subdir}{$action}) {
240 print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
244 print "mr $action: in $dir\n";
245 my $command="set -e; ".
246 (exists $config{$topdir}{$subdir}{lib} ?
247 $config{$topdir}{$subdir}{lib} : "").
248 "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
249 join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
250 my $ret=system($command);
252 print STDERR "mr $action: failed to run: $command\n" if $verbose;
253 push @failed, $topdir.$subdir;
254 if ($ret >> 8 != 0) {
255 print STDERR "mr $action: command failed\n";
258 print STDERR "mr $action: command died ($ret)\n";
262 push @successful, $dir;
272 return "$count ".($count > 1 ? $plural : $singular);
276 print "\nmr $action: finished (".join("; ",
277 showstat($#successful+1, "successful", "successful"),
278 showstat($#failed+1, "failed", "failed"),
279 showstat($#skipped+1, "skipped", "skipped"),
284 elsif (! @successful && @skipped) {
297 if (ref $f eq 'GLOB') {
302 # $f might be a symlink
303 my $absf=abs_path($f);
304 if ($loaded{$absf}) {
309 print "mr: loading config $f\n" if $verbose;
310 open($in, "<", $f) || die "mr: open $f: $!\n";
311 ($dir)=$f=~/^(.*\/)[^\/]+$/;
312 if (! defined $dir) {
315 $dir=abs_path($dir)."/";
317 # copy in defaults from first parent
319 while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
320 if (exists $config{$parent} &&
321 exists $config{$parent}{default}) {
322 $config{$dir}{default}={ %{$config{$parent}{default}} };
331 next if /^\s*\#/ || /^\s*$/;
332 if (/^\s*\[([^\]]*)\]\s*$/) {
335 elsif (/^\s*(\w+)\s*=\s*(.*)/) {
340 while ($value=~/(.*)\\$/) {
345 if (! defined $section) {
346 die "$f line $.: parameter ($parameter) not in section\n";
348 if (! exists $config{$dir}{$section} &&
349 exists $config{$dir}{default}) {
351 $config{$dir}{$section}={ %{$config{$dir}{default}} };
353 if ($parameter ne 'lib') {
354 $config{$dir}{$section}{$parameter}=$value;
355 $knownactions{$parameter}=1;
358 $config{$dir}{$section}{$parameter}.=$value." ; ";
361 if ($parameter eq 'chain' &&
362 length $dir && $section ne "default" &&
363 -e $dir.$section."/.mrconfig" &&
364 system($value) >> 8 == 0) {
365 push @toload, $dir.$section."/.mrconfig";
369 die "$f line $.: parse error\n";
379 # Finally, some useful actions that mr knows about by default.
380 # These can be overridden in ~/.mrconfig.
389 if [ -d .svn ]; then \
391 elif [ -d .git ]; then \
392 git pull origin master; \
394 error "unknown repo type"; \
397 if [ -d .svn ]; then \
399 elif [ -d .git ]; then \
400 git status || true; \
402 error "unknown repo type"; \
405 if [ -d .svn ]; then \
407 elif [ -d .git ]; then \
408 git commit -a "$@" && git push --all; \
410 error "unknown repo type"; \