Add missing calls to svn_stream_close().

[svn-all-fast-export.git] / src / svn.cpp

diff --git a/src/svn.cpp b/src/svn.cpp
index 4062f31a3d7e097f28dbde523dd4bdc650f59cb0..5236579600af2babf06a558823d88e3e927d3bb4 100644 (file)
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -271,6 +271,8 @@ static int dumpBlob(Repository::Transaction *txn, svn_fs_root_t *fs_root,
     // open a generic svn_stream_t for the QIODevice
     out_stream = streamForDevice(io, dumppool);
     SVN_ERR(svn_stream_copy(in_stream, out_stream, dumppool));
+    svn_stream_close(out_stream);
+    svn_stream_close(in_stream);
 
     // print an ending newline
     io->putChar('\n');
@@ -479,7 +481,7 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change
         }
 
         current += '/';
-        qDebug() << "   " << key << "was copied from" << path_from;
+        qDebug() << "   " << key << "was copied from" << path_from << "rev" << rev_from;
     }
 
     // find the first rule that matches this pathname
@@ -512,8 +514,8 @@ int SvnRevision::exportDispatch(const char *key, const svn_fs_path_change_t *cha
     switch (rule.action) {
     case Rules::Match::Ignore:
         // ignore rule
-        qDebug() << "   " << qPrintable(current) << "rev" << revnum
-                 << "-> ignored (rule" << rule << ")";
+        //qDebug() << "   " << qPrintable(current) << "rev" << revnum
+        //         << "-> ignored (rule" << rule << ")";
         return EXIT_SUCCESS;
 
     case Rules::Match::Recurse:
@@ -631,6 +633,9 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change,
         apr_hash_this(i, &vkey, NULL, &value);
 
         svn_fs_dirent_t *dirent = reinterpret_cast<svn_fs_dirent_t *>(value);
+        if (dirent->kind != svn_node_dir)
+            continue;           // not a directory, so can't recurse; skip
+
         QByteArray entry = path + QByteArray("/") + dirent->name;
         QByteArray entryFrom;
         if (path_from)