Changeset 1449

Timestamp:

Dec 22, 2011, 3:11:55 AM (12 years ago)

Author:

Peter Johansson

Message:

refs #387. svncopyright no longer listens to property
svndigest:ignore. New revision (71) in test repo where
svncopyright:ignore was added to dir_to_be ignored.

Location:

trunk

Files:

• lib/CacheCopyer.cc (modified) (2 diffs)
• lib/CopyrightVisitor.cc (modified) (2 diffs)
• lib/Directory.cc (modified) (1 diff)
• lib/Node.cc (modified) (4 diffs)
• lib/Node.h (modified) (2 diffs)
• lib/NodeCounter.cc (modified) (2 diffs)
• lib/NodePrinter.cc (modified) (1 diff)
• lib/SvndigestVisitor.cc (modified) (2 diffs)
• test/copyright2_test.sh (modified) (1 diff)
• test/repo/db/current (modified) (1 diff)
• test/repo/db/revprops/71 (added)
• test/repo/db/revs/71 (added)

trunk/lib/CacheCopyer.cc

@@ -42 +42 @@
   bool CacheCopyer::enter(Directory& dir) 
   {
-    if (dir.ignore())
+    if (dir.svndigest_ignore() && dir.svncopyright_ignore())
       return false;
 
@@ -61 +61 @@
   void CacheCopyer::visit(File& file)
   {
-    if (file.ignore())
+    if (file.svndigest_ignore() && file.svncopyright_ignore())
       return;
     std::string src_file = file.cache_name();

trunk/lib/CopyrightVisitor.cc

@@ -103 +103 @@
   bool CopyrightVisitor::enter(Directory& dir)
   {
-    if (dir.ignore() || dir.svncopyright_ignore())
+    if (dir.svncopyright_ignore())
       return false;
     return true;
@@ -189 +189 @@
   void CopyrightVisitor::visit(File& file)
   {
-    if (file.ignore() || file.svncopyright_ignore())
+    if (file.svncopyright_ignore())
       return;
     update_copyright(file);

trunk/lib/Directory.cc

@@ -94 +94 @@
     stats_.reset();
     for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); ++i)
-      if (!(*i)->ignore()) {
+      if (!(*i)->svndigest_ignore()) {
         stats_ += (*i)->stats();
         (*i)->stats().reset();

trunk/lib/Node.cc

@@ -73 +73 @@
 
   std::string Node::author(void) const
-  { 
-    if (ignore())
-      return svninfo_.last_changed_author(); 
+  {
+    if (svndigest_ignore())
+      return svninfo_.last_changed_author();
     assert(log().commits().size());
     return log().latest_commit().author();
@@ -149 +149 @@
   {
     if (!log_) {
-      if (ignore())
+      if (svndigest_ignore())
         log_ = new SVNlog;
       else {
@@ -180 +180 @@
   bool Node::svncopyright_ignore(void) const
   {
-    return property_.svncopyright_ignore();
+    return property_.svncopyright_ignore() || binary() || link_;
   }
 
@@ -186 +186 @@
   bool Node::svndigest_ignore(void) const
   {
-    return property_.svndigest_ignore();
+    return property_.svndigest_ignore() || binary() || link_;
   }
 

trunk/lib/Node.h

@@ -99 +99 @@
 
     /**
-       @brief Check whether node should be ignored in statistics.
-
-       If a node is to be ignored the statistics implementer should
-       respect this state. Currently binary files and items with
-       property svndigest:ignore are to be ignored by svndigest. If
-       the node is a directory then the direcotry and its siblings
-       should be ignored by statistics.
-
-       @return True of node should be ignored by statistics.
-
-       @see SVNproperty::svndigest_ingorable
-    */
-    inline bool ignore(void) const 
-    { return binary() || svndigest_ignore() || link_; }
-
-    /**
        Create the TinyStats based on the stored CollectionStats
      */
@@ -158 +142 @@
 
     /**
-       @brief Check if item used to create this object has been
-       assigned property svndigest:ignore.
-
-       Currently files with property svndigest:ignore are to be
-       ignored by svndigest. It is the responsibility of the
-       statistics implementer to obey the ignore state.
-
-       @return True if item property svndigest:ignore was set.
+       @brief Check if Node should be ignored by svndigest.
+
+       Binary files and links will be ignored as well as nodes with
+       property svndigest:ignore set to "" as that implies that all
+       revs should be ignored.
+
+       @return True if item property svndigest:ignore was set with
+       empty string or node is binary or link.
+
+       \see SVNpropert::svndigest_ignore()
     */
     bool svndigest_ignore(void) const;

trunk/lib/NodeCounter.cc

@@ -41 +41 @@
   bool NodeCounter::enter(Directory& dir) 
   {
-    if (dir.ignore())
+    if (dir.svndigest_ignore())
       return false;
     ++directories_;
@@ -61 +61 @@
   void NodeCounter::visit(File& file)
   {
-    if (!file.ignore())
+    if (!file.svndigest_ignore())
       ++files_;
   }

trunk/lib/NodePrinter.cc

@@ -86 +86 @@
   void NodePrinter::print(const bool verbose) const
   {
-    if (node().ignore())
+    if (node().svndigest_ignore())
       return;
     if (!Configuration::instance().output_file() && !node().dir())

trunk/lib/SvndigestVisitor.cc

@@ -39 +39 @@
   bool SvndigestVisitor::enter(Directory& dir)
   {
-    if (dir.ignore())
+    if (dir.svndigest_ignore())
       return false;
     return true;
@@ -58 +58 @@
   void SvndigestVisitor::visit(File& file)
   {
-    if (!file.ignore())
+    if (!file.svndigest_ignore())
       file.parse(verbose_, ignore_cache_);
     if (report_) {
       file.init_tiny_stats();
-      if (!file.ignore()) {
+      if (!file.svndigest_ignore()) {
         FilePrinter fp(file);
         fp.print(verbose_);

trunk/test/copyright2_test.sh

@@ -31 +31 @@
 $SVN update $rootdir -r 45
 $SVN update $rootdir/lib
+# to get svncopyright:ignore property
+$SVN update $rootdir/dir_to_be_ignored -r 71
 # cannot use old config file because it's invalid
 $SVN update $rootdir/.svndigest
 
 SVNCOPYRIGHT_run 0 -r $rootdir --ignore-cache --verbose
-rm -rf $rootdir
 
 $GREP '^Parsing.*dir_to_be_ignored' stdout && exit_fail
 
+rm -rf $rootdir
 exit_success;

trunk/test/repo/db/current

@@ -1 @@
-70 2z 4
+71 31 4