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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
This commit is contained in:
Oswald Buddenhagen
2014-03-11 13:39:55 +01:00
parent ee299651df 01715c6172
commit 52bf71fbdf
279 changed files with 3131 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1122,8 +1122,10 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(
QTC_CHECK(!findExistingVCSEditor(registerDynamicProperty, dynamicPropertyValue));
// Create new, set wait message, set up with source and codec
Core::IEditor *outputEditor = Core::EditorManager::openEditorWithContents(id, &title,
m_msgWait.toUtf8());
Core::IEditor *outputEditor
= Core::EditorManager::openEditorWithContents(id, &title, m_msgWait.toUtf8(),
(Core::EditorManager::OpenInOtherSplit
| Core::EditorManager::NoNewSplits));
outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
connect(rc, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
@@ -1140,7 +1142,6 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(
}
rc->setForceReadOnly(true);
Core::EditorManager::activateEditor(outputEditor);
if (configWidget)
rc->setConfigurationWidget(configWidget);
@@ -3215,7 +3216,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
filesToReset.append(newFile);
}
} else if (state & UnmergedFile && checked) {
QTC_ASSERT(false, continue); // There should not be unmerged files when commiting!
QTC_ASSERT(false, continue); // There should not be unmerged files when committing!
}
if (state == ModifiedFile && checked) {
@@ -3231,7 +3232,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
} else if (state == CopiedFile && checked) {
QTC_ASSERT(false, continue); // only is noticed after adding a new file to the index
} else if (state == UnmergedFile && checked) {
QTC_ASSERT(false, continue); // There should not be unmerged files when commiting!
QTC_ASSERT(false, continue); // There should not be unmerged files when committing!
}
}

2
src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
View File

@@ -227,7 +227,7 @@ QString GitoriousRepositoryWizardPage::repositoryName() const
QUrl GitoriousRepositoryWizardPage::repositoryURL() const
{
// Find by name (as we sorted the the repositories)
// Find by name (as we sorted the repositories)
const QString repoName = repositoryName();
foreach (const GitoriousRepository &r, m_projectPage->project()->repositories)
if (r.name == repoName)

5
src/plugins/git/gitversioncontrol.cpp
View File

@@ -152,6 +152,11 @@ QString GitVersionControl::vcsTopic(const QString &directory)
return topic;
}
QStringList GitVersionControl::additionalToolsPath() const
{
return m_client->settings()->searchPathList();
}
bool GitVersionControl::managesDirectory(const QString &directory, QString *topLevel) const
{
const QString topLevelFound = m_client->findRepositoryForDirectory(directory);

2
src/plugins/git/gitversioncontrol.h
View File

@@ -63,6 +63,8 @@ public:
bool vcsAnnotate(const QString &file, int line);
QString vcsTopic(const QString &directory);
QStringList additionalToolsPath() const;
void emitFilesChanged(const QStringList &);
void emitRepositoryChanged(const QString &);
void emitConfigurationChanged();