subversionplugin.cpp 41.1 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 74 75 76 77 78

using namespace Subversion::Internal;

// Timeout for normal output commands
enum { subversionShortTimeOut = 10000 };
// Timeout for submit, update
enum { subversionLongTimeOut = 120000 };

79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
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";
static const char * const CMD_ID_STATUS             = "Subversion.Status";
static const char * const CMD_ID_UPDATE             = "Subversion.Update";
static const char * const CMD_ID_DESCRIBE           = "Subversion.Describe";
con's avatar
con committed
96

97 98
static const char *nonInteractiveOptionC = "--non-interactive";

con's avatar
con committed
99 100 101
static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
{
    VCSBase::RegularCommandOutput,
102 103
    "Subversion Command Log Editor", // kind
    "Subversion Command Log Editor", // context
con's avatar
con committed
104 105 106
    "application/vnd.nokia.text.scs_svn_commandlog",
    "scslog"},
{   VCSBase::LogOutput,
107 108
    "Subversion File Log Editor",   // kind
    "Subversion File Log Editor",   // context
con's avatar
con committed
109 110 111
    "application/vnd.nokia.text.scs_svn_filelog",
    "scsfilelog"},
{    VCSBase::AnnotateOutput,
112 113
    "Subversion Annotation Editor",  // kind
    "Subversion Annotation Editor",  // context
con's avatar
con committed
114 115 116
    "application/vnd.nokia.text.scs_svn_annotation",
    "scsannotate"},
{   VCSBase::DiffOutput,
117 118
    "Subversion Diff Editor",  // kind
    "Subversion Diff Editor",  // context
con's avatar
con committed
119 120 121 122 123 124 125 126 127 128 129 130 131 132 133
    "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
134
Core::IEditor* locateEditor(const char *property, const QString &entry)
con's avatar
con committed
135
{
136
    foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors())
con's avatar
con committed
137 138 139 140 141
        if (ed->property(property).toString() == entry)
            return ed;
    return 0;
}

142 143 144 145 146 147 148 149 150 151 152 153 154 155
// 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')) {
156 157
                const QString fileName = line.mid(7); // Column 8 starting from svn 1.6
                changeSet.push_back(SubversionSubmitEditor::StatusFilePair(QString(state), fileName.trimmed()));
158 159 160 161 162 163 164
            }

        }
    }
    return changeSet;
}

165 166 167 168 169 170 171 172 173 174 175
// 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
176 177 178 179
// ------------- SubversionPlugin
SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0;

SubversionPlugin::SubversionPlugin() :
180
    VCSBase::VCSBasePlugin(QLatin1String(Subversion::Constants::SUBVERSIONCOMMITEDITOR_KIND)),
181
    m_svnDirectories(svnDirectories()),
