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

Git: Try do consolidate code duplication

Browse Source 
Change-Id: I5ac34d96152d6e4f9abc8f6dd18d1e1eab0bde7f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
hjk
2013-06-03 18:12:41 +02:00
committed by Jarek Kobus
parent 0f4cfa7e39
commit 8510c2ab2b
2 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/plugins/git/gitclient.cpp
View File

@@ -823,20 +823,29 @@ VcsBase::VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *regis
return rc; return rc;
} }
DiffEditor::DiffEditor *GitClient::findExistingDiffEditor(const char *registerDynamicProperty, DiffEditor::DiffEditor *GitClient::findExistingOrOpenNewDiffEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const const QString &dynamicPropertyValue, const QString &titlePattern) const
{ {
Core::IEditor *outputEditor = locateEditor(registerDynamicProperty, dynamicPropertyValue); Core::IEditor *outputEditor = locateEditor(registerDynamicProperty, dynamicPropertyValue);
if (!outputEditor) if (outputEditor) {
return 0;
// Exists already // Exists already
Core::EditorManager::activateEditor(outputEditor, Core::EditorManager::ModeSwitch); Core::EditorManager::activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
outputEditor->createNew(m_msgWait); outputEditor->createNew(m_msgWait);
return qobject_cast<DiffEditor::DiffEditor *>(outputEditor);
} }
DiffEditor::DiffEditor *editor = qobject_cast<DiffEditor::DiffEditor *>(outputEditor);
if (!editor) {
const Core::Id editorId = DiffEditor::Constants::DIFF_EDITOR_ID;
QString title = titlePattern;
editor = qobject_cast<DiffEditor::DiffEditor *>(
Core::EditorManager::openEditorWithContents(editorId, &title, m_msgWait));
editor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
Core::EditorManager::activateEditor(editor, Core::EditorManager::ModeSwitch); // should probably go outside this block
}
return editor;
}
/* Create an editor associated to VCS output of a source file/directory /* Create an editor associated to VCS output of a source file/directory
* (using the file's codec). Makes use of a dynamic property to find an * (using the file's codec). Makes use of a dynamic property to find an
* existing instance and to reuse it (in case, say, 'git diff foo' is * existing instance and to reuse it (in case, say, 'git diff foo' is
@@ -885,21 +894,13 @@ void GitClient::diff(const QString &workingDirectory,
const QStringList &unstagedFileNames, const QStringList &unstagedFileNames,
const QStringList &stagedFileNames) const QStringList &stagedFileNames)
{ {
const QString title = tr("Git Diff");
const int timeout = settings()->intValue(GitSettings::timeoutKey);
if (settings()->boolValue(GitSettings::useDiffEditorKey)) { if (settings()->boolValue(GitSettings::useDiffEditorKey)) {
const Core::Id editorId = DiffEditor::Constants::DIFF_EDITOR_ID; DiffEditor::DiffEditor *editor = findExistingOrOpenNewDiffEditor("originalFileName", workingDirectory, title);
QString title = tr("Git Diff");
DiffEditor::DiffEditor *editorEditable = findExistingDiffEditor("originalFileName", workingDirectory); GitDiffHandler *handler = new GitDiffHandler(editor, gitBinaryPath(), workingDirectory, processEnvironment(), timeout);
if (!editorEditable) {
editorEditable = qobject_cast<DiffEditor::DiffEditor *>(
Core::EditorManager::openEditorWithContents(editorId, &title, m_msgWait));
editorEditable->document()->setProperty("originalFileName", workingDirectory);
Core::EditorManager::activateEditor(editorEditable, Core::EditorManager::ModeSwitch); // should probably go outside this block
}
int timeout = settings()->intValue(GitSettings::timeoutKey);
GitDiffHandler *handler = new GitDiffHandler(editorEditable, gitBinaryPath(), workingDirectory, processEnvironment(), timeout);
if (unstagedFileNames.empty() && stagedFileNames.empty()) { if (unstagedFileNames.empty() && stagedFileNames.empty()) {
// local repository diff // local repository diff
@@ -914,7 +915,6 @@ void GitClient::diff(const QString &workingDirectory,
} else { } else {
const QString binary = settings()->stringValue(GitSettings::binaryPathKey); const QString binary = settings()->stringValue(GitSettings::binaryPathKey);
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
const QString title = tr("Git Diff");
VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", workingDirectory); VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", workingDirectory);
if (!editor) { if (!editor) {
@@ -940,8 +940,6 @@ void GitClient::diff(const QString &workingDirectory,
QStringList cmdArgs; QStringList cmdArgs;
cmdArgs << QLatin1String("diff") << QLatin1String(noColorOption); cmdArgs << QLatin1String("diff") << QLatin1String(noColorOption);
int timeout = settings()->intValue(GitSettings::timeoutKey);
if (unstagedFileNames.empty() && stagedFileNames.empty()) { if (unstagedFileNames.empty() && stagedFileNames.empty()) {
QStringList arguments(cmdArgs); QStringList arguments(cmdArgs);
arguments << userDiffArgs; arguments << userDiffArgs;
@@ -972,27 +970,18 @@ void GitClient::diff(const QString &workingDirectory,
const QStringList &diffArgs, const QStringList &diffArgs,
const QString &fileName) const QString &fileName)
{ {
const QString title = tr("Git Diff \"%1\"").arg(fileName);
if (settings()->boolValue(GitSettings::useDiffEditorKey)) { if (settings()->boolValue(GitSettings::useDiffEditorKey)) {
const Core::Id editorId = DiffEditor::Constants::DIFF_EDITOR_ID;
QString title = tr("Git Diff \"%1\"").arg(fileName);
const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileName); const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileName);
DiffEditor::DiffEditor *editor = findExistingOrOpenNewDiffEditor("originalFileName", sourceFile, title);
DiffEditor::DiffEditor *editorEditable = findExistingDiffEditor("originalFileName", sourceFile);
if (!editorEditable) {
editorEditable = qobject_cast<DiffEditor::DiffEditor *>(
Core::EditorManager::openEditorWithContents(editorId, &title, m_msgWait));
editorEditable->document()->setProperty("originalFileName", sourceFile);
Core::EditorManager::activateEditor(editorEditable, Core::EditorManager::ModeSwitch);
}
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
int timeout = settings()->intValue(GitSettings::timeoutKey); int timeout = settings()->intValue(GitSettings::timeoutKey);
GitDiffHandler *handler = new GitDiffHandler(editorEditable, gitBinaryPath(), workingDirectory, processEnvironment(), timeout); GitDiffHandler *handler = new GitDiffHandler(editor, gitBinaryPath(), workingDirectory, processEnvironment(), timeout);
handler->diffFile(fileName); handler->diffFile(fileName);
} }
} else { } else {
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
const QString title = tr("Git Diff \"%1\"").arg(fileName);
const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileName); const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileName);
VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", sourceFile); VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", sourceFile);
@@ -1022,24 +1011,16 @@ void GitClient::diffBranch(const QString &workingDirectory,
const QStringList &diffArgs, const QStringList &diffArgs,
const QString &branchName) const QString &branchName)
{ {
const QString title = tr("Git Diff Branch \"%1\"").arg(branchName);
if (settings()->boolValue(GitSettings::useDiffEditorKey)) { if (settings()->boolValue(GitSettings::useDiffEditorKey)) {
const Core::Id editorId = DiffEditor::Constants::DIFF_EDITOR_ID; DiffEditor::DiffEditor *editor =
QString title = tr("Git Diff Branch \"%1\"").arg(branchName); findExistingOrOpenNewDiffEditor("BranchName", branchName, title);
DiffEditor::DiffEditor *editorEditable = findExistingDiffEditor("BranchName", branchName);
if (!editorEditable) {
editorEditable = qobject_cast<DiffEditor::DiffEditor *>(
Core::EditorManager::openEditorWithContents(editorId, &title, m_msgWait));
editorEditable->document()->setProperty("BranchName", branchName);
Core::EditorManager::activateEditor(editorEditable, Core::EditorManager::ModeSwitch);
}
int timeout = settings()->intValue(GitSettings::timeoutKey); int timeout = settings()->intValue(GitSettings::timeoutKey);
GitDiffHandler *handler = new GitDiffHandler(editorEditable, gitBinaryPath(), workingDirectory, processEnvironment(), timeout); GitDiffHandler *handler = new GitDiffHandler(editor, gitBinaryPath(), workingDirectory, processEnvironment(), timeout);
handler->diffBranch(branchName); handler->diffBranch(branchName);
} else { } else {
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
const QString title = tr("Git Diff Branch \"%1\"").arg(branchName);
const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, QStringList()); const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, QStringList());
VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("BranchName", branchName); VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("BranchName", branchName);
@@ -1137,23 +1118,14 @@ void GitClient::show(const QString &source, const QString &id,
return; return;
} }
QString title = tr("Git Show \"%1\"").arg(name.isEmpty() ? id : name); const QString title = tr("Git Show \"%1\"").arg(name.isEmpty() ? id : name);
const QFileInfo sourceFi(source); const QFileInfo sourceFi(source);
const QString workDir = sourceFi.isDir() ? sourceFi.absoluteFilePath() : sourceFi.absolutePath(); const QString workDir = sourceFi.isDir() ? sourceFi.absoluteFilePath() : sourceFi.absolutePath();
if (settings()->boolValue(GitSettings::useDiffEditorKey)) { if (settings()->boolValue(GitSettings::useDiffEditorKey)) {
const Core::Id editorId = DiffEditor::Constants::DIFF_EDITOR_ID; DiffEditor::DiffEditor *editor = findExistingOrOpenNewDiffEditor("show", id, title);
DiffEditor::DiffEditor *editorEditable = findExistingDiffEditor("show", id);
if (!editorEditable) {
editorEditable = qobject_cast<DiffEditor::DiffEditor *>(
Core::EditorManager::openEditorWithContents(editorId, &title, m_msgWait));
editorEditable->document()->setProperty("show", id);
Core::EditorManager::activateEditor(editorEditable, Core::EditorManager::ModeSwitch); // should probably go outside this block
}
int timeout = settings()->intValue(GitSettings::timeoutKey); int timeout = settings()->intValue(GitSettings::timeoutKey);
GitDiffHandler *handler = new GitDiffHandler(editorEditable, gitBinaryPath(), GitDiffHandler *handler = new GitDiffHandler(editor, gitBinaryPath(),
findRepositoryForDirectory(workDir), findRepositoryForDirectory(workDir),
processEnvironment(), timeout); processEnvironment(), timeout);
handler->show(id); handler->show(id);

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

@@ -334,8 +334,9 @@ private:
QTextCodec *getSourceCodec(const QString &file) const; QTextCodec *getSourceCodec(const QString &file) const;
VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty, VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const; const QString &dynamicPropertyValue) const;
DiffEditor::DiffEditor *findExistingDiffEditor(const char *registerDynamicProperty, DiffEditor::DiffEditor *findExistingOrOpenNewDiffEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const; const QString &dynamicPropertyValue,
const QString &titlePattern) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone }; enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind, VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind,