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

Git: Support diff against a selected commit

Browse Source 
Change-Id: Ibb4287bf00f1d0c3212630d60e59ab80b600a879
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2020-04-10 09:59:47 +03:00
committed by Orgad Shaneh
parent c49b9c9a21
commit 4e66cd0770
2 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,13 @@ public:
const QStringList &stagedFileNames) const;
void diffProject(const QString &workingDirectory,
const QString &projectDirectory) const;
void diffRepository(const QString &workingDirectory) const;
void diffRepository(const QString &workingDirectory) const
{
return diffRepository(workingDirectory, {}, {});
}
void diffRepository(const QString &workingDirectory,
const QString &leftCommit,
const QString &rightCommit) const;
void diffBranch(const QString &workingDirectory,
const QString &branchName) const;
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList());
@@ -407,6 +413,7 @@ private:
QString m_gitQtcEditor;
QMap<QString, StashInfo> m_stashInfo;
QString m_pushFallbackCommand;
QString m_diffCommit;
QStringList m_updatedSubmodules;
bool m_disableEditor;
QFutureSynchronizer<void> m_synchronizer; // for commit updates