con's avatar
con committed
182 183 184 185 186 187 188 189 190
    m_addAction(0),
    m_deleteAction(0),
    m_revertAction(0),
    m_diffProjectAction(0),
    m_diffCurrentAction(0),
    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
    m_updateProjectAction = new Utils::ParameterAction(tr("Update Project"), tr("Update Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
370
    command = ami->registerAction(m_updateProjectAction, CMD_ID_UPDATE, globalcontext);
con's avatar
con committed
371
    connect(m_updateProjectAction, SIGNAL(triggered()), this, SLOT(updateProject()));
372
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
373 374 375 376
    subversionMenu->addAction(command);

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

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

383
    m_submitDiffAction = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff Selected Files"), this);
con's avatar
con committed
384 385 386 387 388 389 390 391 392 393 394 395 396 397 398
    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()
{
}

399
bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor)
con's avatar
con committed
400
{
401
    if (!isCommitEditorOpen())
con's avatar
con committed
402 403
        return true;

404 405
    Core::IFile *fileIFace = submitEditor->file();
    const SubversionSubmitEditor *editor = qobject_cast<SubversionSubmitEditor *>(submitEditor);
con's avatar
con committed
406 407 408 409 410 411
    if (!fileIFace || !editor)
        return true;

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

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

449
void SubversionPlugin::diffCommitFiles(const QStringList &files)
con's avatar
con committed
450
{
451
    svnDiff(m_commitRepository, files);
con's avatar
con committed
452 453
}

454 455 456 457 458 459
static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db)
{
    if (VCSBase::VCSBaseEditor *ve = qobject_cast<VCSBase::VCSBaseEditor*>(editor->widget()))
        ve->setDiffBaseDirectory(db);
}

460
void SubversionPlugin::svnDiff(const QString &workingDir, const QStringList &files, QString diffname)
con's avatar
con committed
461 462 463
{
    if (Subversion::Constants::debug)
        qDebug() << Q_FUNC_INFO << files << diffname;
464
    const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
465
    QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VCSBase::VCSBaseEditor::getCodec(source);
con's avatar
con committed
466 467 468 469 470 471 472

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

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

473
    const SubversionResponse response = runSvn(workingDir, args, subversionShortTimeOut, false, codec);
con's avatar
con committed
474 475 476 477 478 479 480
    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
481
        if (Core::IEditor *editor = locateEditor("originalFileName", files.front())) {
con's avatar
con committed
482
            editor->createNew(response.stdOut);
483
            Core::EditorManager::instance()->activateEditor(editor);
484
            setDiffBaseDirectory(editor, workingDir);
con's avatar
con committed
485 486 487
            return;
        }
    }
Oswald Buddenhagen's avatar
Oswald Buddenhagen committed
488
    const QString title = QString::fromLatin1("svn diff %1").arg(diffname);
con's avatar
con committed
489
    Core::IEditor *editor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec);
490
    setDiffBaseDirectory(editor, workingDir);
con's avatar
con committed
491 492 493 494 495 496
    if (files.count() == 1)
        editor->setProperty("originalFileName", files.front());
}

SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName)
{
497
    Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_KIND));
con's avatar
con committed
498
    SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor);
hjk's avatar
hjk committed
499
    QTC_ASSERT(submitEditor, /**/);
500
    submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
501
    connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
502
    submitEditor->setCheckScriptWorkingDirectory(m_commitRepository);
con's avatar
con committed
503 504 505 506

    return submitEditor;
}

507
void SubversionPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
con's avatar
con committed
508
{
509 510 511
    if (!VCSBase::VCSBasePlugin::enableMenuAction(as, m_menuAction))
        return;

512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529
    const QString projectName = currentState().currentProjectName();
    m_diffProjectAction->setParameter(projectName);
    m_statusProjectAction->setParameter(projectName);
    m_updateProjectAction->setParameter(projectName);

    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
530 531 532 533
}

void SubversionPlugin::addCurrentFile()
{
534 535 536
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
537 538 539 540
}

void SubversionPlugin::deleteCurrentFile()
{
541 542 543
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    vcsDelete(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
544 545 546 547
}

void SubversionPlugin::revertCurrentFile()
{
548 549
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
con's avatar
con committed
550 551

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

554
    const SubversionResponse diffResponse = runSvn(state.currentFileTopLevel(), args, subversionShortTimeOut, false);
con's avatar
con committed
555 556 557 558 559
    if (diffResponse.error)
        return;

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

564

565
    Core::FileChangeBlocker fcb(state.currentFile());
con's avatar
con committed
566 567 568

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

571
    const SubversionResponse revertResponse = runSvn(state.currentFileTopLevel(), args, subversionShortTimeOut, true);
572 573
    if (!revertResponse.error) {
        fcb.setModifiedReload(true);
574
        subVersionControl()->emitFilesChanged(QStringList(state.currentFile()));
con's avatar
con committed
575 576 577 578 579
    }
}

void SubversionPlugin::diffProject()
{
580 581 582
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return)
    svnDiff(state.currentProjectTopLevel(), state.relativeCurrentProject(), state.currentProjectName());
con's avatar
con committed
583 584 585 586
}

void SubversionPlugin::diffCurrentFile()
{
587 588 589
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    svnDiff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
590 591 592 593
}

void SubversionPlugin::startCommitCurrentFile()
{
594 595 596
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    startCommit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
597 598 599 600
}

void SubversionPlugin::startCommitAll()
{
601 602 603
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return);
    startCommit(state.topLevel());
