[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/vcs
From:       Evgeniy Ivanov <pfx.kde () gmail ! com>
Date:       2008-07-12 16:03:14
Message-ID: 1215878594.141048.31509.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 831398 by eivanov:

VcsLocation should be used for repo variables (instead of QString)


 M  +6 -6      dvcs/dvcsplugin.cpp  
 M  +4 -4      dvcs/dvcsplugin.h  
 M  +10 -10    interfaces/idistributedversioncontrol.h  


--- trunk/KDE/kdevplatform/vcs/dvcs/dvcsplugin.cpp #831397:831398
@@ -228,22 +228,22 @@
 }
 
 KDevelop::VcsJob*
-        DistributedVersionControlPlugin::clone(const QString& repositoryLocationSrc,
+        DistributedVersionControlPlugin::clone(const VcsLocation& localOrRepoLocationSrc,
                                                const KUrl& localRepositoryRoot)
 {
     return d->m_exec->empty_cmd();
 }
 
 KDevelop::VcsJob*
-        DistributedVersionControlPlugin::pull(const QString& repositoryLocation,
-                                              const KUrl& localRepositoryLocation)
+        DistributedVersionControlPlugin::push(const KUrl& localRepositoryLocation,
+                                              const VcsLocation& localOrRepoLocationDst)
 {
     return d->m_exec->empty_cmd();
 }
 
 KDevelop::VcsJob*
-        DistributedVersionControlPlugin::push(const KUrl& localRepositoryLocation,
-                                              const QString& repositoryLocation)
+        DistributedVersionControlPlugin::pull(const VcsLocation& localOrRepoLocationSrc,
+                                              const KUrl& localRepositoryLocation)
 {
     return d->m_exec->empty_cmd();
 }
@@ -450,4 +450,4 @@
          return "org.kdevelop.DVCSview";
 }
 
-#endif
\ No newline at end of file
+#endif
--- trunk/KDE/kdevplatform/vcs/dvcs/dvcsplugin.h #831397:831398
@@ -95,12 +95,12 @@
 
     // Begin:  KDevelop::IDistributedVersionControl
     virtual VcsJob* init(const KUrl& localRepositoryRoot);
-    virtual VcsJob* clone(const QString& repositoryLocationSrc,
+    virtual VcsJob* clone(const VcsLocation& localOrRepoLocationSrc,
                           const KUrl& localRepositoryRoot);
-    virtual VcsJob* pull(const QString& repositoryLocation,
+    virtual VcsJob* push(const KUrl& localRepositoryLocation,
+                         const VcsLocation& localOrRepoLocationDst);
+    virtual VcsJob* pull(const VcsLocation& localOrRepoLocationSrc,
                          const KUrl& localRepositoryLocation);
-    virtual VcsJob* push(const KUrl& localRepositoryLocation,
-                 const QString& repositoryLocation);
     // End:  KDevelop::IDistributedVersionControl
 
     IDVCSexecutor* proxy();
--- trunk/KDE/kdevplatform/vcs/interfaces/idistributedversioncontrol.h #831397:831398
@@ -44,37 +44,37 @@
     /**
      * Create a new repository inside the given local directory.
      */
-    virtual VcsJob* init( const KUrl& localRepositoryRoot ) = 0;
+    virtual VcsJob* init(const KUrl& localRepositoryRoot) = 0;
 
     /**
      * Create a new repository by cloning another one into a newly created
      * local directory, including all of the other repository's history.
      *
-     * @param repositoryLocation The repository that will be cloned.
+     * @param localOrRepoLocationSrc The repository that will be cloned.
      * @param localRepositoryRoot The root folder of the newly created repository.
      */
-    virtual VcsJob* clone( const QString& repositoryLocationSrc,
-                           const KUrl& localRepositoryRoot ) = 0;
+    virtual VcsJob* clone(const VcsLocation& localOrRepoLocationSrc,
+                          const KUrl& localRepositoryRoot) = 0;
 
     /**
      * Export the locally committed revisions to another repository.
      *
      * @param localRepositoryLocation Any location inside the local repository.
-     * @param repositoryLocation The repository which will receive the pushed revisions.
+     * @param localOrRepoLocationDst The repository which will receive the pushed revisions.
      */
-    virtual VcsJob* push( const KUrl& localRepositoryLocation,
-                          const QString& repositoryLocation ) = 0;
+    virtual VcsJob* push(const KUrl& localRepositoryLocation,
+                         const VcsLocation& localOrRepoLocationDst) = 0;
 
     /**
      * Import revisions from another repository the local one, but don't yet
      * merge them into the working copy.
      *
-     * @param repositoryLocation The repository which contains the revisions
+     * @param localOrRepoLocationSrc The repository which contains the revisions
      *                           to be pulled.
      * @param localRepositoryLocation Any location inside the local repository.
      */
-    virtual VcsJob* pull( const QString& repositoryLocation,
-                          const KUrl& localRepositoryLocation ) = 0;
+    virtual VcsJob* pull(const VcsLocation& localOrRepoLocationSrc,
+                         const KUrl& localRepositoryLocation) = 0;
 };
 
 }
[prev in list] [next in list] [prev in thread] [next in thread]