getcwd might fail if the working directory is deleted. deal with it.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 0bded236e0e782a267a1d6e2abe5672503197912..59d6a699cf94421b2477fdc4392fb8cb95ef36e6 100755 (executable)
--- a/mr
+++ b/mr
@@ -239,8 +239,7 @@ repositories be processed earlier, and larger values to make repositories
 be processed later.
 
 Note that if a repository is located in a subdirectory of another
 be processed later.
 
 Note that if a repository is located in a subdirectory of another

-repository, ordering it to be processed earlier is not recommended, as this
-can cause confusion during checkouts.
+repository, ordering it to be processed earlier is not recommended.

 
 =item chain
 
 
 =item chain
 


@@ -287,7 +286,6 @@ $SIG{INT}=sub {
 
 $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 my $config_overridden=0;
 
 $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 my $config_overridden=0;

-my $directory=getcwd();

 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;
 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;


@@ -296,6 +294,7 @@ my %config;
 my %configfiles;
 my %knownactions;
 my %alias;
 my %configfiles;
 my %knownactions;
 my %alias;

+my $directory=getcwd();

 
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
 
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(


@@ -311,6 +310,9 @@ if (! $result || @ARGV < 1) {
            "(Use mr help for man page.)\n");
 
 }
            "(Use mr help for man page.)\n");
 
 }

+if (! defined $directory) {
+       die("mr: failed to determine working directory\n");
+}

 
 # 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
 
 # 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


@@ -448,7 +450,7 @@ foreach my $repo (@list) {
 }
 if (! @repos) {
        # fallback to find a leaf repo
 }
 if (! @repos) {
        # fallback to find a leaf repo

-       foreach my $repo (@list) {
+       foreach my $repo (reverse @list) {

                my $topdir=$repo->{topdir};
                my $subdir=$repo->{subdir};
                
                my $topdir=$repo->{topdir};
                my $subdir=$repo->{subdir};