subversionplugin.cpp 43.9 KB
Newer Older
1
/**************************************************************************
con's avatar
con committed
2 3 4
**
** This file is part of Qt Creator
**
5
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
con's avatar
con committed
6
**
7
** Contact: Nokia Corporation (qt-info@nokia.com)
con's avatar
con committed
8
**
9
** Commercial Usage
10
**
11 12 13 14
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
15
**
16
** GNU Lesser General Public License Usage
17
**
18 19 20 21 22 23
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
24
**
25
** If you are unsure which license is appropriate for your use, please
hjk's avatar
hjk committed
26
** contact the sales department at http://qt.nokia.com/contact.
con's avatar
con committed
27
**
28
**************************************************************************/
hjk's avatar
hjk committed
29

con's avatar
con committed
30 31 32 33 34 35 36 37
#include "subversionplugin.h"

#include "settingspage.h"
#include "subversioneditor.h"

#include "subversionsubmiteditor.h"
#include "subversionconstants.h"
#include "subversioncontrol.h"
38
#include "checkoutwizard.h"
con's avatar
con committed
39 40 41 42

#include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/vcsbaseeditor.h>
#include <vcsbase/basevcssubmiteditorfactory.h>
43
#include <vcsbase/vcsbaseoutputwindow.h>
con's avatar
con committed
44
#include <utils/synchronousprocess.h>
45
#include <utils/parameteraction.h>
con's avatar
con committed
46 47 48 49 50 51 52

#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/filemanager.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/mimedatabase.h>
#include <coreplugin/uniqueidmanager.h>
53
#include <coreplugin/actionmanager/actionmanager.h>
con's avatar
con committed
54
#include <coreplugin/editormanager/editormanager.h>
hjk's avatar
hjk committed
55
#include <utils/qtcassert.h>
con's avatar
con committed
56 57

#include <QtCore/QDebug>
58
#include <QtCore/QDir>
con's avatar
con committed
59 60
#include <QtCore/QFileInfo>
#include <QtCore/QTemporaryFile>
61 62
#include <QtCore/QTextCodec>
#include <QtCore/QtPlugin>
con's avatar
con committed
63
#include <QtGui/QAction>
64 65
#include <QtGui/QFileDialog>
#include <QtGui/QMainWindow>
con's avatar
con committed
66 67
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
68 69 70
#include <QtGui/QInputDialog>

#include <limits.h>
con's avatar
con committed
71 72 73

using namespace Subversion::Internal;

74 75 76 77 78 79 80 81 82 83 84 85 86 87
static const char * const CMD_ID_SUBVERSION_MENU    = "Subversion.Menu";
static const char * const CMD_ID_ADD                = "Subversion.Add";
static const char * const CMD_ID_DELETE_FILE        = "Subversion.Delete";
static const char * const CMD_ID_REVERT             = "Subversion.Revert";
static const char * const CMD_ID_SEPARATOR0         = "Subversion.Separator0";
static const char * const CMD_ID_DIFF_PROJECT       = "Subversion.DiffAll";
static const char * const CMD_ID_DIFF_CURRENT       = "Subversion.DiffCurrent";
static const char * const CMD_ID_SEPARATOR1         = "Subversion.Separator1";
static const char * const CMD_ID_COMMIT_ALL         = "Subversion.CommitAll";
static const char * const CMD_ID_COMMIT_CURRENT     = "Subversion.CommitCurrent";
static const char * const CMD_ID_SEPARATOR2         = "Subversion.Separator2";
static const char * const CMD_ID_FILELOG_CURRENT    = "Subversion.FilelogCurrent";
static const char * const CMD_ID_ANNOTATE_CURRENT   = "Subversion.AnnotateCurrent";
static const char * const CMD_ID_SEPARATOR3         = "Subversion.Separator3";
88
static const char * const CMD_ID_SEPARATOR4         = "Subversion.Separator4";
89
static const char * const CMD_ID_STATUS             = "Subversion.Status";
90 91
static const char * const CMD_ID_PROJECTLOG         = "Subversion.ProjectLog";
static const char * const CMD_ID_REPOSITORYLOG      = "Subversion.RepositoryLog";
92 93
static const char * const CMD_ID_UPDATE             = "Subversion.Update";
static const char * const CMD_ID_DESCRIBE           = "Subversion.Describe";
con's avatar
con committed
94

95 96
static const char *nonInteractiveOptionC = "--non-interactive";

con's avatar
con committed
97 98 99
static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
{
    VCSBase::RegularCommandOutput,
100 101
    "Subversion Command Log Editor", // kind
    "Subversion Command Log Editor", // context
con's avatar
con committed
102 103 104
    "application/vnd.nokia.text.scs_svn_commandlog",
    "scslog"},
{   VCSBase::LogOutput,
105 106
    "Subversion File Log Editor",   // kind
    "Subversion File Log Editor",   // context
con's avatar
con committed
107 108 109
    "application/vnd.nokia.text.scs_svn_filelog",
    "scsfilelog"},
{    VCSBase::AnnotateOutput,
110 111
    "Subversion Annotation Editor",  // kind
    "Subversion Annotation Editor",  // context
con's avatar
con committed
112 113 114
    "application/vnd.nokia.text.scs_svn_annotation",
    "scsannotate"},
{   VCSBase::DiffOutput,
115 116
    "Subversion Diff Editor",  // kind
    "Subversion Diff Editor",  // context
con's avatar
con committed
117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
    "text/x-patch","diff"}
};

