From: Dipesh Patel <dipthegeezer.opensource@gmail.com>
Date: Thu, 19 Aug 2010 17:35:54 +0000 (+0100)
Subject: Few tidy ups on Recursive From Directory.
X-Git-Tag: 0.002007~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=commitdiff_plain;h=48227919c0f0a7638453f782af50bdba182fc6f0

Few tidy ups on Recursive From Directory.

Return from callback if in subdir of already git found parent dir. Remove addition of unneeded method.
---

diff --git a/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm b/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
index fe3b43a..96a303d 100644
--- a/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
+++ b/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
@@ -19,38 +19,37 @@ class Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive
     }
 
     method _get_path_for_repository_name (NonEmptySimpleStr $name) {
-        my $path = $self->repo_dir->subdir($name)->resolve;
-        die "Directory traversal prohibited"
-            unless $self->repo_dir->contains($path);
-        return $path;
+      my $path = $self->repo_dir->subdir($name)->resolve;
+      die "Directory traversal prohibited"
+          unless $self->repo_dir->contains($path);
+      return $path;
     }
 
     ## Builders
     method _build_repositories {
-        my @ret = $self->_recurse_directories( $self->repo_dir );
-        return \@ret;
-    }
-
-    method _recurse_directories (Dir $dir) {
-        my @ret;
-        # can't use Dir->recurse since will kep going even if
-        # know its a git repo so will do manually
-        $dir->recurse( 
-            callback => sub {
-                my ( $dir ) = @_;
-                print STDERR Data::Dumper->Dump([$dir]);
-                if ( $dir->is_dir ) {
-                    eval {
-                        # slight hack since get_repo expects string
-                        # prob needs rewrite.
-                        my @list = $dir->dir_list();
-                        my $p = $self->get_repository($list[$#list]);
-                        push @ret, $p;
-                    };
-                }
+      my @ret;
+      my @git_dirs; #don't recurse in here
+      $self->repo_dir->recurse( 
+        callback => sub {
+          my ( $dir ) = @_;
+          if ( $dir->is_dir ) {
+            for my $already_gitted ( @git_dirs ) {
+              # no need to go further if parent is git dir
+              # never have a git repo in a git repo?
+              return if ( $already_gitted->contains( $dir ) );
             }
-        );
-        return @ret;
+            eval {
+              # slight hack since get_repo expects string
+              my @list = $dir->dir_list();
+              my $p = $self->get_repository($list[$#list]);
+              push @ret, $p;
+              push @git_dirs, $dir;
+            };  
+          }
+          return;
+        }
+      );
+      return \@ret;
     }
       
 }                                # end class