gitplugin.cpp 38.1 KB
Newer Older
1 2
/***************************************************************************
 *   Copyright 2008 Evgeniy Ivanov <powerfox@kde.ru>                       *
3
 *   Copyright 2009 Hugo Parente Lima <hugo.pl@gmail.com>                  *
4
 *   Copyright 2010 Aleix Pol Gonzalez <aleixpol@kde.org>                  *
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 *                                                                         *
 *   This program is free software; you can redistribute it and/or         *
 *   modify it under the terms of the GNU General Public License as        *
 *   published by the Free Software Foundation; either version 2 of        *
 *   the License or (at your option) version 3 or any later version        *
 *   accepted by the membership of KDE e.V. (or its successor approved     *
 *   by the membership of KDE e.V.), which shall act as a proxy            *
 *   defined in Section 14 of version 3 of the license.                    *
 *                                                                         *
 *   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 General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
 ***************************************************************************/

#include "gitplugin.h"

#include <KPluginFactory>
#include <KPluginLoader>
27 28 29 30 31
#include <KLocalizedString>
#include <KAboutData>
#include <KDebug>
#include <QFileInfo>
#include <QDir>
32
#include <QDateTime>
33

34 35
#include <interfaces/icore.h>
#include <interfaces/iprojectcontroller.h>
36
#include <interfaces/iproject.h>
37

38 39
#include <vcs/vcsjob.h>
#include <vcs/vcsrevision.h>
40
#include <vcs/vcsevent.h>
41
#include <vcs/dvcs/dvcsjob.h>
42
#include <vcs/vcsannotation.h>
43
#include <vcs/widgets/standardvcslocationwidget.h>
44
#include <KIO/CopyJob>
45
#include "gitclonejob.h"
46 47 48 49
#include <interfaces/contextmenuextension.h>
#include <QMenu>
#include <interfaces/iruncontroller.h>
#include "stashmanagerdialog.h"
50
#include <KMessageBox>
51 52

K_PLUGIN_FACTORY(KDevGitFactory, registerPlugin<GitPlugin>(); )
53
K_EXPORT_PLUGIN(KDevGitFactory(KAboutData("kdevgit","kdevgit",ki18n("Git"),"0.1",ki18n("A plugin to support git version control systems"), KAboutData::License_GPL)))
54

55 56
using namespace KDevelop;

57 58 59
namespace
{
    
60 61
QDir dotGitDirectory(const KUrl& dirPath)
{
62 63
    const QFileInfo finfo(dirPath.toLocalFile());
    QDir dir = finfo.isDir() ? QDir(dirPath.toLocalFile()) : finfo.absoluteDir();
64 65
    
    static const QString gitDir(".git");
66 67
    while (!dir.exists(gitDir) && dir.cdUp()) {} // cdUp, until there is a sub-directory called .git
    
68 69 70
    return dir;
}

71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
/**
 * Whenever a directory is provided, change it for all the files in it but not inner directories,
 * that way we make sure we won't get into recursion,
 */
static KUrl::List preventRecursion(const KUrl::List& urls)
{
    KUrl::List ret;
    foreach(const KUrl& url, urls) {
        QDir d(url.toLocalFile());
        if(d.exists()) {
            QStringList entries = d.entryList(QDir::Files | QDir::NoDotAndDotDot);
            foreach(const QString& entry, entries) {
                KUrl entryUrl = d.absoluteFilePath(entry);
                ret += entryUrl;
            }
        } else
            ret += url;
    }
    return ret;
}

92 93 94 95 96 97 98 99 100 101 102 103 104 105 106
QString toRevisionName(const KDevelop::VcsRevision& rev, QString currentRevision=QString())
{
    switch(rev.revisionType()) {
        case VcsRevision::Special:
            switch(rev.revisionValue().value<VcsRevision::RevisionSpecialType>()) {
                case VcsRevision::Head:
                    return "^HEAD";
                case VcsRevision::Base:
                    return "HEAD";
                case VcsRevision::Working:
                    return "";
                case VcsRevision::Previous:
                    Q_ASSERT(!currentRevision.isEmpty());
                    return currentRevision + "^1";
                case VcsRevision::Start:
107 108
                    return "";
                case VcsRevision::UserSpecialType: //Not used
109 110 111 112 113 114 115 116 117 118 119 120 121 122
                    Q_ASSERT(false && "i don't know how to do that");
            }
            break;
        case VcsRevision::GlobalNumber:
            return rev.revisionValue().toString();
        case VcsRevision::Date:
        case VcsRevision::FileNumber:
        case VcsRevision::Invalid:
        case VcsRevision::UserSpecialType:
            Q_ASSERT(false);
    }
    return QString();
}

123
QString revisionInterval(const KDevelop::VcsRevision& rev, const KDevelop::VcsRevision& limit)
124 125
{
    QString ret;
126 127 128 129 130 131
    QString srcRevisionName = toRevisionName(rev);
    if(limit.revisionType()==VcsRevision::Special &&
                limit.revisionValue().value<VcsRevision::RevisionSpecialType>()==VcsRevision::Start) //if we want it to the begining just put the revisionInterval
        return ret = srcRevisionName;
    else if(rev.revisionType()==VcsRevision::Special)
        ret = toRevisionName(limit, srcRevisionName);
132
    else
133
        ret = toRevisionName(limit, srcRevisionName)+".." +srcRevisionName;
134 135 136 137
    
    return ret;
}

138 139 140
QDir urlDir(const KUrl& url) { return QFileInfo(url.toLocalFile()).absoluteDir(); }
QDir urlDir(const KUrl::List& urls) { return urlDir(urls.first()); } //TODO: could be improved

141 142
}