// Utility to find a parameter set by type
static inline const VCSBase::VCSBaseEditorParameters *findType(int ie)
{
    const VCSBase::EditorContentType et = static_cast<VCSBase::EditorContentType>(ie);
    return  VCSBase::VCSBaseEditor::findType(editorParameters, sizeof(editorParameters)/sizeof(VCSBase::VCSBaseEditorParameters), et);
}

static inline QString debugCodec(const QTextCodec *c)
{
    return c ? QString::fromAscii(c->name()) : QString::fromAscii("Null codec");
}

hjk's avatar
hjk committed
132
Core::IEditor* locateEditor(const char *property, const QString &entry)
con's avatar
con committed
133
{
134
    foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors())
con's avatar
con committed
135 136 137 138 139
        if (ed->property(property).toString() == entry)
            return ed;
    return 0;
}

140 141 142 143 144 145 146 147 148 149 150 151 152 153
// Parse "svn status" output for added/modified/deleted files
// "M<7blanks>file"
typedef QList<SubversionSubmitEditor::StatusFilePair> StatusList;

StatusList parseStatusOutput(const QString &output)
{
    StatusList changeSet;
    const QString newLine = QString(QLatin1Char('\n'));
    const QStringList list = output.split(newLine, QString::SkipEmptyParts);
    foreach (const QString &l, list) {
        const QString line =l.trimmed();
        if (line.size() > 8) {
            const QChar state = line.at(0);
            if (state == QLatin1Char('A') || state == QLatin1Char('D') || state == QLatin1Char('M')) {
154 155
                const QString fileName = line.mid(7); // Column 8 starting from svn 1.6
                changeSet.push_back(SubversionSubmitEditor::StatusFilePair(QString(state), fileName.trimmed()));
156 157 158 159 160 161 162
            }

        }
    }
    return changeSet;
}

163 164 165 166 167 168 169 170 171 172 173
// Return a list of names for the internal svn directories
static inline QStringList svnDirectories()
{
    QStringList rc(QLatin1String(".svn"));
#ifdef Q_OS_WIN
    // Option on Windows systems to avoid hassle with some IDEs
    rc.push_back(QLatin1String("_svn"));
#endif
    return rc;
}

con's avatar
con committed
174 175 176 177
// ------------- SubversionPlugin
SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0;

SubversionPlugin::SubversionPlugin() :
178
    VCSBase::VCSBasePlugin(QLatin1String(Subversion::Constants::SUBVERSIONCOMMITEDITOR_KIND)),
179
    m_svnDirectories(svnDirectories()),
con's avatar
con committed
180 181 182 183 184
    m_addAction(0),
    m_deleteAction(0),
    m_revertAction(0),
    m_diffProjectAction(0),
    m_diffCurrentAction(0),
185 186
    m_logProjectAction(0),
    m_logRepositoryAction(0),
con's avatar
con committed
187 188 189 190
    m_commitAllAction(0),
    m_commitCurrentAction(0),
    m_filelogCurrentAction(0),
    m_annotateCurrentAction(0),
191
    m_statusProjectAction(0),
con's avatar
con committed
192
    m_updateProjectAction(0),
193
    m_describeAction(0),
con's avatar
con committed
194 195 196
    m_submitCurrentLogAction(0),
    m_submitDiffAction(0),
    m_submitUndoAction(0),
197
    m_submitRedoAction(0),
198
    m_menuAction(0),
199
    m_submitActionTriggered(false)
con's avatar
con committed
200 201 202 203 204
{
}

SubversionPlugin::~SubversionPlugin()
{
205
    cleanCommitMessageFile();
con's avatar
con committed
206 207
}

208
void SubversionPlugin::cleanCommitMessageFile()
con's avatar
con committed
209
{
210 211 212
    if (!m_commitMessageFileName.isEmpty()) {
        QFile::remove(m_commitMessageFileName);
        m_commitMessageFileName.clear();
213
        m_commitRepository.clear();
con's avatar
con committed
214 215 216
    }
}

217 218 219 220 221
bool SubversionPlugin::isCommitEditorOpen() const
{
    return !m_commitMessageFileName.isEmpty();
}

con's avatar
con committed
222 223 224
static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = {
    Subversion::Constants::SUBVERSION_SUBMIT_MIMETYPE,
    Subversion::Constants::SUBVERSIONCOMMITEDITOR_KIND,
225
    Subversion::Constants::SUBVERSIONCOMMITEDITOR
con's avatar
con committed
226 227
};

228 229 230 231 232 233 234 235 236 237
static inline Core::Command *createSeparator(QObject *parent,
                                             Core::ActionManager *ami,
                                             const char*id,
                                             const QList<int> &globalcontext)
{
    QAction *tmpaction = new QAction(parent);
    tmpaction->setSeparator(true);
    return ami->registerAction(tmpaction, id, globalcontext);
}

