Merge branch 'master' into mrconfig_bestguess

diff --combined mr
index 14f41656fee0844aac030602aea22c059e0ba0d2,53f7a068c9b437efd249a1de87f9699aab4db459..19c29aa68f064595d5e4aa6c421ddbf383d0e4c1
--- 1/mr
--- 2/mr
+++ b/mr
@@@ -195,11 -195,8 +195,11 @@@ environment, where any additional param
  "$@". The "checkout" command is run in the parent of the repository
  directory, since the repository isn't checked out yet. All other commands
  are run inside the repository, though not necessarily at the top of it.
 +
  The "MR_REPO" environment variable is set to the path to the top of the
 -repository, and "MR_CONFIG" is set to the topmost .mrconfig file used.
 +repository, and "MR_CONFIG" is set to the .mrconfig file that defines the
 +repo being acted on, or, if the repo is not yet in a config file, the
 +.mrconfig file that mr thinks it should be added to.
  
  A few parameters have special meanings:
  
@@@ -269,14 -266,13 +269,14 @@@ my $verbose=0
  my $stats=0;
  my $no_recurse=0;
  my %config;
 +my %configfiles;
  my %knownactions;
  my %alias;
  
  Getopt::Long::Configure("no_permute");
  my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
-       "c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) },
+       "c|config=s" => \$ENV{MR_CONFIG},
        "v|verbose" => \$verbose,
        "s|stats" => \$stats,
        "n|no-recurse" => \$no_recurse,
@@@ -287,6 -283,13 +287,13 @@@ if (! $result || @ARGV < 1) 
  
  }
  
+ # Make sure MR_CONFIG is an absolute path, but don't use abs_path since
+ # the config file might be a symlink to elsewhere, and the directory it's
+ # in is significant.
+ if ($ENV{MR_CONFIG} !~ /^\//) {
+       $ENV{MR_CONFIG}=getcwd()."/".$ENV{MR_CONFIG};
+ }
+ 
  loadconfig(\*DATA);
  loadconfig($ENV{MR_CONFIG});
  #use Data::Dumper;
@@@ -329,6 -332,8 +336,8 @@@ elsif ($action eq 'config') 
        if ($section=~/^\//) {
                # try to convert to a path relative to the config file
                my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
+               $dir=abs_path($dir);
+               $dir.="/" unless $dir=~/\/$/;
                if ($section=~/^\Q$dir\E(.*)/) {
                        $section=$1;
                }
@@@ -403,10 -408,9 +412,10 @@@ foreach my $repo (@repos) 
  
  sub action { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
 -      
 -      my $lib= exists $config{$topdir}{$subdir}{lib} ?
 -                      $config{$topdir}{$subdir}{lib}."\n" : "";
 +
 +      $ENV{MR_CONFIG}=$configfiles{$topdir};
 +      my $lib=exists $config{$topdir}{$subdir}{lib} ?
 +                     $config{$topdir}{$subdir}{lib}."\n" : "";
  
        if (exists $config{$topdir}{$subdir}{deleted}) {
                my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted};
@@@ -651,9 -655,6 +660,9 @@@ sub loadconfig { #{{
                        else {
                                $config{$dir}{$section}{$parameter}=$value;
                                $knownactions{$parameter}=1;
 +                              if (! exists $configfiles{$dir}) {
 +                                      $configfiles{$dir}=abs_path($f);
 +                              }
                                if ($parameter eq 'chain' &&
                                    length $dir && $section ne "DEFAULT" &&
                                    -e $dir.$section."/.mrconfig") {
@@@ -879,22 -880,31 +888,31 @@@ register 
                if [ -z "$url" ]; then
                        error "cannot determine svn url"
                fi
 -              echo "Registering svn url: $url"
 +              echo "Registering svn url: $url in $MR_CONFIG"
                mr -c "$MR_CONFIG" config "$(pwd)" checkout="svn co $url $basedir"
        elif [ -d .git ]; then
                url=$(LANG=C git-config --get remote.origin.url)
                if [ -z "$url" ]; then
                        error "cannot determine git url"
                fi
 -              echo "Registering git url: $url"
 +              echo "Registering git url: $url in $MR_CONFIG"
                mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir"
        elif [ -d .bzr ]; then
                url=$(cat .bzr/branch/parent)
                if [ -z "$url" ]; then
                        error "cannot determine bzr url"
                fi
 -              echo "Registering bzr url: $url"
 +              echo "Registering bzr url: $url in $MR_CONFIG"
                mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir"
+       elif [ -d CVS ]; then
+               repo=$(cat CVS/Repository)
+               root=$(cat CVS/Root)
+               if [ -z "$root" ]; then
+                       error "cannot determine cvs root"
+               fi
+               echo "Registering cvs repository $repo at root $root"
+               mr -c "$MR_CONFIG" config "$(pwd)" \
+                       checkout="cvs -d '$root' co -d $basedir $repo"
        else
                error "unable to register this repo type"
        fi