143
GitPlugin::GitPlugin( QObject *parent, const QVariantList & )
144
    : DistributedVersionControlPlugin(parent, KDevGitFactory::componentData())
145 146 147 148
{
    KDEV_USE_EXTENSION_INTERFACE( KDevelop::IBasicVersionControl )
    KDEV_USE_EXTENSION_INTERFACE( KDevelop::IDistributedVersionControl )

149
    core()->uiController()->addToolView(i18n("Git"), dvcsViewFactory());
150
    setObjectName("Git");
151 152 153
}

GitPlugin::~GitPlugin()
154
{}
155

156 157 158 159 160 161 162 163 164 165 166 167 168 169
bool emptyOutput(DVcsJob* job)
{
    QScopedPointer<DVcsJob> _job(job);
    if(job->exec() && job->status()==VcsJob::JobSucceeded)
        return job->rawOutput().trimmed().isEmpty();
    
    return false;
}

bool GitPlugin::hasStashes(const QDir& repository)
{
    return !emptyOutput(gitStash(repository, QStringList("list"), KDevelop::OutputJob::Silent));
}

170
bool GitPlugin::hasModifications(const QDir& d)
171
{
172
    return !emptyOutput(lsFiles(d, QStringList("-m"), OutputJob::Silent));
173 174 175 176 177 178 179
}

void GitPlugin::additionalMenuEntries(QMenu* menu, const KUrl::List& urls)
{
    m_urls = urls;
    
    QDir dir=urlDir(urls);
180
    bool modif = hasModifications(dotGitDirectory(urls.first()));
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207
    bool canApply = !modif && hasStashes(dir);
    menu->addSeparator()->setText(i18n("Git Stashes"));
    menu->addAction(i18n("Stash Manager"), this, SLOT(ctxStashManager()))->setEnabled(canApply);
    menu->addAction(i18n("Push Stash"), this, SLOT(ctxPushStash()))->setEnabled(modif);
    menu->addAction(i18n("Pop Stash"), this, SLOT(ctxPopStash()))->setEnabled(canApply);
}

void GitPlugin::ctxPushStash()
{
    VcsJob* job = gitStash(urlDir(m_urls), QStringList(), KDevelop::OutputJob::Verbose);
    ICore::self()->runController()->registerJob(job);
}

void GitPlugin::ctxPopStash()
{
    VcsJob* job = gitStash(urlDir(m_urls), QStringList("pop"), KDevelop::OutputJob::Verbose);
    ICore::self()->runController()->registerJob(job);
}

void GitPlugin::ctxStashManager()
{
    QPointer<StashManagerDialog> d = new StashManagerDialog(urlDir(m_urls), this, 0);
    d->exec();
    
    delete d;
}

208
DVcsJob* GitPlugin::errorsFound(const QString& error, KDevelop::OutputJob::OutputJobVerbosity verbosity=OutputJob::Verbose)
209
{
210
    DVcsJob* j = new DVcsJob(QDir::temp(), this, verbosity);
211 212 213 214
    *j << "echo" << i18n("error: %1", error) << "-n";
    return j;
}

215 216 217 218 219 220
void GitPlugin::unload()
{
    core()->uiController()->removeToolView( dvcsViewFactory() );
}


221
QString GitPlugin::name() const
222
{
223 224 225
    return QLatin1String("Git");
}

226 227
KUrl GitPlugin::repositoryRoot(const KUrl& path)
{
228
    return KUrl(dotGitDirectory(path).absolutePath());
229 230
}

231 232
bool GitPlugin::isValidDirectory(const KUrl & dirPath)
{
233
    QDir dir=dotGitDirectory(dirPath);
234

235
    return dir.exists(".git");
236 237 238 239
}

bool GitPlugin::isVersionControlled(const KUrl &path)
{
240
    QFileInfo fsObject(path.toLocalFile());
241
    if (fsObject.isDir()) {
242
        return isValidDirectory(path);
243
    }
244

245 246
    QString filename = fsObject.fileName();

247
    QStringList otherFiles = getLsFiles(fsObject.dir(), QStringList("--") << filename, KDevelop::OutputJob::Silent);
248
    return !otherFiles.empty();
249 250 251 252
}

VcsJob* GitPlugin::init(const KUrl &directory)
{
253 254 255
    DVcsJob* job = new DVcsJob(urlDir(directory), this);
    *job << "git" << "init";
    return job;
256 257
}

258
VcsJob* GitPlugin::createWorkingCopy(const KDevelop::VcsLocation & source, const KUrl& dest, KDevelop::IBasicVersionControl::RecursionMode)
259
{
260 261 262
    DVcsJob* job = new GitCloneJob(urlDir(dest), this);
    *job << "git" << "clone" << "--progress" << "--" << source.localUrl().url() << dest;
    return job;
263 264 265 266 267
}

VcsJob* GitPlugin::add(const KUrl::List& localLocations, KDevelop::IBasicVersionControl::RecursionMode recursion)
{
    if (localLocations.empty())
268
        return errorsFound(i18n("Did not specify the list of files"), OutputJob::Verbose);
269

270
    DVcsJob* job = new DVcsJob(urlDir(localLocations), this);
271
    *job << "git" << "add" << "--" << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
272
    return job;
273 274
}

