File indexing completed on 2024-05-12 17:16:21

 /***************************************************************************
  *   Copyright (C) 2005-2009 by Rajko Albrecht  ral@alwins-world.de        *
  *   http://kdesvn.alwins-world.de/                                        *
  *                                                                         *
  * This program is free software; you can redistribute it and/or           *
  * modify it under the terms of the GNU Lesser General Public              *
  * License as published by the Free Software Foundation; either            *
  * version 2.1 of the License, or (at your option) any later version.      *
  *                                                                         *
  * This program is distributed in the hope that it will be useful,         *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
  * Lesser General Public License for more details.                         *
  *                                                                         *
  * You should have received a copy of the GNU Lesser General Public        *
  * License along with this program (in the file LGPL.txt); if not,         *
  * write to the Free Software Foundation, Inc., 51 Franklin St,            *
  * Fifth Floor, Boston, MA  02110-1301  USA                                *
  *                                                                         *
  * This software consists of voluntary contributions made by many          *
  * individuals.  For exact contribution history, see the revision          *
  * history and logs, available at http://kdesvn.alwins-world.de.           *
  ***************************************************************************/
 #include "client_impl.h"
 
 // subversion api
 #include <svn_client.h>
 
 #include "exception.h"
 #include "pool.h"
 #include "targets.h"
 #include "svnqt_defines.h"
 #include "helper.h"
 #include "client_parameter.h"
 
 #include <QDebug>
 
 namespace svn
 {
 
 void Client_impl::merge_reintegrate(const MergeParameter &parameters)
 {
     Pool pool;
     svn_error_t *error = nullptr;
     error = svn_client_merge_reintegrate(parameters.path1().cstr(),
                                          parameters.peg().revision(),
                                          parameters.localPath().cstr(),
                                          parameters.dry_run(),
                                          parameters.merge_options().array(pool),
                                          *m_context,
                                          pool
                                         );
     if (error != nullptr) {
         throw ClientException(error);
     }
 }
 
 void Client_impl::merge(const MergeParameter &parameters)
 {
     Pool pool;
     svn_error_t *error = nullptr;
     if (parameters.reintegrate()) {
         merge_reintegrate(parameters);
     } else {
       // todo svn 1.8: svn_client_merge5
         error =
             svn_client_merge4
             (parameters.path1().cstr(),
              parameters.revision1().revision(),
              parameters.path2().cstr(),
              parameters.revision2().revision(),
              parameters.localPath().cstr(),
              internal::DepthToSvn(parameters.depth()),
              !parameters.notice_ancestry(),
              parameters.force(),
              parameters.record_only(),
              parameters.dry_run(),
              parameters.allow_mixed_rev(),
              parameters.merge_options().array(pool),
              *m_context,
              pool);
     }
 
     if (error != nullptr) {
         throw ClientException(error);
     }
 }
 
 void Client_impl::merge_peg(const MergeParameter &parameters)
 {
     Pool pool;
     internal::RevisionRangesToHash _rhash(parameters.revisions());
 
     // todo svn 1.8: svn_client_merge_peg5
     svn_error_t *error =
         svn_client_merge_peg4
         (
             parameters.path1().cstr(),
             _rhash.array(pool),
             parameters.peg(),
             parameters.localPath().cstr(),
             internal::DepthToSvn(parameters.depth()),
             !parameters.notice_ancestry(),
             parameters.force(),
             parameters.record_only(),
             parameters.dry_run(),
             parameters.allow_mixed_rev(),
             parameters.merge_options().array(pool),
             *m_context,
             pool
         );
     if (error != nullptr) {
         throw ClientException(error);
     }
 }
 }