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

Vcs: Use setters to set up DiffController parameters

Browse Source 
Plan is to avoid client use down there, so extract the actually
used data first and pass it down.

Change-Id: I088fc9cc3086e8f6e1e0c3c9d3a35445f752e6f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-02-04 08:11:50 +01:00
parent 8f88b89d81
commit c17767c78e
7 changed files with 120 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/subversion/subversionclient.cpp
View File

@@ -171,10 +171,8 @@ class SubversionDiffEditorController : public VcsBaseDiffEditorController
{
Q_OBJECT
public:
SubversionDiffEditorController(IDocument *document,
VcsBaseClient *client,
const QString &workingDirectory)
: VcsBaseDiffEditorController(document, client, workingDirectory)
SubversionDiffEditorController(IDocument *document, const QStringList &authOptions)
: VcsBaseDiffEditorController(document), m_authenticationOptions(authOptions)
{
forceContextLineCount(3); // SVN cannot change that when using internal diff
}
@@ -194,6 +192,7 @@ private:
State m_state = Idle;
QStringList m_filesList;
int m_changeNumber = 0;
QStringList m_authenticationOptions;
};
@@ -218,7 +217,7 @@ void SubversionDiffEditorController::requestDescription()
m_state = GettingDescription;
QStringList args(QLatin1String("log"));
args << SubversionClient::addAuthenticationOptions(settings());
args << m_authenticationOptions;
args << QLatin1String("-r");
args << QString::number(m_changeNumber);
runCommand(QList<QStringList>() << args, VcsCommand::SshPasswordPrompt);
@@ -230,7 +229,7 @@ void SubversionDiffEditorController::requestDiff()
QStringList args;
args << QLatin1String("diff");
args << SubversionClient::addAuthenticationOptions(settings());
args << m_authenticationOptions;
args << QLatin1String("--internal-diff");
if (ignoreWhitespace())
args << QLatin1String("-x") << QLatin1String("-uw");
@@ -273,8 +272,13 @@ SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const Q
IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title);
auto controller = qobject_cast<SubversionDiffEditorController *>(
DiffEditorController::controller(document));
if (!controller)
controller = new SubversionDiffEditorController(document, this, workingDirectory);
if (!controller) {
controller = new SubversionDiffEditorController(document, addAuthenticationOptions(settings()));
controller->setVcsBinary(settings().binaryPath());
controller->setVcsTimeoutS(settings().vcsTimeoutS());
controller->setProcessEnvironment(processEnvironment());
controller->setWorkingDirectory(workingDirectory);
}
VcsBase::setSource(document, source);
EditorManager::activateEditorForDocument(document);
return controller;