238
bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *errorMessage)
con's avatar
con committed
239 240 241 242 243 244 245 246
{
    typedef VCSBase::VCSSubmitEditorFactory<SubversionSubmitEditor> SubversionSubmitEditorFactory;
    typedef VCSBase::VCSEditorFactory<SubversionEditor> SubversionEditorFactory;
    using namespace Constants;

    using namespace Core::Constants;
    using namespace ExtensionSystem;

247 248
    VCSBase::VCSBasePlugin::initialize(new SubversionControl(this));

con's avatar
con committed
249
    m_subversionPluginInstance = this;
hjk's avatar
hjk committed
250
    Core::ICore *core = Core::ICore::instance();
con's avatar
con committed
251

hjk's avatar
hjk committed
252
    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.subversion/Subversion.mimetypes.xml"), errorMessage))
con's avatar
con committed
253 254
        return false;

hjk's avatar
hjk committed
255
    if (QSettings *settings = core->settings())
con's avatar
con committed
256 257
        m_settings.fromSettings(settings);

258
    addAutoReleasedObject(new SettingsPage);
con's avatar
con committed
259

260
    addAutoReleasedObject(new SubversionSubmitEditorFactory(&submitParameters));
con's avatar
con committed
261 262 263

    static const char *describeSlot = SLOT(describe(QString,QString));
    const int editorCount = sizeof(editorParameters)/sizeof(VCSBase::VCSBaseEditorParameters);
264 265
    for (int i = 0; i < editorCount; i++)
        addAutoReleasedObject(new SubversionEditorFactory(editorParameters + i, this, describeSlot));
con's avatar
con committed
266

267 268
    addAutoReleasedObject(new CheckoutWizard);

con's avatar
con committed
269
    //register actions
hjk's avatar
hjk committed
270
    Core::ActionManager *ami = core->actionManager();
271
    Core::ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS);
con's avatar
con committed
272

273
    Core::ActionContainer *subversionMenu =
274
        ami->createMenu(QLatin1String(CMD_ID_SUBVERSION_MENU));
con's avatar
con committed
275 276
    subversionMenu->menu()->setTitle(tr("&Subversion"));
    toolsContainer->addMenu(subversionMenu);
277
    m_menuAction = subversionMenu->menu()->menuAction();
con's avatar
con committed
278
    QList<int> globalcontext;
hjk's avatar
hjk committed
279
    globalcontext << core->uniqueIDManager()->uniqueIdentifier(C_GLOBAL);
con's avatar
con committed
280

con's avatar
con committed
281
    Core::Command *command;
282
    m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
283
    command = ami->registerAction(m_addAction, CMD_ID_ADD,
con's avatar
con committed
284
        globalcontext);
con's avatar
con committed
285
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
286 287 288 289
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A")));
    connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
    subversionMenu->addAction(command);

290
    m_deleteAction = new Utils::ParameterAction(tr("Delete"), tr("Delete \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
291
    command = ami->registerAction(m_deleteAction, CMD_ID_DELETE_FILE,
con's avatar
con committed
292
        globalcontext);
con's avatar
con committed
293
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
294 295 296
    connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(deleteCurrentFile()));
    subversionMenu->addAction(command);

297
    m_revertAction = new Utils::ParameterAction(tr("Revert"), tr("Revert \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
298
    command = ami->registerAction(m_revertAction, CMD_ID_REVERT,
con's avatar
con committed
299
        globalcontext);
con's avatar
con committed
300
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
301 302 303
    connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
    subversionMenu->addAction(command);

304
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR0, globalcontext));
con's avatar
con committed
305

306
    m_diffProjectAction = new Utils::ParameterAction(tr("Diff Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
307
    command = ami->registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT,
con's avatar
con committed
308
        globalcontext);
309
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
310 311 312
    connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffProject()));
    subversionMenu->addAction(command);

313
    m_diffCurrentAction = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
con's avatar
con committed
314
    command = ami->registerAction(m_diffCurrentAction,
315
        CMD_ID_DIFF_CURRENT, globalcontext);
con's avatar
con committed
316
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
317 318 319 320
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+D")));
    connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
    subversionMenu->addAction(command);

321
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR1, globalcontext));
con's avatar
con committed
322 323

    m_commitAllAction = new QAction(tr("Commit All Files"), this);
324
    command = ami->registerAction(m_commitAllAction, CMD_ID_COMMIT_ALL,
con's avatar
con committed
325 326 327 328
        globalcontext);
    connect(m_commitAllAction, SIGNAL(triggered()), this, SLOT(startCommitAll()));
    subversionMenu->addAction(command);

329
    m_commitCurrentAction = new Utils::ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
con's avatar
con committed
330
    command = ami->registerAction(m_commitCurrentAction,
331
        CMD_ID_COMMIT_CURRENT, globalcontext);
con's avatar
con committed
332
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
333 334 335 336
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+C")));
    connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
    subversionMenu->addAction(command);

337
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR2, globalcontext));
con's avatar
con committed
338

339
    m_filelogCurrentAction = new Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
con's avatar
con committed
340
    command = ami->registerAction(m_filelogCurrentAction,
341
        CMD_ID_FILELOG_CURRENT, globalcontext);
con's avatar
con committed
342
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
343 344 345 346
    connect(m_filelogCurrentAction, SIGNAL(triggered()), this,
        SLOT(filelogCurrentFile()));
    subversionMenu->addAction(command);