275
KDevelop::VcsJob* GitPlugin::status(const KUrl::List& localLocations, KDevelop::IBasicVersionControl::RecursionMode recursion)
276
{
277 278 279
    if (localLocations.empty())
        return errorsFound(i18n("Did not specify the list of files"), OutputJob::Verbose);

Aleix Pol Gonzalez's avatar
Aleix Pol Gonzalez committed
280
    DVcsJob* job = new DVcsJob(urlDir(localLocations), this, OutputJob::Silent);
281 282
    *job << "git" << "status" << "--porcelain" << "--";
    *job << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
283

284
    connect(job, SIGNAL(readyForParsing(KDevelop::DVcsJob*)), SLOT(parseGitStatusOutput(KDevelop::DVcsJob*)));
285
    return job;
286 287
}

288 289 290
VcsJob* GitPlugin::diff(const KUrl& fileOrDirectory, const KDevelop::VcsRevision& srcRevision, const KDevelop::VcsRevision& dstRevision,
                        VcsDiff::Type type, IBasicVersionControl::RecursionMode recursion)
{
291 292
    //TODO: control different types
    
293
    DVcsJob* job = new DVcsJob(urlDir(fileOrDirectory), this);
294 295 296 297 298 299
    *job << "git" << "diff" << "--no-prefix";
    QString revstr = revisionInterval(srcRevision, dstRevision);
    if(!revstr.isEmpty())
        *job << revstr;
    
    *job << "--" << (recursion == IBasicVersionControl::Recursive ? fileOrDirectory : preventRecursion(fileOrDirectory));
300
    
301
    connect(job, SIGNAL(readyForParsing(KDevelop::DVcsJob*)), SLOT(parseGitDiffOutput(KDevelop::DVcsJob*)));
302
    return job;
303 304 305 306
}

VcsJob* GitPlugin::revert(const KUrl::List& localLocations, IBasicVersionControl::RecursionMode recursion)
{
307 308 309 310 311 312
    if(localLocations.isEmpty() )
        return errorsFound(i18n("Could not revert changes"), OutputJob::Verbose);
    
    DVcsJob* job = new DVcsJob(urlDir(localLocations), this);
    *job << "git" << "checkout" << "--";
    *job << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
313
    
314
    return job;
315 316 317
}


318 319 320 321 322 323
//TODO: git doesn't like empty messages, but "KDevelop didn't provide any message, it may be a bug" looks ugly...
//If no files specified then commit already added files
VcsJob* GitPlugin::commit(const QString& message,
                             const KUrl::List& localLocations,
                             KDevelop::IBasicVersionControl::RecursionMode recursion)
{
324
    if (localLocations.empty() || message.isEmpty())
325
        return errorsFound(i18n("No files or message specified"));
326

327
    DVcsJob* job = new DVcsJob(dotGitDirectory(localLocations.front()), this);
328
    
329
    *job << "git" << "commit" << "-m" << message;
330
    *job << "--" << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
331
    return job;
332
}
333

334 335
VcsJob* GitPlugin::remove(const KUrl::List& files)
{
336 337 338 339
    if (files.isEmpty())
        return errorsFound(i18n("No files to remove"));

    DVcsJob* job = new DVcsJob(urlDir(files), this);
340
    *job << "git" << "rm" << "-r";
341 342
    *job << "--" << files;
    return job;
343 344
}

345
VcsJob* GitPlugin::log(const KUrl& localLocation,
346
                const KDevelop::VcsRevision& src, const KDevelop::VcsRevision& dst)
347
{
348 349 350
    DVcsJob* job = new DVcsJob(urlDir(localLocation), this);
    *job << "git" << "log" << revisionInterval(src, dst) << "--date=raw";
    *job << "--" << localLocation;
351
    connect(job, SIGNAL(readyForParsing(KDevelop::DVcsJob*)), this, SLOT(parseGitLogOutput(KDevelop::DVcsJob*)));
352
    return job;
353 354
}

355

356
VcsJob* GitPlugin::log(const KUrl& localLocation, const KDevelop::VcsRevision& rev, unsigned long int limit)
357
{
358
    DVcsJob* job = new DVcsJob(urlDir(localLocation), this, KDevelop::OutputJob::Silent);
359 360 361 362 363 364
    *job << "git" << "log" << "--date=raw" << toRevisionName(rev, QString());
    if(limit>0)
        *job << QString("-%1").arg(limit);
    
    *job << "--" << localLocation;
    connect(job, SIGNAL(readyForParsing(KDevelop::DVcsJob*)), this, SLOT(parseGitLogOutput(KDevelop::DVcsJob*)));
365
    return job;
366 367
}

368 369
KDevelop::VcsJob* GitPlugin::annotate(const KUrl &localLocation, const KDevelop::VcsRevision&)
{
370
    DVcsJob* job = new DVcsJob(urlDir(localLocation), this, KDevelop::OutputJob::Silent);
371 372
    *job << "git" << "blame" << "--porcelain";
    *job << "--" << localLocation;
373
    connect(job, SIGNAL(readyForParsing(KDevelop::DVcsJob*)), this, SLOT(parseGitBlameOutput(KDevelop::DVcsJob*)));
374
    return job;
375 376
}

