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

Basic integration of diff editor inside git plugin

Browse Source 
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
jkobus
2013-05-07 14:02:08 +02:00
committed by Tobias Hunger
parent 60b1aaeae4
commit 97a86c50dc
20 changed files with 967 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,11 +60,16 @@ namespace Utils {
struct SynchronousProcessResponse;
}
namespace DiffEditor {
class DiffEditorWidget;
}
namespace Git {
namespace Internal {
class GitPlugin;
class GitOutputWindow;
class GitDiffEditorWidget;
class CommitData;
struct GitSubmitEditorPanelData;
class Stash;
@@ -128,6 +133,8 @@ public:
QString findRepositoryForDirectory(const QString &dir);
QString findGitDirForRepository(const QString &repositoryDir) const;
DiffEditor::DiffEditorWidget *diffEditorWidget(const Core::IEditor *editor) const;
void diff(const QString &workingDirectory, const QStringList &diffArgs, const QString &fileName);
void diff(const QString &workingDirectory, const QStringList &diffArgs,
const QStringList &unstagedFileNames, const QStringList &stagedFileNames= QStringList());
@@ -319,6 +326,9 @@ private:
QTextCodec *getSourceCodec(const QString &file) const;
VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
DiffEditor::DiffEditorWidget *findExistingDiffEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind,
QString title,