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] record [-m "message"]
25 B<mr> [options] run command [param ...]
27 B<mr> [options] bootstrap url [directory]
29 B<mr> [options] register [repository]
31 B<mr> [options] config section ["parameter=[value]" ...]
33 B<mr> [options] action [params ...]
35 B<mr> [options] [online|offline]
37 B<mr> [options] remember action [params ...]
41 B<mr> is a Multiple Repository management tool. It can checkout, update, or
42 perform other actions on a set of repositories as if they were one combined
43 repository. It supports any combination of subversion, git, cvs, mercurial,
44 bzr, darcs and fossil repositories, and support for other revision
45 control systems can easily be added.
47 B<mr> cds into and operates on all registered repositories at or below your
48 working directory. Or, if you are in a subdirectory of a repository that
49 contains no other registered repositories, it will stay in that directory,
50 and work on only that repository,
52 B<mr> is configured by .mrconfig files, which list the repositories. It
53 starts by reading the .mrconfig file in your home directory, and this can
54 in turn chain load .mrconfig files from repositories. It also automatically
55 looks for a .mrconfig file in the current directory, or in one of its
58 These predefined commands should be fairly familiar to users of any revision
63 =item checkout (or co)
65 Checks out any repositories that are not already checked out.
69 Updates each repository from its configured remote repository.
71 If a repository isn't checked out yet, it will first check it out.
75 Displays a status report for each repository, showing what
76 uncommitted changes are present in the repository.
80 Commits changes to each repository. (By default, changes are pushed to the
81 remote repository too, when using distributed systems like git. If you
82 don't like this default, you can change it in your .mrconfig, or use record
85 The optional -m parameter allows specifying a commit message.
89 Records changes to the local repository, but does not push them to the
90 remote repository. Only supported for distributed revision control systems.
92 The optional -m parameter allows specifying a commit message.
96 Pushes committed local changes to the remote repository. A no-op for
97 centralized revision control systems.
101 Show a diff of uncommitted changes.
107 =item run command [param ...]
109 Runs the specified command in each repository.
113 These commands are also available:
117 =item bootstrap url [directory]
119 Causes mr to download the url, and use it as a .mrconfig file
120 to checkout the repositories listed in it, into the specified directory.
122 The directory will be created if it does not exist. If no directory is
123 specified, the current directory will be used.
125 If the .mrconfig file includes a repository named ".", that
126 is checked out into the top of the specified directory.
130 List the repositories that mr will act on.
134 Register an existing repository in a mrconfig file. By default, the
135 repository in the current directory is registered, or you can specify a
136 directory to register.
138 The mrconfig file that is modified is chosen by either the -c option, or by
139 looking for the closest known one at or in a parent of the current directory.
143 Adds, modifies, removes, or prints a value from a mrconfig file. The next
144 parameter is the name of the section the value is in. To add or modify
145 values, use one or more instances of "parameter=value". Use "parameter=" to
146 remove a parameter. Use just "parameter" to get the value of a parameter.
148 For example, to add (or edit) a repository in src/foo:
150 mr config src/foo checkout="svn co svn://example.com/foo/trunk foo"
152 To show the command that mr uses to update the repository in src/foo:
154 mr config src/foo update
156 To see the built-in library of shell functions contained in mr:
158 mr config DEFAULT lib
160 The mrconfig file that is used is chosen by either the -c option, or by
161 looking for the closest known one at or in a parent of the current directory.
165 Advises mr that it is in offline mode. Any commands that fail in
166 offline mode will be remembered, and retried when mr is told it's online.
170 Advices mr that it is in online mode again. Commands that failed while in
171 offline mode will be re-run.
175 Remember a command, to be run later when mr re-enters online mode. This
176 implicitly puts mr into offline mode. The command can be any regular mr
177 command. This is useful when you know that a command will fail due to being
178 offline, and so don't want to run it right now at all, but just remember
179 to run it when you go back online.
187 Actions can be abbreviated to any unambiguous substring, so
188 "mr st" is equivalent to "mr status", and "mr up" is equivalent to "mr
191 Additional parameters can be passed to most commands, and are passed on
192 unchanged to the underlying revision control system. This is mostly useful
193 if the repositories mr will act on all use the same revision control
202 =item --directory directory
204 Specifies the topmost directory that B<mr> should work in. The default is
205 the current working directory.
209 =item --config mrconfig
211 Use the specified mrconfig file. The default is to use both B<~/.mrconfig>
212 as well as look for a .mrconfig file in the current directory, or in one
213 of its parent directories.
225 Be quiet. This supresses mr's usual output, as well as any output from
226 commands that are run (including stderr output). If a command fails,
227 the output will be shown.
233 Accept untrusted SSL certificates when bootstrapping.
239 Expand the statistics line displayed at the end to include information
240 about exactly which repositories failed and were skipped, if any.
246 Interactive mode. If a repository fails to be processed, a subshell will be
247 started which you can use to resolve or investigate the problem. Exit the
248 subshell to continue the mr run.
252 =item --no-recurse [number]
254 If no number if specified, just operate on the repository for the current
255 directory, do not recurse into deeper repositories.
257 If a number is specified, will recurse into repositories at most that many
258 subdirectories deep. For example, with -n 2 it would recurse into ./src/foo,
259 but not ./src/packages/bar.
263 =item --jobs [number]
265 Run the specified number of jobs in parallel, or an unlimited number of jobs
266 with no number specified. This can greatly speed up operations such as updates.
267 It is not recommended for interactive operations.
269 Note that running more than 10 jobs at a time is likely to run afoul of
270 ssh connection limits. Running between 3 and 5 jobs at a time will yield
271 a good speedup in updates without loading the machine too much.
277 Trust all mrconfig files even if they are not listed in ~/.mrtrust.
284 This obsolete flag is ignored.
288 =head1 MRCONFIG FILES
290 Here is an example .mrconfig file:
293 checkout = svn checkout svn://svn.example.com/src/trunk src
297 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git &&
299 git checkout -b mybranch origin/master
301 The .mrconfig file uses a variant of the INI file format. Lines starting with
302 "#" are comments. Values can be continued to the following line by
303 indenting the line with whitespace.
305 The "DEFAULT" section allows setting default values for the sections that
308 The "ALIAS" section allows adding aliases for actions. Each parameter
309 is an alias, and its value is the action to use.
311 All other sections add repositories. The section header specifies the
312 directory where the repository is located. This is relative to the directory
313 that contains the mrconfig file, but you can also choose to use absolute
314 paths. (Note that you can use environment variables in section names; they
315 will be passed through the shell for expansion. For example,
316 "[$HOSTNAME]", or "[${HOSTNAME}foo]")
318 Within a section, each parameter defines a shell command to run to handle a
319 given action. mr contains default handlers for "update", "status",
320 "commit", and other standard actions.
322 Normally you only need to specify what to do for "checkout". Here you
323 specify the command to run in order to create a checkout of the repository.
324 The command will be run in the parent directory, and must create the
325 repository's directory. So use "git clone", "svn checkout", "bzr branch"
326 or "bzr checkout" (for a bound branch), etc.
328 Note that these shell commands are run in a "set -e" shell
329 environment, where any additional parameters you pass are available in
330 "$@". All commands other than "checkout" are run inside the repository,
331 though not necessarily at the top of it.
333 The "MR_REPO" environment variable is set to the path to the top of the
334 repository. (For the "register" action, "MR_REPO" is instead set to the
335 basename of the directory that should be created when checking the
338 The "MR_CONFIG" environment variable is set to the .mrconfig file
339 that defines the repo being acted on, or, if the repo is not yet in a config
340 file, the .mrconfig file that should be modified to register the repo.
342 A few parameters have special meanings:
348 If the "skip" parameter is set and its command returns true, then B<mr>
349 will skip acting on that repository. The command is passed the action
352 Here are two examples. The first skips the repo unless
353 mr is run by joey. The second uses the hours_since function
354 (included in mr's built-in library) to skip updating the repo unless it's
355 been at least 12 hours since the last update.
357 skip = test `whoami` != joey
358 skip = [ "$1" = update ] && ! hours_since "$1" 12
362 The "order" parameter can be used to override the default ordering of
363 repositories. The default order value is 10. Use smaller values to make
364 repositories be processed earlier, and larger values to make repositories
367 Note that if a repository is located in a subdirectory of another
368 repository, ordering it to be processed earlier is not recommended.
372 If the "chain" parameter is set and its command returns true, then B<mr>
373 will try to load a .mrconfig file from the root of the repository.
377 If the "include" parameter is set, its command is ran, and should output
378 additional mrconfig file content. The content is included as if it were
379 part of the including file.
381 Unlike all other parameters, this parameter does not need to be placed
386 If the "deleted" parameter is set and its command returns true, then
387 B<mr> will treat the repository as deleted. It won't ever actually delete
388 the repository, but it will warn if it sees the repository's directory.
389 This is useful when one mrconfig file is shared amoung multiple machines,
390 to keep track of and remember to delete old repositories.
394 The "lib" parameter can specify some shell code that will be run before each
395 command, this can be a useful way to define shell functions for other commands
400 If the "fixups" parameter is set, its command is run whenever a repository
401 is checked out, or updated. This provides an easy way to do things
402 like permissions fixups, or other tweaks to the repository content,
403 whenever the repository is changed.
407 If a "pre_action" parameter is set, its command is run before mr performs the
408 specified action. Similarly, "post_action" parameters are run after mr
409 successfully performs the specified action. For example, "pre_commit" is
410 run before committing; "post_update" is run after updating.
414 When looking for a command to run for a given action, mr first looks for
415 a parameter with the same name as the action. If that is not found, it
416 looks for a parameter named "rcs_action" (substituting in the name of the
417 revision control system and the action). The name of the revision control
418 system is itself determined by running each defined "rcs_test" action,
421 Internally, mr has settings for "git_update", "svn_update", etc. To change
422 the action that is performed for a given revision control system, you can
423 override these rcs specific actions. To add a new revision control system,
424 you can just add rcs specific actions for it.
426 =head1 UNTRUSTED MRCONFIG FILES
428 Since mrconfig files can contain arbitrary shell commands, they can do
429 anything. This flexibility is good, but it also allows a malicious mrconfig
430 file to delete your whole home directory. Such a file might be contained
431 inside a repository that your main ~/.mrconfig checks out. To
432 avoid worries about evil commands in a mrconfig file, mr defaults to
433 reading all mrconfig files other than the main ~/.mrconfig in untrusted
434 mode. In untrusted mode, mrconfig files are limited to running only known
435 safe commands (like "git clone") in a carefully checked manner.
437 To configure mr to trust other mrconfig files, list them in ~/.mrtrust.
438 One mrconfig file should be listed per line. Either the full pathname
439 should be listed, or the pathname can start with "~/" to specify a file
440 relative to your home directory.
442 =head1 OFFLINE LOG FILE
444 The ~/.mrlog file contains commands that mr has remembered to run later,
445 due to being offline. You can delete or edit this file to remove commands,
446 or even to add other commands for 'mr online' to run. If the file is
447 present, mr assumes it is in offline mode.
451 mr can be extended to support things such as unison and git-svn. Some
452 files providing such extensions are available in /usr/share/mr/. See
453 the documentation in the files for details about using them.
457 mr returns nonzero if a command failed in any of the repositories.
461 Copyright 2007-2011 Joey Hess <joey@kitenet.net>
463 Licensed under the GNU GPL version 2 or higher.
465 http://kitenet.net/~joey/code/mr/
472 use Cwd qw(getcwd abs_path);
474 # things that can happen when mr runs a command
483 my $config_overridden=0;
493 my $directory=getcwd();
495 $ENV{MR_CONFIG}=find_mrconfig();
502 my (@ok, @failed, @skipped);
508 my ($action, $dir, $topdir, $subdir) = @_;
510 if (exists $rcs{$dir}) {
515 foreach my $rcs_test (
517 length $a <=> length $b
520 } grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {
521 my ($rcs)=$rcs_test=~/(.*)_test/;
522 $test="my_$rcs_test() {\n$config{$topdir}{$subdir}{$rcs_test}\n}\n".$test;
523 $test.="if my_$rcs_test; then echo $rcs; fi\n";
525 $test=$config{$topdir}{$subdir}{lib}."\n".$test
526 if exists $config{$topdir}{$subdir}{lib};
528 print "mr $action: running rcs test >>$test<<\n" if $verbose;
533 print STDERR "mr $action: found multiple possible repository types ($rcs) for ".fulldir($topdir, $subdir)."\n";
537 return $rcs{$dir}=undef;
540 return $rcs{$dir}=$rcs;
545 my ($action, $dir, $topdir, $subdir, $is_checkout) = @_;
547 if (exists $config{$topdir}{$subdir}{$action}) {
548 return $config{$topdir}{$subdir}{$action};
555 my $rcs=rcs_test(@_);
558 exists $config{$topdir}{$subdir}{$rcs."_".$action}) {
559 return $config{$topdir}{$subdir}{$rcs."_".$action};
567 my ($topdir, $subdir) = @_;
568 return $subdir =~ /^\// ? $subdir : $topdir.$subdir;
572 my ($action, $dir, $topdir, $subdir, $force_checkout) = @_;
573 my $fulldir=fulldir($topdir, $subdir);
575 $ENV{MR_CONFIG}=$configfiles{$topdir};
576 my $lib=exists $config{$topdir}{$subdir}{lib} ?
577 $config{$topdir}{$subdir}{lib}."\n" : "";
578 my $is_checkout=($action eq 'checkout');
579 my $is_update=($action =~ /update/);
583 foreach my $testname ("skip", "deleted") {
584 my $testcommand=findcommand($testname, $dir, $topdir, $subdir, $is_checkout);
586 if (defined $testcommand) {
587 my $test="set -e;".$lib.
588 "my_action(){ $testcommand\n }; my_action '$action'";
589 print "mr $action: running $testname test >>$test<<\n" if $verbose;
590 my $ret=system($test);
592 if (($? & 127) == 2) {
593 print STDERR "mr $action: interrupted\n";
597 print STDERR "mr $action: $testname test received signal ".($? & 127)."\n";
601 if ($ret >> 8 == 0) {
602 if ($testname eq "deleted") {
604 print STDERR "mr error: $dir should be deleted yet still exists\n";
608 print "mr $action: skip $dir skipped\n" if $verbose;
615 if (! $force_checkout) {
617 print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
621 $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
626 return action("checkout", $dir, $topdir, $subdir);
630 my $command=findcommand($action, $dir, $topdir, $subdir, $is_checkout);
632 if ($is_checkout && ! -d $dir) {
633 print "mr $action: creating parent directory $dir\n" if $verbose;
634 system("mkdir", "-p", $dir);
637 if (! $no_chdir && ! chdir($dir)) {
638 print STDERR "mr $action: failed to chdir to $dir: $!\n";
641 elsif (! defined $command) {
642 my $rcs=rcs_test(@_);
643 if (! defined $rcs) {
644 print STDERR "mr $action: unknown repository type and no defined $action command for $fulldir\n";
648 print STDERR "mr $action: no defined action for $rcs repository $fulldir, skipping\n";
655 $actionmsg="mr $action: $fulldir";
659 $s=~s/^\Q$fulldir\E\/?//;
660 $actionmsg="mr $action: $fulldir (in subdir $s)";
662 print "$actionmsg\n" unless $quiet;
664 my $hookret=hook("pre_$action", $topdir, $subdir);
665 return $hookret if $hookret != OK;
667 $command="set -e; ".$lib.
668 "my_action(){ $command\n }; my_action ".
669 join(" ", map { s/\\/\\\\/g; s/"/\"/g; '"'.$_.'"' } @ARGV);
670 print "mr $action: running >>$command<<\n" if $verbose;
673 my $output = qx/$command 2>&1/;
676 print "$actionmsg\n";
677 print STDERR $output;
681 $ret=system($command);
684 if (($? & 127) == 2) {
685 print STDERR "mr $action: interrupted\n";
689 print STDERR "mr $action: received signal ".($? & 127)."\n";
692 print STDERR "mr $action: failed ($ret)\n" if $verbose;
693 if ($ret >> 8 != 0) {
694 print STDERR "mr $action: command failed\n";
695 if (-e "$ENV{HOME}/.mrlog" && $action ne 'remember') {
696 # recreate original command line to
697 # remember, and avoid recursing
699 @ARGV=('-n', $action, @orig);
700 action("remember", $dir, $topdir, $subdir);
705 print STDERR "mr $action: command died ($ret)\n";
710 if ($is_checkout && ! -d $dir) {
711 print STDERR "mr $action: $dir missing after checkout\n";;
715 my $ret=hook("post_$action", $topdir, $subdir);
716 return $ret if $ret != OK;
718 if (($is_checkout || $is_update)) {
719 my $ret=hook("fixups", $topdir, $subdir);
720 return $ret if $ret != OK;
729 my ($hook, $topdir, $subdir) = @_;
731 my $command=$config{$topdir}{$subdir}{$hook};
732 return OK unless defined $command;
733 my $lib=exists $config{$topdir}{$subdir}{lib} ?
734 $config{$topdir}{$subdir}{lib}."\n" : "";
735 my $shell="set -e;".$lib.
736 "my_hook(){ $command\n }; my_hook";
737 print "mr $hook: running >>$shell<<\n" if $verbose;
740 my $output = qx/$shell 2>&1/;
743 print STDERR $output;
750 if (($? & 127) == 2) {
751 print STDERR "mr $hook: interrupted\n";
755 print STDERR "mr $hook: received signal ".($? & 127)."\n";
766 # run actions on multiple repos, in parallel
776 while (@fhs or @repos) {
777 while ((!$jobs || $running < $jobs) && @repos) {
779 my $repo = shift @repos;
780 pipe(my $outfh, CHILD_STDOUT);
781 pipe(my $errfh, CHILD_STDERR);
783 unless ($pid = fork) {
784 die "mr $action: cannot fork: $!" unless defined $pid;
785 open(STDOUT, ">&CHILD_STDOUT") || die "mr $action cannot reopen stdout: $!";
786 open(STDERR, ">&CHILD_STDERR") || die "mr $action cannot reopen stderr: $!";
791 exit action($action, @$repo);
795 push @active, [$pid, $repo];
796 push @fhs, [$outfh, $errfh];
799 my ($rin, $rout) = ('','');
801 foreach my $fh (@fhs) {
802 next unless defined $fh;
803 vec($rin, fileno($fh->[0]), 1) = 1 if defined $fh->[0];
804 vec($rin, fileno($fh->[1]), 1) = 1 if defined $fh->[1];
806 $nfound = select($rout=$rin, undef, undef, 1);
807 foreach my $channel (0, 1) {
808 foreach my $i (0..$#fhs) {
809 next unless defined $fhs[$i];
810 my $fh = $fhs[$i][$channel];
811 next unless defined $fh;
812 if (vec($rout, fileno($fh), 1) == 1) {
814 if (sysread($fh, $r, 1024) == 0) {
816 $fhs[$i][$channel] = undef;
817 if (! defined $fhs[$i][0] &&
818 ! defined $fhs[$i][1]) {
819 waitpid($active[$i][0], 0);
820 print STDOUT $out[$i][0];
821 print STDERR $out[$i][1];
822 record($active[$i][1], $? >> 8);
824 splice(@active, $i, 1);
829 $out[$i][$channel] .= $r;
837 my $dir=shift()->[0];
842 print "\n" unless $quiet;
844 elsif ($ret == FAILED) {
846 chdir($dir) unless $no_chdir;
847 print STDERR "mr: Starting interactive shell. Exit shell to continue.\n";
848 system((getpwuid($<))[8], "-i");
851 print "\n" unless $quiet;
853 elsif ($ret == SKIPPED) {
856 elsif ($ret == ABORT) {
860 die "unknown exit status $ret";
866 if (! @ok && ! @failed && ! @skipped) {
867 die "mr $action: no repositories found to work on\n";
869 print "mr $action: finished (".join("; ",
870 showstat($#ok+1, "ok", "ok"),
871 showstat($#failed+1, "failed", "failed"),
872 showstat($#skipped+1, "skipped", "skipped"),
873 ).")\n" unless $quiet;
876 print "mr $action: (skipped: ".join(" ", @skipped).")\n" unless $quiet;
879 print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
889 return "$count ".($count > 1 ? $plural : $singular);
894 # an ordered list of repos
897 foreach my $topdir (sort keys %config) {
898 foreach my $subdir (sort keys %{$config{$topdir}}) {
902 order => $config{$topdir}{$subdir}{order},
907 $a->{order} <=> $b->{order}
909 $a->{topdir} cmp $b->{topdir}
911 $a->{subdir} cmp $b->{subdir}
917 my $topdir=$repo->{topdir};
918 my $subdir=$repo->{subdir};
919 my $ret=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
924 # figure out which repos to act on
927 foreach my $repo (repolist()) {
928 my $topdir=$repo->{topdir};
929 my $subdir=$repo->{subdir};
931 next if $subdir eq 'DEFAULT';
932 my $dir=repodir($repo);
934 $dir.="/" unless $dir=~/\/$/;
935 $d.="/" unless $d=~/\/$/;
936 next if $dir ne $d && $dir !~ /^\Q$d\E/;
937 if (defined $max_depth) {
938 my @a=split('/', $dir);
939 my @b=split('/', $d);
940 do { } while (@a && @b && shift(@a) eq shift(@b));
941 next if @a > $max_depth || @b > $max_depth;
943 push @repos, [$dir, $topdir, $subdir];
946 # fallback to find a leaf repo
947 foreach my $repo (reverse repolist()) {
948 my $topdir=$repo->{topdir};
949 my $subdir=$repo->{subdir};
951 next if $subdir eq 'DEFAULT';
952 my $dir=repodir($repo);
954 $dir.="/" unless $dir=~/\/$/;
955 $d.="/" unless $d=~/\/$/;
956 if ($d=~/^\Q$dir\E/) {
957 push @repos, [$dir, $topdir, $subdir];
979 sub is_trusted_config {
980 my $config=shift; # must be abs_pathed already
982 # We always trust ~/.mrconfig.
983 return 1 if $config eq abs_path("$ENV{HOME}/.mrconfig");
985 return 1 if $trust_all;
987 my $trustfile=$ENV{HOME}."/.mrtrust";
990 $trusted{"$ENV{HOME}/.mrconfig"}=1;
991 if (open (TRUST, "<", $trustfile)) {
994 s/^~\//$ENV{HOME}\//;
995 $trusted{abs_path($_)}=1;
1001 return $trusted{$config};
1005 sub is_trusted_repo {
1008 # Tightly limit what is allowed in a repo name.
1009 # No ../, no absolute paths, and no unusual filenames
1010 # that might try to escape to the shell.
1011 return $repo =~ /^[-_.+\/A-Za-z0-9]+$/ &&
1012 $repo !~ /\.\./ && $repo !~ /^\//;
1015 sub is_trusted_checkout {
1018 # To determine if the command is safe, compare it with the
1019 # *_trusted_checkout config settings. Those settings are
1020 # templates for allowed commands, so make sure that each word
1021 # of the command matches the corresponding word of the template.
1024 foreach my $word (split(' ', $command)) {
1026 if ($word=~/^'(.*)'$/) {
1029 elsif ($word=~/^"(.*)"$/) {
1036 foreach my $key (grep { /_trusted_checkout$/ }
1037 keys %{$config{''}{DEFAULT}}) {
1038 my @twords=split(' ', $config{''}{DEFAULT}{$key});
1039 next if @words > @twords;
1043 for (my $c=0; $c < @twords && $match; $c++) {
1044 if ($twords[$c] eq '$url') {
1045 # Match all the typical characters found in
1046 # urls, plus @ which svn can use. Note
1047 # that the "url" might also be a local
1050 defined $words[$c] &&
1051 $words[$c] =~ /^[-_.+:@\/A-Za-z0-9]+$/
1055 elsif ($twords[$c] eq '$repo') {
1056 # If a repo is not specified, assume it
1057 # will be the last path component of the
1058 # url, or something derived from it, and
1060 if (! defined $words[$c] && defined $url) {
1061 ($words[$c])=$url=~/\/([^\/]+)\/?$/;
1065 defined $words[$c] &&
1066 is_trusted_repo($words[$c])
1069 elsif (defined $words[$c] && $words[$c]=~/^($twords[$c])$/) {
1083 my ($err, $file, $line, $url)=@_;
1086 die "$err in untrusted $url line $line\n".
1087 "(To trust this url, --trust-all can be used; but please use caution;\n".
1088 "this can allow arbitrary code execution!)\n";
1091 die "$err in untrusted $file line $line\n".
1092 "(To trust this file, list it in ~/.mrtrust.)\n";
1100 my $bootstrap_url=shift;
1106 if (ref $f eq 'GLOB') {
1112 my $absf=abs_path($f);
1113 if ($loaded{$absf}) {
1118 $trusted=is_trusted_config($absf);
1120 if (! defined $dir) {
1121 ($dir)=$f=~/^(.*\/)[^\/]+$/;
1122 if (! defined $dir) {
1127 $dir=abs_path($dir)."/";
1129 if (! exists $configfiles{$dir}) {
1130 $configfiles{$dir}=$f;
1133 # copy in defaults from first parent
1135 while ($parent=~s/^(.*\/)[^\/]+\/?$/$1/) {
1136 if ($parent eq '/') {
1139 if (exists $config{$parent} &&
1140 exists $config{$parent}{DEFAULT}) {
1141 $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };
1150 print "mr: loading config $f\n" if $verbose;
1151 open($in, "<", $f) || die "mr: open $f: $!\n";
1154 close $in unless ref $f eq 'GLOB';
1162 next if /^\s*\#/ || /^\s*$/;
1163 if (/^\[([^\]]*)\]\s*$/) {
1167 if (! is_trusted_repo($section) ||
1168 $section eq 'ALIAS' ||
1169 $section eq 'DEFAULT') {
1170 trusterror("mr: illegal section \"[$section]\"", $f, $line, $bootstrap_url)
1173 $section=expandenv($section) if $trusted;
1174 if ($section ne 'ALIAS' &&
1175 ! exists $config{$dir}{$section} &&
1176 exists $config{$dir}{DEFAULT}) {
1178 $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} };
1181 elsif (/^(\w+)\s*=\s*(.*)/) {
1186 while (@lines && $lines[0]=~/^\s(.+)/) {
1194 # Untrusted files can only contain a few
1195 # settings in specific known-safe formats.
1196 if ($parameter eq 'checkout') {
1197 if (! is_trusted_checkout($value)) {
1198 trusterror("mr: illegal checkout command \"$value\"", $f, $line, $bootstrap_url);
1201 elsif ($parameter eq 'order') {
1202 # not interpreted as a command, so
1205 elsif ($value eq 'true' || $value eq 'false') {
1206 # skip=true , deleted=true etc are
1210 trusterror("mr: illegal setting \"$parameter=$value\"", $f, $line, $bootstrap_url);
1214 if ($parameter eq "include") {
1215 print "mr: including output of \"$value\"\n" if $verbose;
1216 unshift @lines, `$value`;
1218 print STDERR "mr: include command exited nonzero ($?)\n";
1223 if (! defined $section) {
1224 die "$f line $.: parameter ($parameter) not in section\n";
1226 if ($section eq 'ALIAS') {
1227 $alias{$parameter}=$value;
1229 elsif ($parameter eq 'lib') {
1230 $config{$dir}{$section}{lib}.=$value."\n";
1233 $config{$dir}{$section}{$parameter}=$value;
1234 if ($parameter =~ /.*_(.*)/) {
1235 $knownactions{$1}=1;
1238 $knownactions{$parameter}=1;
1240 if ($parameter eq 'chain' &&
1241 length $dir && $section ne "DEFAULT" &&
1242 -e $dir.$section."/.mrconfig") {
1243 my $ret=system($value);
1245 if (($? & 127) == 2) {
1246 print STDERR "mr: chain test interrupted\n";
1250 print STDERR "mr: chain test received signal ".($? & 127)."\n";
1254 push @toload, $dir.$section."/.mrconfig";
1260 die "$f line $line: parse error\n";
1269 sub startingconfig {
1270 %alias=%config=%configfiles=%knownactions=%loaded=();
1271 my $datapos=tell(DATA);
1273 seek(DATA,$datapos,0); # rewind
1278 # the section to modify or add
1279 my $targetsection=shift;
1280 # fields to change in the section
1281 # To remove a field, set its value to "".
1282 my %changefields=@_;
1288 open(my $in, "<", $f) || die "mr: open $f: $!\n";
1293 my $formatfield=sub {
1295 my @value=split(/\n/, shift);
1297 return "$field = ".shift(@value)."\n".
1298 join("", map { "\t$_\n" } @value);
1302 while ($out[$#out] =~ /^\s*$/) {
1303 unshift @blanks, pop @out;
1305 foreach my $field (sort keys %changefields) {
1306 if (length $changefields{$field}) {
1307 push @out, "$field = $changefields{$field}\n";
1308 delete $changefields{$field};
1318 if (/^\s*\#/ || /^\s*$/) {
1321 elsif (/^\[([^\]]*)\]\s*$/) {
1322 if (defined $section &&
1323 $section eq $targetsection) {
1327 $section=expandenv($1);
1331 elsif (/^(\w+)\s*=\s(.*)/) {
1336 while (@lines && $lines[0]=~/^\s(.+)/) {
1342 if ($section eq $targetsection) {
1343 if (exists $changefields{$parameter}) {
1344 if (length $changefields{$parameter}) {
1345 $value=$changefields{$parameter};
1347 delete $changefields{$parameter};
1351 push @out, $formatfield->($parameter, $value);
1355 if (defined $section &&
1356 $section eq $targetsection) {
1359 elsif (%changefields) {
1360 push @out, "\n[$targetsection]\n";
1361 foreach my $field (sort keys %changefields) {
1362 if (length $changefields{$field}) {
1363 push @out, $formatfield->($field, $changefields{$field});
1368 open(my $out, ">", $f) || die "mr: write $f: $!\n";
1376 # actions that do not operate on all repos
1377 if ($action eq 'help') {
1380 elsif ($action eq 'config') {
1383 elsif ($action eq 'register') {
1386 elsif ($action eq 'bootstrap') {
1389 elsif ($action eq 'remember' ||
1390 $action eq 'offline' ||
1391 $action eq 'online') {
1392 my @repos=selectrepos;
1393 action($action, @{$repos[0]}) if @repos;
1397 if (!$jobs || $jobs > 1) {
1398 mrs($action, selectrepos());
1401 foreach my $repo (selectrepos()) {
1402 record($repo, action($action, @$repo));
1408 exec($config{''}{DEFAULT}{help}) || die "exec: $!";
1413 die "mr config: not enough parameters\n";
1416 if ($section=~/^\//) {
1417 # try to convert to a path relative to the config file
1418 my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
1419 $dir=abs_path($dir);
1420 $dir.="/" unless $dir=~/\/$/;
1421 if ($section=~/^\Q$dir\E(.*)/) {
1427 if (/^([^=]+)=(.*)$/) {
1428 $changefields{$1}=$2;
1432 foreach my $topdir (sort keys %config) {
1433 if (exists $config{$topdir}{$section} &&
1434 exists $config{$topdir}{$section}{$_}) {
1435 print $config{$topdir}{$section}{$_}."\n";
1437 last if $section eq 'DEFAULT';
1441 die "mr config: $section $_ not set\n";
1445 modifyconfig($ENV{MR_CONFIG}, $section, %changefields) if %changefields;
1450 if ($config_overridden) {
1451 # Find the directory that the specified config file is
1453 ($directory)=abs_path($ENV{MR_CONFIG})=~/^(.*\/)[^\/]+$/;
1456 # Find the closest known mrconfig file to the current
1458 $directory.="/" unless $directory=~/\/$/;
1460 foreach my $topdir (reverse sort keys %config) {
1461 next unless length $topdir;
1462 if ($directory=~/^\Q$topdir\E/) {
1463 $ENV{MR_CONFIG}=$configfiles{$topdir};
1469 if (! $foundconfig) {
1470 $directory=""; # no config file, use builtin
1474 my $subdir=shift @ARGV;
1475 if (! chdir($subdir)) {
1476 print STDERR "mr register: failed to chdir to $subdir: $!\n";
1480 $ENV{MR_REPO}=getcwd();
1481 my $command=findcommand("register", $ENV{MR_REPO}, $directory, 'DEFAULT', 0);
1482 if (! defined $command) {
1483 die "mr register: unknown repository type\n";
1486 $ENV{MR_REPO}=~s/.*\/(.*)/$1/;
1487 $command="set -e; ".$config{$directory}{DEFAULT}{lib}."\n".
1488 "my_action(){ $command\n }; my_action ".
1489 join(" ", map { s/\\/\\\\/g; s/"/\"/g; '"'.$_.'"' } @ARGV);
1490 print "mr register: running >>$command<<\n" if $verbose;
1491 exec($command) || die "exec: $!";
1495 my $url=shift @ARGV;
1496 my $dir=shift @ARGV || ".";
1498 if (! defined $url || ! length $url) {
1499 die "mr: bootstrap requires url\n";
1502 # Download the config file to a temporary location.
1503 eval q{use File::Temp};
1505 my $tmpconfig=File::Temp->new();
1506 my @curlargs = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
1507 push(@curlargs, "-k") if $insecure;
1508 my $curlstatus = system(@curlargs);
1509 die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;
1510 die "mr bootstrap: download of $url failed\n" if $curlstatus != 0;
1513 system("mkdir", "-p", $dir);
1515 chdir($dir) || die "chdir $dir: $!";
1517 # Special case to handle checkout of the "." repo, which
1518 # would normally be skipped.
1519 my $topdir=abs_path(".")."/";
1520 my @repo=($topdir, $topdir, ".");
1521 loadconfig($tmpconfig, $topdir, $url);
1522 record(\@repo, action("checkout", @repo, 1))
1523 if exists $config{$topdir}{"."}{"checkout"};
1525 if (-e ".mrconfig") {
1526 print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
1529 eval q{use File::Copy};
1531 move($tmpconfig, ".mrconfig") || die "rename: $!";
1534 # Reload the config file (in case we got a different version)
1535 # and checkout everything else.
1537 loadconfig(".mrconfig");
1538 dispatch("checkout");
1539 @skipped=grep { abs_path($_) ne abs_path($topdir) } @skipped;
1540 showstats("bootstrap");
1544 # alias expansion and command stemming
1547 if (exists $alias{$action}) {
1548 $action=$alias{$action};
1550 if (! exists $knownactions{$action}) {
1551 my @matches = grep { /^\Q$action\E/ }
1552 keys %knownactions, keys %alias;
1553 if (@matches == 1) {
1554 $action=$matches[0];
1556 elsif (@matches == 0) {
1557 die "mr: unknown action \"$action\" (known actions: ".
1558 join(", ", sort keys %knownactions).")\n";
1561 die "mr: ambiguous action \"$action\" (matches: ".
1562 join(", ", @matches).")\n";
1570 while (length $dir) {
1571 if (-e "$dir/.mrconfig") {
1572 return "$dir/.mrconfig";
1574 $dir=~s/\/[^\/]*$//;
1576 return "$ENV{HOME}/.mrconfig";
1581 Getopt::Long::Configure("bundling", "no_permute");
1582 my $result=GetOptions(
1583 "d|directory=s" => sub { $directory=abs_path($_[1]) },
1584 "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
1585 "p|path" => sub { }, # now default, ignore
1586 "v|verbose" => \$verbose,
1587 "q|quiet" => \$quiet,
1588 "s|stats" => \$stats,
1589 "k|insecure" => \$insecure,
1590 "i|interactive" => \$interactive,
1591 "n|no-recurse:i" => \$max_depth,
1592 "j|jobs:i" => \$jobs,
1593 "t|trust-all" => \$trust_all,
1595 if (! $result || @ARGV < 1) {
1596 die("Usage: mr [options] action [params ...]\n".
1597 "(Use mr help for man page.)\n");
1600 $ENV{MR_SWITCHES}="";
1601 foreach my $option (@saved) {
1602 last if $option eq $ARGV[0];
1603 $ENV{MR_SWITCHES}.="$option ";
1609 print STDERR "mr: interrupted\n";
1613 # This can happen if it's run in a directory that was removed
1614 # or other strangeness.
1615 if (! defined $directory) {
1616 die("mr: failed to determine working directory\n");
1618 # Make sure MR_CONFIG is an absolute path, but don't use abs_path since
1619 # the config file might be a symlink to elsewhere, and the directory it's
1620 # in is significant.
1621 if ($ENV{MR_CONFIG} !~ /^\//) {
1622 $ENV{MR_CONFIG}=getcwd()."/".$ENV{MR_CONFIG};
1624 # Try to set MR_PATH to the path to the program.
1626 use FindBin qw($Bin $Script);
1627 $ENV{MR_PATH}=$Bin."/".$Script;
1645 loadconfig("$ENV{HOME}/.mrconfig");
1646 loadconfig($ENV{MR_CONFIG});
1647 #use Data::Dumper; print Dumper(\%config);
1649 my $action=expandaction(shift @ARGV);
1656 # Finally, some useful actions that mr knows about by default.
1657 # These can be overridden in ~/.mrconfig.
1672 echo "mr (warning): $@" >&2
1678 if [ -z "$1" ] || [ -z "$2" ]; then
1679 error "mr: usage: hours_since action num"
1681 for dir in .git .svn .bzr CVS .hg _darcs _FOSSIL_; do
1682 if [ -e "$MR_REPO/$dir" ]; then
1683 flagfile="$MR_REPO/$dir/.mr_last$1"
1687 if [ -z "$flagfile" ]; then
1688 error "cannot determine flag filename"
1690 delta=`perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile"`
1691 if [ "$delta" -lt "$2" ]; then
1699 LANG=C bzr info | egrep -q '^Checkout'
1702 svn_test = test -d "$MR_REPO"/.svn
1703 git_test = test -d "$MR_REPO"/.git
1704 bzr_test = test -d "$MR_REPO"/.bzr
1705 cvs_test = test -d "$MR_REPO"/CVS
1706 hg_test = test -d "$MR_REPO"/.hg
1707 darcs_test = test -d "$MR_REPO"/_darcs
1708 fossil_test = test -f "$MR_REPO"/_FOSSIL_
1710 test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
1711 test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
1712 test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
1714 svn_update = svn update "$@"
1715 git_update = git pull "$@"
1717 if is_bzr_checkout; then
1720 bzr merge --pull "$@"
1722 cvs_update = cvs update "$@"
1723 hg_update = hg pull "$@" && hg update "$@"
1724 darcs_update = darcs pull -a "$@"
1725 fossil_update = fossil pull "$@"
1727 svn_status = svn status "$@"
1728 git_status = git status -s "$@" || true
1729 bzr_status = bzr status --short "$@"
1730 cvs_status = cvs status "$@"
1731 hg_status = hg status "$@"
1732 darcs_status = darcs whatsnew -ls "$@" || true
1733 fossil_status = fossil changes "$@"
1735 svn_commit = svn commit "$@"
1736 git_commit = git commit -a "$@" && git push --all
1738 if is_bzr_checkout; then
1741 bzr commit "$@" && bzr push
1743 cvs_commit = cvs commit "$@"
1744 hg_commit = hg commit -m "$@" && hg push
1745 darcs_commit = darcs record -a -m "$@" && darcs push -a
1746 fossil_commit = fossil commit "$@"
1748 git_record = git commit -a "$@"
1750 if is_bzr_checkout; then
1751 bzr commit --local "$@"
1755 hg_record = hg commit -m "$@"
1756 darcs_record = darcs record -a -m "$@"
1757 fossil_record = fossil commit "$@"
1760 git_push = git push "$@"
1761 bzr_push = bzr push "$@"
1763 hg_push = hg push "$@"
1764 darcs_push = darcs push -a "$@"
1765 fossil_push = fossil push "$@"
1767 svn_diff = svn diff "$@"
1768 git_diff = git diff "$@"
1769 bzr_diff = bzr diff "$@"
1770 cvs_diff = cvs diff "$@"
1771 hg_diff = hg diff "$@"
1772 darcs_diff = darcs diff -u "$@"
1773 fossil_diff = fossil diff "$@"
1775 svn_log = svn log "$@"
1776 git_log = git log "$@"
1777 bzr_log = bzr log "$@"
1778 cvs_log = cvs log "$@"
1779 hg_log = hg log "$@"
1780 darcs_log = darcs changes "$@"
1781 git_bare_log = git log "$@"
1782 fossil_log = fossil timeline "$@"
1787 url=`LC_ALL=C svn info . | grep -i '^URL:' | cut -d ' ' -f 2`
1788 if [ -z "$url" ]; then
1789 error "cannot determine svn url"
1791 echo "Registering svn url: $url in $MR_CONFIG"
1792 mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
1794 url="`LC_ALL=C git config --get remote.origin.url`" || true
1795 if [ -z "$url" ]; then
1796 error "cannot determine git url"
1798 echo "Registering git url: $url in $MR_CONFIG"
1799 mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
1801 url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
1802 if [ -z "$url" ]; then
1803 error "cannot determine bzr url"
1805 echo "Registering bzr url: $url in $MR_CONFIG"
1806 mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr branch '$url' '$MR_REPO'"
1808 repo=`cat CVS/Repository`
1810 if [ -z "$root" ]; then
1811 error "cannot determine cvs root"
1813 echo "Registering cvs repository $repo at root $root"
1814 mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
1816 url=`hg showconfig paths.default`
1817 echo "Registering mercurial repo url: $url in $MR_CONFIG"
1818 mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone '$url' '$MR_REPO'"
1820 url=`cat _darcs/prefs/defaultrepo`
1821 echo "Registering darcs repository $url in $MR_CONFIG"
1822 mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url' '$MR_REPO'"
1824 url="`LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url`" || true
1825 if [ -z "$url" ]; then
1826 error "cannot determine git url"
1828 echo "Registering git url: $url in $MR_CONFIG"
1829 mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"
1831 url=`fossil remote-url`
1832 repo=`fossil info | grep repository | sed -e 's/repository:*.//g' -e 's/ //g'`
1833 echo "Registering fossil repository $url in $MR_CONFIG"
1834 mr -c "$MR_CONFIG" config "`pwd`" checkout="mkdir -p '$MR_REPO' && cd '$MR_REPO' && fossil open '$repo'"
1836 svn_trusted_checkout = svn co $url $repo
1837 svn_alt_trusted_checkout = svn checkout $url $repo
1838 git_trusted_checkout = git clone $url $repo
1839 bzr_trusted_checkout = bzr checkout|clone|branch|get $url $repo
1841 hg_trusted_checkout = hg clone $url $repo
1842 darcs_trusted_checkout = darcs get $url $repo
1843 git_bare_trusted_checkout = git clone --bare $url $repo
1844 # fossil: messy to do
1850 SHOWMANFILE="man -f"
1856 SHOWMANFILE="man -l"
1859 if [ ! -e "$MR_PATH" ]; then
1860 error "cannot find program path"
1862 tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
1863 trap "rm -f $tmp" exit
1864 pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
1865 $SHOWMANFILE "$tmp" || error "man failed"
1871 if [ -s ~/.mrlog ]; then
1872 info "running offline commands"
1873 mv -f ~/.mrlog ~/.mrlog.old
1874 if ! sh -e ~/.mrlog.old; then
1875 error "offline command failed; left in ~/.mrlog.old"
1879 info "no offline commands to run"
1884 info "offline mode enabled"
1886 info "remembering command: 'mr $@'"
1887 command="mr -d '$(pwd)' $MR_SWITCHES"
1889 command="$command '$w'"
1891 if [ ! -e ~/.mrlog ] || ! grep -q -F "$command" ~/.mrlog; then
1892 echo "$command" >> ~/.mrlog
1895 ed = echo "A horse is a horse, of course, of course.."
1896 T = echo "I pity the fool."
1897 right = echo "Not found."
1899 # vim:sw=8:sts=0:ts=8:noet