377 378
void GitPlugin::parseGitBlameOutput(DVcsJob *job)
{
379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419
    QVariantList results;
    VcsAnnotationLine* annotation;
    QStringList lines = job->output().split('\n');
    
    bool skipNext=false;
    QMap<QString, VcsAnnotationLine> definedRevisions;
    for(QStringList::const_iterator it=lines.constBegin(), itEnd=lines.constEnd();
        it!=itEnd; ++it)
    {
        if(skipNext) {
            skipNext=false;
            results += qVariantFromValue(*annotation);
            
            continue;
        }
        
        if(it->isEmpty())
            continue;
        
        QString name = it->left(it->indexOf(' '));
        QString value = it->right(it->size()-name.size()-1);
        
        qDebug() << "last line" << *it;
        if(name=="author")
            annotation->setAuthor(value);
        else if(name=="author-mail") {} //TODO: do smth with the e-mail?
        else if(name=="author-tz") {} //TODO: does it really matter?
        else if(name=="author-time")
            annotation->setDate(QDateTime::fromTime_t(value.toUInt()));
        else if(name=="summary")
            annotation->setCommitMessage(value);
        else if(name.startsWith("committer")) {} //We will just store the authors
        else if(name=="previous") {} //We don't need that either
        else if(name=="filename") { skipNext=true; }
        else if(name=="boundary") {
            definedRevisions.insert("boundary", VcsAnnotationLine());
        }
        else
        {
            QStringList values = value.split(' ');
            
420
            VcsRevision rev;
421 422 423 424 425 426 427 428 429 430
            rev.setRevisionValue(name, KDevelop::VcsRevision::GlobalNumber);
            
            skipNext = definedRevisions.contains(name);
            
            if(!skipNext)
                definedRevisions.insert(name, VcsAnnotationLine());
            
            annotation = &definedRevisions[name];
            annotation->setLineNumber(values[1].toInt());
            annotation->setRevision(rev);
431 432 433 434
        }
    }
    job->setResults(results);
}
435 436 437

DVcsJob* GitPlugin::switchBranch(const QString &repository, const QString &branch)
{
438 439 440 441 442 443 444 445
    QDir d(repository);
    
    if(hasModifications(d) && KMessageBox::questionYesNo(0, i18n("There are pending changes, do you want to stash them first?"))==KMessageBox::Yes) {
        QScopedPointer<DVcsJob> stash(gitStash(urlDir(m_urls), QStringList(), KDevelop::OutputJob::Verbose));
        stash->exec();
    }
    
    DVcsJob* job = new DVcsJob(d, this);
446 447
    *job << "git" << "checkout" << branch;
    return job;
448 449 450 451 452
}

DVcsJob* GitPlugin::branch(const QString &repository, const QString &basebranch, const QString &branch,
                             const QStringList &args)
{
453
    DVcsJob* job = new DVcsJob(QDir(repository), this, KDevelop::OutputJob::Silent);
454 455 456 457 458 459 460 461
    *job << "git" << "branch" << args;
    
    *job << "--";
    if (!branch.isEmpty())
        *job << branch;
    if (!basebranch.isEmpty())
        *job << basebranch;
    return job;
462 463
}

464
DVcsJob* GitPlugin::lsFiles(const QDir &repository, const QStringList &args,
465
                            OutputJob::OutputJobVerbosity verbosity)
466
{
467
    DVcsJob* job = new DVcsJob(repository, this, verbosity);
468 469
    *job << "git" << "ls-files" << args;
    return job;
470 471
}

472 473 474 475 476 477 478
DVcsJob* GitPlugin::gitStash(const QDir& repository, const QStringList& args, OutputJob::OutputJobVerbosity verbosity)
{
    DVcsJob* job = new DVcsJob(repository, this, verbosity);
    *job << "git" << "stash" << args;
    return job;
}

479 480
QString GitPlugin::curBranch(const QString &repository)
{
481 482
    kDebug() << "Getting branch list";
    
483
    QScopedPointer<DVcsJob> job(new DVcsJob(QDir(repository), this, OutputJob::Silent));
484
    *job << "git" << "symbolic-ref" << "HEAD";
485 486
    if (job->exec() && job->status() == KDevelop::VcsJob::JobSucceeded) {
        QString out = job->output();
487 488 489
        int slashPos = out.lastIndexOf('/')+1;
        kDebug() << "Getting branch list" << out.mid(slashPos, out.size()-slashPos).trimmed();
        return out.mid(slashPos, out.size()-slashPos).trimmed();
490
    }
491
    return QString();
492 493 494 495
}

QStringList GitPlugin::branches(const QString &repository)
{
496
    QStringList branchListDirty;
497 498 499 500 501 502 503
    QScopedPointer<DVcsJob> job(branch(repository));
    kDebug() << "Getting branch list";
    
    if (job->exec() && job->status() == KDevelop::VcsJob::JobSucceeded)
        branchListDirty = job->output().split('\n', QString::SkipEmptyParts);
    else
        return QStringList();
504 505 506 507 508 509 510 511 512 513 514 515

    QStringList branchList;
    foreach(QString branch, branchListDirty)
    {
        if (branch.contains('*'))
        {
            branch = branch.prepend('\n').section("\n*", 1);
        }
        else
        {
            branch = branch.prepend('\n').section('\n', 1);
        }
516 517
        
        branch = branch.trimmed();
518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553
        branchList<<branch;
    }
    return branchList;
}

/* Few words about how this hardcore works:
1. get all commits (with --paretns)
2. select master (root) branch and get all unicial commits for branches (git-rev-list br2 ^master ^br3)
3. parse allCommits. While parsing set mask (columns state for every row) for BRANCH, INITIAL, CROSS,
   MERGE and INITIAL are also set in DVCScommit::setParents (depending on parents count)
   another setType(INITIAL) is used for "bottom/root/first" commits of branches
4. find and set merges, HEADS. It's an ittaration through all commits.
    - first we check if parent is from the same branch, if no then we go through all commits searching parent's index
      and set CROSS/HCROSS for rows (in 3 rows are set EMPTY after commit with parent from another tree met)
    - then we check branchesShas[i][0] to mark heads

4 can be a seporate function. TODO: All this porn require refactoring (rewriting is better)!

It's a very dirty implementation.
FIXME:
1. HEAD which is head has extra line to connect it with further commit
2. If you menrge branch2 to master, only new commits of branch2 will be visible (it's fine, but there will be
extra merge rectangle in master. If there are no extra commits in branch2, but there are another branches, then the place for branch2 will be empty (instead of be used for branch3).
3. Commits that have additional commit-data (not only history merging, but changes to fix conflicts) are shown incorrectly
*/

QList<DVcsEvent> GitPlugin::getAllCommits(const QString &repo)
{
    static bool hasHash = false;
    if (!hasHash)
    {
        initBranchHash(repo);
        hasHash = true;
    }
    QStringList args;
    args << "--all" << "--pretty" << "--parents";
554 555 556
    QScopedPointer<DVcsJob> job(gitRevList(repo, args));
    bool ret = job->exec();
    Q_ASSERT(ret && job->status()==VcsJob::JobSucceeded && "TODO: provide a fall back in case of failing");
557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718
    QStringList commits = job->output().split('\n', QString::SkipEmptyParts);

    static QRegExp rx_com("commit \\w{40,40}");

    QList<DVcsEvent>commitList;
    DVcsEvent item;

    //used to keep where we have empty/cross/branch entry
    //true if it's an active branch (then cross or branch) and false if not
    QVector<bool> additionalFlags(branchesShas.count());
    foreach(int flag, additionalFlags)
        flag = false;

    //parse output
    for(int i = 0; i < commits.count(); ++i)
    {
        if (commits[i].contains(rx_com))
        {
            kDebug() << "commit found in " << commits[i];
            item.setCommit(commits[i].section(' ', 1, 1).trimmed());
//             kDebug() << "commit is: " << commits[i].section(' ', 1);

            QStringList parents;
            QString parent = commits[i].section(' ', 2);
            int section = 2;
            while (!parent.isEmpty())
            {
                /*                kDebug() << "Parent is: " << parent;*/
                parents.append(parent.trimmed());
                section++;
                parent = commits[i].section(' ', section);
            }
            item.setParents(parents);

            //Avoid Merge string
            while (!commits[i].contains("Author: "))
                    ++i;

            item.setAuthor(commits[i].section("Author: ", 1).trimmed());
//             kDebug() << "author is: " << commits[i].section("Author: ", 1);

            item.setDate(commits[++i].section("Date:   ", 1).trimmed());
//             kDebug() << "date is: " << commits[i].section("Date:   ", 1);

            QString log;
            i++; //next line!
            while (i < commits.count() && !commits[i].contains(rx_com))
                log += commits[i++];
            --i; //while took commit line
            item.setLog(log.trimmed());
//             kDebug() << "log is: " << log;

            //mask is used in CommitViewDelegate to understand what we should draw for each branch
            QList<int> mask;

            //set mask (properties for each graph column in row)
            for(int i = 0; i < branchesShas.count(); ++i)
            {
                kDebug()<<"commit: " << item.getCommit();
                if (branchesShas[i].contains(item.getCommit()))
                {
                    mask.append(item.getType()); //we set type in setParents

                    //check if parent from the same branch, if not then we have found a root of the branch
                    //and will use empty column for all futher (from top to bottom) revisions
                    //FIXME: we should set CROSS between parent and child (and do it when find merge point)
                    additionalFlags[i] = false;
                    foreach(const QString &sha, item.getParents())
                    {
                        if (branchesShas[i].contains(sha))
                            additionalFlags[i] = true;
                    }
                    if (additionalFlags[i] == false)
                       item.setType(DVcsEvent::INITIAL); //hasn't parents from the same branch, used in drawing
                }
                else
                {
                    if (additionalFlags[i] == false)
                        mask.append(DVcsEvent::EMPTY);
                    else
                        mask.append(DVcsEvent::CROSS);
                }
                kDebug() << "mask " << i << "is " << mask[i];
            }
            item.setProperties(mask);
            commitList.append(item);
        }
    }

    //find and set merges, HEADS, require refactoring!
    for(QList<DVcsEvent>::iterator iter = commitList.begin();
        iter != commitList.end(); ++iter)
    {
        QStringList parents = iter->getParents();
        //we need only only child branches
        if (parents.count() != 1)
            break;

        QString parent = parents[0];
        QString commit = iter->getCommit();
        bool parent_checked = false;
        int heads_checked = 0;

        for(int i = 0; i < branchesShas.count(); ++i)
        {
            //check parent
            if (branchesShas[i].contains(commit))
            {
                if (!branchesShas[i].contains(parent))
                {
                    //parent and child are not in same branch
                    //since it is list, than parent has i+1 index
                    //set CROSS and HCROSS
                    for(QList<DVcsEvent>::iterator f_iter = iter;
                        f_iter != commitList.end(); ++f_iter)
                    {
                        if (parent == f_iter->getCommit())
                        {
                            for(int j = 0; j < i; ++j)
                            {
                                if(branchesShas[j].contains(parent))
                                    f_iter->setPropetry(j, DVcsEvent::MERGE);
                                else
                                    f_iter->setPropetry(j, DVcsEvent::HCROSS);
                            }
                            f_iter->setType(DVcsEvent::MERGE);
                            f_iter->setPropetry(i, DVcsEvent::MERGE_RIGHT);
                            kDebug() << parent << " is parent of " << commit;
                            kDebug() << f_iter->getCommit() << " is merge";
                            parent_checked = true;
                            break;
                        }
                        else
                            f_iter->setPropetry(i, DVcsEvent::CROSS);
                    }
                }
            }
            //mark HEADs

            if (!branchesShas[i].empty() && commit == branchesShas[i][0])
            {
                iter->setType(DVcsEvent::HEAD);
                iter->setPropetry(i, DVcsEvent::HEAD);
                heads_checked++;
                kDebug() << "HEAD found";
            }
            //some optimization
            if (heads_checked == branchesShas.count() && parent_checked)
                break;
        }
    }

    return commitList;
}

