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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdev-mercurial=5D_/=3A_New_API_in_kdevplatform_mast?=
From:       Andrey Batyiev <batyiev () gmail ! com>
Date:       2011-06-09 2:05:52
Message-ID: 20110609020552.1F5D8A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit e342502818e29edf8c46292d936cecca902ff1bb by Andrey Batyiev.
Committed on 09/06/2011 at 04:05.
Pushed by abatyiev into branch 'master'.

New API in kdevplatform master, let's handle it.

M  +39   -0    mercurialplugin.cpp     
M  +14   -6    mercurialplugin.h     

http://commits.kde.org/kdev-mercurial/e342502818e29edf8c46292d936cecca902ff1bb

diff --git a/mercurialplugin.cpp b/mercurialplugin.cpp
index 003b245..0435109 100644
--- a/mercurialplugin.cpp
+++ b/mercurialplugin.cpp
@@ -575,6 +575,43 @@ VcsJob* MercurialPlugin::mergeWith(const KUrl &localLocation, \
const KDevelop::Vc  return job;
 }
 
+VcsJob* MercurialPlugin::branch(const KUrl& repository, const VcsRevision& rev, \
const QString& branchName) +{
+    return 0;
+}
+
+VcsJob* MercurialPlugin::branches(const KUrl& repository)
+{
+    return 0;
+}
+
+VcsJob* MercurialPlugin::currentBranch(const KUrl& repository)
+{
+    return 0;
+}
+
+VcsJob* MercurialPlugin::deleteBranch(const KUrl& repository, const QString& \
branchName) +{
+    return 0;
+}
+
+VcsJob* MercurialPlugin::renameBranch(const KUrl& repository, const QString& \
oldBranchName, const QString& newBranchName) +{
+    return 0;
+}
+
+VcsJob* MercurialPlugin::switchBranch(const KUrl& repository, const QString& \
branchName) +{
+    return 0;
+}
+
+VcsJob* MercurialPlugin::tag(const KUrl& repository, const QString& commitMessage, \
const VcsRevision& rev, const QString& tagName) +{
+    return 0;
+}
+
+
+#if 0
 DVcsJob* MercurialPlugin::switchBranch(const QString &repository, const QString \
&branch)  {
     DVcsJob *job = new DVcsJob(findWorkingDir(repository), this);
@@ -648,6 +685,8 @@ QStringList MercurialPlugin::branches(const QString &repository)
 
     return result;
 }
+#endif 
+
 
 QList<DVcsEvent> MercurialPlugin::getAllCommits(const QString &repo)
 {
diff --git a/mercurialplugin.h b/mercurialplugin.h
index 6557e6f..9b4710f 100644
--- a/mercurialplugin.h
+++ b/mercurialplugin.h
@@ -114,9 +114,9 @@ public:
     KDevelop::VcsJob* checkoutHead(const KUrl &localLocation, const \
                KDevelop::VcsRevision &rev);
     KDevelop::VcsJob* mergeWith(const KUrl &localLocation, const \
KDevelop::VcsRevision &rev);  
-    KDevelop::DVcsJob* switchBranch(const QString &repository, const QString \
                &branch);
-    KDevelop::DVcsJob* branch(const QString &repository, const QString &basebranch = \
                QString(), const QString &branch = QString(),
-                    const QStringList &args = QStringList());
+    //KDevelop::DVcsJob* switchBranch(const QString &repository, const QString \
&branch); +    //KDevelop::DVcsJob* branch(const QString &repository, const QString \
&basebranch = QString(), const QString //&branch = QString(), +                    \
//const QStringList &args = QStringList());  
     KDevelop::VcsJob* push(const KUrl& localRepositoryLocation,
                           const KDevelop::VcsLocation& localOrRepoLocationDst);
@@ -124,10 +124,18 @@ public:
                           const KUrl& localRepositoryLocation);
 
     KDevelop::VcsLocationWidget* vcsLocation(QWidget* parent) const;
-public:
+
     //parsers for branch:
-    QString curBranch(const QString &repository);
-    QStringList branches(const QString &repository);
+    KDevelop::VcsJob *branch(const KUrl &repository, const KDevelop::VcsRevision \
&rev, const QString &branchName); +    KDevelop::VcsJob *branches(const KUrl \
&repository); +    KDevelop::VcsJob *currentBranch(const KUrl &repository);
+    KDevelop::VcsJob *deleteBranch(const KUrl &repository, const QString \
&branchName); +    KDevelop::VcsJob *renameBranch(const KUrl &repository, const \
QString &oldBranchName, const QString &newBranchName); +    KDevelop::VcsJob \
*switchBranch(const KUrl &repository, const QString &branchName); +    \
KDevelop::VcsJob *tag(const KUrl &repository, const QString &commitMessage, const \
KDevelop::VcsRevision &rev, const QString &tagName); +    
+    //QString curBranch(const QString &repository);
+    //QStringList branches(const QString &repository);
 
     //graph helpers
     QList<DVcsEvent> getAllCommits(const QString &repo);


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