con's avatar
con committed
604 605 606 607 608
}

/* Start commit of files of a single repository by displaying
 * template and files in a submit editor. On closing, the real
 * commit will start. */
609
void SubversionPlugin::startCommit(const QString &workingDir, const QStringList &files)
con's avatar
con committed
610
{
611 612
    if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
        return;
613
    if (isCommitEditorOpen()) {
614
        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed."));
con's avatar
con committed
615 616 617 618 619 620
        return;
    }

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

621
    const SubversionResponse response = runSvn(workingDir, args, subversionShortTimeOut, false);
con's avatar
con committed
622 623
    if (response.error)
        return;
624

con's avatar
con committed
625
    // Get list of added/modified/deleted files
626
    const StatusList statusOutput = parseStatusOutput(response.stdOut);
con's avatar
con committed
627
    if (statusOutput.empty()) {
628
        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("There are no modified files."));
con's avatar
con committed
629 630
        return;
    }
631
    m_commitRepository = workingDir;
con's avatar
con committed
632
    // Create a new submit change file containing the submit template
633 634 635 636
    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
637 638
        return;
    }
639
    m_commitMessageFileName = changeTmpFile.fileName();
640
    // TODO: Regitctrieve submit template from
con's avatar
con committed
641 642
    const QString submitTemplate;
    // Create a submit
643 644 645
    changeTmpFile.write(submitTemplate.toUtf8());
    changeTmpFile.flush();
    changeTmpFile.close();
con's avatar
con committed
646
    // Create a submit editor and set file list
647
    SubversionSubmitEditor *editor = openSubversionSubmitEditor(m_commitMessageFileName);
648
    editor->setStatusList(statusOutput);
con's avatar
con committed
649 650 651 652 653 654 655 656 657 658 659
}

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"));
660
    args << QLatin1String(nonInteractiveOptionC) << QLatin1String("--file") << messageFile;
con's avatar
con committed
661
    args.append(subVersionFileList);
662
    const SubversionResponse response = runSvn(m_commitRepository, args, subversionLongTimeOut, true);
con's avatar
con committed
663 664 665 666 667
    return !response.error ;
}

void SubversionPlugin::filelogCurrentFile()
{
668 669 670
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
   filelog(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
671 672
}

673
void SubversionPlugin::filelog(const QString &workingDir, const QStringList &files)
con's avatar
con committed
674
{
675
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(workingDir, files);
con's avatar
con committed
676 677
    // no need for temp file
    QStringList args(QLatin1String("log"));
678 679
    foreach(const QString &file, files)
        args.append(QDir::toNativeSeparators(file));
con's avatar
con committed
680

681
    const SubversionResponse response = runSvn(workingDir, args, subversionShortTimeOut, false, codec);
con's avatar
con committed
682 683 684 685 686 687
    if (response.error)
        return;

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

688 689
    const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir, files);
    if (Core::IEditor *editor = locateEditor("logFileName", id)) {
con's avatar
con committed
690
        editor->createNew(response.stdOut);
691
        Core::EditorManager::instance()->activateEditor(editor);
con's avatar
con committed
692
    } else {
693 694 695 696
        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);
con's avatar
con committed
697 698 699 700 701
    }
}

void SubversionPlugin::updateProject()
{
702 703
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
con's avatar
con committed
704 705

    QStringList args(QLatin1String("update"));
706
    args.push_back(QLatin1String(nonInteractiveOptionC));
707 708 709 710
    args.append(state.relativeCurrentProject());
    const SubversionResponse response = runSvn(state.currentProjectTopLevel(), args, subversionLongTimeOut, true);
    if (!response.error)
        subVersionControl()->emitRepositoryChanged(state.currentProjectTopLevel());
con's avatar
con committed
711 712 713 714
}

void SubversionPlugin::annotateCurrentFile()
{
715 716 717
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return);
    annotate(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
718 719
}

720
void SubversionPlugin::annotate(const QString &workingDir, const QString &file)
con's avatar
con committed
721
{
722
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file);
con's avatar
con committed
723 724 725 726 727

    QStringList args(QLatin1String("annotate"));
    args.push_back(QLatin1String("-v"));
    args.append(QDir::toNativeSeparators(file));