void GitPlugin::initBranchHash(const QString &repo)
{
    QStringList branches = GitPlugin::branches(repo);
    kDebug() << "BRANCHES: " << branches;
    //Now root branch is the current branch. In future it should be the longest branch
    //other commitLists are got with git-rev-lits branch ^br1 ^ br2
    QString root = GitPlugin::curBranch(repo);
719 720 721
    QScopedPointer<DVcsJob> job(gitRevList(repo, QStringList(root)));
    bool ret = job->exec();
    Q_ASSERT(ret && job->status()==VcsJob::JobSucceeded && "TODO: provide a fall back in case of failing");
722 723 724 725 726 727 728 729 730 731 732 733 734 735
    QStringList commits = job->output().split('\n', QString::SkipEmptyParts);
//     kDebug() << "\n\n\n commits" << commits << "\n\n\n";
    branchesShas.append(commits);
    foreach(const QString &branch, branches)
    {
        if (branch == root)
            continue;
        QStringList args(branch);
        foreach(const QString &branch_arg, branches)
        {
            if (branch_arg != branch)
                //man gitRevList for '^'
                args<<'^' + branch_arg;
        }
736 737 738
        QScopedPointer<DVcsJob> job(gitRevList(repo, args));
        bool ret = job->exec();
        Q_ASSERT(ret && job->status()==VcsJob::JobSucceeded && "TODO: provide a fall back in case of failing");
739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779
        QStringList commits = job->output().split('\n', QString::SkipEmptyParts);
//         kDebug() << "\n\n\n commits" << commits << "\n\n\n";
        branchesShas.append(commits);
    }
}

//Actually we can just copy the output without parsing. So it's a kind of draft for future
void GitPlugin::parseLogOutput(const DVcsJob * job, QList<DVcsEvent>& commits) const
{
//     static QRegExp rx_sep( "[-=]+" );
//     static QRegExp rx_date( "date:\\s+([^;]*);\\s+author:\\s+([^;]*).*" );

    static QRegExp rx_com( "commit \\w{1,40}" );

    QStringList lines = job->output().split('\n', QString::SkipEmptyParts);

    DVcsEvent item;
    QString commitLog;

    for (int i=0; i<lines.count(); ++i) {
        QString s = lines[i];
        kDebug() << "line:" << s ;

        if (rx_com.exactMatch(s)) {
            kDebug() << "MATCH COMMIT";
            item.setCommit(s);
            s = lines[++i];
            item.setAuthor(s);
            s = lines[++i];
            item.setDate(s);
            item.setLog(commitLog);
            commits.append(item);
        }
        else
        {
            //FIXME: add this in a loop to the if, like in getAllCommits()
            commitLog += s +'\n';
        }
    }
}

780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816
void GitPlugin::parseGitLogOutput(DVcsJob * job)
{
    QList<QVariant> commits;
    static QRegExp commitRegex( "^commit (\\w{8})\\w{32}" );
    static QRegExp infoRegex( "^(\\w+):(.*)" );

    QString contents = job->output();
    QTextStream s(&contents);

    VcsEvent item;
    QString message;
    bool pushCommit = false;
    while (!s.atEnd()) {
        QString line = s.readLine();
        if (commitRegex.exactMatch(line)) {
            if (pushCommit) {
                item.setMessage(message.trimmed());
                commits.append(QVariant::fromValue(item));
            } else {
                pushCommit = true;
            }
            VcsRevision rev;
            rev.setRevisionValue(commitRegex.cap(1), KDevelop::VcsRevision::GlobalNumber);
            item.setRevision(rev);
            message.clear();
        } else if (infoRegex.exactMatch(line)) {
            QString cap1 = infoRegex.cap(1);
            if (cap1 == "Author") {
                item.setAuthor(infoRegex.cap(2).trimmed());
            } else if (cap1 == "Date") {
                item.setDate(QDateTime::fromTime_t(infoRegex.cap(2).trimmed().split(' ')[0].toUInt()));
            }
        } else if (line.startsWith("    ")) {
            message += line.remove(0, 4);
            message += '\n';
        }
    }
817
    
818 819 820 821 822
    item.setMessage(message.trimmed());
    commits.append(QVariant::fromValue(item));
    job->setResults(commits);
}

823 824
void GitPlugin::parseGitDiffOutput(DVcsJob* job)
{
825 826
    VcsDiff diff;
    diff.setDiff(job->output());
827
    diff.setBaseDiff(repositoryRoot(KUrl(job->directory().absolutePath())));
828 829
    
    job->setResults(qVariantFromValue(diff));
830 831
}

832 833 834 835 836 837 838 839 840 841 842 843 844 845 846
// static VcsStatusInfo::State lsfilesToState(char id)
// {
//     switch(id) {
//         case 'H': return VcsStatusInfo::ItemUpToDate; //Cached
//         case 'S': return VcsStatusInfo::ItemUpToDate; //Skip work tree
//         case 'M': return VcsStatusInfo::ItemHasConflicts; //unmerged
//         case 'R': return VcsStatusInfo::ItemDeleted; //removed/deleted
//         case 'C': return VcsStatusInfo::ItemModified; //modified/changed
//         case 'K': return VcsStatusInfo::ItemDeleted; //to be killed
//         case '?': return VcsStatusInfo::ItemUnknown; //other
//     }
//     Q_ASSERT(false);
//     return VcsStatusInfo::ItemUnknown;
// }

847 848
void GitPlugin::parseGitStatusOutput(DVcsJob* job)
{
849
    QStringList outputLines = job->output().split('\n', QString::SkipEmptyParts);
850
    const KUrl workingDir = job->directory().absolutePath();
851
    const KUrl dotGit = dotGitDirectory(workingDir).absolutePath();
852 853
    
    QVariantList statuses;
854
    QList<KUrl> processedFiles;
855
    
856
    foreach(const QString& line, outputLines) {
857 858 859 860 861 862 863
        //every line is 2 chars for the status, 1 space then the file desc
        QString curr=line.right(line.size()-3);
        QString state = line.left(2);
        
        int arrow = curr.indexOf("-> ");
        if(arrow>=0)
            curr = curr.right(curr.size()-arrow-3);
864
        
865
        KUrl fileUrl = dotGit;
866 867
        fileUrl.addPath(curr);
        processedFiles.append(fileUrl);
868 869 870
        
        VcsStatusInfo status;
        status.setUrl(fileUrl);
871 872 873
        status.setState(messageToState(state));
        
        kDebug() << "Checking git status for " << line << curr << messageToState(state);
874 875 876
        
        statuses.append(qVariantFromValue<VcsStatusInfo>(status));
    }
877 878 879 880 881
    QStringList paths;
    QStringList oldcmd=job->dvcsCommand();
    QStringList::const_iterator it=oldcmd.constBegin()+oldcmd.indexOf("--")+1, itEnd=oldcmd.constEnd();
    for(; it!=itEnd; ++it)
        paths += *it;
882
    
883
    //here we add the already up to date files
884
    QStringList files = getLsFiles(job->directory(), QStringList() << "-c" << "--" << paths, OutputJob::Silent);
885 886 887 888 889 890 891 892 893 894 895 896
    foreach(const QString& file, files) {
        KUrl fileUrl = workingDir;
        fileUrl.addPath(file);
        
        if(!processedFiles.contains(fileUrl)) {
            VcsStatusInfo status;
            status.setUrl(fileUrl);
            status.setState(VcsStatusInfo::ItemUpToDate);
            
            statuses.append(qVariantFromValue<VcsStatusInfo>(status));
        }
    }
897 898 899
    job->setResults(statuses);
}

900
QStringList GitPlugin::getLsFiles(const QDir &directory, const QStringList &args,
901
    KDevelop::OutputJob::OutputJobVerbosity verbosity)
902
{
903
    QScopedPointer<DVcsJob> job(lsFiles(directory, args, verbosity));
904 905 906
    if (job->exec() && job->status() == KDevelop::VcsJob::JobSucceeded)
        return job->output().split('\n', QString::SkipEmptyParts);
    
907 908 909
    return QStringList();
}

910 911
DVcsJob* GitPlugin::gitRevParse(const QString &repository, const QStringList &args,
    KDevelop::OutputJob::OutputJobVerbosity verbosity)
912
{
913
    DVcsJob* job = new DVcsJob(QDir(repository), this, verbosity);
914
    *job << "git" << "rev-parse" << args;
915

916
    return job;
917 918 919 920
}

DVcsJob* GitPlugin::gitRevList(const QString &repository, const QStringList &args)
{
921 922
    DVcsJob* job = new DVcsJob(QDir(repository), this);
    {
923
        *job << "git" << "rev-list" << args;
924 925 926 927
        return job;
    }
}

928
VcsStatusInfo::State GitPlugin::messageToState(const QString& msg)
929
{
930 931 932 933 934 935
    Q_ASSERT(msg.size()==1 || msg.size()==2);
    VcsStatusInfo::State ret = VcsStatusInfo::ItemUnknown;
    
    if(msg.contains('U') || msg == "AA" || msg == "DD")
        ret = VcsStatusInfo::ItemHasConflicts;
    else switch(msg[0].toAscii())
936 937
    {
        case 'M':
938 939
            ret = VcsStatusInfo::ItemModified;
            break;
940
        case 'A':
941 942
            ret = VcsStatusInfo::ItemAdded;
            break;
943 944 945 946 947 948 949
        case 'R':
        case 'C':
            ret = VcsStatusInfo::ItemModified;
            break;
        case ' ':
            ret = msg[1] == 'M' ? VcsStatusInfo::ItemModified : VcsStatusInfo::ItemDeleted;
            break;
950
        case 'D':
951 952 953 954 955
            ret = VcsStatusInfo::ItemDeleted;
            break;
        case '?':
            ret = VcsStatusInfo::ItemUnknown;
            break;
956 957 958
        default:
            kDebug() << "Git status not identified:" << msg;
            break;
959
    }
960 961
    
    return ret;
962 963
}

