1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 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 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 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 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 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 554 555 556 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 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 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 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 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 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 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610
|
/***************************************************************************
* Copyright 2008 Evgeniy Ivanov <powerfox@kde.ru> *
* Copyright 2009 Hugo Parente Lima <hugo.pl@gmail.com> *
* Copyright 2010 Aleix Pol Gonzalez <aleixpol@kde.org> *
* *
* 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 <QDateTime>
#include <QProcess>
#include <QDir>
#include <QFileInfo>
#include <QMenu>
#include <QTimer>
#include <QRegularExpression>
#include <QPointer>
#include <interfaces/icore.h>
#include <interfaces/iproject.h>
#include <util/path.h>
#include <vcs/vcsjob.h>
#include <vcs/vcsrevision.h>
#include <vcs/vcsevent.h>
#include <vcs/vcslocation.h>
#include <vcs/dvcs/dvcsjob.h>
#include <vcs/vcsannotation.h>
#include <vcs/widgets/standardvcslocationwidget.h>
#include "gitclonejob.h"
#include <interfaces/iruncontroller.h>
#include "rebasedialog.h"
#include "stashmanagerdialog.h"
#include <KDirWatch>
#include <KIO/CopyJob>
#include <KLocalizedString>
#include <KMessageBox>
#include <KTextEdit>
#include <KTextEditor/Document>
#include "gitjob.h"
#include "gitmessagehighlighter.h"
#include "gitplugincheckinrepositoryjob.h"
#include "gitnameemaildialog.h"
#include "debug.h"
#include <array>
using namespace KDevelop;
QVariant runSynchronously(KDevelop::VcsJob* job)
{
QVariant ret;
if(job->exec() && job->status()==KDevelop::VcsJob::JobSucceeded) {
ret = job->fetchResults();
}
delete job;
return ret;
}
namespace
{
QDir dotGitDirectory(const QUrl& dirPath)
{
const QFileInfo finfo(dirPath.toLocalFile());
QDir dir = finfo.isDir() ? QDir(finfo.filePath()): finfo.absoluteDir();
const QString gitDir = QStringLiteral(".git");
while (!dir.exists(gitDir) && dir.cdUp()) {} // cdUp, until there is a sub-directory called .git
if (dir.isRoot()) {
qCWarning(PLUGIN_GIT) << "couldn't find the git root for" << dirPath;
}
return dir;
}
/**
* 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 QList<QUrl> preventRecursion(const QList<QUrl>& urls)
{
QList<QUrl> ret;
for (const QUrl& url : urls) {
QDir d(url.toLocalFile());
if(d.exists()) {
const QStringList entries = d.entryList(QDir::Files | QDir::NoDotAndDotDot);
ret.reserve(ret.size() + entries.size());
for (const QString& entry : entries) {
QUrl entryUrl = QUrl::fromLocalFile(d.absoluteFilePath(entry));
ret += entryUrl;
}
} else
ret += url;
}
return ret;
}
QString toRevisionName(const KDevelop::VcsRevision& rev, const QString& currentRevision=QString())
{
switch(rev.revisionType()) {
case VcsRevision::Special:
switch(rev.revisionValue().value<VcsRevision::RevisionSpecialType>()) {
case VcsRevision::Head:
return QStringLiteral("^HEAD");
case VcsRevision::Base:
return QString();
case VcsRevision::Working:
return QString();
case VcsRevision::Previous:
Q_ASSERT(!currentRevision.isEmpty());
return currentRevision + QLatin1String("^1");
case VcsRevision::Start:
return QString();
case VcsRevision::UserSpecialType: //Not used
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::UserType:
Q_ASSERT(false);
}
return QString();
}
QString revisionInterval(const KDevelop::VcsRevision& rev, const KDevelop::VcsRevision& limit)
{
QString ret;
if(rev.revisionType()==VcsRevision::Special &&
rev.revisionValue().value<VcsRevision::RevisionSpecialType>()==VcsRevision::Start) //if we want it to the beginning just put the revisionInterval
ret = toRevisionName(limit, QString());
else {
QString dst = toRevisionName(limit);
if(dst.isEmpty())
ret = dst;
else {
QString src = toRevisionName(rev, dst);
if(src.isEmpty())
ret = src;
else
ret = src + QLatin1String("..") + dst;
}
}
return ret;
}
QDir urlDir(const QUrl& url)
{
QFileInfo f(url.toLocalFile());
if(f.isDir())
return QDir(url.toLocalFile());
else
return f.absoluteDir();
}
QDir urlDir(const QList<QUrl>& urls) { return urlDir(urls.first()); } //TODO: could be improved
}
GitPlugin::GitPlugin( QObject *parent, const QVariantList & )
: DistributedVersionControlPlugin(parent, QStringLiteral("kdevgit")), m_oldVersion(false), m_usePrefix(true)
{
if (QStandardPaths::findExecutable(QStringLiteral("git")).isEmpty()) {
setErrorDescription(i18n("Unable to find git executable. Is it installed on the system?"));
return;
}
setObjectName(QStringLiteral("Git"));
auto* versionJob = new DVcsJob(QDir::tempPath(), this, KDevelop::OutputJob::Silent);
*versionJob << "git" << "--version";
connect(versionJob, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitVersionOutput);
ICore::self()->runController()->registerJob(versionJob);
m_watcher = new KDirWatch(this);
connect(m_watcher, &KDirWatch::dirty, this, &GitPlugin::fileChanged);
connect(m_watcher, &KDirWatch::created, this, &GitPlugin::fileChanged);
}
GitPlugin::~GitPlugin()
{}
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(QStringLiteral("list")), KDevelop::OutputJob::Silent));
}
bool GitPlugin::hasModifications(const QDir& d)
{
return !emptyOutput(lsFiles(d, QStringList(QStringLiteral("-m")), OutputJob::Silent));
}
bool GitPlugin::hasModifications(const QDir& repo, const QUrl& file)
{
return !emptyOutput(lsFiles(repo, QStringList{QStringLiteral("-m"), file.path()}, OutputJob::Silent));
}
void GitPlugin::additionalMenuEntries(QMenu* menu, const QList<QUrl>& urls)
{
m_urls = urls;
QDir dir=urlDir(urls);
bool hasSt = hasStashes(dir);
menu->addAction(i18nc("@action:inmenu", "Rebase"), this, SLOT(ctxRebase()));
menu->addSeparator()->setText(i18nc("@title:menu", "Git Stashes"));
menu->addAction(i18nc("@action:inmenu", "Stash Manager"), this, SLOT(ctxStashManager()))->setEnabled(hasSt);
menu->addAction(i18nc("@action:inmenu", "Push Stash"), this, SLOT(ctxPushStash()));
menu->addAction(i18nc("@action:inmenu", "Pop Stash"), this, SLOT(ctxPopStash()))->setEnabled(hasSt);
}
void GitPlugin::ctxRebase()
{
auto* dialog = new RebaseDialog(this, m_urls.first(), nullptr);
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->open();
}
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(QStringLiteral("pop")), KDevelop::OutputJob::Verbose);
ICore::self()->runController()->registerJob(job);
}
void GitPlugin::ctxStashManager()
{
QPointer<StashManagerDialog> d = new StashManagerDialog(urlDir(m_urls), this, nullptr);
d->exec();
delete d;
}
DVcsJob* GitPlugin::errorsFound(const QString& error, KDevelop::OutputJob::OutputJobVerbosity verbosity=OutputJob::Verbose)
{
auto* j = new DVcsJob(QDir::temp(), this, verbosity);
*j << "echo" << i18n("error: %1", error) << "-n";
return j;
}
QString GitPlugin::name() const
{
return QStringLiteral("Git");
}
QUrl GitPlugin::repositoryRoot(const QUrl& path)
{
return QUrl::fromLocalFile(dotGitDirectory(path).absolutePath());
}
bool GitPlugin::isValidDirectory(const QUrl & dirPath)
{
QDir dir=dotGitDirectory(dirPath);
QFile dotGitPotentialFile(dir.filePath(QStringLiteral(".git")));
// if .git is a file, we may be in a git worktree
QFileInfo dotGitPotentialFileInfo(dotGitPotentialFile);
if (!dotGitPotentialFileInfo.isDir() && dotGitPotentialFile.exists()) {
QString gitWorktreeFileContent;
if (dotGitPotentialFile.open(QFile::ReadOnly)) {
// the content should be gitdir: /path/to/the/.git/worktree
gitWorktreeFileContent = QString::fromUtf8(dotGitPotentialFile.readAll());
dotGitPotentialFile.close();
} else {
return false;
}
const auto items = gitWorktreeFileContent.split(QLatin1Char(' '));
if (items.size() == 2 && items.at(0) == QLatin1String("gitdir:")) {
qCDebug(PLUGIN_GIT) << "we are in a git worktree" << items.at(1);
return true;
}
}
return dir.exists(QStringLiteral(".git/HEAD"));
}
bool GitPlugin::isValidRemoteRepositoryUrl(const QUrl& remoteLocation)
{
if (remoteLocation.isLocalFile()) {
QFileInfo fileInfo(remoteLocation.toLocalFile());
if (fileInfo.isDir()) {
QDir dir(fileInfo.filePath());
if (dir.exists(QStringLiteral(".git/HEAD"))) {
return true;
}
// TODO: check also for bare repo
}
} else {
const QString scheme = remoteLocation.scheme();
if (scheme == QLatin1String("git") || scheme == QLatin1String("git+ssh")) {
return true;
}
// heuristic check, anything better we can do here without talking to server?
if ((scheme == QLatin1String("http") ||
scheme == QLatin1String("https")) &&
remoteLocation.path().endsWith(QLatin1String(".git"))) {
return true;
}
}
return false;
}
bool GitPlugin::isVersionControlled(const QUrl &path)
{
QFileInfo fsObject(path.toLocalFile());
if (!fsObject.exists()) {
return false;
}
if (fsObject.isDir()) {
return isValidDirectory(path);
}
QString filename = fsObject.fileName();
QStringList otherFiles = getLsFiles(fsObject.dir(), QStringList(QStringLiteral("--")) << filename, KDevelop::OutputJob::Silent);
return !otherFiles.empty();
}
VcsJob* GitPlugin::init(const QUrl &directory)
{
auto* job = new DVcsJob(urlDir(directory), this);
job->setType(VcsJob::Import);
*job << "git" << "init";
return job;
}
VcsJob* GitPlugin::createWorkingCopy(const KDevelop::VcsLocation & source, const QUrl& dest, KDevelop::IBasicVersionControl::RecursionMode)
{
DVcsJob* job = new GitCloneJob(urlDir(dest), this);
job->setType(VcsJob::Import);
*job << "git" << "clone" << "--progress" << "--" << source.localUrl().url() << dest;
return job;
}
VcsJob* GitPlugin::add(const QList<QUrl>& localLocations, KDevelop::IBasicVersionControl::RecursionMode recursion)
{
if (localLocations.empty())
return errorsFound(i18n("Did not specify the list of files"), OutputJob::Verbose);
DVcsJob* job = new GitJob(dotGitDirectory(localLocations.front()), this);
job->setType(VcsJob::Add);
*job << "git" << "add" << "--" << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
return job;
}
KDevelop::VcsJob* GitPlugin::status(const QList<QUrl>& localLocations, KDevelop::IBasicVersionControl::RecursionMode recursion)
{
if (localLocations.empty())
return errorsFound(i18n("Did not specify the list of files"), OutputJob::Verbose);
DVcsJob* job = new GitJob(urlDir(localLocations), this, OutputJob::Silent);
job->setType(VcsJob::Status);
if(m_oldVersion) {
*job << "git" << "ls-files" << "-t" << "-m" << "-c" << "-o" << "-d" << "-k" << "--directory";
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitStatusOutput_old);
} else {
*job << "git" << "status" << "--porcelain";
job->setIgnoreError(true);
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitStatusOutput);
}
*job << "--" << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
return job;
}
VcsJob* GitPlugin::diff(const QUrl& fileOrDirectory, const KDevelop::VcsRevision& srcRevision, const KDevelop::VcsRevision& dstRevision,
IBasicVersionControl::RecursionMode recursion)
{
DVcsJob* job = new GitJob(dotGitDirectory(fileOrDirectory), this, KDevelop::OutputJob::Silent);
job->setType(VcsJob::Diff);
*job << "git" << "diff" << "--no-color" << "--no-ext-diff";
if (!usePrefix()) {
// KDE's ReviewBoard now requires p1 patchfiles, so `git diff --no-prefix` to generate p0 patches
// has become optional.
*job << "--no-prefix";
}
if (dstRevision.revisionType() == VcsRevision::Special &&
dstRevision.specialType() == VcsRevision::Working) {
if (srcRevision.revisionType() == VcsRevision::Special &&
srcRevision.specialType() == VcsRevision::Base) {
*job << "HEAD";
} else {
*job << "--cached" << srcRevision.revisionValue().toString();
}
} else {
QString revstr = revisionInterval(srcRevision, dstRevision);
if(!revstr.isEmpty())
*job << revstr;
}
*job << "--";
if (recursion == IBasicVersionControl::Recursive) {
*job << fileOrDirectory;
} else {
*job << preventRecursion(QList<QUrl>() << fileOrDirectory);
}
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitDiffOutput);
return job;
}
VcsJob* GitPlugin::revert(const QList<QUrl>& localLocations, IBasicVersionControl::RecursionMode recursion)
{
if(localLocations.isEmpty() )
return errorsFound(i18n("Could not revert changes"), OutputJob::Verbose);
QDir repo = urlDir(repositoryRoot(localLocations.first()));
QString modified;
for (const auto& file: localLocations) {
if (hasModifications(repo, file)) {
modified.append(file.toDisplayString(QUrl::PreferLocalFile) + QLatin1String("<br/>"));
}
}
if (!modified.isEmpty()) {
auto res = KMessageBox::questionYesNo(nullptr, i18n("The following files have uncommitted changes, "
"which will be lost. Continue?") + QLatin1String("<br/><br/>") + modified);
if (res != KMessageBox::Yes) {
return errorsFound(QString(), OutputJob::Silent);
}
}
DVcsJob* job = new GitJob(dotGitDirectory(localLocations.front()), this);
job->setType(VcsJob::Revert);
*job << "git" << "checkout" << "--";
*job << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
return job;
}
//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 QList<QUrl>& localLocations,
KDevelop::IBasicVersionControl::RecursionMode recursion)
{
if (localLocations.empty() || message.isEmpty())
return errorsFound(i18n("No files or message specified"));
const QDir dir = dotGitDirectory(localLocations.front());
if (!ensureValidGitIdentity(dir)) {
return errorsFound(i18n("Email or name for Git not specified"));
}
auto* job = new DVcsJob(dir, this);
job->setType(VcsJob::Commit);
QList<QUrl> files = (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
addNotVersionedFiles(dir, files);
*job << "git" << "commit" << "-m" << message;
*job << "--" << files;
return job;
}
bool GitPlugin::ensureValidGitIdentity(const QDir& dir)
{
const QUrl url = QUrl::fromLocalFile(dir.absolutePath());
const QString name = readConfigOption(url, QStringLiteral("user.name"));
const QString email = readConfigOption(url, QStringLiteral("user.email"));
if (!email.isEmpty() && !name.isEmpty()) {
return true; // already okay
}
GitNameEmailDialog dialog;
dialog.setName(name);
dialog.setEmail(email);
if (!dialog.exec()) {
return false;
}
runSynchronously(setConfigOption(url, QStringLiteral("user.name"), dialog.name(), dialog.isGlobal()));
runSynchronously(setConfigOption(url, QStringLiteral("user.email"), dialog.email(), dialog.isGlobal()));
return true;
}
void GitPlugin::addNotVersionedFiles(const QDir& dir, const QList<QUrl>& files)
{
const QStringList otherStr = getLsFiles(dir, QStringList() << QStringLiteral("--others"), KDevelop::OutputJob::Silent);
QList<QUrl> toadd, otherFiles;
otherFiles.reserve(otherStr.size());
for (const QString& file : otherStr) {
QUrl v = QUrl::fromLocalFile(dir.absoluteFilePath(file));
otherFiles += v;
}
//We add the files that are not versioned
for (const QUrl& file : files) {
if(otherFiles.contains(file) && QFileInfo(file.toLocalFile()).isFile())
toadd += file;
}
if(!toadd.isEmpty()) {
VcsJob* job = add(toadd);
job->exec(); // krazy:exclude=crashy
}
}
bool isEmptyDirStructure(const QDir &dir)
{
const auto infos = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
for (const QFileInfo& i : infos) {
if (i.isDir()) {
if (!isEmptyDirStructure(QDir(i.filePath()))) return false;
} else if (i.isFile()) {
return false;
}
}
return true;
}
VcsJob* GitPlugin::remove(const QList<QUrl>& files)
{
if (files.isEmpty())
return errorsFound(i18n("No files to remove"));
QDir dotGitDir = dotGitDirectory(files.front());
QList<QUrl> files_(files);
QMutableListIterator<QUrl> i(files_);
while (i.hasNext()) {
QUrl file = i.next();
QFileInfo fileInfo(file.toLocalFile());
const QStringList otherStr = getLsFiles(dotGitDir, QStringList{QStringLiteral("--others"), QStringLiteral("--"), file.toLocalFile()}, KDevelop::OutputJob::Silent);
if(!otherStr.isEmpty()) {
//remove files not under version control
QList<QUrl> otherFiles;
otherFiles.reserve(otherStr.size());
for (const QString& f : otherStr) {
otherFiles << QUrl::fromLocalFile(dotGitDir.path() + QLatin1Char('/') + f);
}
if (fileInfo.isFile()) {
//if it's an unversioned file we are done, don't use git rm on it
i.remove();
}
auto trashJob = KIO::trash(otherFiles);
trashJob->exec();
qCDebug(PLUGIN_GIT) << "other files" << otherFiles;
}
if (fileInfo.isDir()) {
if (isEmptyDirStructure(QDir(file.toLocalFile()))) {
//remove empty folders, git doesn't do that
auto trashJob = KIO::trash(file);
trashJob->exec();
qCDebug(PLUGIN_GIT) << "empty folder, removing" << file;
//we already deleted it, don't use git rm on it
i.remove();
}
}
}
if (files_.isEmpty()) return nullptr;
DVcsJob* job = new GitJob(dotGitDir, this);
job->setType(VcsJob::Remove);
// git refuses to delete files with local modifications
// use --force to overcome this
*job << "git" << "rm" << "-r" << "--force";
*job << "--" << files_;
return job;
}
VcsJob* GitPlugin::log(const QUrl& localLocation,
const KDevelop::VcsRevision& src, const KDevelop::VcsRevision& dst)
{
DVcsJob* job = new GitJob(dotGitDirectory(localLocation), this, KDevelop::OutputJob::Silent);
job->setType(VcsJob::Log);
*job << "git" << "log" << "--date=raw" << "--name-status" << "-M80%" << "--follow";
QString rev = revisionInterval(dst, src);
if(!rev.isEmpty())
*job << rev;
*job << "--" << localLocation;
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitLogOutput);
return job;
}
VcsJob* GitPlugin::log(const QUrl& localLocation, const KDevelop::VcsRevision& rev, unsigned long int limit)
{
DVcsJob* job = new GitJob(dotGitDirectory(localLocation), this, KDevelop::OutputJob::Silent);
job->setType(VcsJob::Log);
*job << "git" << "log" << "--date=raw" << "--name-status" << "-M80%" << "--follow";
QString revStr = toRevisionName(rev, QString());
if(!revStr.isEmpty())
*job << revStr;
if(limit>0)
*job << QStringLiteral("-%1").arg(limit);
*job << "--" << localLocation;
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitLogOutput);
return job;
}
KDevelop::VcsJob* GitPlugin::annotate(const QUrl &localLocation, const KDevelop::VcsRevision&)
{
DVcsJob* job = new GitJob(dotGitDirectory(localLocation), this, KDevelop::OutputJob::Silent);
job->setType(VcsJob::Annotate);
*job << "git" << "blame" << "--porcelain" << "-w";
*job << "--" << localLocation;
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitBlameOutput);
return job;
}
void GitPlugin::parseGitBlameOutput(DVcsJob *job)
{
QVariantList results;
VcsAnnotationLine* annotation = nullptr;
const auto output = job->output();
const auto lines = output.splitRef(QLatin1Char('\n'));
bool skipNext=false;
QMap<QString, VcsAnnotationLine> definedRevisions;
for (auto& line : lines) {
if(skipNext) {
skipNext=false;
results += QVariant::fromValue(*annotation);
continue;
}
if (line.isEmpty())
continue;
QStringRef name = line.left(line.indexOf(QLatin1Char(' ')));
QStringRef value = line.mid(name.size()+1);
if(name==QLatin1String("author"))
annotation->setAuthor(value.toString());
else if(name==QLatin1String("author-mail")) {} //TODO: do smth with the e-mail?
else if(name==QLatin1String("author-tz")) {} //TODO: does it really matter?
else if(name==QLatin1String("author-time"))
annotation->setDate(QDateTime::fromSecsSinceEpoch(value.toUInt(), Qt::LocalTime));
else if(name==QLatin1String("summary"))
annotation->setCommitMessage(value.toString());
else if(name.startsWith(QLatin1String("committer"))) {} //We will just store the authors
else if(name==QLatin1String("previous")) {} //We don't need that either
else if(name==QLatin1String("filename")) { skipNext=true; }
else if(name==QLatin1String("boundary")) {
definedRevisions.insert(QStringLiteral("boundary"), VcsAnnotationLine());
}
else
{
const auto values = value.split(QLatin1Char(' '));
VcsRevision rev;
rev.setRevisionValue(name.left(8).toString(), KDevelop::VcsRevision::GlobalNumber);
skipNext = definedRevisions.contains(name.toString());
if(!skipNext)
definedRevisions.insert(name.toString(), VcsAnnotationLine());
annotation = &definedRevisions[name.toString()];
annotation->setLineNumber(values[1].toInt() - 1);
annotation->setRevision(rev);
}
}
job->setResults(results);
}
DVcsJob* GitPlugin::lsFiles(const QDir &repository, const QStringList &args,
OutputJob::OutputJobVerbosity verbosity)
{
auto* job = new DVcsJob(repository, this, verbosity);
*job << "git" << "ls-files" << args;
return job;
}
DVcsJob* GitPlugin::gitStash(const QDir& repository, const QStringList& args, OutputJob::OutputJobVerbosity verbosity)
{
auto* job = new DVcsJob(repository, this, verbosity);
*job << "git" << "stash" << args;
return job;
}
VcsJob* GitPlugin::tag(const QUrl& repository, const QString& commitMessage, const VcsRevision& rev, const QString& tagName)
{
auto* job = new DVcsJob(urlDir(repository), this);
*job << "git" << "tag" << "-m" << commitMessage << tagName;
if(rev.revisionValue().isValid())
*job << rev.revisionValue().toString();
return job;
}
VcsJob* GitPlugin::switchBranch(const QUrl &repository, const QString &branch)
{
QDir d=urlDir(repository);
if(hasModifications(d) && KMessageBox::questionYesNo(nullptr, i18n("There are pending changes, do you want to stash them first?"))==KMessageBox::Yes) {
QScopedPointer<DVcsJob> stash(gitStash(d, QStringList(), KDevelop::OutputJob::Verbose));
stash->exec();
}
auto* job = new DVcsJob(d, this);
*job << "git" << "checkout" << branch;
return job;
}
VcsJob* GitPlugin::branch(const QUrl& repository, const KDevelop::VcsRevision& rev, const QString& branchName)
{
Q_ASSERT(!branchName.isEmpty());
auto* job = new DVcsJob(urlDir(repository), this);
*job << "git" << "branch" << "--" << branchName;
if(!rev.prettyValue().isEmpty())
*job << rev.revisionValue().toString();
return job;
}
VcsJob* GitPlugin::deleteBranch(const QUrl& repository, const QString& branchName)
{
auto* job = new DVcsJob(urlDir(repository), this, OutputJob::Silent);
*job << "git" << "branch" << "-D" << branchName;
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitCurrentBranch);
return job;
}
VcsJob* GitPlugin::renameBranch(const QUrl& repository, const QString& oldBranchName, const QString& newBranchName)
{
auto* job = new DVcsJob(urlDir(repository), this, OutputJob::Silent);
*job << "git" << "branch" << "-m" << newBranchName << oldBranchName;
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitCurrentBranch);
return job;
}
VcsJob* GitPlugin::mergeBranch(const QUrl& repository, const QString& branchName)
{
Q_ASSERT(!branchName.isEmpty());
auto* job = new DVcsJob(urlDir(repository), this);
*job << "git" << "merge" << branchName;
return job;
}
VcsJob* GitPlugin::rebase(const QUrl& repository, const QString& branchName)
{
auto* job = new DVcsJob(urlDir(repository), this);
*job << "git" << "rebase" << branchName;
return job;
}
VcsJob* GitPlugin::currentBranch(const QUrl& repository)
{
auto* job = new DVcsJob(urlDir(repository), this, OutputJob::Silent);
job->setIgnoreError(true);
*job << "git" << "symbolic-ref" << "-q" << "--short" << "HEAD";
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitCurrentBranch);
return job;
}
void GitPlugin::parseGitCurrentBranch(DVcsJob* job)
{
QString out = job->output().trimmed();
job->setResults(out);
}
VcsJob* GitPlugin::branches(const QUrl &repository)
{
auto* job=new DVcsJob(urlDir(repository));
*job << "git" << "branch" << "-a";
connect(job, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitBranchOutput);
return job;
}
void GitPlugin::parseGitBranchOutput(DVcsJob* job)
{
const auto output = job->output();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const auto branchListDirty = output.splitRef(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
const auto branchListDirty = output.splitRef(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
QStringList branchList;
for (const auto& branch : branchListDirty) {
// Skip pointers to another branches (one example of this is "origin/HEAD -> origin/master");
// "git rev-list" chokes on these entries and we do not need duplicate branches altogether.
if (branch.contains(QLatin1String("->")))
continue;
// Skip entries such as '(no branch)'
if (branch.contains(QLatin1String("(no branch)")))
continue;
QStringRef name = branch;
if (name.startsWith(QLatin1Char('*')))
name = branch.mid(2);
branchList << name.trimmed().toString();
}
job->setResults(branchList);
}
/* Few words about how this hardcore works:
1. get all commits (with --parents)
2. select master (root) branch and get all unique 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 iteration 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 separate 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 merge 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
*/
QVector<DVcsEvent> GitPlugin::allCommits(const QString& repo)
{
initBranchHash(repo);
const QStringList args{
QStringLiteral("--all"),
QStringLiteral("--pretty"),
QStringLiteral("--parents"),
};
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");
Q_UNUSED(ret);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const QStringList commits = job->output().split(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
QStringList commits = job->output().split(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
static QRegExp rx_com(QStringLiteral("commit \\w{40,40}"));
QVector<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());
additionalFlags.fill(false);
//parse output
for(int i = 0; i < commits.count(); ++i)
{
if (commits[i].contains(rx_com))
{
qCDebug(PLUGIN_GIT) << "commit found in " << commits[i];
item.setCommit(commits[i].section(QLatin1Char(' '), 1, 1).trimmed());
// qCDebug(PLUGIN_GIT) << "commit is: " << commits[i].section(' ', 1);
QStringList parents;
QString parent = commits[i].section(QLatin1Char(' '), 2);
int section = 2;
while (!parent.isEmpty())
{
/* qCDebug(PLUGIN_GIT) << "Parent is: " << parent;*/
parents.append(parent.trimmed());
section++;
parent = commits[i].section(QLatin1Char(' '), section);
}
item.setParents(parents);
//Avoid Merge string
while (!commits[i].contains(QLatin1String("Author: ")))
++i;
item.setAuthor(commits[i].section(QStringLiteral("Author: "), 1).trimmed());
// qCDebug(PLUGIN_GIT) << "author is: " << commits[i].section("Author: ", 1);
item.setDate(commits[++i].section(QStringLiteral("Date: "), 1).trimmed());
// qCDebug(PLUGIN_GIT) << "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());
// qCDebug(PLUGIN_GIT) << "log is: " << log;
//mask is used in CommitViewDelegate to understand what we should draw for each branch
QList<int> mask;
mask.reserve(branchesShas.count());
//set mask (properties for each graph column in row)
for(int i = 0; i < branchesShas.count(); ++i)
{
qCDebug(PLUGIN_GIT)<<"commit: " << item.commit();
if (branchesShas[i].contains(item.commit()))
{
mask.append(item.type()); //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 further (from top to bottom) revisions
//FIXME: we should set CROSS between parent and child (and do it when find merge point)
additionalFlags[i] = false;
const auto parentShas = item.parents();
for (const QString& sha : parentShas) {
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);
}
qCDebug(PLUGIN_GIT) << "mask " << i << "is " << mask[i];
}
item.setProperties(mask);
commitList.append(item);
}
}
//find and set merges, HEADS, require refactoring!
for (auto iter = commitList.begin();
iter != commitList.end(); ++iter)
{
QStringList parents = iter->parents();
//we need only only child branches
if (parents.count() != 1)
break;
QString parent = parents[0];
const QString commit = iter->commit();
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 (auto f_iter = iter;
f_iter != commitList.end(); ++f_iter)
{
if (parent == f_iter->commit())
{
for(int j = 0; j < i; ++j)
{
if(branchesShas[j].contains(parent))
f_iter->setProperty(j, DVcsEvent::MERGE);
else
f_iter->setProperty(j, DVcsEvent::HCROSS);
}
f_iter->setType(DVcsEvent::MERGE);
f_iter->setProperty(i, DVcsEvent::MERGE_RIGHT);
qCDebug(PLUGIN_GIT) << parent << " is parent of " << commit;
qCDebug(PLUGIN_GIT) << f_iter->commit() << " is merge";
parent_checked = true;
break;
}
else
f_iter->setProperty(i, DVcsEvent::CROSS);
}
}
}
//mark HEADs
if (!branchesShas[i].empty() && commit == branchesShas[i][0])
{
iter->setType(DVcsEvent::HEAD);
iter->setProperty(i, DVcsEvent::HEAD);
heads_checked++;
qCDebug(PLUGIN_GIT) << "HEAD found";
}
//some optimization
if (heads_checked == branchesShas.count() && parent_checked)
break;
}
}
return commitList;
}
void GitPlugin::initBranchHash(const QString &repo)
{
const QUrl repoUrl = QUrl::fromLocalFile(repo);
const QStringList gitBranches = runSynchronously(branches(repoUrl)).toStringList();
qCDebug(PLUGIN_GIT) << "BRANCHES: " << gitBranches;
//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 = runSynchronously(currentBranch(repoUrl)).toString();
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");
Q_UNUSED(ret);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const QStringList commits = job->output().split(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
const QStringList commits = job->output().split(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
// qCDebug(PLUGIN_GIT) << "\n\n\n commits" << commits << "\n\n\n";
branchesShas.append(commits);
for (const QString& branch : gitBranches) {
if (branch == root)
continue;
QStringList args(branch);
for (const QString& branch_arg : gitBranches) {
if (branch_arg != branch)
//man gitRevList for '^'
args << QLatin1Char('^') + branch_arg;
}
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");
Q_UNUSED(ret);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const QStringList commits = job->output().split(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
const QStringList commits = job->output().split(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
// qCDebug(PLUGIN_GIT) << "\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, QVector<DVcsEvent>& commits) const
{
// static QRegExp rx_sep( "[-=]+" );
// static QRegExp rx_date( "date:\\s+([^;]*);\\s+author:\\s+([^;]*).*" );
static QRegularExpression rx_com( QStringLiteral("commit \\w{1,40}") );
const auto output = job->output();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const auto lines = output.splitRef(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
const auto lines = output.splitRef(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
DVcsEvent item;
QString commitLog;
for (int i=0; i<lines.count(); ++i) {
// qCDebug(PLUGIN_GIT) << "line:" << s;
if (rx_com.match(lines[i]).hasMatch()) {
// qCDebug(PLUGIN_GIT) << "MATCH COMMIT";
item.setCommit(lines[++i].toString());
item.setAuthor(lines[++i].toString());
item.setDate(lines[++i].toString());
item.setLog(commitLog);
commits.append(item);
}
else
{
//FIXME: add this in a loop to the if, like in getAllCommits()
commitLog += lines[i].toString() + QLatin1Char('\n');
}
}
}
VcsItemEvent::Actions actionsFromString(char c)
{
switch(c) {
case 'A': return VcsItemEvent::Added;
case 'D': return VcsItemEvent::Deleted;
case 'R': return VcsItemEvent::Replaced;
case 'M': return VcsItemEvent::Modified;
}
return VcsItemEvent::Modified;
}
void GitPlugin::parseGitLogOutput(DVcsJob * job)
{
static QRegExp commitRegex(QStringLiteral("^commit (\\w{8})\\w{32}"));
static QRegExp infoRegex(QStringLiteral("^(\\w+):(.*)"));
static QRegExp modificationsRegex(QStringLiteral("^([A-Z])[0-9]*\t([^\t]+)\t?(.*)"), Qt::CaseSensitive, QRegExp::RegExp2);
//R099 plugins/git/kdevgit.desktop plugins/git/kdevgit.desktop.cmake
//M plugins/grepview/CMakeLists.txt
QList<QVariant> commits;
QString contents = job->output();
// check if git-log returned anything
if (contents.isEmpty()) {
job->setResults(commits); // empty list
return;
}
// start parsing the 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));
item.setItems(QList<VcsItemEvent>());
} 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 == QLatin1String("Author")) {
item.setAuthor(infoRegex.cap(2).trimmed());
} else if (cap1 == QLatin1String("Date")) {
item.setDate(QDateTime::fromSecsSinceEpoch(infoRegex.cap(2).trimmed().split(QLatin1Char(' '))[0].toUInt(), Qt::LocalTime));
}
} else if (modificationsRegex.exactMatch(line)) {
VcsItemEvent::Actions a = actionsFromString(modificationsRegex.cap(1).at(0).toLatin1());
QString filenameA = modificationsRegex.cap(2);
VcsItemEvent itemEvent;
itemEvent.setActions(a);
itemEvent.setRepositoryLocation(filenameA);
if(a==VcsItemEvent::Replaced) {
QString filenameB = modificationsRegex.cap(3);
itemEvent.setRepositoryCopySourceLocation(filenameB);
}
item.addItem(itemEvent);
} else if (line.startsWith(QLatin1String(" "))) {
message += line.midRef(4) + QLatin1Char('\n');
}
}
item.setMessage(message.trimmed());
commits.append(QVariant::fromValue(item));
job->setResults(commits);
}
void GitPlugin::parseGitDiffOutput(DVcsJob* job)
{
VcsDiff diff;
diff.setDiff(job->output());
diff.setBaseDiff(repositoryRoot(QUrl::fromLocalFile(job->directory().absolutePath())));
diff.setDepth(usePrefix()? 1 : 0);
job->setResults(QVariant::fromValue(diff));
}
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;
}
void GitPlugin::parseGitStatusOutput_old(DVcsJob* job)
{
const QString output = job->output();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const auto outputLines = output.splitRef(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
const auto outputLines = output.splitRef(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
QDir dir = job->directory();
QMap<QUrl, VcsStatusInfo::State> allStatus;
for (const auto& line : outputLines) {
VcsStatusInfo::State status = lsfilesToState(line[0].toLatin1());
QUrl url = QUrl::fromLocalFile(dir.absoluteFilePath(line.mid(2).toString()));
allStatus[url] = status;
}
QVariantList statuses;
statuses.reserve(allStatus.size());
QMap< QUrl, VcsStatusInfo::State >::const_iterator it = allStatus.constBegin(), itEnd=allStatus.constEnd();
for(; it!=itEnd; ++it) {
VcsStatusInfo status;
status.setUrl(it.key());
status.setState(it.value());
statuses.append(QVariant::fromValue<VcsStatusInfo>(status));
}
job->setResults(statuses);
}
void GitPlugin::parseGitStatusOutput(DVcsJob* job)
{
const auto output = job->output();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
const auto outputLines = output.splitRef(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
const auto outputLines = output.splitRef(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
QDir workingDir = job->directory();
QDir dotGit = dotGitDirectory(QUrl::fromLocalFile(workingDir.absolutePath()));
QVariantList statuses;
QList<QUrl> processedFiles;
for (const QStringRef& line : outputLines) {
//every line is 2 chars for the status, 1 space then the file desc
QStringRef curr=line.mid(3);
QStringRef state = line.left(2);
int arrow = curr.indexOf(QLatin1String(" -> "));
if(arrow>=0) {
VcsStatusInfo status;
status.setUrl(QUrl::fromLocalFile(dotGit.absoluteFilePath(curr.toString().left(arrow))));
status.setState(VcsStatusInfo::ItemDeleted);
statuses.append(QVariant::fromValue<VcsStatusInfo>(status));
processedFiles += status.url();
curr = curr.mid(arrow+4);
}
if (curr.startsWith(QLatin1Char('\"')) && curr.endsWith(QLatin1Char('\"'))) { //if the path is quoted, unquote
curr = curr.mid(1, curr.size()-2);
}
VcsStatusInfo status;
status.setUrl(QUrl::fromLocalFile(dotGit.absoluteFilePath(curr.toString())));
status.setState(messageToState(state));
processedFiles.append(status.url());
qCDebug(PLUGIN_GIT) << "Checking git status for " << line << curr << status.state();
statuses.append(QVariant::fromValue<VcsStatusInfo>(status));
}
QStringList paths;
QStringList oldcmd=job->dvcsCommand();
QStringList::const_iterator it=oldcmd.constBegin()+oldcmd.indexOf(QStringLiteral("--"))+1, itEnd=oldcmd.constEnd();
paths.reserve(oldcmd.size());
for(; it!=itEnd; ++it)
paths += *it;
//here we add the already up to date files
const QStringList files = getLsFiles(job->directory(), QStringList{QStringLiteral("-c"), QStringLiteral("--")} << paths, OutputJob::Silent);
for (const QString& file : files) {
QUrl fileUrl = QUrl::fromLocalFile(workingDir.absoluteFilePath(file));
if(!processedFiles.contains(fileUrl)) {
VcsStatusInfo status;
status.setUrl(fileUrl);
status.setState(VcsStatusInfo::ItemUpToDate);
statuses.append(QVariant::fromValue<VcsStatusInfo>(status));
}
}
job->setResults(statuses);
}
void GitPlugin::parseGitVersionOutput(DVcsJob* job)
{
const auto output = job->output().trimmed();
auto versionString = output.midRef(output.lastIndexOf(QLatin1Char(' '))).split(QLatin1Char('.'));
static const std::array<int, 2> minimumVersion = {1, 7};
qCDebug(PLUGIN_GIT) << "checking git version" << versionString << "against" << minimumVersion[0] << minimumVersion[1];
m_oldVersion = false;
if (static_cast<uint>(versionString.size()) < minimumVersion.size()) {
m_oldVersion = true;
qCWarning(PLUGIN_GIT) << "invalid git version string:" << job->output().trimmed();
return;
}
for (int num : minimumVersion) {
QStringRef curr = versionString.takeFirst();
int valcurr = curr.toInt();
if (valcurr < num) {
m_oldVersion = true;
break;
}
if (valcurr > num) {
m_oldVersion = false;
break;
}
}
qCDebug(PLUGIN_GIT) << "the current git version is old: " << m_oldVersion;
}
QStringList GitPlugin::getLsFiles(const QDir &directory, const QStringList &args,
KDevelop::OutputJob::OutputJobVerbosity verbosity)
{
QScopedPointer<DVcsJob> job(lsFiles(directory, args, verbosity));
if (job->exec() && job->status() == KDevelop::VcsJob::JobSucceeded)
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
return job->output().split(QLatin1Char('\n'), Qt::SkipEmptyParts);
#else
return job->output().split(QLatin1Char('\n'), QString::SkipEmptyParts);
#endif
return QStringList();
}
DVcsJob* GitPlugin::gitRevParse(const QString &repository, const QStringList &args,
KDevelop::OutputJob::OutputJobVerbosity verbosity)
{
auto* job = new DVcsJob(QDir(repository), this, verbosity);
*job << "git" << "rev-parse" << args;
return job;
}
DVcsJob* GitPlugin::gitRevList(const QString& directory, const QStringList& args)
{
auto* job = new DVcsJob(urlDir(QUrl::fromLocalFile(directory)), this, KDevelop::OutputJob::Silent);
{
*job << "git" << "rev-list" << args;
return job;
}
}
VcsStatusInfo::State GitPlugin::messageToState(const QStringRef& msg)
{
Q_ASSERT(msg.size()==1 || msg.size()==2);
VcsStatusInfo::State ret = VcsStatusInfo::ItemUnknown;
if(msg.contains(QLatin1Char('U')) || msg == QLatin1String("AA") || msg == QLatin1String("DD"))
ret = VcsStatusInfo::ItemHasConflicts;
else switch(msg.at(0).toLatin1())
{
case 'M':
ret = VcsStatusInfo::ItemModified;
break;
case 'A':
ret = VcsStatusInfo::ItemAdded;
break;
case 'R':
ret = VcsStatusInfo::ItemModified;
break;
case 'C':
ret = VcsStatusInfo::ItemHasConflicts;
break;
case ' ':
ret = msg.at(1) == QLatin1Char('M') ? VcsStatusInfo::ItemModified : VcsStatusInfo::ItemDeleted;
break;
case 'D':
ret = VcsStatusInfo::ItemDeleted;
break;
case '?':
ret = VcsStatusInfo::ItemUnknown;
break;
default:
qCDebug(PLUGIN_GIT) << "Git status not identified:" << msg;
break;
}
return ret;
}
StandardJob::StandardJob(IPlugin* parent, KJob* job,
OutputJob::OutputJobVerbosity verbosity)
: VcsJob(parent, verbosity)
, m_job(job)
, m_plugin(parent)
, m_status(JobNotStarted)
{}
void StandardJob::start()
{
connect(m_job, &KJob::result, this, &StandardJob::result);
m_job->start();
m_status=JobRunning;
}
void StandardJob::result(KJob* job)
{
if (job->error() == 0) {
m_status = JobSucceeded;
setError(NoError);
} else {
m_status = JobFailed;
setError(UserDefinedError);
}
emitResult();
}
VcsJob* GitPlugin::copy(const QUrl& localLocationSrc, const QUrl& localLocationDstn)
{
//TODO: Probably we should "git add" after
return new StandardJob(this, KIO::copy(localLocationSrc, localLocationDstn), KDevelop::OutputJob::Silent);
}
VcsJob* GitPlugin::move(const QUrl& source, const QUrl& destination)
{
QDir dir = urlDir(source);
QFileInfo fileInfo(source.toLocalFile());
if (fileInfo.isDir()) {
if (isEmptyDirStructure(QDir(source.toLocalFile()))) {
//move empty folder, git doesn't do that
qCDebug(PLUGIN_GIT) << "empty folder" << source;
return new StandardJob(this, KIO::move(source, destination), KDevelop::OutputJob::Silent);
}
}
const QStringList otherStr = getLsFiles(dir, QStringList{QStringLiteral("--others"), QStringLiteral("--"), source.toLocalFile()}, KDevelop::OutputJob::Silent);
if(otherStr.isEmpty()) {
auto* job = new DVcsJob(dir, this, KDevelop::OutputJob::Verbose);
*job << "git" << "mv" << source.toLocalFile() << destination.toLocalFile();
return job;
} else {
return new StandardJob(this, KIO::move(source, destination), KDevelop::OutputJob::Silent);
}
}
void GitPlugin::parseGitRepoLocationOutput(DVcsJob* job)
{
job->setResults(QVariant::fromValue(QUrl::fromLocalFile(job->output())));
}
VcsJob* GitPlugin::repositoryLocation(const QUrl& localLocation)
{
auto* job = new DVcsJob(urlDir(localLocation), this);
//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, &DVcsJob::readyForParsing, this, &GitPlugin::parseGitRepoLocationOutput);
return job;
}
VcsJob* GitPlugin::pull(const KDevelop::VcsLocation& localOrRepoLocationSrc, const QUrl& localRepositoryLocation)
{
auto* job = new DVcsJob(urlDir(localRepositoryLocation), this);
job->setCommunicationMode(KProcess::MergedChannels);
*job << "git" << "pull";
if(!localOrRepoLocationSrc.localUrl().isEmpty())
*job << localOrRepoLocationSrc.localUrl().url();
return job;
}
VcsJob* GitPlugin::push(const QUrl& localRepositoryLocation, const KDevelop::VcsLocation& localOrRepoLocationDst)
{
auto* job = new DVcsJob(urlDir(localRepositoryLocation), this);
job->setCommunicationMode(KProcess::MergedChannels);
*job << "git" << "push";
if(!localOrRepoLocationDst.localUrl().isEmpty())
*job << localOrRepoLocationDst.localUrl().url();
return job;
}
VcsJob* GitPlugin::resolve(const QList<QUrl>& localLocations, IBasicVersionControl::RecursionMode recursion)
{
return add(localLocations, recursion);
}
VcsJob* GitPlugin::update(const QList<QUrl>& localLocations, const KDevelop::VcsRevision& rev, IBasicVersionControl::RecursionMode recursion)
{
if(rev.revisionType()==VcsRevision::Special && rev.revisionValue().value<VcsRevision::RevisionSpecialType>()==VcsRevision::Head) {
return pull(VcsLocation(), localLocations.first());
} else {
auto* job = new DVcsJob(urlDir(localLocations.first()), this);
{
//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() << "--";
*job << (recursion == IBasicVersionControl::Recursive ? localLocations : preventRecursion(localLocations));
return job;
}
}
}
void GitPlugin::setupCommitMessageEditor(const QUrl& localLocation, KTextEdit* editor) const
{
new GitMessageHighlighter(editor);
QFile mergeMsgFile(dotGitDirectory(localLocation).filePath(QStringLiteral(".git/MERGE_MSG")));
// Some limit on the file size should be set since whole content is going to be read into
// the memory. 1Mb seems to be good value since it's rather strange to have so huge commit
// message.
static const qint64 maxMergeMsgFileSize = 1024*1024;
if (mergeMsgFile.size() > maxMergeMsgFileSize || !mergeMsgFile.open(QIODevice::ReadOnly))
return;
QString mergeMsg = QString::fromLocal8Bit(mergeMsgFile.read(maxMergeMsgFileSize));
editor->setPlainText(mergeMsg);
}
class GitVcsLocationWidget : public KDevelop::StandardVcsLocationWidget
{
Q_OBJECT
public:
explicit GitVcsLocationWidget(QWidget* parent = nullptr)
: StandardVcsLocationWidget(parent)
{}
bool isCorrect() const override
{
return !url().isEmpty();
}
};
KDevelop::VcsLocationWidget* GitPlugin::vcsLocation(QWidget* parent) const
{
return new GitVcsLocationWidget(parent);
}
void GitPlugin::registerRepositoryForCurrentBranchChanges(const QUrl& repository)
{
QDir dir = dotGitDirectory(repository);
QString headFile = dir.absoluteFilePath(QStringLiteral(".git/HEAD"));
m_watcher->addFile(headFile);
}
void GitPlugin::fileChanged(const QString& file)
{
Q_ASSERT(file.endsWith(QLatin1String("HEAD")));
//SMTH/.git/HEAD -> SMTH/
const QUrl fileUrl = Path(file).parent().parent().toUrl();
//We need to delay the emitted signal, otherwise the branch hasn't change yet
//and the repository is not functional
m_branchesChange.append(fileUrl);
QTimer::singleShot(1000, this, &GitPlugin::delayedBranchChanged);
}
void GitPlugin::delayedBranchChanged()
{
emit repositoryBranchChanged(m_branchesChange.takeFirst());
}
CheckInRepositoryJob* GitPlugin::isInRepository(KTextEditor::Document* document)
{
CheckInRepositoryJob* job = new GitPluginCheckInRepositoryJob(document, repositoryRoot(document->url()).path());
job->start();
return job;
}
DVcsJob* GitPlugin::setConfigOption(const QUrl& repository, const QString& key, const QString& value, bool global)
{
auto job = new DVcsJob(urlDir(repository), this);
QStringList args;
args << QStringLiteral("git") << QStringLiteral("config");
if(global)
args << QStringLiteral("--global");
args << key << value;
*job << args;
return job;
}
QString GitPlugin::readConfigOption(const QUrl& repository, const QString& key)
{
QProcess exec;
exec.setWorkingDirectory(urlDir(repository).absolutePath());
exec.start(QStringLiteral("git"), QStringList{QStringLiteral("config"), QStringLiteral("--get"), key});
exec.waitForFinished();
return QString::fromUtf8(exec.readAllStandardOutput().trimmed());
}
#include "gitplugin.moc"
|