347
    m_annotateCurrentAction = new Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
con's avatar
con committed
348
    command = ami->registerAction(m_annotateCurrentAction,
349
        CMD_ID_ANNOTATE_CURRENT, globalcontext);
con's avatar
con committed
350
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
351 352 353 354
    connect(m_annotateCurrentAction, SIGNAL(triggered()), this,
        SLOT(annotateCurrentFile()));
    subversionMenu->addAction(command);

355
    m_describeAction = new QAction(tr("Describe..."), this);
356
    command = ami->registerAction(m_describeAction, CMD_ID_DESCRIBE, globalcontext);
357 358 359
    connect(m_describeAction, SIGNAL(triggered()), this, SLOT(slotDescribe()));
    subversionMenu->addAction(command);

360
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR3, globalcontext));
con's avatar
con committed
361

362 363
    m_statusProjectAction = new Utils::ParameterAction(tr("Project Status"), tr("Status of Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_statusProjectAction, CMD_ID_STATUS,
con's avatar
con committed
364
        globalcontext);
365 366
    command->setAttribute(Core::Command::CA_UpdateText);
    connect(m_statusProjectAction, SIGNAL(triggered()), this, SLOT(projectStatus()));
con's avatar
con committed
367 368
    subversionMenu->addAction(command);

369 370 371 372 373 374
    m_logProjectAction = new Utils::ParameterAction(tr("Log Project Log"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_logProjectAction, CMD_ID_PROJECTLOG, globalcontext);
    command->setAttribute(Core::Command::CA_UpdateText);
    connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject()));
    subversionMenu->addAction(command);

375
    m_updateProjectAction = new Utils::ParameterAction(tr("Update Project"), tr("Update Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
376
    command = ami->registerAction(m_updateProjectAction, CMD_ID_UPDATE, globalcontext);
con's avatar
con committed
377
    connect(m_updateProjectAction, SIGNAL(triggered()), this, SLOT(updateProject()));
378
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
379 380
    subversionMenu->addAction(command);

381 382 383 384 385 386
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR4, globalcontext));
    m_logRepositoryAction = new QAction(tr("Repository Log"), this);
    command = ami->registerAction(m_logRepositoryAction, CMD_ID_REPOSITORYLOG, globalcontext);
    connect(m_logRepositoryAction, SIGNAL(triggered()), this, SLOT(logRepository()));
    subversionMenu->addAction(command);

con's avatar
con committed
387 388
    // Actions of the submit editor
    QList<int> svncommitcontext;
389
    svncommitcontext << Core::UniqueIDManager::instance()->uniqueIdentifier(Constants::SUBVERSIONCOMMITEDITOR);
con's avatar
con committed
390

391
    m_submitCurrentLogAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this);
con's avatar
con committed
392 393 394
    command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, svncommitcontext);
    connect(m_submitCurrentLogAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog()));

395
    m_submitDiffAction = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff Selected Files"), this);
con's avatar
con committed
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410
    command = ami->registerAction(m_submitDiffAction , Constants::DIFF_SELECTED, svncommitcontext);

    m_submitUndoAction = new QAction(tr("&Undo"), this);
    command = ami->registerAction(m_submitUndoAction, Core::Constants::UNDO, svncommitcontext);

    m_submitRedoAction = new QAction(tr("&Redo"), this);
    command = ami->registerAction(m_submitRedoAction, Core::Constants::REDO, svncommitcontext);

    return true;
}

void SubversionPlugin::extensionsInitialized()
{
}

411
bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor)
con's avatar
con committed
412
{
413
    if (!isCommitEditorOpen())
con's avatar
con committed
414 415
        return true;

416 417
    Core::IFile *fileIFace = submitEditor->file();
    const SubversionSubmitEditor *editor = qobject_cast<SubversionSubmitEditor *>(submitEditor);
con's avatar
con committed
418 419 420 421 422 423
    if (!fileIFace || !editor)
        return true;

    // Submit editor closing. Make it write out the commit message
    // and retrieve files
    const QFileInfo editorFile(fileIFace->fileName());
424
    const QFileInfo changeFile(m_commitMessageFileName);
con's avatar
con committed
425 426 427
    if (editorFile.absoluteFilePath() != changeFile.absoluteFilePath())
        return true; // Oops?!

428 429
    // Prompt user. Force a prompt unless submit was actually invoked (that
    // is, the editor was closed or shutdown).
430
    SubversionSettings newSettings = m_settings;
431 432 433
    const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer =
            editor->promptSubmit(tr("Closing Subversion Editor"),
                                 tr("Do you want to commit the change?"),
434
                                 tr("The commit message check failed. Do you want to commit the change?"),
435
                                 &newSettings.promptToSubmit, !m_submitActionTriggered);
436
    m_submitActionTriggered = false;
con's avatar
con committed
437
    switch (answer) {
438
    case VCSBase::VCSBaseSubmitEditor::SubmitCanceled:
con's avatar
con committed
439
        return false; // Keep editing and change file
440
    case VCSBase::VCSBaseSubmitEditor::SubmitDiscarded:
441
        cleanCommitMessageFile();
con's avatar
con committed
442 443 444 445
        return true; // Cancel all
    default:
        break;
    }
446
    setSettings(newSettings); // in case someone turned prompting off
con's avatar
con committed
447
    const QStringList fileList = editor->checkedFiles();
448
    bool closeEditor = true;
con's avatar
con committed
449 450
    if (!fileList.empty()) {
        // get message & commit
hjk's avatar
hjk committed
451
        Core::ICore::instance()->fileManager()->blockFileChange(fileIFace);
con's avatar
con committed
452
        fileIFace->save();
hjk's avatar
hjk committed
453
        Core::ICore::instance()->fileManager()->unblockFileChange(fileIFace);
454
        closeEditor= commit(m_commitMessageFileName, fileList);
con's avatar
con committed
455
    }
456
    if (closeEditor)
457
        cleanCommitMessageFile();
458
    return closeEditor;
con's avatar
con committed
459 460
}

461
void SubversionPlugin::diffCommitFiles(const QStringList &files)
con's avatar
con committed
462
{
463
    svnDiff(m_commitRepository, files);
con's avatar
con committed
464 465
}

466 467 468 469 470 471
static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db)
{
    if (VCSBase::VCSBaseEditor *ve = qobject_cast<VCSBase::VCSBaseEditor*>(editor->widget()))
        ve->setDiffBaseDirectory(db);
}

472
void SubversionPlugin::svnDiff(const QString &workingDir, const QStringList &files, QString diffname)
con's avatar
con committed
473 474 475
{
    if (Subversion::Constants::debug)
        qDebug() << Q_FUNC_INFO << files << diffname;
476
    const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
477
    QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VCSBase::VCSBaseEditor::getCodec(source);
con's avatar
con committed
478 479 480 481 482 483 484

    if (files.count() == 1 && diffname.isEmpty())
        diffname = QFileInfo(files.front()).fileName();

    QStringList args(QLatin1String("diff"));
    args << files;

485
    const SubversionResponse response = runSvn(workingDir, args, m_settings.timeOutMS(), false, codec);
con's avatar
con committed
486 487 488 489 490 491 492
    if (response.error)
        return;

    // diff of a single file? re-use an existing view if possible to support
    // the common usage pattern of continuously changing and diffing a file
    if (files.count() == 1) {
        // Show in the same editor if diff has been executed before
hjk's avatar
hjk committed
493
        if (Core::IEditor *editor = locateEditor("originalFileName", files.front())) {
con's avatar
con committed
494
            editor->createNew(response.stdOut);
495
            Core::EditorManager::instance()->activateEditor(editor);
496
            setDiffBaseDirectory(editor, workingDir);
con's avatar
con committed
497 498 499
            return;
        }
    }
Oswald Buddenhagen's avatar
Oswald Buddenhagen committed
500
    const QString title = QString::fromLatin1("svn diff %1").arg(diffname);
con's avatar
con committed
501
    Core::IEditor *editor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec);
502
    setDiffBaseDirectory(editor, workingDir);
con's avatar
con committed
503 504 505 506 507 508
    if (files.count() == 1)
        editor->setProperty("originalFileName", files.front());
}

SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName)
{
509
    Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_KIND));
con's avatar
con committed
510
    SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor);
hjk's avatar
hjk committed
511
    QTC_ASSERT(submitEditor, /**/);
512
    submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
513
    connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
514
    submitEditor->setCheckScriptWorkingDirectory(m_commitRepository);
con's avatar
con committed
515 516 517 518

    return submitEditor;
}

519
void SubversionPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
con's avatar
con committed
520
{
521 522 523
    if (!VCSBase::VCSBasePlugin::enableMenuAction(as, m_menuAction))
        return;

524 525
    m_logRepositoryAction->setEnabled(currentState().hasTopLevel());

526 527 528 529
    const QString projectName = currentState().currentProjectName();
    m_diffProjectAction->setParameter(projectName);
    m_statusProjectAction->setParameter(projectName);
    m_updateProjectAction->setParameter(projectName);
530
    m_logProjectAction->setParameter(projectName);
531 532 533 534 535 536 537 538 539 540 541 542 543 544

    const bool repoEnabled = currentState().hasTopLevel();
    m_commitAllAction->setEnabled(repoEnabled);
    m_describeAction->setEnabled(repoEnabled);

    const QString fileName = currentState().currentFileName();

    m_addAction->setParameter(fileName);
    m_deleteAction->setParameter(fileName);
    m_revertAction->setParameter(fileName);
    m_diffCurrentAction->setParameter(fileName);
    m_commitCurrentAction->setParameter(fileName);
    m_filelogCurrentAction->setParameter(fileName);
    m_annotateCurrentAction->setParameter(fileName);
con's avatar
con committed
545 546 547 548
}

void SubversionPlugin::addCurrentFile()
{
549 550 551
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
552 553 554 555
}

void SubversionPlugin::deleteCurrentFile()
{
556 557 558
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    vcsDelete(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
559 560 561 562
}

void SubversionPlugin::revertCurrentFile()
{
563 564
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
con's avatar
con committed
565 566

    QStringList args(QLatin1String("diff"));
567
    args.push_back(state.relativeCurrentFile());
con's avatar
con committed
568

569
    const SubversionResponse diffResponse = runSvn(state.currentFileTopLevel(), args, m_settings.timeOutMS(), false);
con's avatar
con committed
570 571 572 573 574
    if (diffResponse.error)
        return;

    if (diffResponse.stdOut.isEmpty())
        return;
Oswald Buddenhagen's avatar
Oswald Buddenhagen committed
575
    if (QMessageBox::warning(0, QLatin1String("svn revert"), tr("The file has been changed. Do you want to revert it?"),
con's avatar
con committed
576 577 578
                             QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
        return;

579

580
    Core::FileChangeBlocker fcb(state.currentFile());
con's avatar
con committed
581 582 583

    // revert
    args.clear();
584
    args << QLatin1String("revert") << state.relativeCurrentFile();
con's avatar
con committed
585

586
    const SubversionResponse revertResponse = runSvn(state.currentFileTopLevel(), args, m_settings.timeOutMS(), true);
587 588
    if (!revertResponse.error) {
        fcb.setModifiedReload(true);
589
        subVersionControl()->emitFilesChanged(QStringList(state.currentFile()));
con's avatar
con committed
590 591 592 593 594
    }
}

void SubversionPlugin::diffProject()
{
595 596 597
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return)
    svnDiff(state.currentProjectTopLevel(), state.relativeCurrentProject(), state.currentProjectName());
con's avatar
con committed
598 599 600 601
}

void SubversionPlugin::diffCurrentFile()
{
602 603 604
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    svnDiff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
605 606 607 608
}

void SubversionPlugin::startCommitCurrentFile()
{
609 610 611
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    startCommit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
612 613 614 615
}

void SubversionPlugin::startCommitAll()
{
616 617 618
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return);
    startCommit(state.topLevel());
con's avatar
con committed
619 620 621 622 623
}

/* Start commit of files of a single repository by displaying
 * template and files in a submit editor. On closing, the real
 * commit will start. */
624
void SubversionPlugin::startCommit(const QString &workingDir, const QStringList &files)
con's avatar
con committed
625
{
626 627
    if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
        return;
628
    if (isCommitEditorOpen()) {
629
        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed."));
con's avatar
con committed
630 631 632 633 634 635
        return;
    }

    QStringList args(QLatin1String("status"));
    args += files;

636
    const SubversionResponse response = runSvn(workingDir, args, m_settings.timeOutMS(), false);
con's avatar
con committed
637 638
    if (response.error)
        return;
639

con's avatar
con committed
640
    // Get list of added/modified/deleted files
641
    const StatusList statusOutput = parseStatusOutput(response.stdOut);
con's avatar
con committed
642
    if (statusOutput.empty()) {
643
        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("There are no modified files."));
con's avatar
con committed
644 645
        return;
    }
646
    m_commitRepository = workingDir;
con's avatar
con committed
647
    // Create a new submit change file containing the submit template
648 649 650 651
    QTemporaryFile changeTmpFile;
    changeTmpFile.setAutoRemove(false);
    if (!changeTmpFile.open()) {
        VCSBase::VCSBaseOutputWindow::instance()->appendError(tr("Cannot create temporary file: %1").arg(changeTmpFile.errorString()));
con's avatar
con committed
652 653
        return;
    }
654
    m_commitMessageFileName = changeTmpFile.fileName();
655
    // TODO: Regitctrieve submit template from
con's avatar
con committed
656 657
    const QString submitTemplate;
    // Create a submit
658 659 660
    changeTmpFile.write(submitTemplate.toUtf8());
    changeTmpFile.flush();
    changeTmpFile.close();
con's avatar
con committed
661
    // Create a submit editor and set file list
662
    SubversionSubmitEditor *editor = openSubversionSubmitEditor(m_commitMessageFileName);
663
    editor->setStatusList(statusOutput);
con's avatar
con committed
664 665 666 667 668 669 670 671 672 673 674
}

bool SubversionPlugin::commit(const QString &messageFile,
                              const QStringList &subVersionFileList)
{
    if (Subversion::Constants::debug)
        qDebug() << Q_FUNC_INFO << messageFile << subVersionFileList;
    // Transform the status list which is sth
    // "[ADM]<blanks>file" into an args list. The files of the status log
    // can be relative or absolute depending on where the command was run.
    QStringList args = QStringList(QLatin1String("commit"));
675
    args << QLatin1String(nonInteractiveOptionC) << QLatin1String("--file") << messageFile;
con's avatar
con committed
676
    args.append(subVersionFileList);
677
    const SubversionResponse response = runSvn(m_commitRepository, args, m_settings.longTimeOutMS(), true);
con's avatar
con committed
678 679 680 681 682
    return !response.error ;
}

void SubversionPlugin::filelogCurrentFile()
{
683 684
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
685 686 687 688 689 690 691 692 693 694 695 696 697 698 699
   filelog(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true);
}

void SubversionPlugin::logProject()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return)
    filelog(state.currentProjectTopLevel(), state.relativeCurrentProject());
}

void SubversionPlugin::logRepository()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return)
    filelog(state.topLevel());
con's avatar
con committed
700 701
}

702 703 704
void SubversionPlugin::filelog(const QString &workingDir,
                               const QStringList &files,
                               bool enableAnnotationContextMenu)