964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992
StandardCopyJob::StandardCopyJob(IPlugin* parent, const KUrl& source, const KUrl& dest,
                                 OutputJob::OutputJobVerbosity verbosity)
    : VcsJob(parent, verbosity)
    , m_source(source), m_dest(dest)
    , m_plugin(parent)
    , m_status(JobNotStarted)
{}

void StandardCopyJob::start()
{
    KIO::CopyJob* job=KIO::copy(m_source, m_dest);
    connect(job, SIGNAL(result(KJob*)), SLOT(result(KJob*)));
    job->start();
    m_status=JobRunning;
}

void StandardCopyJob::result(KJob* job)
{
    m_status=job->error() == 0? JobSucceeded : JobFailed; emitResult();
}

VcsJob* GitPlugin::copy(const KUrl& localLocationSrc, const KUrl& localLocationDstn)
{
    //TODO: Probably we should "git add" after
    return new StandardCopyJob(this, localLocationSrc, localLocationDstn, KDevelop::OutputJob::Silent);
}

VcsJob* GitPlugin::move(const KUrl& source, const KUrl& destination)
{
993 994
    DVcsJob* job = new DVcsJob(urlDir(source), this, KDevelop::OutputJob::Verbose);
    {
995 996 997 998 999
        *job << "git" << "mv" << source.toLocalFile() << destination.toLocalFile();
        return job;
    }
}

1000 1001 1002 1003 1004 1005 1006
void GitPlugin::parseGitRepoLocationOutput(DVcsJob* job)
{
    job->setResults(qVariantFromValue(KUrl(job->output())));
}

VcsJob* GitPlugin::repositoryLocation(const KUrl& localLocation)
{
1007
    DVcsJob* job = new DVcsJob(urlDir(localLocation), this);
1008 1009 1010 1011
    //Probably we should check first if origin is the proper remote we have to use but as a first attempt it works
    *job << "git" << "config" << "remote.origin.url";
    connect(job, SIGNAL(readyForParsing(KDevelop::DVcsJob*)), SLOT(parseGitRepoLocationOutput(KDevelop::DVcsJob*)));
    return job;
1012 1013
}

1014 1015
VcsJob* GitPlugin::pull(const KDevelop::VcsLocation& localOrRepoLocationSrc, const KUrl& localRepositoryLocation)
{
1016
    DVcsJob* job = new DVcsJob(urlDir(localRepositoryLocation), this);
1017 1018 1019 1020
    job->setCommunicationMode(KProcess::MergedChannels);
    *job << "git" << "pull";
    if(!localOrRepoLocationSrc.localUrl().isEmpty())
        *job << localOrRepoLocationSrc.localUrl().url();
1021
    return job;
1022 1023 1024 1025
}

VcsJob* GitPlugin::push(const KUrl& localRepositoryLocation, const KDevelop::VcsLocation& localOrRepoLocationDst)
{
1026
    DVcsJob* job = new DVcsJob(urlDir(localRepositoryLocation), this);
1027
    job->setCommunicationMode(KProcess::MergedChannels);
1028 1029 1030
    *job << "git" << "push";
    if(!localOrRepoLocationDst.localUrl().isEmpty())
        *job << localOrRepoLocationDst.localUrl().url();
1031
    return job;
1032 1033 1034 1035
}

VcsJob* GitPlugin::resolve(const KUrl::List& localLocations, IBasicVersionControl::RecursionMode recursion)
{
1036
    return add(localLocations, recursion);
1037 1038 1039 1040
}

VcsJob* GitPlugin::update(const KUrl::List& localLocations, const KDevelop::VcsRevision& rev, IBasicVersionControl::RecursionMode recursion)
{
1041 1042 1043
    if(rev.revisionType()==VcsRevision::Special && rev.revisionValue().value<VcsRevision::RevisionSpecialType>()==VcsRevision::Head) {
        return pull(VcsLocation(), localLocations.first());
    } else {
1044 1045
        DVcsJob* job = new DVcsJob(urlDir(localLocations.first().toLocalFile()), this);
        {
1046 1047
            //Probably we should check first if origin is the proper remote we have to use but as a first attempt it works
            *job << "git" << "checkout" << rev.revisionValue().toString() << "--";
1048
            *job << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
1049 1050 1051
            return job;
        }
    }
1052 1053
}

Aleix Pol Gonzalez's avatar
Aleix Pol Gonzalez committed
1054 1055 1056 1057 1058 1059 1060 1061
class GitVcsLocationWidget : public KDevelop::StandardVcsLocationWidget
{
    public:
        GitVcsLocationWidget(QWidget* parent = 0, Qt::WindowFlags f = 0)
            : StandardVcsLocationWidget(parent, f) {}
        virtual bool isCorrect() const { return true; }
};

1062 1063
KDevelop::VcsLocationWidget* GitPlugin::vcsLocation(QWidget* parent) const
{
Aleix Pol Gonzalez's avatar
Aleix Pol Gonzalez committed
1064
    return new GitVcsLocationWidget(parent);
1065
}