From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 25 Sep 2015 06:53:05 +0000 (+0000)
Subject: kdevplatform: make subversion plugin compile with subversion 1.9
X-Git-Tag: 4.22.0~980
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb2a2a313e0a37186ecd67dcde72cd12f5777522;p=kde%2Fkde-extraapps.git

kdevplatform: make subversion plugin compile with subversion 1.9

patch from https://git.reviewboard.kde.org/r/124783/
---

diff --git a/kdevplatform/plugins/subversion/kdevsvncpp/client_ls.cpp b/kdevplatform/plugins/subversion/kdevsvncpp/client_ls.cpp
index 6cd79bb4..95fd6cb9 100644
--- a/kdevplatform/plugins/subversion/kdevsvncpp/client_ls.cpp
+++ b/kdevplatform/plugins/subversion/kdevsvncpp/client_ls.cpp
@@ -29,6 +29,7 @@
 #include "svn_client.h"
 #include "svn_path.h"
 #include "svn_sorts.h"
+#include "svn_version.h"
 //#include "svn_utf.h"
 
 // svncpp
@@ -37,6 +38,8 @@
 #include "kdevsvncpp/exception.hpp"
 
 
+#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
+
 static int
 compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
 {
@@ -90,6 +93,72 @@ namespace svn
   }
 }
 
+#else
+
+#include <algorithm>
+
+static svn_error_t* store_entry(
+        void *baton,
+        const char *path,
+        const svn_dirent_t *dirent,
+        const svn_lock_t *,
+        const char *abs_path,
+        const char *,
+        const char *,
+        apr_pool_t *scratch_pool)
+{
+  svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
+  if (path[0] == '\0') {
+    if (dirent->kind == svn_node_file) {
+      // for compatibility with svn_client_ls behaviour, listing a file
+      // stores that file name
+      entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
+    }
+  } else {
+    entries->push_back(svn::DirEntry(path, dirent));
+  }
+  return SVN_NO_ERROR;
+}
+
+static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
+{
+  return svn_path_compare_paths(a.name(), b.name()) < 0;
+}
+
+namespace svn
+{
+  DirEntries
+  Client::list(const char * pathOrUrl,
+               svn_opt_revision_t * revision,
+               bool recurse) throw(ClientException)
+  {
+    Pool pool;
+    DirEntries entries;
+
+    svn_error_t * error =
+      svn_client_list3(pathOrUrl,
+                       revision,
+                       revision,
+                       SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
+                       SVN_DIRENT_ALL,
+                       FALSE, // fetch locks
+                       FALSE, // include externals
+                       &store_entry,
+                       &entries,
+                       *m_context,
+                       pool);
+
+    if (error != SVN_NO_ERROR)
+      throw ClientException(error);
+
+    std::sort(entries.begin(), entries.end(), &sort_by_path);
+
+    return entries;
+  }
+}
+
+#endif
+
 /* -----------------------------------------------------------------
  * local variables:
  * eval: (load-file "../../rapidsvn-dev.el")
diff --git a/kdevplatform/plugins/subversion/kdevsvncpp/dirent.cpp b/kdevplatform/plugins/subversion/kdevsvncpp/dirent.cpp
index f911e913..75dd29cb 100644
--- a/kdevplatform/plugins/subversion/kdevsvncpp/dirent.cpp
+++ b/kdevplatform/plugins/subversion/kdevsvncpp/dirent.cpp
@@ -47,7 +47,7 @@ public:
     {
     }
 
-    Data(const char * _name, svn_dirent_t * dirEntry)
+    Data(const char * _name, const svn_dirent_t * dirEntry)
         : name(_name), kind(dirEntry->kind), size(dirEntry->size),
         hasProps(dirEntry->has_props != 0),
         createdRev(dirEntry->created_rev), time(dirEntry->time)
@@ -78,7 +78,7 @@ public:
   {
   }
 
-  DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
+  DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
       : m(new Data(name, DirEntry))
   {
   }
diff --git a/kdevplatform/plugins/subversion/kdevsvncpp/dirent.hpp b/kdevplatform/plugins/subversion/kdevsvncpp/dirent.hpp
index cabef7ef..2f0f8d8a 100644
--- a/kdevplatform/plugins/subversion/kdevsvncpp/dirent.hpp
+++ b/kdevplatform/plugins/subversion/kdevsvncpp/dirent.hpp
@@ -41,7 +41,7 @@ namespace svn
     /**
      * constructor for existing @a svn_dirent_t entries
      */
-    DirEntry(const char * name, svn_dirent_t * dirEntry);
+    DirEntry(const char * name, const svn_dirent_t * dirEntry);
 
     /**
      * copy constructor