Changeset 1464

Timestamp:

Mar 11, 2012, 8:20:18 AM (12 years ago)

Author:

Peter Johansson

Message:

closes #512

Location:

branches/0.9-stable

Files:

• lib/Directory.cc (modified) (4 diffs)
• test/Makefile.am (modified) (1 diff)
• test/traverse_test.sh (modified) (1 diff)

branches/0.9-stable/lib/Directory.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2012 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -29 +30 @@
 #include "NodeVisitor.h"
 #include "SVN.h"
+#include "SVNinfo.h"
 #include "SVNlog.h"
 #include "TinyStats.h"
@@ -74 +76 @@
 
     SVN* svn=SVN::instance();
+    std::string mother_url = SVNinfo(path).url();
+    assert(mother_url.size());
+    // ensure trailing trailing '/'
+    if (mother_url[mother_url.size()-1]!='/')
+      mother_url.push_back('/');
     for (list<string>::iterator i=entries.begin(); i!=entries.end(); ++i)
       if ((*i)!=string(".") && (*i)!=string("..") && (*i)!=string(".svn")) {
@@ -81 +88 @@
           struct stat nodestat;                // C api from sys/stat.h
           lstat(fullpath,&nodestat);   // C api from sys/stat.h
-          if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
+          if (S_ISDIR(nodestat.st_mode)) {     // C api from sys/stat.h
+            // ignore directory if it is not a daughter of 'path' in repo
+            std::string url = SVNinfo(fullpath).url();
+            if (mother_url != directory_name(url))
+              continue;
             daughters_.push_back(new Directory(level_+1,fullpath,local_path()));
+          }
           else
             daughters_.push_back(new File(level_,fullpath,local_path()));

branches/0.9-stable/test/Makefile.am

@@ -59 +59 @@
 
 # tests not yet passing are listed here
-XFAIL_TESTS = traverse_test.sh
+XFAIL_TESTS =
 
 noinst_HEADERS = Suite.h

branches/0.9-stable/test/traverse_test.sh

@@ -49 +49 @@
 
 $SVN log $rootdir/$daughter
-SVNCOPYRIGHT_run 0 -v -r $rootdir/.svndigest
-$GREP "^Parsing.*$rootdir" stdout || exit_fail
+SVNCOPYRIGHT_run 0 -v -r $rootdir
+$GREP "^Parsing.*$rootdir/.svndigest" stdout || exit_fail
 $GREP "^Parsing.*$rootdir/$daughter" stdout && exit_fail