feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Use a separate thread for updating commit data

Browse Source 
Task-number: QTCREATORBUG-12449
Change-Id: I3057ca458272daac72c54abce1d6f9acf6a5d4af
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-20 16:00:20 +03:00
committed by Orgad Shaneh
parent aaa7cd5851
commit f3106ebafe
6 changed files with 100 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.h
View File

@@ -35,6 +35,7 @@
#include <coreplugin/editormanager/ieditor.h>
#include <QFutureSynchronizer>
#include <QObject>
#include <QString>
#include <QStringList>
@@ -329,6 +330,7 @@ public:
void endStashScope(const QString &workingDirectory);
bool isValidRevision(const QString &revision) const;
void handleMergeConflicts(const QString &workingDir, const QString &commit, const QStringList &files, const QString &abortCommand);
void addFuture(const QFuture<void> &future);
static QString msgNoChangedFiles();
static QString msgNoCommits(bool includeRemote);
@@ -433,6 +435,7 @@ private:
int m_contextDiffFileIndex;
int m_contextChunkIndex;
QPointer<DiffEditor::DiffEditorController> m_contextDocument;
QFutureSynchronizer<void> m_synchronizer; // for commit updates
};
} // namespace Internal