add removeNamespace, getParentKey

src/tools/kdb/cmdline.cpp

@@ -563,6 +563,26 @@ kdb::Key Cmdline::createKey (int pos, bool allowCascading) const
 	return root;
 }
 
+
+/**
+ * @brief return a parent key to use with kdbGet/kdbSet
+ *
+ * @param key the key of interest
+ *
+ * @return a newly created key to use with kdbGet/kdbSet. If -f was specified, a simple copy will be returned, otherwise a copy without a namespace will be returned.
+ */
+kdb::Key Cmdline::getParentKey (kdb::Key const & key) const
+{
+	if (force)
+	{
+		return key.dup ();
+	}
+	else
+	{
+		return removeNamespace (key);
+	}
+}
+
 /**
  * @brief resolve the bookmark with the given name
  *

src/tools/kdb/cmdline.hpp

@@ -93,6 +93,7 @@ class Cmdline
 	std::string profile;
 
 	kdb::Key createKey (int pos, bool allowCascading = true) const;
+	kdb::Key getParentKey (kdb::Key const & key) const;
 	kdb::Key resolveBookmark (std::string name) const;
 
 	kdb::KeySet getPluginsConfig (std::string basepath = "user:/") const;

src/tools/kdb/mergehelper.cpp

@@ -143,6 +143,18 @@ Key prependNamespace (Key const & root, std::string const & ns)
 	return ret;
 }
 
+Key removeNamespace (Key const & root)
+{
+	Key ret = root.dup ();
+	if (!ret.isCascading ())
+	{
+		string keyName = ret.getName ();
+		string cascadingName = keyName.substr (keyName.find(":") + 1);
+		ret.setName (cascadingName);
+	}
+	return ret;
+}
+
 void applyMeta (KeySet & imported, KeySet const & base)
 {
 	for (auto k : imported)

src/tools/kdb/mergehelper.hpp

@@ -20,6 +20,7 @@ using namespace kdb::tools::merging;
 
 kdb::KeySet prependNamespace (kdb::KeySet const & resultKeys, std::string const & ns);
 kdb::Key prependNamespace (kdb::Key const & root, std::string const & ns);
+kdb::Key removeNamespace (kdb::Key const & root);
 void applyMeta (kdb::KeySet & imported, kdb::KeySet const & base);
 
 class MergeHelper