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

Perforce: Diff for files in submit changelist dialog works

Browse Source 
Perforce repositories configured with P4CONFIG had a bug
in the submit dialog, one could not see the differences for
the submited files.

Change-Id: Ie15fd66667dca1c0863a29e87ff76583d9aa3bbb
Task-number: QTCREATORBUG-14538
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Cristian Adam
2015-07-13 10:29:59 +02:00
committed by Tobias Hunger
parent 9d8441986e
commit 0a0a620489
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/perforce/perforceplugin.cpp
View File

@@ -668,7 +668,7 @@ IEditor *PerforcePlugin::openPerforceSubmitEditor(const QString &fileName, const
submitEditor->registerActions(m_undoAction, m_redoAction, m_submitCurrentLogAction, m_diffSelectedFiles); submitEditor->registerActions(m_undoAction, m_redoAction, m_submitCurrentLogAction, m_diffSelectedFiles);
connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles, connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
this, &PerforcePlugin::slotSubmitDiff); this, &PerforcePlugin::slotSubmitDiff);
submitEditor->setCheckScriptWorkingDirectory(m_commitWorkingDirectory); submitEditor->setCheckScriptWorkingDirectory(m_settings.topLevel());
return editor; return editor;
} }
@@ -1250,7 +1250,7 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title,
void PerforcePlugin::slotSubmitDiff(const QStringList &files) void PerforcePlugin::slotSubmitDiff(const QStringList &files)
{ {
p4Diff(m_commitWorkingDirectory, files); p4Diff(m_settings.topLevel(), files);
} }
struct PerforceDiffParameters struct PerforceDiffParameters
@@ -1368,7 +1368,6 @@ void PerforcePlugin::cleanCommitMessageFile()
if (!m_commitMessageFileName.isEmpty()) { if (!m_commitMessageFileName.isEmpty()) {
QFile::remove(m_commitMessageFileName); QFile::remove(m_commitMessageFileName);
m_commitMessageFileName.clear(); m_commitMessageFileName.clear();
m_commitWorkingDirectory.clear();
} }
} }

1
src/plugins/perforce/perforceplugin.h
View File

@@ -246,7 +246,6 @@ private:
bool m_submitActionTriggered; bool m_submitActionTriggered;
QAction *m_diffSelectedFiles; QAction *m_diffSelectedFiles;
QString m_commitMessageFileName; QString m_commitMessageFileName;
QString m_commitWorkingDirectory;
mutable QString m_tempFilePattern; mutable QString m_tempFilePattern;
QAction *m_undoAction; QAction *m_undoAction;
QAction *m_redoAction; QAction *m_redoAction;