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

Git: Fix showing commits from rebase-todo editor

Browse Source 
We used to need the repository root in order to resolve the file.

This is no longer needed, since the raw patch is parsed instead.

Change-Id: Ifdbbcd686a5ef7bbbd472f37b20190b9e9abebe7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-29 17:35:41 +03:00
committed by Orgad Shaneh
parent cf211e46cf
commit 398872bcdc
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,11 +369,8 @@ GitDiffEditorReloader::GitDiffEditorReloader(QObject *parent)
void GitDiffEditorReloader::reload() void GitDiffEditorReloader::reload()
{ {
const QString workingDirectory = m_diffType == DiffShow
? m_gitClient->findRepositoryForDirectory(m_workingDirectory)
: m_workingDirectory;
GitDiffHandler *handler = new GitDiffHandler(diffEditorController(), GitDiffHandler *handler = new GitDiffHandler(diffEditorController(),
workingDirectory); m_workingDirectory);
connect(handler, SIGNAL(destroyed()), this, SLOT(reloadFinished())); connect(handler, SIGNAL(destroyed()), this, SLOT(reloadFinished()));
switch (m_diffType) { switch (m_diffType) {

1
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -750,6 +750,7 @@ static const char SOURCE_PROPERTY[] = "qtcreator_source";
void VcsBasePlugin::setSource(Core::IDocument *document, const QString &source) void VcsBasePlugin::setSource(Core::IDocument *document, const QString &source)
{ {
document->setProperty(SOURCE_PROPERTY, source); document->setProperty(SOURCE_PROPERTY, source);
VcsBasePluginPrivate::m_listener->slotStateChanged();
} }
QString VcsBasePlugin::source(Core::IDocument *document) QString VcsBasePlugin::source(Core::IDocument *document)