con's avatar
con committed
705
{
706
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(workingDir, files);
con's avatar
con committed
707 708
    // no need for temp file
    QStringList args(QLatin1String("log"));
709 710
    if (m_settings.logCount > 0)
        args << QLatin1String("-l") << QString::number(m_settings.logCount);
711 712
    foreach(const QString &file, files)
        args.append(QDir::toNativeSeparators(file));
con's avatar
con committed
713

714
    const SubversionResponse response = runSvn(workingDir, args, m_settings.timeOutMS(), false, codec);
con's avatar
con committed
715 716 717 718 719 720
    if (response.error)
        return;

    // Re-use an existing view if possible to support
    // the common usage pattern of continuously changing and diffing a file

721 722
    const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir, files);
    if (Core::IEditor *editor = locateEditor("logFileName", id)) {
con's avatar
con committed
723
        editor->createNew(response.stdOut);
724
        Core::EditorManager::instance()->activateEditor(editor);
con's avatar
con committed
725
    } else {
726 727 728 729
        const QString title = QString::fromLatin1("svn log %1").arg(id);
        const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, source, codec);
        newEditor->setProperty("logFileName", id);
730 731
        if (enableAnnotationContextMenu)
            VCSBase::VCSBaseEditor::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true);
con's avatar
con committed
732 733 734 735 736
    }
}

void SubversionPlugin::updateProject()
{
737 738
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
con's avatar
con committed
739 740

    QStringList args(QLatin1String("update"));
741
    args.push_back(QLatin1String(nonInteractiveOptionC));
742
    args.append(state.relativeCurrentProject());
743
    const SubversionResponse response = runSvn(state.currentProjectTopLevel(), args, m_settings.longTimeOutMS(), true);
744 745
    if (!response.error)
        subVersionControl()->emitRepositoryChanged(state.currentProjectTopLevel());
con's avatar
con committed
746 747 748 749
}

void SubversionPlugin::annotateCurrentFile()
{
750 751 752
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return);
    annotate(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
753 754
}

755 756 757 758 759 760 761 762 763 764 765
void SubversionPlugin::annotateVersion(const QString &file,
                                       const QString &revision,
                                       int lineNr)
{
    const QFileInfo fi(file);
    annotate(fi.absolutePath(), fi.fileName(), revision, lineNr);
}

void SubversionPlugin::annotate(const QString &workingDir, const QString &file,
                                const QString &revision /* = QString() */,
                                int lineNumber /* = -1 */)
con's avatar
con committed
766
{
767
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file);
con's avatar
con committed
768 769

    QStringList args(QLatin1String("annotate"));
770 771
    if (m_settings.spaceIgnorantAnnotation)
        args << QLatin1String("-x") << QLatin1String("-uw");
772 773
    if (!revision.isEmpty())
        args << QLatin1String("-r") << revision;
con's avatar
con committed
774 775 776
    args.push_back(QLatin1String("-v"));
    args.append(QDir::toNativeSeparators(file));

777
    const SubversionResponse response = runSvn(workingDir, args, m_settings.timeOutMS(), false, codec);
con's avatar
con committed
778 779 780 781 782
    if (response.error)
        return;

    // Re-use an existing view if possible to support
    // the common usage pattern of continuously changing and diffing a file
783
    const QString source = workingDir + QLatin1Char('/') + file;
784 785 786 787
    if (lineNumber <= 0)
        lineNumber = VCSBase::VCSBaseEditor::lineNumberOfCurrentEditor(source);
    // Determine id
    const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir, QStringList(file), revision);
con's avatar
con committed
788

789
    if (Core::IEditor *editor = locateEditor("annotateFileName", id)) {
con's avatar
con committed
790
        editor->createNew(response.stdOut);
791 792
        VCSBase::VCSBaseEditor::gotoLineOfEditor(editor, lineNumber);
        Core::EditorManager::instance()->activateEditor(editor);        
con's avatar
con committed
793
    } else {
794 795 796
        const QString title = QString::fromLatin1("svn annotate %1").arg(id);
        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, source, codec);
        newEditor->setProperty("annotateFileName", id);
797
        VCSBase::VCSBaseEditor::gotoLineOfEditor(newEditor, lineNumber);
con's avatar
con committed
798 799 800 801 802
    }
}

void SubversionPlugin::projectStatus()
{
803 804
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
con's avatar
con committed
805
    QStringList args(QLatin1String("status"));
806
    args += state.relativeCurrentProject();
807 808
    VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance();
    outwin->setRepository(state.currentProjectTopLevel());
809
    runSvn(state.currentProjectTopLevel(), args, m_settings.timeOutMS(), true);
810
    outwin->clearRepository();
con's avatar
con committed
811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827
}

