Differential D14492 Diff 38814 plugins/git/gitplugin.cpp

Changeset View

Standalone View

View Options

plugins/git/gitplugin.cpp

Show First 20 Lines • Show All 828 Lines • ▼ Show 20 Line(s)
829It's a very dirty implementation. 829​It's a very dirty implementation.
830FIXME: 830​FIXME:
8311. HEAD which is head has extra line to connect it with further commit 831​1. HEAD which is head has extra line to connect it with further commit
8322. If you menrge branch2 to master, only new commits of branch2 will be visible (it's fine, but there will be 832​2. If you menrge branch2 to master, only new commits of branch2 will be visible (it's fine, but there will be
833extra 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). 833​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).
8343. Commits that have additional commit-data (not only history merging, but changes to fix conflicts) are shown incorrectly 834​3. Commits that have additional commit-data (not only history merging, but changes to fix conflicts) are shown incorrectly
835*/ 835​*/
836 836​
837QVector<DVcsEvent> GitPlugin::getAllCommits(const QString &repo) 837​QVector<DVcsEvent> GitPlugin::allCommits(const QString& repo)
838{ 838​{
839 initBranchHash(repo); 839​ initBranchHash(repo);
840 840​
841 QStringList args; 841​ QStringList args;
842 args << QStringLiteral("--all") << QStringLiteral("--pretty") << QStringLiteral("--parents"); 842​ args << QStringLiteral("--all") << QStringLiteral("--pretty") << QStringLiteral("--parents");
843 QScopedPointer<DVcsJob> job(gitRevList(repo, args)); 843​ QScopedPointer<DVcsJob> job(gitRevList(repo, args));
844 bool ret = job->exec(); 844​ bool ret = job->exec();
845 Q_ASSERT(ret && job->status()==VcsJob::JobSucceeded && "TODO: provide a fall back in case of failing"); 845​ Q_ASSERT(ret && job->status()==VcsJob::JobSucceeded && "TODO: provide a fall back in case of failing");
▲ Show 20 Lines • Show All 709 Lines • Show Last 20 Lines