[Cmake-commits] [cmake-commits] king committed cmCTestUpdateHandler.cxx 1.54 1.55

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv20567/Source/CTest

Modified Files:
	cmCTestUpdateHandler.cxx 
Log Message:
ENH: Refactor quoting of VCS tool command

Previously we pre-quoted the command line tool path.  This avoids it by
quoting the command everywhere it is used, thus preserving access to the
original, unquoted command.


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.54
retrieving revision 1.55
diff -C 2 -d -r1.54 -r1.55
*** cmCTestUpdateHandler.cxx	17 Feb 2009 16:37:18 -0000	1.54
--- cmCTestUpdateHandler.cxx	23 Feb 2009 20:59:39 -0000	1.55
***************
*** 462,467 ****
    bool res = true;
  
-   updateCommand = "\"" + updateCommand + "\"";
- 
    // First, check what the current state of repository is
    std::string command = "";
--- 462,465 ----
***************
*** 472,476 ****
      break;
    case cmCTestUpdateHandler::e_SVN:
!     command = updateCommand + " cleanup";
      break;
      }
--- 470,474 ----
      break;
    case cmCTestUpdateHandler::e_SVN:
!     command = "\"" + updateCommand + "\" cleanup";
      break;
      }
***************
*** 514,518 ****
      break;
    case cmCTestUpdateHandler::e_SVN:
!     command = updateCommand + " info";
      break;
      }
--- 512,516 ----
      break;
    case cmCTestUpdateHandler::e_SVN:
!     command = "\"" + updateCommand + "\" info";
      break;
      }
***************
*** 599,603 ****
        {
      case cmCTestUpdateHandler::e_CVS:
!       command = updateCommand + " -z3 update " + updateOptions +
          " " + extra_update_opts;
        ofs << "* Update repository: " << std::endl;
--- 597,601 ----
        {
      case cmCTestUpdateHandler::e_CVS:
!       command = "\"" + updateCommand + "\" -z3 update " + updateOptions +
          " " + extra_update_opts;
        ofs << "* Update repository: " << std::endl;
***************
*** 611,615 ****
          {
          std::string partialOutput;
!         command = updateCommand + " update " + updateOptions +
            " " + extra_update_opts;
          ofs << "* Update repository: " << std::endl;
--- 609,613 ----
          {
          std::string partialOutput;
!         command = "\"" + updateCommand + "\" update " + updateOptions +
            " " + extra_update_opts;
          ofs << "* Update repository: " << std::endl;
***************
*** 621,625 ****
          ofs << "  Errors: " << errors.c_str() << std::endl;
          goutput = partialOutput;
!         command = updateCommand + " status";
          ofs << "* Status repository: " << std::endl;
          ofs << "  Command: " << command.c_str() << std::endl;
--- 619,623 ----
          ofs << "  Errors: " << errors.c_str() << std::endl;
          goutput = partialOutput;
!         command = "\"" + updateCommand + "\" status";
          ofs << "* Status repository: " << std::endl;
          ofs << "  Command: " << command.c_str() << std::endl;
***************
*** 773,777 ****
            {
          case cmCTestUpdateHandler::e_CVS:
!           logcommand = updateCommand + " -z3 log -N \"" + file + "\"";
            break;
          case cmCTestUpdateHandler::e_SVN:
--- 771,775 ----
            {
          case cmCTestUpdateHandler::e_CVS:
!           logcommand = "\""+updateCommand+"\" -z3 log -N \"" + file + "\"";
            break;
          case cmCTestUpdateHandler::e_SVN:
***************
*** 780,784 ****
              {
              cmOStringStream logCommandStream;
!             logCommandStream << updateCommand << " log -r "
                << svn_current_revision << ":" << svn_latest_revision
                << " --xml \"" << file << "\"";
--- 778,782 ----
              {
              cmOStringStream logCommandStream;
!             logCommandStream << "\"" << updateCommand << "\" log -r "
                << svn_current_revision << ":" << svn_latest_revision
                << " --xml \"" << file << "\"";
***************
*** 787,792 ****
            else
              {
!             logcommand = updateCommand +
!               " status  --verbose \"" + file + "\"";
              svn_use_status = 1;
              }
--- 785,790 ----
            else
              {
!             logcommand = "\"" + updateCommand +
!               "\" status  --verbose \"" + file + "\"";
              svn_use_status = 1;
              }