void SubversionPlugin::describe(const QString &source, const QString &changeNr)
{
    // To describe a complete change, find the top level and then do
    //svn diff -r 472958:472959 <top level>
    const QFileInfo fi(source);
    const QString topLevel = findTopLevelForDirectory(fi.isDir() ? source : fi.absolutePath());
    if (topLevel.isEmpty())
        return;
    if (Subversion::Constants::debug)
        qDebug() << Q_FUNC_INFO << source << topLevel << changeNr;
    // Number must be > 1
    bool ok;
    const int number = changeNr.toInt(&ok);
    if (!ok || number < 2)
        return;
828 829 830 831 832
    // Run log to obtain message (local utf8)
    QString description;
    QStringList args(QLatin1String("log"));
    args.push_back(QLatin1String("-r"));
    args.push_back(changeNr);
833
    const SubversionResponse logResponse = runSvn(topLevel, args, m_settings.timeOutMS(), false);
834 835 836 837 838 839 840
    if (logResponse.error)
        return;
    description = logResponse.stdOut;

    // Run diff (encoding via source codec)
    args.clear();
    args.push_back(QLatin1String("diff"));
con's avatar
con committed
841 842 843 844 845
    args.push_back(QLatin1String("-r"));
    QString diffArg;
    QTextStream(&diffArg) << (number - 1) << ':' << number;
    args.push_back(diffArg);

846
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(source);
847
    const SubversionResponse response = runSvn(topLevel, args, m_settings.timeOutMS(), false, codec);
con's avatar
con committed
848 849
    if (response.error)
        return;
850
    description += response.stdOut;
con's avatar
con committed
851 852 853 854

    // Re-use an existing view if possible to support
    // the common usage pattern of continuously changing and diffing a file
    const QString id = diffArg + source;
hjk's avatar
hjk committed
855
    if (Core::IEditor *editor = locateEditor("describeChange", id)) {
856
        editor->createNew(description);
hjk's avatar
hjk committed
857
        Core::EditorManager::instance()->activateEditor(editor);
con's avatar
con committed
858
    } else {
859
        const QString title = QString::fromLatin1("svn describe %1#%2").arg(fi.fileName(), changeNr);
860
        Core::IEditor *newEditor = showOutputInEditor(title, description, VCSBase::DiffOutput, source, codec);
con's avatar
con committed
861 862 863 864
        newEditor->setProperty("describeChange", id);
    }
}

865 866
void SubversionPlugin::slotDescribe()
{
867 868
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return);
869 870 871 872 873 874 875 876 877 878 879

    QInputDialog inputDialog(Core::ICore::instance()->mainWindow());
    inputDialog.setWindowFlags(inputDialog.windowFlags() & ~Qt::WindowContextHelpButtonHint);
    inputDialog.setInputMode(QInputDialog::IntInput);
    inputDialog.setIntRange(2, INT_MAX);
    inputDialog.setWindowTitle(tr("Describe"));
    inputDialog.setLabelText(tr("Revision number:"));
    if (inputDialog.exec() != QDialog::Accepted)
        return;

    const int revision = inputDialog.intValue();
880
    describe(state.topLevel(), QString::number(revision));
881 882
}

con's avatar
con committed
883 884
void SubversionPlugin::submitCurrentLog()
{
885
    m_submitActionTriggered = true;
886 887
    Core::EditorManager::instance()->closeEditors(QList<Core::IEditor*>()
        << Core::EditorManager::instance()->currentEditor());
con's avatar
con committed
888 889 890 891 892 893 894 895 896 897 898 899 900 901
}

static inline QString processStdErr(QProcess &proc)
{
    return QString::fromLocal8Bit(proc.readAllStandardError()).remove(QLatin1Char('\r'));
}

static inline QString processStdOut(QProcess &proc, QTextCodec *outputCodec = 0)
{
    const QByteArray stdOutData = proc.readAllStandardOutput();
    QString stdOut = outputCodec ? outputCodec->toUnicode(stdOutData) : QString::fromLocal8Bit(stdOutData);
    return stdOut.remove(QLatin1Char('\r'));
}

902 903
SubversionResponse SubversionPlugin::runSvn(const QString &workingDir,
                                            const QStringList &arguments,
con's avatar
con committed
904 905 906 907 908 909 910 911 912 913 914 915 916
                                            int timeOut,
                                            bool showStdOutInOutputWindow,
                                            QTextCodec *outputCodec)
{
    const QString executable = m_settings.svnCommand;
    SubversionResponse response;
    if (executable.isEmpty()) {
        response.error = true;
        response.message =tr("No subversion executable specified!");
        return response;
    }
    const QStringList allArgs = m_settings.addOptions(arguments);

917
    VCSBase::VCSBaseOutputWindow *outputWindow = VCSBase::VCSBaseOutputWindow::instance();
con's avatar
con committed
918
    // Hide passwords, etc in the log window
919 920 921
    //: Executing: <executable> <arguments>
    const QString outputText = tr("Executing: %1 %2\n").arg(executable, SubversionSettings::formatArguments(allArgs));
    outputWindow->appendCommand(outputText);
con's avatar
con committed
922 923 924 925 926

    if (Subversion::Constants::debug)
        qDebug() << "runSvn" << timeOut << outputText;

    // Run, connect stderr to the output window
927
    Utils::SynchronousProcess process;
928 929
    if (!workingDir.isEmpty())
        process.setWorkingDirectory(workingDir);
con's avatar
con committed
930 931 932 933
    process.setTimeout(timeOut);
    process.setStdOutCodec(outputCodec);

    process.setStdErrBufferedSignalsEnabled(true);
934
    connect(&process, SIGNAL(stdErrBuffered(QString,bool)), outputWindow, SLOT(append(QString)));
con's avatar
con committed
935 936 937 938

    // connect stdout to the output window if desired
    if (showStdOutInOutputWindow) {
        process.setStdOutBufferedSignalsEnabled(true);