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 1611 1612 1613 1614 1615 1616 1617
|
/*
Description: start-up repository opening and reading
Author: Marco Costalba (C) 2005-2007
Copyright: See COPYING file that comes with this distribution
*/
#include <QApplication>
#include <QPair>
#include <QSettings>
#include <QTextCodec>
#include "exceptionmanager.h"
#include "rangeselectimpl.h"
#include "lanes.h"
#include "myprocess.h"
#include "cache.h"
#include "annotate.h"
#include "mainimpl.h"
#include "dataloader.h"
#include "git.h"
#define SHOW_MSG(x) QApplication::postEvent(parent(), new MessageEvent(x)); EM_PROCESS_EVENTS_NO_INPUT;
using namespace QGit;
static bool startup = true; // it's OK to be unique among qgit windows
static QHash<QString, QString> localDates;
const QString Git::getLocalDate(SCRef gitDate) {
// fast path here, we use a cache to avoid the slow date calculation
QString localDate(localDates.value(gitDate));
if (!localDate.isEmpty())
return localDate;
QDateTime d;
d.setTime_t(gitDate.toULong());
localDate = d.toString(Qt::LocalDate);
localDates[gitDate] = localDate;
return localDate;
}
const QStringList Git::getArgs(bool* quit, bool repoChanged) {
QString args;
if (startup) {
for (int i = 1; i < qApp->argc(); i++) {
// in arguments with spaces double quotes
// are stripped by Qt, so re-add them
QString arg(qApp->argv()[i]);
if (arg.contains(' '))
arg.prepend('\"').append('\"');
args.append(arg + ' ');
}
}
if (testFlag(RANGE_SELECT_F) && (!startup || args.isEmpty())) {
RangeSelectImpl rs((QWidget*)parent(), &args, repoChanged, this);
*quit = (rs.exec() == QDialog::Rejected); // modal execution
if (*quit)
return QStringList();
}
startup = false;
return MyProcess::splitArgList(args);
}
const QString Git::getBaseDir(bool* changed, SCRef wd, bool* ok, QString* gd) {
// we could run from a subdirectory, so we need to get correct directories
QString runOutput, tmp(workDir);
workDir = wd;
errorReportingEnabled = false;
bool ret = run("git rev-parse --git-dir", &runOutput); // run under newWorkDir
errorReportingEnabled = true;
workDir = tmp;
runOutput = runOutput.trimmed();
if (!ret || runOutput.isEmpty()) {
*changed = true;
if (ok)
*ok = false;
return wd;
}
// 'git rev-parse --git-dir' output could be a relative
// to working dir (as ex .git) or an absolute path
QDir d(runOutput.startsWith("/") ? runOutput : wd + "/" + runOutput);
*changed = (d.absolutePath() != gitDir);
if (gd)
*gd = d.absolutePath();
if (ok)
*ok = true;
d.cdUp();
return d.absolutePath();
}
Reference* Git::lookupReference(const ShaString& sha, bool create) {
/* Note: if create flag is set then sha MUST point to persistent data */
RefMap::iterator it(refsShaMap.find(sha));
if (it == refsShaMap.end() && create)
it = refsShaMap.insert(sha, Reference());
return (it != refsShaMap.end() ? &(*it) : NULL);
}
bool Git::getRefs() {
// check for a StGIT stack
QDir d(gitDir);
QString stgCurBranch;
if (d.exists("patches")) { // early skip
errorReportingEnabled = false;
isStGIT = run("stg branch", &stgCurBranch); // slow command
errorReportingEnabled = true;
stgCurBranch = stgCurBranch.trimmed();
} else
isStGIT = false;
// check for a merge and read current branch sha
isMergeHead = d.exists("MERGE_HEAD");
QString curBranchSHA, curBranchName;
if (!run("git rev-parse --revs-only HEAD", &curBranchSHA))
return false;
if (!run("git branch", &curBranchName))
return false;
curBranchSHA = curBranchSHA.trimmed();
curBranchName = curBranchName.prepend('\n').section("\n*", 1);
curBranchName = curBranchName.section('\n', 0, 0).trimmed();
// read refs, normally unsorted
QString runOutput;
if (!run("git show-ref -d", &runOutput))
return false;
refsShaMap.clear();
shaBackupBuf.clear(); // revs are already empty now
QString prevRefSha;
QStringList patchNames, patchShas;
const QStringList rLst(runOutput.split('\n', QString::SkipEmptyParts));
FOREACH_SL (it, rLst) {
SCRef revSha = (*it).left(40);
SCRef refName = (*it).mid(41);
if (refName.startsWith("refs/patches/")) {
// save StGIT patch sha, to be used later
SCRef patchesDir("refs/patches/" + stgCurBranch + "/");
if (refName.startsWith(patchesDir)) {
patchNames.append(refName.mid(patchesDir.length()));
patchShas.append(revSha);
}
// StGIT patches should not be added to refs,
// but an applied StGIT patch could be also an head or
// a tag in this case will be added in another loop cycle
continue;
}
// one rev could have many tags
Reference* cur = lookupReference(toPersistentSha(revSha, shaBackupBuf), optCreate);
if (refName.startsWith("refs/tags/")) {
if (refName.endsWith("^{}")) { // tag dereference
// we assume that a tag dereference follows strictly
// the corresponding tag object in rLst. So the
// last added tag is a tag object, not a commit object
cur->tags.append(refName.mid(10, refName.length() - 13));
// store tag object. Will be used to fetching
// tag message (if any) when necessary.
cur->tagObj = prevRefSha;
// tagObj must be removed from ref map
if (!prevRefSha.isEmpty())
refsShaMap.remove(toTempSha(prevRefSha));
} else
cur->tags.append(refName.mid(10));
cur->type |= TAG;
} else if (refName.startsWith("refs/heads/")) {
cur->branches.append(refName.mid(11));
cur->type |= BRANCH;
if (curBranchSHA == revSha) {
cur->type |= CUR_BRANCH;
cur->currentBranch = curBranchName;
}
} else if (refName.startsWith("refs/remotes/") && !refName.endsWith("HEAD")) {
cur->remoteBranches.append(refName.mid(13));
cur->type |= RMT_BRANCH;
} else if (!refName.startsWith("refs/bases/") && !refName.endsWith("HEAD")) {
cur->refs.append(refName);
cur->type |= REF;
}
prevRefSha = revSha;
}
if (isStGIT && !patchNames.isEmpty())
parseStGitPatches(patchNames, patchShas);
return !refsShaMap.empty();
}
void Git::parseStGitPatches(SCList patchNames, SCList patchShas) {
patchesStillToFind = 0;
// get patch names and status of current branch
QString runOutput;
if (!run("stg series", &runOutput))
return;
const QStringList pl(runOutput.split('\n', QString::SkipEmptyParts));
FOREACH_SL (it, pl) {
SCRef status = (*it).left(1);
SCRef patchName = (*it).mid(2);
bool applied = (status == "+" || status == ">");
int pos = patchNames.indexOf(patchName);
if (pos == -1) {
dbp("ASSERT in Git::parseStGitPatches(), patch %1 "
"not found in references list.", patchName);
continue;
}
const ShaString& ss = toPersistentSha(patchShas.at(pos), shaBackupBuf);
Reference* cur = lookupReference(ss, optCreate);
cur->stgitPatch = patchName;
cur->type |= (applied ? APPLIED : UN_APPLIED);
if (applied)
patchesStillToFind++;
}
}
const QStringList Git::getOthersFiles() {
// add files present in working directory but not in git archive
QString runCmd("git ls-files --others");
QSettings settings;
QString exFile(settings.value(EX_KEY, EX_DEF).toString());
if (!exFile.isEmpty()) {
QString path = (exFile.startsWith("/")) ? exFile : workDir + "/" + exFile;
if (QFile::exists(path))
runCmd.append(" --exclude-from=" + quote(exFile));
}
QString exPerDir(settings.value(EX_PER_DIR_KEY, EX_PER_DIR_DEF).toString());
if (!exPerDir.isEmpty())
runCmd.append(" --exclude-per-directory=" + quote(exPerDir));
QString runOutput;
run(runCmd, &runOutput);
return runOutput.split('\n', QString::SkipEmptyParts);
}
Rev* Git::fakeRevData(SCRef sha, SCList parents, SCRef author, SCRef date, SCRef log, SCRef longLog,
SCRef patch, int idx, FileHistory* fh) {
QString data('>' + sha + 'X' + parents.join(" ") + " \n");
data.append(author + '\n' + author + '\n' + date + '\n');
data.append(log + '\n' + longLog);
QString header("log size " + QString::number(data.size() - 1) + '\n');
data.prepend(header);
if (!patch.isEmpty())
data.append('\n' + patch);
QByteArray* ba = new QByteArray(data.toAscii());
ba->append('\0');
fh->rowData.append(ba);
int dummy;
Rev* c = new Rev(*ba, 0, idx, &dummy, !isMainHistory(fh));
return c;
}
const Rev* Git::fakeWorkDirRev(SCRef parent, SCRef log, SCRef longLog, int idx, FileHistory* fh) {
QString patch;
if (!isMainHistory(fh))
patch = getWorkDirDiff(fh->fileNames().first());
QString date(QString::number(QDateTime::currentDateTime().toTime_t()));
QString author("Working Dir");
QStringList parents(parent);
Rev* c = fakeRevData(ZERO_SHA, parents, author, date, log, longLog, patch, idx, fh);
c->isDiffCache = true;
c->lanes.append(EMPTY);
return c;
}
const RevFile* Git::fakeWorkDirRevFile(const WorkingDirInfo& wd) {
FileNamesLoader fl;
RevFile* rf = new RevFile();
parseDiffFormat(*rf, wd.diffIndex, fl);
rf->
FOREACH_SL (it, wd.otherFiles) {
appendFileName(*rf, *it, fl);
rf->status.append(RevFile::UNKNOWN);
rf->mergeParent.append(1);
}
RevFile cachedFiles;
parseDiffFormat(cachedFiles, wd.diffIndexCached, fl);
flushFileNames(fl);
for (int i = 0; i < rf->count(); i++)
if (findFileIndex(cachedFiles, filePath(*rf, i)) != -1)
rf->status[i] |= RevFile::IN_INDEX;
return rf;
}
void Git::getDiffIndex() {
QString status;
if (!run("git status", &status)) // git status refreshes the index, run as first
return;
QString head;
if (!run("git rev-parse --revs-only HEAD", &head))
return;
head = head.trimmed();
if (!head.isEmpty()) { // repository initialized but still no history
if (!run("git diff-index " + head, &workingDirInfo.diffIndex))
return;
// check for files already updated in cache, we will
// save this information in status third field
if (!run("git diff-index --cached " + head, &workingDirInfo.diffIndexCached))
return;
}
// get any file not in tree
workingDirInfo.otherFiles = getOthersFiles();
// now mockup a RevFile
revsFiles.insert(ZERO_SHA_RAW, fakeWorkDirRevFile(workingDirInfo));
// then mockup the corresponding Rev
SCRef log = (isNothingToCommit() ? "Nothing to commit" : "Working dir changes");
const Rev* r = fakeWorkDirRev(head, log, status, revData->revOrder.count(), revData);
revData->revs.insert(ZERO_SHA_RAW, r);
revData->revOrder.append(ZERO_SHA_RAW);
revData->earlyOutputCntBase = revData->revOrder.count();
// finally send it to GUI
emit newRevsAdded(revData, revData->revOrder);
}
void Git::parseDiffFormatLine(RevFile& rf, SCRef line, int parNum, FileNamesLoader& fl) {
if (line[1] == ':') { // it's a combined merge
/* For combined merges rename/copy information is useless
* because nor the original file name, nor similarity info
* is given, just the status tracks that in the left/right
* branch a renamed/copy occurred (as example status could
* be RM or MR). For visualization purposes we could consider
* the file as modified
*/
appendFileName(rf, line.section('\t', -1), fl);
setStatus(rf, "M");
rf.mergeParent.append(parNum);
} else { // faster parsing in normal case
if (line.at(98) == '\t') {
appendFileName(rf, line.mid(99), fl);
setStatus(rf, line.at(97));
rf.mergeParent.append(parNum);
} else
// it's a rename or a copy, we are not in fast path now!
setExtStatus(rf, line.mid(97), parNum, fl);
}
}
void Git::setStatus(RevFile& rf, SCRef rowSt) {
char status = rowSt.at(0).toLatin1();
switch (status) {
case 'M':
case 'T':
case 'U':
rf.status.append(RevFile::MODIFIED);
break;
case 'D':
rf.status.append(RevFile::DELETED);
rf.
break;
case 'A':
rf.status.append(RevFile::NEW);
rf.
break;
case '?':
rf.status.append(RevFile::UNKNOWN);
rf.
break;
default:
dbp("ASSERT in Git::setStatus, unknown status <%1>. "
"'MODIFIED' will be used instead.", rowSt);
rf.status.append(RevFile::MODIFIED);
break;
}
}
void Git::setExtStatus(RevFile& rf, SCRef rowSt, int parNum, FileNamesLoader& fl) {
const QStringList sl(rowSt.split('\t', QString::SkipEmptyParts));
if (sl.count() != 3) {
dbp("ASSERT in setExtStatus, unexpected status string %1", rowSt);
return;
}
// we want store extra info with format "orig --> dest (Rxx%)"
// but git give us something like "Rxx\t<orig>\t<dest>"
SCRef type = sl[0];
SCRef orig = sl[1];
SCRef dest = sl[2];
const QString extStatusInfo(orig + " --> " + dest + " (" + type + "%)");
/*
NOTE: we set rf.extStatus size equal to position of latest
copied/renamed file. So it can have size lower then
rf.count() if after copied/renamed file there are
others. Here we have no possibility to know final
dimension of this RefFile. We are still in parsing.
*/
// simulate new file
appendFileName(rf, dest, fl);
rf.mergeParent.append(parNum);
rf.status.append(RevFile::NEW);
rf.extStatus.resize(rf.status.size());
rf.extStatus[rf.status.size() - 1] = extStatusInfo;
// simulate deleted orig file only in case of rename
if (type.at(0) == 'R') { // renamed file
appendFileName(rf, orig, fl);
rf.mergeParent.append(parNum);
rf.status.append(RevFile::DELETED);
rf.extStatus.resize(rf.status.size());
rf.extStatus[rf.status.size() - 1] = extStatusInfo;
}
rf.
}
void Git::parseDiffFormat(RevFile& rf, SCRef buf, FileNamesLoader& fl) {
int parNum = 1, startPos = 0, endPos = buf.indexOf('\n');
while (endPos != -1) {
SCRef line = buf.mid(startPos, endPos - startPos);
if (line[0] == ':') // avoid sha's in merges output
parseDiffFormatLine(rf, line, parNum, fl);
else
parNum++;
startPos = endPos + 1;
endPos = buf.indexOf('\n', endPos + 99);
}
}
bool Git::startParseProc(SCList initCmd, FileHistory* fh, SCRef buf) {
DataLoader* dl = new DataLoader(this, fh); // auto-deleted when done
connect(this, SIGNAL(cancelLoading(const FileHistory*)),
dl, SLOT(on_cancel(const FileHistory*)));
connect(dl, SIGNAL(newDataReady(const FileHistory*)),
this, SLOT(on_newDataReady(const FileHistory*)));
connect(dl, SIGNAL(loaded(FileHistory*, ulong, int,
bool, const QString&, const QString&)), this,
SLOT(on_loaded(FileHistory*, ulong, int,
bool, const QString&, const QString&)));
return dl->start(initCmd, workDir, buf);
}
bool Git::startRevList(SCList args, FileHistory* fh) {
QString baseCmd("git log --topo-order --no-color "
#ifndef Q_OS_WIN32
"--log-size " // FIXME broken on Windows
#endif
"--parents --boundary -z "
"--pretty=format:%m%HX%PX%n%cn<%ce>%n%an<%ae>%n%at%n%s%n");
// we don't need log message body for file history
if (isMainHistory(fh))
baseCmd.append("%b");
QStringList initCmd(baseCmd.split(' '));
if (!isMainHistory(fh)) {
/*
NOTE: we don't use '--remove-empty' option because
in case a file is deleted and then a new file with
the same name is created again in the same directory
then, with this option, file history is truncated to
the file deletion revision.
*/
initCmd << QString("-r -m -p --full-index").split(' ');
} else
{} // initCmd << QString("--early-output"); currently disabled
return startParseProc(initCmd + args, fh, QString());
}
bool Git::startUnappliedList() {
QStringList unAppliedShaList(getAllRefSha(UN_APPLIED));
if (unAppliedShaList.isEmpty())
return false;
// WARNING: with this command 'git log' could send spurious
// revs so we need some filter out logic during loading
QString cmd("git log --no-color --parents -z "
#ifndef Q_OS_WIN32
"--log-size " // FIXME broken on Windows
#endif
"--pretty=format:%m%HX%PX%n%an<%ae>%n%at%n%s%n%b ^HEAD");
QStringList sl(cmd.split(' '));
sl << unAppliedShaList;
return startParseProc(sl, revData, QString());
}
void Git::stop(bool saveCache) {
// normally called when changing directory or closing
EM_RAISE(exGitStopped);
// stop all data sending from process and asks them
// to terminate. Note that process could still keep
// running for a while although silently
emit cancelAllProcesses(); // non blocking
// after cancelAllProcesses() procFinished() is not called anymore
// TODO perhaps is better to call procFinished() also if process terminated
// incorrectly as QProcess does. BUt first we need to fix FileView::on_loadCompleted()
emit fileNamesLoad(1, revsFiles.count() - filesLoadingStartOfs);
if (cacheNeedsUpdate && saveCache) {
cacheNeedsUpdate = false;
if (!filesLoadingCurSha.isEmpty()) // we are in the middle of a loading
revsFiles.remove(toTempSha(filesLoadingCurSha)); // remove partial data
if (!revsFiles.isEmpty()) {
SHOW_MSG("Saving cache. Please wait...");
if (!Cache::save(gitDir, revsFiles, dirNamesVec, fileNamesVec))
dbs("ERROR unable to save file names cache");
}
}
}
void Git::clearRevs() {
revData->clear();
patchesStillToFind = 0; // TODO TEST WITH FILTERING
firstNonStGitPatch = "";
workingDirInfo.clear();
revsFiles.remove(ZERO_SHA_RAW);
}
void Git::clearFileNames() {
qDeleteAll(revsFiles);
revsFiles.clear();
fileNamesMap.clear();
dirNamesMap.clear();
dirNamesVec.clear();
fileNamesVec.clear();
revsFilesShaBackupBuf.clear();
cacheNeedsUpdate = false;
}
bool Git::init(SCRef wd, bool askForRange, const QStringList* passedArgs, bool overwriteArgs, bool* quit) {
// normally called when changing git directory. Must be called after stop()
*quit = false;
clearRevs();
/* we only update filtering info here, original arguments
* are not overwritten. Only getArgs() can update arguments,
* an exception is if flag overwriteArgs is set
*/
loadArguments.filteredLoading = (!overwriteArgs && passedArgs != NULL);
if (loadArguments.filteredLoading)
loadArguments.filterList = *passedArgs;
if (overwriteArgs) // in this case must be passedArgs != NULL
loadArguments.args = *passedArgs;
try {
setThrowOnStop(true);
const QString msg1("Path is '" + workDir + "' Loading ");
// check if repository is valid
bool repoChanged;
workDir = getBaseDir(&repoChanged, wd, &isGIT, &gitDir);
if (repoChanged) {
localDates.clear();
clearFileNames();
fileCacheAccessed = false;
SHOW_MSG(msg1 + "file names cache...");
loadFileCache();
SHOW_MSG("");
}
if (!isGIT) {
setThrowOnStop(false);
return false;
}
if (!passedArgs) {
// update text codec according to repo settings
bool dummy;
QTextCodec::setCodecForCStrings(getTextCodec(&dummy));
// load references
SHOW_MSG(msg1 + "refs...");
if (!getRefs())
dbs("WARNING: no tags or heads found");
// startup input range dialog
SHOW_MSG("");
if (startup || askForRange) {
loadArguments.args = getArgs(quit, repoChanged); // must be called with refs loaded
if (*quit) {
setThrowOnStop(false);
return false;
}
}
// load StGit unapplied patches, must be after getRefs()
if (isStGIT) {
loadingUnAppliedPatches = startUnappliedList();
if (loadingUnAppliedPatches) {
SHOW_MSG(msg1 + "StGIT unapplied patches...");
setThrowOnStop(false);
// we will continue with init2() at
// the end of loading...
return true;
}
}
}
init2();
setThrowOnStop(false);
return true;
} catch (int i) {
setThrowOnStop(false);
if (isThrowOnStopRaised(i, "initializing 1")) {
EM_THROW_PENDING;
return false;
}
const QString info("Exception \'" + EM_DESC(i) + "\' "
"not handled in init...re-throw");
dbs(info);
throw;
}
}
void Git::init2() {
const QString msg1("Path is '" + workDir + "' Loading ");
// after loading unapplied patch update base early output offset to
// avoid losing unapplied patches at first early output event
if (isStGIT)
revData->earlyOutputCntBase = revData->revOrder.count();
try {
setThrowOnStop(true);
// load working dir files
if (!loadArguments.filteredLoading && testFlag(DIFF_INDEX_F)) {
SHOW_MSG(msg1 + "working directory changed files...");
getDiffIndex(); // blocking, we could be in setRepository() now
}
SHOW_MSG(msg1 + "revisions...");
// build up command line arguments
QStringList args(loadArguments.args);
if (loadArguments.filteredLoading) {
if (!args.contains("--"))
args << "--";
args << loadArguments.filterList;
}
if (!startRevList(args, revData))
SHOW_MSG("ERROR: unable to start 'git log'");
setThrowOnStop(false);
} catch (int i) {
setThrowOnStop(false);
if (isThrowOnStopRaised(i, "initializing 2")) {
EM_THROW_PENDING;
return;
}
const QString info("Exception \'" + EM_DESC(i) + "\' "
"not handled in init2...re-throw");
dbs(info);
throw;
}
}
void Git::on_newDataReady(const FileHistory* fh) {
emit newRevsAdded(fh , fh->revOrder);
}
void Git::on_loaded(FileHistory* fh, ulong byteSize, int loadTime,
bool normalExit, SCRef cmd, SCRef errorDesc) {
if (!errorDesc.isEmpty()) {
MainExecErrorEvent* e = new MainExecErrorEvent(cmd, errorDesc);
QApplication::postEvent(parent(), e);
}
if (normalExit) { // do not send anything if killed
on_newDataReady(fh);
if (!loadingUnAppliedPatches) {
fh->loadTime += loadTime;
uint kb = byteSize / 1024;
float mbs = (float)byteSize / fh->loadTime / 1000;
QString tmp;
tmp.sprintf("Loaded %i revisions (%i KB), "
"time elapsed: %i ms (%.2f MB/s)",
fh->revs.count(), kb, fh->loadTime, mbs);
if (!tryFollowRenames(fh))
emit loadCompleted(fh, tmp);
if (isMainHistory(fh))
// wait the dust to settle down before to start
// background file names loading for new revisions
QTimer::singleShot(500, this, SLOT(loadFileNames()));
}
}
if (loadingUnAppliedPatches) {
loadingUnAppliedPatches = false;
revData->lns->clear(); // again to reset lanes
init2(); // continue with loading of remaining revisions
}
}
bool Git::tryFollowRenames(FileHistory* fh) {
if (isMainHistory(fh))
return false;
QStringList oldNames;
QMutableStringListIterator it(fh->renamedRevs);
while (it.hasNext())
if (!populateRenamedPatches(it.next(), fh->curFNames, fh, &oldNames, false))
it.remove();
if (fh->renamedRevs.isEmpty())
return false;
QStringList args;
args << fh->renamedRevs << "--" << oldNames;
fh->fNames << oldNames;
fh->curFNames = oldNames;
fh->renamedRevs.clear();
return startRevList(args, fh);
}
bool Git::populateRenamedPatches(SCRef renamedSha, SCList newNames, FileHistory* fh,
QStringList* oldNames, bool backTrack) {
QString runOutput;
if (!run("git diff-tree -r -M " + renamedSha, &runOutput))
return false;
// find the first renamed file with the new file name in renamedFiles list
QString line;
FOREACH_SL (it, newNames) {
if (backTrack) {
line = runOutput.section('\t' + *it + '\t', 0, 0,
QString::SectionIncludeTrailingSep);
line.chop(1);
} else
line = runOutput.section('\t' + *it + '\n', 0, 0);
if (!line.isEmpty())
break;
}
if (line.contains('\n'))
line = line.section('\n', -1, -1);
SCRef status = line.section('\t', -2, -2).section(' ', -1, -1);
if (!status.startsWith('R'))
return false;
if (backTrack) {
SCRef nextFile = runOutput.section(line, 1, 1).section('\t', 1, 1);
oldNames->append(nextFile.section('\n', 0, 0));
return true;
}
// get the diff betwen two files
SCRef prevFileSha = line.section(' ', 2, 2);
SCRef lastFileSha = line.section(' ', 3, 3);
if (prevFileSha == lastFileSha) // just renamed
runOutput.clear();
else if (!run("git diff -r --full-index " + prevFileSha + " " + lastFileSha, &runOutput))
return false;
SCRef prevFile = line.section('\t', -1, -1);
if (!oldNames->contains(prevFile))
oldNames->append(prevFile);
// save the patch, will be used later to create a
// proper graft sha with correct parent info
if (fh) {
QString tmp(!runOutput.isEmpty() ? runOutput : "diff --\nsimilarity index 100%\n");
fh->renamedPatches.insert(renamedSha, tmp);
}
return true;
}
void Git::populateFileNamesMap() {
for (int i = 0; i < dirNamesVec.count(); ++i)
dirNamesMap.insert(dirNamesVec[i], i);
for (int i = 0; i < fileNamesVec.count(); ++i)
fileNamesMap.insert(fileNamesVec[i], i);
}
void Git::loadFileCache() {
if (!fileCacheAccessed) {
fileCacheAccessed = true;
QByteArray shaBuf;
if (Cache::load(gitDir, revsFiles, dirNamesVec, fileNamesVec, shaBuf)) {
revsFilesShaBackupBuf.append(shaBuf);
populateFileNamesMap();
} else
dbs("ERROR: unable to load file names cache");
}
}
void Git::loadFileNames() {
indexTree(); // we are sure data loading is finished at this point
int revCnt = 0;
QString diffTreeBuf;
FOREACH (ShaVect, it, revData->revOrder) {
if (!revsFiles.contains(*it)) {
const Rev* c = revLookup(*it);
if (c->parentsCount() == 1) { // skip initials and merges
diffTreeBuf.append(*it).append('\n');
revCnt++;
}
}
}
if (!diffTreeBuf.isEmpty()) {
filesLoadingPending = filesLoadingCurSha = "";
filesLoadingStartOfs = revsFiles.count();
emit fileNamesLoad(3, revCnt);
const QString runCmd("git diff-tree --no-color -r -C --stdin");
runAsync(runCmd, this, diffTreeBuf);
}
}
bool Git::filterEarlyOutputRev(FileHistory* fh, Rev* rev) {
if (fh->earlyOutputCnt < fh->revOrder.count()) {
const ShaString& sha = fh->revOrder[fh->earlyOutputCnt++];
const Rev* c = revLookup(sha, fh);
if (c) {
if (rev->sha() != sha || rev->parents() != c->parents()) {
// mismatch found! set correct value, 'rev' will
// overwrite 'c' upon returning
rev->orderIdx = c->orderIdx;
revData->clear(false); // flush the tail
} else
return true; // filter out 'rev'
}
}
// we have new revisions, exit from early output state
fh->setEarlyOutputState(false);
return false;
}
int Git::addChunk(FileHistory* fh, const QByteArray& ba, int start) {
RevMap& r = fh->revs;
int nextStart;
Rev* rev;
do {
// only here we create a new rev
rev = new Rev(ba, start, fh->revOrder.count(), &nextStart, !isMainHistory(fh));
if (nextStart == -2) {
delete rev;
fh->setEarlyOutputState(true);
start = ba.indexOf('\n', start) + 1;
}
} while (nextStart == -2);
if (nextStart == -1) { // half chunk detected
delete rev;
return -1;
}
const ShaString& sha = rev->sha();
if (fh->earlyOutputCnt != -1 && filterEarlyOutputRev(fh, rev)) {
delete rev;
return nextStart;
}
if (isStGIT) {
if (loadingUnAppliedPatches) { // filter out possible spurious revs
Reference* rf = lookupReference(sha);
if (!(rf && (rf->type & UN_APPLIED))) {
delete rev;
return nextStart;
}
}
// remove StGIT spurious revs filter
if (!firstNonStGitPatch.isEmpty() && firstNonStGitPatch == sha)
firstNonStGitPatch = "";
// StGIT called with --all option creates spurious revs so filter
// out unknown revs until no more StGIT patches are waited and
// firstNonStGitPatch is reached
if (!(firstNonStGitPatch.isEmpty() && patchesStillToFind == 0) &&
!loadingUnAppliedPatches && isMainHistory(fh)) {
Reference* rf = lookupReference(sha);
if (!(rf && (rf->type & APPLIED))) {
delete rev;
return nextStart;
}
}
if (r.contains(sha)) {
// StGIT unapplied patches could be sent again by
// 'git log' as example if called with --all option.
if (r[sha]->isUnApplied) {
delete rev;
return nextStart;
}
// could be a side effect of 'git log -m', see below
if (isMainHistory(fh) || rev->parentsCount() < 2)
dbp("ASSERT: addChunk sha <%1> already received", sha);
}
}
if (r.isEmpty() && !isMainHistory(fh)) {
bool added = copyDiffIndex(fh, sha);
rev->orderIdx = added ? 1 : 0;
}
if ( !isMainHistory(fh)
&& !fh->renamedPatches.isEmpty()
&& fh->renamedPatches.contains(sha)) {
// this is the new rev with renamed file, the rev is correct but
// the patch, create a new rev with proper patch and use that instead
const Rev* prevSha = revLookup(sha, fh);
Rev* c = fakeRevData(sha, rev->parents(), rev->author(),
rev->authorDate(), rev->shortLog(), rev->longLog(),
fh->renamedPatches[sha], prevSha->orderIdx, fh);
r.insert(sha, c); // overwrite old content
fh->renamedPatches.remove(sha);
return nextStart;
}
if (!isMainHistory(fh) && rev->parentsCount() > 1 && r.contains(sha)) {
/* In this case git log is called with -m option and merges are splitted
in one commit per parent but all them have the same sha.
So we add only the first to fh->revOrder to display history correctly,
but we nevertheless add all the commits to 'r' so that annotation code
can get the patches.
*/
QString mergeSha;
int i = 0;
do
mergeSha = QString::number(++i) + " m " + sha;
while (r.contains(toTempSha(mergeSha)));
const ShaString& ss = toPersistentSha(mergeSha, shaBackupBuf);
r.insert(ss, rev);
} else {
r.insert(sha, rev);
fh->revOrder.append(sha);
if (rev->parentsCount() == 0 && !isMainHistory(fh))
fh->renamedRevs.append(sha);
}
if (isStGIT) {
// updateLanes() is called too late, after loadingUnAppliedPatches
// has been reset so update the lanes now.
if (loadingUnAppliedPatches) {
Rev* c = const_cast<Rev*>(revLookup(sha, fh));
c->isUnApplied = true;
c->lanes.append(UNAPPLIED);
} else if (patchesStillToFind > 0 || !isMainHistory(fh)) { // try to avoid costly lookup
Reference* rf = lookupReference(sha);
if (rf && (rf->type & APPLIED)) {
Rev* c = const_cast<Rev*>(revLookup(sha, fh));
c->isApplied = true;
if (isMainHistory(fh)) {
patchesStillToFind--;
if (patchesStillToFind == 0)
// any rev will be discarded until
// firstNonStGitPatch arrives
firstNonStGitPatch = c->parent(0);
}
}
}
}
return nextStart;
}
bool Git::copyDiffIndex(FileHistory* fh, SCRef parent) {
// must be called with empty revs and empty revOrder
if (!fh->revOrder.isEmpty() || !fh->revs.isEmpty()) {
dbs("ASSERT in copyDiffIndex: called with wrong context");
return false;
}
const Rev* r = revLookup(ZERO_SHA);
if (!r)
return false;
const RevFile* files = getFiles(ZERO_SHA);
if (!files || findFileIndex(*files, fh->fileNames().first()) == -1)
return false;
// insert a custom ZERO_SHA rev with proper parent
const Rev* rf = fakeWorkDirRev(parent, "Working dir changes", "long log\n", 0, fh);
fh->revs.insert(ZERO_SHA_RAW, rf);
fh->revOrder.append(ZERO_SHA_RAW);
return true;
}
void Git::setLane(SCRef sha, FileHistory* fh) {
Lanes* l = fh->lns;
uint i = fh->firstFreeLane;
QVector<QByteArray> ba;
const ShaString& ss = toPersistentSha(sha, ba);
const ShaVect& shaVec(fh->revOrder);
for (uint cnt = shaVec.count(); i < cnt; ++i) {
const ShaString& curSha = shaVec[i];
Rev* r = const_cast<Rev*>(revLookup(curSha, fh));
if (r->lanes.count() == 0)
updateLanes(*r, *l, curSha);
if (curSha == ss)
break;
}
fh->firstFreeLane = ++i;
}
void Git::updateLanes(Rev& c, Lanes& lns, SCRef sha) {
// we could get third argument from c.sha(), but we are in fast path here
// and c.sha() involves a deep copy, so we accept a little redundancy
if (lns.isEmpty())
lns.init(sha);
bool isDiscontinuity;
bool isFork = lns.isFork(sha, isDiscontinuity);
bool isMerge = (c.parentsCount() > 1);
bool isInitial = (c.parentsCount() == 0);
if (isDiscontinuity)
lns.changeActiveLane(sha); // uses previous isBoundary state
lns.setBoundary(c.isBoundary()); // update must be here
if (isFork)
lns.setFork(sha);
if (isMerge)
lns.setMerge(c.parents());
if (c.isApplied)
lns.setApplied();
if (isInitial)
lns.setInitial();
lns.getLanes(c.lanes); // here lanes are snapshotted
SCRef nextSha = (isInitial) ? "" : QString(c.parent(0));
lns.nextParent(nextSha);
if (c.isApplied)
lns.afterApplied();
if (isMerge)
lns.afterMerge();
if (isFork)
lns.afterFork();
if (lns.isBranch())
lns.afterBranch();
// QString tmp = "", tmp2;
// for (uint i = 0; i < c.lanes.count(); i++) {
// tmp2.setNum(c.lanes[i]);
// tmp.append(tmp2 + "-");
// }
// qDebug("%s %s", tmp.toUtf8().data(), sha.toUtf8().data());
}
void Git::procFinished() {
flushFileNames(fileLoader);
filesLoadingPending = filesLoadingCurSha = "";
emit fileNamesLoad(1, revsFiles.count() - filesLoadingStartOfs);
}
void Git::procReadyRead(const QByteArray& fileChunk) {
if (filesLoadingPending.isEmpty())
filesLoadingPending = fileChunk;
else
filesLoadingPending.append(fileChunk); // add to previous half lines
RevFile* rf = NULL;
if (!filesLoadingCurSha.isEmpty() && revsFiles.contains(toTempSha(filesLoadingCurSha)))
rf = const_cast<RevFile*>(revsFiles[toTempSha(filesLoadingCurSha)]);
int nextEOL = filesLoadingPending.indexOf('\n');
int lastEOL = -1;
while (nextEOL != -1) {
SCRef line(filesLoadingPending.mid(lastEOL + 1, nextEOL - lastEOL - 1));
if (line.at(0) != ':') {
SCRef sha = line.left(40);
if (!rf || sha != filesLoadingCurSha) { // new commit
rf = new RevFile();
revsFiles.insert(toPersistentSha(sha, revsFilesShaBackupBuf), rf);
filesLoadingCurSha = sha;
cacheNeedsUpdate = true;
} else
dbp("ASSERT: repeated sha %1 in file names loading", sha);
} else // line.constref(0) == ':'
parseDiffFormatLine(*rf, line, 1, fileLoader);
lastEOL = nextEOL;
nextEOL = filesLoadingPending.indexOf('\n', lastEOL + 1);
}
if (lastEOL != -1)
filesLoadingPending.remove(0, lastEOL + 1);
emit fileNamesLoad(2, revsFiles.count() - filesLoadingStartOfs);
}
void Git::flushFileNames(FileNamesLoader& fl) {
if (!fl.rf)
return;
QByteArray& b = fl.rf->pathsIdx;
QVector<int>& dirs = fl.rfDirs;
b.clear();
b.resize(2 * dirs.size() * sizeof(int));
int* d = (int*)(b.data());
for (int i = 0; i < dirs.size(); i++) {
d[i] = dirs.at(i);
d[dirs.size() + i] = fl.rfNames.at(i);
}
dirs.clear();
fl.rfNames.clear();
fl.rf = NULL;
}
void Git::appendFileName(RevFile& rf, SCRef name, FileNamesLoader& fl) {
if (fl.rf != &rf) {
flushFileNames(fl);
fl.rf = &rf;
}
int idx = name.lastIndexOf('/') + 1;
SCRef dr = name.left(idx);
SCRef nm = name.mid(idx);
QHash<QString, int>::const_iterator it(dirNamesMap.constFind(dr));
if (it == dirNamesMap.constEnd()) {
int idx = dirNamesVec.count();
dirNamesMap.insert(dr, idx);
dirNamesVec.append(dr);
fl.rfDirs.append(idx);
} else
fl.rfDirs.append(*it);
it = fileNamesMap.constFind(nm);
if (it == fileNamesMap.constEnd()) {
int idx = fileNamesVec.count();
fileNamesMap.insert(nm, idx);
fileNamesVec.append(nm);
fl.rfNames.append(idx);
} else
fl.rfNames.append(*it);
}
void Git::updateDescMap(const Rev* r,uint idx, QHash<QPair<uint, uint>, bool>& dm,
QHash<uint, QVector<int> >& dv) {
QVector<int> descVec;
if (r->descRefsMaster != -1) {
const Rev* tmp = revLookup(revData->revOrder[r->descRefsMaster]);
const QVector<int>& nr = tmp->descRefs;
for (int i = 0; i < nr.count(); i++) {
if (!dv.contains(nr[i])) {
dbp("ASSERT descendant for %1 not found", r->sha());
return;
}
const QVector<int>& dvv = dv[nr[i]];
// copy the whole vector instead of each element
// in the first iteration of the loop below
descVec = dvv; // quick (shared) copy
for (int y = 0; y < dvv.count(); y++) {
uint v = (uint)dvv[y];
QPair<uint, uint> key = qMakePair(idx, v);
QPair<uint, uint> keyN = qMakePair(v, idx);
dm.insert(key, true);
dm.insert(keyN, false);
// we don't want duplicated entry, otherwise 'dvv' grows
// greatly in repos with many tagged development branches
if (i > 0 && !descVec.contains(v)) // i > 0 is rare, no
descVec.append(v); // need to optimize
}
}
}
descVec.append(idx);
dv.insert(idx, descVec);
}
void Git::mergeBranches(Rev* p, const Rev* r) {
int r_descBrnMaster = (checkRef(r->sha(), BRANCH | RMT_BRANCH) ? r->orderIdx : r->descBrnMaster);
if (p->descBrnMaster == r_descBrnMaster || r_descBrnMaster == -1)
return;
// we want all the descendant branches, so just avoid duplicates
const QVector<int>& src1 = revLookup(revData->revOrder[p->descBrnMaster])->descBranches;
const QVector<int>& src2 = revLookup(revData->revOrder[r_descBrnMaster])->descBranches;
QVector<int> dst(src1);
for (int i = 0; i < src2.count(); i++)
if (qFind(src1.constBegin(), src1.constEnd(), src2[i]) == src1.constEnd())
dst.append(src2[i]);
p->descBranches = dst;
p->descBrnMaster = p->orderIdx;
}
void Git::mergeNearTags(bool down, Rev* p, const Rev* r, const QHash<QPair<uint, uint>, bool>& dm) {
bool isTag = checkRef(r->sha(), TAG);
int r_descRefsMaster = isTag ? r->orderIdx : r->descRefsMaster;
int r_ancRefsMaster = isTag ? r->orderIdx : r->ancRefsMaster;
if (down && (p->descRefsMaster == r_descRefsMaster || r_descRefsMaster == -1))
return;
if (!down && (p->ancRefsMaster == r_ancRefsMaster || r_ancRefsMaster == -1))
return;
// we want the nearest tag only, so remove any tag
// that is ancestor of any other tag in p U r
const ShaVect& ro = revData->revOrder;
const ShaString& sha1 = down ? ro[p->descRefsMaster] : ro[p->ancRefsMaster];
const ShaString& sha2 = down ? ro[r_descRefsMaster] : ro[r_ancRefsMaster];
const QVector<int>& src1 = down ? revLookup(sha1)->descRefs : revLookup(sha1)->ancRefs;
const QVector<int>& src2 = down ? revLookup(sha2)->descRefs : revLookup(sha2)->ancRefs;
QVector<int> dst(src1);
for (int s2 = 0; s2 < src2.count(); s2++) {
bool add = false;
for (int s1 = 0; s1 < src1.count(); s1++) {
if (src2[s2] == src1[s1]) {
add = false;
break;
}
QPair<uint, uint> key = qMakePair((uint)src2[s2], (uint)src1[s1]);
if (!dm.contains(key)) { // could be empty if all tags are independent
add = true; // could be an independent path
continue;
}
add = (down && dm[key]) || (!down && !dm[key]);
if (add)
dst[s1] = -1; // mark for removing
else
break;
}
if (add)
dst.append(src2[s2]);
}
QVector<int>& nearRefs = (down ? p->descRefs : p->ancRefs);
int& nearRefsMaster = (down ? p->descRefsMaster : p->ancRefsMaster);
nearRefs.clear();
for (int s2 = 0; s2 < dst.count(); s2++)
if (dst[s2] != -1)
nearRefs.append(dst[s2]);
nearRefsMaster = p->orderIdx;
}
void Git::indexTree() {
const ShaVect& ro = revData->revOrder;
if (ro.count() == 0)
return;
// we keep the pairs(x, y). Value is true if x is
// ancestor of y or false if y is ancestor of x
QHash<QPair<uint, uint>, bool> descMap;
QHash<uint, QVector<int> > descVect;
// walk down the tree from latest to oldest,
// compute children and nearest descendants
for (uint i = 0, cnt = ro.count(); i < cnt; i++) {
uint type = checkRef(ro[i]);
bool isB = (type & (BRANCH | RMT_BRANCH));
bool isT = (type & TAG);
const Rev* r = revLookup(ro[i]);
if (isB) {
Rev* rr = const_cast<Rev*>(r);
if (r->descBrnMaster != -1) {
const ShaString& sha = ro[r->descBrnMaster];
rr->descBranches = revLookup(sha)->descBranches;
}
rr->descBranches.append(i);
}
if (isT) {
updateDescMap(r, i, descMap, descVect);
Rev* rr = const_cast<Rev*>(r);
rr->descRefs.clear();
rr->descRefs.append(i);
}
for (uint y = 0; y < r->parentsCount(); y++) {
Rev* p = const_cast<Rev*>(revLookup(r->parent(y)));
if (p) {
p->childs.append(i);
if (p->descBrnMaster == -1)
p->descBrnMaster = isB ? r->orderIdx : r->descBrnMaster;
else
mergeBranches(p, r);
if (p->descRefsMaster == -1)
p->descRefsMaster = isT ? r->orderIdx : r->descRefsMaster;
else
mergeNearTags(optGoDown, p, r, descMap);
}
}
}
// walk backward through the tree and compute nearest tagged ancestors
for (int i = ro.count() - 1; i >= 0; i--) {
const Rev* r = revLookup(ro[i]);
bool isTag = checkRef(ro[i], TAG);
if (isTag) {
Rev* rr = const_cast<Rev*>(r);
rr->ancRefs.clear();
rr->ancRefs.append(i);
}
for (int y = 0; y < r->childs.count(); y++) {
Rev* c = const_cast<Rev*>(revLookup(ro[r->childs[y]]));
if (c) {
if (c->ancRefsMaster == -1)
c->ancRefsMaster = isTag ? r->orderIdx:r->ancRefsMaster;
else
mergeNearTags(!optGoDown, c, r, descMap);
}
}
}
}
// ********************************* Rev **************************
const QString Rev::mid(int start, int len) const {
// warning no sanity check is done on arguments
const char* data = ba.constData();
return QString::fromAscii(data + start, len);
}
const QString Rev::midSha(int start, int len) const {
// warning no sanity check is done on arguments
const char* data = ba.constData();
return QString::fromLatin1(data + start, len); // faster then formAscii
}
const ShaString Rev::parent(int idx) const {
return ShaString(ba.constData() + shaStart + 41 + 41 * idx);
}
const QStringList Rev::parents() const {
QStringList p;
int idx = shaStart + 41;
for (int i = 0; i < parentsCnt; i++) {
p.append(midSha(idx, 40));
idx += 41;
}
return p;
}
int Rev::indexData(bool quick, bool withDiff) const {
/*
This is what 'git log' produces:
- a possible one line with "Final output:\n" in case of --early-output option
- one line with "log size" + len of this record
- one line with boundary info + sha + an arbitrary amount of parent's sha
- one line with committer name + e-mail
- one line with author name + e-mail
- one line with author date as unix timestamp
- zero or more non blank lines with other info, as the encoding FIXME
- one blank line
- zero or one line with log title
- zero or more lines with log message
- zero or more lines with diff content (only for file history)
- a terminating '\0'
*/
const int last = ba.size() - 1;
int logSize = 0, idx = start;
int logEnd, revEnd;
// direct access is faster then QByteArray.at()
const char* data = ba.constData();
char* fixup = const_cast<char*>(data); // to build '\0' terminating strings
if (start + 42 > last) // at least sha + 'X' + 'X' + '\n' + must be present
return -1;
if (data[start] == 'F') // "Final output", let caller handle this
return (ba.indexOf('\n', start) != -1 ? -2 : -1);
// parse log size if present
if (data[idx] == 'l') { // 'log size xxx\n'
idx += 9; // move idx to beginning of log size
int tmp;
while ((tmp = data[idx++]) != '\n')
logSize = logSize * 10 + tmp - 48;
}
// idx points to the boundary information
if (++idx + 42 > last)
return -1;
shaStart = idx;
// ok, now shaStart is valid but msgSize
// could be still 0 if not available
logEnd = shaStart - 1 + logSize;
if (logEnd > last)
return -1;
idx += 40; // now points to 'X' place holder
fixup[idx] = '\0'; // we want sha to be a '\0' terminated ascii string
parentsCnt = 0;
if (data[idx + 2] == '\n') // initial revision
++idx;
else do {
parentsCnt++;
idx += 41;
if (idx + 1 >= last)
break;
fixup[idx] = '\0'; // we want parents '\0' terminated
} while (data[idx + 1] != '\n');
++idx; // now points to the trailing '\n' of sha line
// check for !msgSize
if (withDiff || !logSize) {
revEnd = (logEnd > idx) ? logEnd - 1: idx;
do { // search for "\n\0" to handle (rare) cases of '\0'
// in content, see c42012 and bb8d8a6 in Linux tree
revEnd = ba.indexOf('\0', revEnd + 1);
if (revEnd == -1)
return -1;
} while (data[revEnd - 1] != '\n');
} else
revEnd = logEnd;
if (revEnd > last) // after this point we know to have the whole record
return -1;
// ok, now revEnd is valid but logEnd could be not if !logSize
// in case of diff we are sure content will be consumed so
// we go all the way
if (quick && !withDiff)
return ++revEnd;
comStart = ++idx;
idx = ba.indexOf('\n', idx); // committer line end
if (idx == -1) {
dbs("ASSERT in indexData: unexpected end of data");
return -1;
}
autStart = ++idx;
idx = ba.indexOf('\n', idx); // author line end
if (idx == -1) {
dbs("ASSERT in indexData: unexpected end of data");
return -1;
}
autDateStart = ++idx;
idx += 11; // date length + trailing '\n'
diffStart = diffLen = 0;
if (withDiff) {
diffStart = logSize ? logEnd : ba.indexOf("\ndiff ", idx);
if (diffStart != -1 && diffStart < revEnd)
diffLen = revEnd - ++diffStart;
else
diffStart = 0;
}
if (!logSize)
logEnd = diffStart ? diffStart : revEnd;
// ok, now logEnd is valid and we can handle the log
sLogStart = idx;
if (logEnd < sLogStart) { // no shortlog no longLog
sLogStart = sLogLen = 0;
lLogStart = lLogLen = 0;
} else {
lLogStart = ba.indexOf('\n', sLogStart);
if (lLogStart != -1 && lLogStart < logEnd - 1) {
sLogLen = lLogStart - sLogStart; // skip sLog trailing '\n'
lLogLen = logEnd - lLogStart; // include heading '\n' in long log
} else { // no longLog
sLogLen = logEnd - sLogStart;
if (data[sLogStart + sLogLen - 1] == '\n')
sLogLen--; // skip trailing '\n' if any
lLogStart = lLogLen = 0;
}
}
indexed = true;
return ++revEnd;
}
|