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

Git: Deduplicate diff editor creation sequence

Browse Source 
Change-Id: I9d0751726f0acb340f9b19be62c6bbe23ec460f7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Orgad Shaneh
2014-08-03 23:00:06 +03:00
committed by Orgad Shaneh
parent 127d3b9687
commit ee2023ef65
4 changed files with 104 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,7 @@ namespace Git {
namespace Internal {
class CommitData;
class GitDiffEditorReloader;
struct GitSubmitEditorPanelData;
class Stash;
@@ -143,10 +144,13 @@ public:
QString findGitDirForRepository(const QString &repositoryDir) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
void diff(const QString &workingDirectory, const QString &fileName) const;
void diff(const QString &workingDirectory,
const QStringList &unstagedFileNames,
const QStringList &stagedFileNames = QStringList()) const;
void diffFile(const QString &workingDirectory, const QString &fileName) const;
void diffFiles(const QString &workingDirectory,
const QStringList &unstagedFileNames,
const QStringList &stagedFileNames) const;
void diffProject(const QString &workingDirectory,
const QString &projectDirectory) const;
void diffRepository(const QString &workingDirectory) const;
void diffBranch(const QString &workingDirectory,
const QString &branchName) const;
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList());
@@ -363,6 +367,7 @@ private:
const QString &dynamicPropertyValue) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VcsBase::VcsBaseEditorWidget *createVcsEditor(Core::Id kind,
QString title,
const QString &source,
@@ -370,9 +375,11 @@ private:
const char *registerDynamicProperty,
const QString &dynamicPropertyValue,
VcsBase::VcsBaseEditorParameterWidget *configWidget) const;
DiffEditor::DiffEditorDocument *createDiffEditor(const QString &documentId,
const QString &source,
const QString &title) const;
GitDiffEditorReloader *findOrCreateDiffEditor(const QString &documentId,
const QString &source,
const QString &title,
const QString &workingDirectory) const;
VcsBase::VcsCommand *createCommand(const QString &workingDirectory,
VcsBase::VcsBaseEditorWidget* editor = 0,