fix register when config file is overridden

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 412209dd530f6c2d5133e868f58b4ce2317081e7..4fc7971f4fcc97ff4c3cc4e8d5d0f19288a12028 100755 (executable)
--- a/mr
+++ b/mr
@@ -167,6 +167,12 @@ Be quiet.
 Expand the statistics line displayed at the end to include information
 about exactly which repositories failed and were skipped, if any.
 
 Expand the statistics line displayed at the end to include information
 about exactly which repositories failed and were skipped, if any.
 

+=item -i
+
+Interactive mode. If a repository fails to be processed, a subshell will be
+started which you can use to resolve or investigate the problem. Exit the
+subshell to continue the mr run.
+

 =item -n [number]
 
 If no number if specified, just operate on the repository for the current
 =item -n [number]
 
 If no number if specified, just operate on the repository for the current


@@ -218,7 +224,9 @@ is an alias, and its value is the action to use.
 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
 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.
+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]")

 
 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",


@@ -333,6 +341,7 @@ my $config_overridden=0;
 my $verbose=0;
 my $quiet=0;
 my $stats=0;
 my $verbose=0;
 my $quiet=0;
 my $stats=0;

+my $interactive=0;

 my $max_depth;
 my $no_chdir=0;
 my $jobs=1;
 my $max_depth;
 my $no_chdir=0;
 my $jobs=1;


@@ -416,6 +425,8 @@ sub action { #{{{
                       $config{$topdir}{$subdir}{lib}."\n" : "";
        my $is_checkout=($action eq 'checkout');
 
                       $config{$topdir}{$subdir}{lib}."\n" : "";
        my $is_checkout=($action eq 'checkout');
 

+       $ENV{MR_REPO}=$dir;
+

        if ($is_checkout) {
                if (-d $dir) {
                        print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
        if ($is_checkout) {
                if (-d $dir) {
                        print "mr $action: $dir already exists, skipping checkout\n" if $verbose;


@@ -430,8 +441,6 @@ sub action { #{{{
                }
        }
 
                }
        }
 

-       $ENV{MR_REPO}=$dir;
-

        my $skiptest=findcommand("skip", $dir, $topdir, $subdir, $is_checkout);
        my $command=findcommand($action, $dir, $topdir, $subdir, $is_checkout);
 
        my $skiptest=findcommand("skip", $dir, $topdir, $subdir, $is_checkout);
        my $command=findcommand($action, $dir, $topdir, $subdir, $is_checkout);
 


@@ -598,6 +607,11 @@ sub record { #{{{
                print "\n";
        }
        elsif ($ret == FAILED) {
                print "\n";
        }
        elsif ($ret == FAILED) {

+               if ($interactive) {
+                       chdir($dir) unless $no_chdir;
+                       print STDERR "mr: Starting interactive shell. Exit shell to continue.\n";
+                       system((getpwuid($<))[8]);
+               }

                push @failed, $dir;
                print "\n";
        }
                push @failed, $dir;
                print "\n";
        }


@@ -705,6 +719,18 @@ sub selectrepos { #{{{
        return @repos;
 } #}}}
 
        return @repos;
 } #}}}
 

+sub expandenv { #{{{
+       my $val=shift;
+       
+
+       if ($val=~/\$/) {
+               $val=`echo "$val"`;
+               chomp $val;
+       }
+       
+       return $val;
+} #}}}
+

 my %loaded;
 sub loadconfig { #{{{
        my $f=shift;
 my %loaded;
 sub loadconfig { #{{{
        my $f=shift;


@@ -765,7 +791,7 @@ sub loadconfig { #{{{
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {

-                       $section=$1;
+                       $section=expandenv($1);

                }
                elsif (/^(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;
                }
                elsif (/^(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;


@@ -888,7 +914,7 @@ sub modifyconfig { #{{{
                                $addfields->();
                        }
 
                                $addfields->();
                        }
 

-                       $section=$1;
+                       $section=expandenv($1);

 
                        push @out, $_;
                }
 
                        push @out, $_;
                }


@@ -1001,7 +1027,9 @@ sub config { #{{{
 } #}}}
 
 sub register { #{{{
 } #}}}
 
 sub register { #{{{

-       if (! $config_overridden) {
+       if ($config_overridden) {
+               ($directory)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
+       } else {

                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;
                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;


@@ -1072,6 +1100,7 @@ sub getopts { #{{{
                "v|verbose" => \$verbose,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,
                "v|verbose" => \$verbose,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,

+               "i|interactive" => \$interactive,

                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,
        );
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,
        );


@@ -1194,7 +1223,7 @@ git_status = git status "$@" || true
 bzr_status = bzr status "$@"
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 bzr_status = bzr status "$@"
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"

-darcs_status = darcs whatsnew -ls "$@"
+darcs_status = darcs whatsnew -ls "$@" || true

 
 svn_commit = svn commit "$@"
 git_commit = git commit -a "$@" && git push --all
 
 svn_commit = svn commit "$@"
 git_commit = git commit -a "$@" && git push --all