[main] Rewrite rootcp in C++

io/io/src/TDirectoryFile.cxx

@@ -1258,7 +1258,9 @@ TFile *TDirectoryFile::OpenFile(const char *name, Option_t *option,const char *f
 /// Create a sub-directory "a" or a hierarchy of sub-directories "a/b/c/...".
 ///
 /// @param name the name or hierarchy of the subdirectory ("a" or "a/b/c")
-/// @param title the title
+/// @param title the title of the directory. For hierarchies, this is only applied
+/// to the innermost directory (so if `name == "a/b/c"` and `title == "my dir"`,
+/// only `c` will have the title `"my dir"`).
 /// @param returnExistingDirectory if key-name is already existing, the returned
 /// value points to preexisting sub-directory if true and to `nullptr` if false.
 /// @return a pointer to the created sub-directory, not to the top sub-directory
@@ -1284,10 +1286,11 @@ TDirectory *TDirectoryFile::mkdir(const char *name, const char *title, Bool_t re
       TDirectoryFile *tmpdir = nullptr;
       GetObject(workname.Data(), tmpdir);
       if (!tmpdir) {
-         tmpdir = (TDirectoryFile*)mkdir(workname.Data(),title);
+         // We give all intermediate directories a default title, as `title` is only given to the innermost dir.
+         tmpdir = (TDirectoryFile *)mkdir(workname.Data(), workname.Data());
          if (!tmpdir) return nullptr;
       }
-      return tmpdir->mkdir(slash + 1);
+      return tmpdir->mkdir(slash + 1, title, returnExistingDirectory);
    }
 
    TDirectory::TContext ctxt(this);

io/io/test/TFileTests.cxx

@@ -5,6 +5,8 @@
 
 #include "gtest/gtest.h"
 
+#include <ROOT/TestSupport.hxx>
+
 #include "TFile.h"
 #include "TMemFile.h"
 #include "TDirectory.h"
@@ -280,6 +282,28 @@ TEST(TDirectoryFile, SeekParent)
    EXPECT_EQ(dir11->GetSeekParent(), 239);
 }
 
+TEST(TDirectoryFile, RecursiveMkdir)
+{
+   TMemFile f("mkdirtest.root", "RECREATE");
+   auto dir1 = f.mkdir("a/b/c", "my dir");
+   EXPECT_NE(dir1, nullptr);
+   {
+      ROOT::TestSupport::CheckDiagsRAII diags;
+      diags.requiredDiag(kError, "TDirectoryFile::mkdir","An object with name c exists already");
+      auto dir2 = f.mkdir("a/b/c", "", /* returnExisting = */ false);
+      EXPECT_EQ(dir2, nullptr);
+   }
+   auto dir3 = f.mkdir("a/b/c", "foobar", /* returnExisting = */ true);
+   EXPECT_EQ(dir3, dir1);
+   EXPECT_STREQ(dir3->GetTitle(), "my dir");
+   auto dirB = dir3->GetMotherDir();
+   ASSERT_NE(dirB, nullptr);
+   EXPECT_STREQ(dirB->GetTitle(), "b");
+   auto dirA = dirB->GetMotherDir();
+   ASSERT_NE(dirA, nullptr);
+   EXPECT_STREQ(dirA->GetTitle(), "a");
+}
+
 // https://its.cern.ch/jira/browse/ROOT-10581
 TEST(TFile, PersistTObjectStdArray)
 {

main/CMakeLists.txt

@@ -136,6 +136,7 @@ add_dependencies(rootcint rootcint)
 if (TARGET Gui)
   ROOT_EXECUTABLE(rootbrowse src/rootbrowse.cxx LIBRARIES RIO Core Rint Gui)
 endif()
+ROOT_EXECUTABLE(rootcp src/rootcp.cxx LIBRARIES RIO Tree Core Rint)
 ROOT_EXECUTABLE(rootls src/rootls.cxx LIBRARIES RIO Tree Core Rint ROOTNTuple)
 
 ROOT_ADD_TEST_SUBDIRECTORY(test)

main/python/cmdLineUtils.py

@@ -13,11 +13,11 @@
 # http://stackoverflow.com/questions/4675728/redirect-stdout-to-a-file-in-python/22434262#22434262
 # Thanks J.F. Sebastian !!
 
 from contextlib import contextmanager
 import os
 import sys
 from time import sleep
 from itertools import zip_longest
 
 def fileno(file_or_fd):
     """
@@ -81,10 +81,10 @@
 ROOT.PyConfig.IgnoreCommandLineOptions = True
 ROOT.gROOT.GetVersion()
 
 import argparse
 import glob
 import fnmatch
 import logging
 
 LOG_FORMAT = "%(levelname)s: %(message)s"
 logging.basicConfig(format=LOG_FORMAT)
@@ -328,12 +328,12 @@
     Open a ROOT file (like openROOTFile) with the possibility
     to change compression settings
     """
     if compress != None and os.path.isfile(fileName):
         logging.warning("can't change compression settings on existing file")
         return None
     mode = "recreate" if recreate else "update"
     theFile = openROOTFile(fileName, mode)
     if compress != None:
         theFile.SetCompressionSettings(compress)
     return theFile
 
@@ -783,52 +783,6 @@
 # End of help strings
 ##########
 
-##########
-# ROOTCP
-
-
-def _copyObjects(fileName, pathSplitList, destFile, destPathSplit, oneFile, recursive, replace):
-    retcode = 0
-    destFileName = destFile.GetName()
-    rootFile = openROOTFile(fileName) if fileName != destFileName else destFile
-    if not rootFile:
-        return 1
-    ROOT.gROOT.GetListOfFiles().Remove(rootFile)  # Fast copy necessity
-    for pathSplit in pathSplitList:
-        oneSource = oneFile and len(pathSplitList) == 1
-        retcode += copyRootObject(rootFile, pathSplit, destFile, destPathSplit, oneSource, recursive, replace)
-    if fileName != destFileName:
-        rootFile.Close()
-    return retcode
-
-
-def rootCp(sourceList, destFileName, destPathSplit, compress=None, recreate=False, recursive=False, replace=False):
-    # Check arguments
-    if sourceList == [] or destFileName == "":
-        return 1
-    if recreate and destFileName in [n[0] for n in sourceList]:
-        logging.error("cannot recreate destination file if this is also a source file")
-        return 1
-
-    # Open destination file
-    destFile = openROOTFileCompress(destFileName, compress, recreate)
-    if not destFile:
-        return 1
-    ROOT.gROOT.GetListOfFiles().Remove(destFile)  # Fast copy necessity
-
-    # Loop on the root files
-    retcode = 0
-    for fileName, pathSplitList in sourceList:
-        retcode += _copyObjects(
-            fileName, pathSplitList, destFile, destPathSplit, len(sourceList) == 1, recursive, replace
-        )
-    destFile.Close()
-    return retcode
-
-
-# End of ROOTCP
-##########
-
 ##########
 # ROOTEVENTSELECTOR