Changeset 10470

Timestamp:

01/03/11 03:54:12 (2 years ago)

Author:

GeorgeClark

Message:

Item9238: Locate git root of repository

File:

• trunk/RepositoryPlugin/lib/Foswiki/Plugins/RepositoryPlugin.pm (modified) (5 diffs)

trunk/RepositoryPlugin/lib/Foswiki/Plugins/RepositoryPlugin.pm

@@ -160 +160 @@
     my $texit;
 
+    my $repoRoot = _findRepoRoot ( $absfile );
+    return "*Unable to find git root:* =$absfile= " unless ($repoRoot);
+
+    my $repoLoc = "--git-dir=$repoRoot/.git --work-tree=$repoRoot";
+
     (my $topicStatus, $texit) = 
-      Foswiki::Sandbox->sysCommand( "$gitbin status --porcelain  $absfile ",
+      Foswiki::Sandbox->sysCommand( "$gitbin $repoLoc status --porcelain  $absfile ",
              );
 
@@ -178 +183 @@
 
     (my $topicinfo, $texit) = 
-      Foswiki::Sandbox->sysCommand( "$gitbin log -1  $absfile ",
+      Foswiki::Sandbox->sysCommand( "$gitbin $repoLoc log -1  $absfile ",
              );
 
     my $report =
-        "*Repo file:* =$absfile= \n\n";
+        "*Repo file:* =$absfile= \n\n*Repo root:* $repoRoot\n\n";
  
     $report .= "*File Status:* ($topicStatus) - $status\n\n";
@@ -195 +200 @@
 
     my ( $gitinfo, $gexit ) =
-      Foswiki::Sandbox->sysCommand( "$gitbin svn info ",
+      Foswiki::Sandbox->sysCommand( "$gitbin $repoLoc svn info ",
              );
 
@@ -201 +206 @@
 
     my ( $svninfo, $sexit ) =
-      Foswiki::Sandbox->sysCommand( "$svnbin info ",
+      Foswiki::Sandbox->sysCommand( "$svnbin $repoLoc info ",
              );
     $repoInfo{type} = 'svn' unless ($sexit || $svninfo =~ m/not a working copy/);
@@ -272 +277 @@
 }
 
+sub _findRepoRoot {
+
+    my $repoFile = shift;    # full path of a file in repo
+
+    my ($vol, $dir, $file) = File::Spec->splitpath( $repoFile );
+    my @dirs = File::Spec->splitdir( $dir );
+    my $repoRoot;
+
+    while ( scalar @dirs > 1 ) {
+       $repoRoot = File::Spec->catdir( @dirs ); 
+       #print STDERR "Trying $repoRoot \n";
+       last if (-d "$repoRoot/.git");
+       pop(@dirs);
+    }
+
+    return $repoRoot if (-d "$repoRoot/.git");
+
+    return 0;
+}
+
 1;
 __END__