Ignore:
Timestamp:
Mar 19, 2012, 8:18:49 AM (9 years ago)
Author:
Peter Johansson
Message:

merge patch release 0.9.5 into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/lib/Directory.cc

    r1449 r1470  
    33/*
    44  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
     5  Copyright (C) 2012 Peter Johansson
    56
    67  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3031#include "NodeVisitor.h"
    3132#include "SVN.h"
     33#include "SVNinfo.h"
    3234#include "SVNlog.h"
    3335#include "TinyStats.h"
     
    6062
    6163    SVN* svn=SVN::instance();
     64    std::string mother_url = SVNinfo(path).url();
     65    assert(mother_url.size());
    6266    for (DirectoryUtil::const_iterator i=dir.begin(); i!=dir.end(); ++i) {
    6367      std::string fn = file_name(i->path());
     
    6670        switch(svn->version_controlled(fullpath)) {
    6771        case SVN::uptodate:
     72          std::cout << "uptodate\n";
    6873          struct stat nodestat;                // C api from sys/stat.h
    6974          lstat(fullpath,&nodestat);   // C api from sys/stat.h
    70           if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
     75          if (S_ISDIR(nodestat.st_mode)) {     // C api from sys/stat.h
     76            // ignore directory if it is not a daughter of 'path' in repo
     77            std::string url = SVNinfo(fullpath).url();
     78            if (mother_url != directory_name(url))
     79              continue;
    7180            daughters_.push_back(new Directory(level_+1,fullpath,local_path()));
     81          }
    7282          else
    7383            daughters_.push_back(new File(level_,fullpath,local_path()));
Note: See TracChangeset for help on using the changeset viewer.