728
    const SubversionResponse response = runSvn(workingDir, args, subversionShortTimeOut, false, codec);
con's avatar
con committed
729 730 731 732 733
    if (response.error)
        return;

    // Re-use an existing view if possible to support
    // the common usage pattern of continuously changing and diffing a file
734 735 736
    const QString source = workingDir + QLatin1Char('/') + file;
    const int lineNumber = VCSBase::VCSBaseEditor::lineNumberOfCurrentEditor(source);
    const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir, QStringList(file));
con's avatar
con committed
737

738
    if (Core::IEditor *editor = locateEditor("annotateFileName", id)) {
con's avatar
con committed
739
        editor->createNew(response.stdOut);
740 741
        VCSBase::VCSBaseEditor::gotoLineOfEditor(editor, lineNumber);
        Core::EditorManager::instance()->activateEditor(editor);        
con's avatar
con committed
742
    } else {
743 744 745
        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);
746
        VCSBase::VCSBaseEditor::gotoLineOfEditor(newEditor, lineNumber);
con's avatar
con committed
747 748 749 750 751
    }
}

void SubversionPlugin::projectStatus()
{
752 753
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
con's avatar
con committed
754
    QStringList args(QLatin1String("status"));
755 756
    args += state.relativeCurrentProject();
    runSvn(state.currentProjectTopLevel(), args, subversionShortTimeOut, true);
con's avatar
con committed
757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773
}

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;
774 775 776 777 778
    // Run log to obtain message (local utf8)
    QString description;
    QStringList args(QLatin1String("log"));
    args.push_back(QLatin1String("-r"));
    args.push_back(changeNr);
779
    const SubversionResponse logResponse = runSvn(topLevel, args, subversionShortTimeOut, false);
780 781 782 783 784 785 786
    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
787 788 789 790 791
    args.push_back(QLatin1String("-r"));
    QString diffArg;
    QTextStream(&diffArg) << (number - 1) << ':' << number;
    args.push_back(diffArg);

792
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(source);
793
    const SubversionResponse response = runSvn(topLevel, args, subversionShortTimeOut, false, codec);
con's avatar
con committed
794 795
    if (response.error)
        return;
796
    description += response.stdOut;
con's avatar
con committed
797 798 799 800

    // 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
801
    if (Core::IEditor *editor = locateEditor("describeChange", id)) {
802
        editor->createNew(description);
hjk's avatar
hjk committed
803
        Core::EditorManager::instance()->activateEditor(editor);
con's avatar
con committed
804
    } else {
805
        const QString title = QString::fromLatin1("svn describe %1#%2").arg(fi.fileName(), changeNr);
806
        Core::IEditor *newEditor = showOutputInEditor(title, description, VCSBase::DiffOutput, source, codec);
con's avatar
con committed
807 808 809 810
        newEditor->setProperty("describeChange", id);
    }
}

811 812
void SubversionPlugin::slotDescribe()
{
813 814
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return);
815 816 817 818 819 820 821 822 823 824 825

    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();
826
    describe(state.topLevel(), QString::number(revision));
827 828
}

con's avatar
con committed
829 830
void SubversionPlugin::submitCurrentLog()
{
831
    m_submitActionTriggered = true;
832 833
    Core::EditorManager::instance()->closeEditors(QList<Core::IEditor*>()
        << Core::EditorManager::instance()->currentEditor());
con's avatar
con committed
834 835 836 837 838 839 840 841 842 843 844 845 846 847
}

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'));
}

848 849
SubversionResponse SubversionPlugin::runSvn(const QString &workingDir,
                                            const QStringList &arguments,
con's avatar
con committed
850 851 852 853 854 855 856 857 858 859 860 861 862
                                            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);

863
    VCSBase::VCSBaseOutputWindow *outputWindow = VCSBase::VCSBaseOutputWindow::instance();
con's avatar
con committed
864
    // Hide passwords, etc in the log window
865 866 867
    //: Executing: <executable> <arguments>
    const QString outputText = tr("Executing: %1 %2\n").arg(executable, SubversionSettings::formatArguments(allArgs));
    outputWindow->appendCommand(outputText);
con's avatar
con committed
868 869 870 871 872

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

    // Run, connect stderr to the output window
873
    Utils::SynchronousProcess process;
874 875
    if (!workingDir.isEmpty())
        process.setWorkingDirectory(workingDir);
con's avatar
con committed
876 877 878 879
    process.setTimeout(timeOut);
    process.setStdOutCodec(outputCodec);

    process.setStdErrBufferedSignalsEnabled(true);
880
    connect(&process, SIGNAL(stdErrBuffered(QString,bool)), outputWindow, SLOT(append(QString)));
con's avatar
con committed
881 882 883 884

    // connect stdout to the output window if desired
    if (showStdOutInOutputWindow) {
        process.setStdOutBufferedSignalsEnabled(true);
885
        connect(&process, SIGNAL(stdOutBuffered(QString,bool)), outputWindow, SLOT(append(QString)));
con's avatar
con committed
886 887
    }

888
    const Utils::SynchronousProcessResponse sp_resp = process.run(executable, allArgs);
con's avatar
con committed
889 890 891 892
    response.error = true;
    response.stdErr = sp_resp.stdErr;
    response.stdOut = sp_resp.stdOut;
    switch (sp_resp.result) {
893
    case Utils::SynchronousProcessResponse::Finished:
con's avatar
con committed
894 895
        response.error = false;
        break;
896
    case Utils::SynchronousProcessResponse::FinishedError:
con's avatar
con committed
897 898
        response.message = tr("The process terminated with exit code %1.").arg(sp_resp.exitCode);
        break;
899
    case Utils::SynchronousProcessResponse::TerminatedAbnormally:
con's avatar
con committed
900 901
        response.message = tr("The process terminated abnormally.");
        break;
902
    case Utils::SynchronousProcessResponse::StartFailed:
con's avatar
con committed
903 904
        response.message = tr("Could not start subversion '%1'. Please check your settings in the preferences.").arg(executable);
        break;
905
    case Utils::SynchronousProcessResponse::Hang:
con's avatar
con committed
906 907 908 909
        response.message = tr("Subversion did not respond within timeout limit (%1 ms).").arg(timeOut);
        break;
    }
    if (response.error)
910
        outputWindow->appendError(response.message);
con's avatar
con committed
911 912 913 914 915 916 917 918 919

    return response;
}

Core::IEditor * SubversionPlugin::showOutputInEditor(const QString& title, const QString &output,
                                                     int editorType, const QString &source,
                                                     QTextCodec *codec)
{
    const VCSBase::VCSBaseEditorParameters *params = findType(editorType);
hjk's avatar
hjk committed
920
    QTC_ASSERT(params, return 0);
con's avatar
con committed
921 922 923 924
    const QString kind = QLatin1String(params->kind);
    if (Subversion::Constants::debug)
        qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind <<  "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
    QString s = title;
con's avatar
con committed
925
    Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(kind, &s, output);
926
    SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());
con's avatar
con committed
927 928 929 930 931 932 933 934
    if (!e)
        return 0;
    s.replace(QLatin1Char(' '), QLatin1Char('_'));
    e->setSuggestedFileName(s);
    if (!source.isEmpty())
        e->setSource(source);
    if (codec)
        e->setCodec(codec);
935 936 937
    Core::IEditor *ie = e->editableInterface();
    Core::EditorManager::instance()->activateEditor(ie);
    return ie;
con's avatar
con committed
938 939 940 941 942 943 944 945 946 947 948
}

SubversionSettings SubversionPlugin::settings() const
{
    return m_settings;
}

void SubversionPlugin::setSettings(const SubversionSettings &s)
{
    if (s != m_settings) {
        m_settings = s;
hjk's avatar
hjk committed
949
        if (QSettings *settings = Core::ICore::instance()->settings())
con's avatar
con committed
950 951 952 953 954 955
            m_settings.toSettings(settings);
    }
}

SubversionPlugin *SubversionPlugin::subversionPluginInstance()
{