subversionplugin.cpp 51.5 KB
Newer Older
1
/**************************************************************************
con's avatar
con committed
2 3 4
**
** This file is part of Qt Creator
**
hjk's avatar
hjk committed
5
** Copyright (c) 2010 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>
54 55
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
con's avatar
con committed
56
#include <coreplugin/editormanager/editormanager.h>
Friedemann Kleint's avatar
Friedemann Kleint committed
57 58 59

#include <locator/commandlocator.h>

hjk's avatar
hjk committed
60
#include <utils/qtcassert.h>
con's avatar
con committed
61 62

#include <QtCore/QDebug>
63
#include <QtCore/QDir>
con's avatar
con committed
64 65
#include <QtCore/QFileInfo>
#include <QtCore/QTemporaryFile>
66 67
#include <QtCore/QTextCodec>
#include <QtCore/QtPlugin>
68
#include <QtCore/QProcessEnvironment>
con's avatar
con committed
69
#include <QtGui/QAction>
70 71
#include <QtGui/QFileDialog>
#include <QtGui/QMainWindow>
con's avatar
con committed
72 73
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
74 75 76
#include <QtGui/QInputDialog>

#include <limits.h>
con's avatar
con committed
77 78 79

using namespace Subversion::Internal;

80 81 82 83 84 85 86 87 88
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";
89
static const char * const CMD_ID_REVERT_ALL         = "Subversion.RevertAll";
90 91 92 93 94
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";
95
static const char * const CMD_ID_SEPARATOR4         = "Subversion.Separator4";
96
static const char * const CMD_ID_STATUS             = "Subversion.Status";
97 98
static const char * const CMD_ID_PROJECTLOG         = "Subversion.ProjectLog";
static const char * const CMD_ID_REPOSITORYLOG      = "Subversion.RepositoryLog";
99 100 101
static const char * const CMD_ID_REPOSITORYUPDATE   = "Subversion.RepositoryUpdate";
static const char * const CMD_ID_REPOSITORYDIFF     = "Subversion.RepositoryDiff";
static const char * const CMD_ID_REPOSITORYSTATUS   = "Subversion.RepositoryStatus";
102
static const char * const CMD_ID_UPDATE             = "Subversion.Update";
103
static const char * const CMD_ID_COMMIT_PROJECT     = "Subversion.CommitProject";
104
static const char * const CMD_ID_DESCRIBE           = "Subversion.Describe";
con's avatar
con committed
105

106 107
static const char *nonInteractiveOptionC = "--non-interactive";

108 109


con's avatar
con committed
110 111 112
static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
{
    VCSBase::RegularCommandOutput,
113 114
    "Subversion Command Log Editor", // id
    QT_TRANSLATE_NOOP("VCS", "Subversion Command Log Editor"), // display name
115
    "Subversion Command Log Editor", // context
con's avatar
con committed
116 117 118
    "application/vnd.nokia.text.scs_svn_commandlog",
    "scslog"},
{   VCSBase::LogOutput,
119 120
    "Subversion File Log Editor",   // id
    QT_TRANSLATE_NOOP("VCS", "Subversion File Log Editor"),   // display_name
121
    "Subversion File Log Editor",   // context
con's avatar
con committed
122 123 124
    "application/vnd.nokia.text.scs_svn_filelog",
    "scsfilelog"},
{    VCSBase::AnnotateOutput,
125 126
    "Subversion Annotation Editor",  // id
    QT_TRANSLATE_NOOP("VCS", "Subversion Annotation Editor"),   // display_name
127
    "Subversion Annotation Editor",  // context
con's avatar
con committed
128 129 130
    "application/vnd.nokia.text.scs_svn_annotation",
    "scsannotate"},
{   VCSBase::DiffOutput,
131 132
    "Subversion Diff Editor",  // id
    QT_TRANSLATE_NOOP("VCS", "Subversion Diff Editor"),   // display_name
133
    "Subversion Diff Editor",  // context
con's avatar
con committed
134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
    "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
149
Core::IEditor* locateEditor(const char *property, const QString &entry)
con's avatar
con committed
150
{
151
    foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors())
con's avatar
con committed
152 153 154 155 156
        if (ed->property(property).toString() == entry)
            return ed;
    return 0;
}

157 158 159 160 161 162 163 164 165 166 167 168 169 170
// 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')) {
171 172
                const QString fileName = line.mid(7); // Column 8 starting from svn 1.6
                changeSet.push_back(SubversionSubmitEditor::StatusFilePair(QString(state), fileName.trimmed()));
173 174 175 176 177 178 179
            }

        }
    }
    return changeSet;
}

180 181 182 183 184 185 186 187 188 189 190
// 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
191 192 193 194
// ------------- SubversionPlugin
SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0;

SubversionPlugin::SubversionPlugin() :
195
    VCSBase::VCSBasePlugin(QLatin1String(Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID)),
196
    m_svnDirectories(svnDirectories()),
Friedemann Kleint's avatar
Friedemann Kleint committed
197
    m_commandLocator(0),
con's avatar
con committed
198 199 200 201 202
    m_addAction(0),
    m_deleteAction(0),
    m_revertAction(0),
    m_diffProjectAction(0),
    m_diffCurrentAction(0),
203 204
    m_logProjectAction(0),
    m_logRepositoryAction(0),
con's avatar
con committed
205
    m_commitAllAction(0),
206
    m_revertRepositoryAction(0),
207 208 209
    m_diffRepositoryAction(0),
    m_statusRepositoryAction(0),
    m_updateRepositoryAction(0),
con's avatar
con committed
210 211 212
    m_commitCurrentAction(0),
    m_filelogCurrentAction(0),
    m_annotateCurrentAction(0),
213
    m_statusProjectAction(0),
con's avatar
con committed
214
    m_updateProjectAction(0),
215
    m_commitProjectAction(0),
216
    m_describeAction(0),
con's avatar
con committed
217 218 219
    m_submitCurrentLogAction(0),
    m_submitDiffAction(0),
    m_submitUndoAction(0),
220
    m_submitRedoAction(0),
221
    m_menuAction(0),
222
    m_submitActionTriggered(false)
con's avatar
con committed
223 224 225 226 227
{
}

SubversionPlugin::~SubversionPlugin()
{
228
    cleanCommitMessageFile();
con's avatar
con committed
229 230
}

231
void SubversionPlugin::cleanCommitMessageFile()
con's avatar
con committed
232
{
233 234 235
    if (!m_commitMessageFileName.isEmpty()) {
        QFile::remove(m_commitMessageFileName);
        m_commitMessageFileName.clear();
236
        m_commitRepository.clear();
con's avatar
con committed
237 238 239
    }
}

240 241 242 243 244
bool SubversionPlugin::isCommitEditorOpen() const
{
    return !m_commitMessageFileName.isEmpty();
}

con's avatar
con committed
245 246
static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = {
    Subversion::Constants::SUBVERSION_SUBMIT_MIMETYPE,
247 248
    Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID,
    Subversion::Constants::SUBVERSIONCOMMITEDITOR_DISPLAY_NAME,
249
    Subversion::Constants::SUBVERSIONCOMMITEDITOR
con's avatar
con committed
250 251
};

252 253 254 255 256 257 258 259 260 261
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);
}

262
bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *errorMessage)
con's avatar
con committed
263 264 265 266 267 268 269 270
{
    typedef VCSBase::VCSSubmitEditorFactory<SubversionSubmitEditor> SubversionSubmitEditorFactory;
    typedef VCSBase::VCSEditorFactory<SubversionEditor> SubversionEditorFactory;
    using namespace Constants;

    using namespace Core::Constants;
    using namespace ExtensionSystem;

271 272
    VCSBase::VCSBasePlugin::initialize(new SubversionControl(this));

con's avatar
con committed
273
    m_subversionPluginInstance = this;
hjk's avatar
hjk committed
274
    Core::ICore *core = Core::ICore::instance();
con's avatar
con committed
275

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

hjk's avatar
hjk committed
279
    if (QSettings *settings = core->settings())
con's avatar
con committed
280 281
        m_settings.fromSettings(settings);

282
    addAutoReleasedObject(new SettingsPage);
con's avatar
con committed
283

284
    addAutoReleasedObject(new SubversionSubmitEditorFactory(&submitParameters));
con's avatar
con committed
285 286 287

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

291 292
    addAutoReleasedObject(new CheckoutWizard);

Friedemann Kleint's avatar
Friedemann Kleint committed
293 294 295 296 297
    const QString description = QLatin1String("Subversion");
    const QString prefix = QLatin1String("svn");
    m_commandLocator = new Locator::CommandLocator(description, prefix, prefix);
    addAutoReleasedObject(m_commandLocator);

con's avatar
con committed
298
    //register actions
hjk's avatar
hjk committed
299
    Core::ActionManager *ami = core->actionManager();
300
    Core::ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS);
con's avatar
con committed
301

302
    Core::ActionContainer *subversionMenu =
303
        ami->createMenu(QLatin1String(CMD_ID_SUBVERSION_MENU));
con's avatar
con committed
304 305
    subversionMenu->menu()->setTitle(tr("&Subversion"));
    toolsContainer->addMenu(subversionMenu);
306
    m_menuAction = subversionMenu->menu()->menuAction();
con's avatar
con committed
307
    QList<int> globalcontext;
hjk's avatar
hjk committed
308
    globalcontext << core->uniqueIDManager()->uniqueIdentifier(C_GLOBAL);
con's avatar
con committed
309

con's avatar
con committed
310
    Core::Command *command;
311 312 313 314

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

321 322 323
    m_filelogCurrentAction = new Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_filelogCurrentAction,
        CMD_ID_FILELOG_CURRENT, globalcontext);
con's avatar
con committed
324
    command->setAttribute(Core::Command::CA_UpdateText);
325 326
    connect(m_filelogCurrentAction, SIGNAL(triggered()), this,
        SLOT(filelogCurrentFile()));
con's avatar
con committed
327
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
328
    m_commandLocator->appendCommand(command);
con's avatar
con committed
329

330 331 332
    m_annotateCurrentAction = new Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_annotateCurrentAction,
        CMD_ID_ANNOTATE_CURRENT, globalcontext);
con's avatar
con committed
333
    command->setAttribute(Core::Command::CA_UpdateText);
334 335
    connect(m_annotateCurrentAction, SIGNAL(triggered()), this,
        SLOT(annotateCurrentFile()));
con's avatar
con committed
336
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
337
    m_commandLocator->appendCommand(command);
con's avatar
con committed
338

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

341 342
    m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_addAction, CMD_ID_ADD,
con's avatar
con committed
343
        globalcontext);
344
    command->setAttribute(Core::Command::CA_UpdateText);
345 346
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A")));
    connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
con's avatar
con committed
347
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
348
    m_commandLocator->appendCommand(command);
con's avatar
con committed
349

350
    m_commitCurrentAction = new Utils::ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
con's avatar
con committed
351
    command = ami->registerAction(m_commitCurrentAction,
352
        CMD_ID_COMMIT_CURRENT, globalcontext);
con's avatar
con committed
353
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
354 355 356
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+C")));
    connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
357
    m_commandLocator->appendCommand(command);
con's avatar
con committed
358

359 360 361
    m_deleteAction = new Utils::ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_deleteAction, CMD_ID_DELETE_FILE,
        globalcontext);
con's avatar
con committed
362
    command->setAttribute(Core::Command::CA_UpdateText);
363
    connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile()));
con's avatar
con committed
364
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
365
    m_commandLocator->appendCommand(command);
con's avatar
con committed
366

367 368 369
    m_revertAction = new Utils::ParameterAction(tr("Revert..."), tr("Revert \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_revertAction, CMD_ID_REVERT,
        globalcontext);
con's avatar
con committed
370
    command->setAttribute(Core::Command::CA_UpdateText);
371
    connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
con's avatar
con committed
372
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
373
    m_commandLocator->appendCommand(command);
con's avatar
con committed
374

375
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR1, globalcontext));
376

377 378 379 380 381 382
    m_diffProjectAction = new Utils::ParameterAction(tr("Diff Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT,
        globalcontext);
    command->setAttribute(Core::Command::CA_UpdateText);
    connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffProject()));
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
383
    m_commandLocator->appendCommand(command);
con's avatar
con committed
384

385 386
    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
387
        globalcontext);
388 389
    command->setAttribute(Core::Command::CA_UpdateText);
    connect(m_statusProjectAction, SIGNAL(triggered()), this, SLOT(projectStatus()));
con's avatar
con committed
390
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
391
    m_commandLocator->appendCommand(command);
con's avatar
con committed
392

Friedemann Kleint's avatar
Friedemann Kleint committed
393
    m_logProjectAction = new Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
394 395 396 397
    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);
Friedemann Kleint's avatar
Friedemann Kleint committed
398
    m_commandLocator->appendCommand(command);
399

400
    m_updateProjectAction = new Utils::ParameterAction(tr("Update Project"), tr("Update Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
401
    command = ami->registerAction(m_updateProjectAction, CMD_ID_UPDATE, globalcontext);
con's avatar
con committed
402
    connect(m_updateProjectAction, SIGNAL(triggered()), this, SLOT(updateProject()));
403
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
404
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
405
    m_commandLocator->appendCommand(command);
con's avatar
con committed
406

407 408 409 410 411 412 413
    m_commitProjectAction = new Utils::ParameterAction(tr("Commit Project"), tr("Commit Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
    command = ami->registerAction(m_commitProjectAction, CMD_ID_COMMIT_PROJECT, globalcontext);
    connect(m_commitProjectAction, SIGNAL(triggered()), this, SLOT(startCommitProject()));
    command->setAttribute(Core::Command::CA_UpdateText);
    subversionMenu->addAction(command);
    m_commandLocator->appendCommand(command);

414 415
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR2, globalcontext));

416 417 418 419 420 421 422 423 424 425 426 427 428
    m_diffRepositoryAction = new QAction(tr("Diff Repository"), this);
    command = ami->registerAction(m_diffRepositoryAction, CMD_ID_REPOSITORYDIFF, globalcontext);
    connect(m_diffRepositoryAction, SIGNAL(triggered()), this, SLOT(diffRepository()));
    subversionMenu->addAction(command);
    m_commandLocator->appendCommand(command);

    m_statusRepositoryAction = new QAction(tr("Repository Status"), this);
    command = ami->registerAction(m_statusRepositoryAction, CMD_ID_REPOSITORYSTATUS, globalcontext);
    connect(m_statusRepositoryAction, SIGNAL(triggered()), this, SLOT(statusRepository()));
    subversionMenu->addAction(command);
    m_commandLocator->appendCommand(command);

    m_logRepositoryAction = new QAction(tr("Log Repository"), this);
429 430 431
    command = ami->registerAction(m_logRepositoryAction, CMD_ID_REPOSITORYLOG, globalcontext);
    connect(m_logRepositoryAction, SIGNAL(triggered()), this, SLOT(logRepository()));
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
432
    m_commandLocator->appendCommand(command);
433

434 435 436
    m_updateRepositoryAction = new QAction(tr("Update Repository"), this);
    command = ami->registerAction(m_updateRepositoryAction, CMD_ID_REPOSITORYUPDATE, globalcontext);
    connect(m_updateRepositoryAction, SIGNAL(triggered()), this, SLOT(updateRepository()));
437
    subversionMenu->addAction(command);
438
    m_commandLocator->appendCommand(command);
439 440 441 442 443 444

    m_commitAllAction = new QAction(tr("Commit All Files"), this);
    command = ami->registerAction(m_commitAllAction, CMD_ID_COMMIT_ALL,
        globalcontext);
    connect(m_commitAllAction, SIGNAL(triggered()), this, SLOT(startCommitAll()));
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
445
    m_commandLocator->appendCommand(command);
446

447 448 449 450 451
    m_describeAction = new QAction(tr("Describe..."), this);
    command = ami->registerAction(m_describeAction, CMD_ID_DESCRIBE, globalcontext);
    connect(m_describeAction, SIGNAL(triggered()), this, SLOT(slotDescribe()));
    subversionMenu->addAction(command);

452 453 454 455 456
    m_revertRepositoryAction = new QAction(tr("Revert Repository..."), this);
    command = ami->registerAction(m_revertRepositoryAction, CMD_ID_REVERT_ALL,
        globalcontext);
    connect(m_revertRepositoryAction, SIGNAL(triggered()), this, SLOT(revertAll()));
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
457
    m_commandLocator->appendCommand(command);
458

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

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

467
    m_submitDiffAction = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff Selected Files"), this);
con's avatar
con committed
468 469 470 471 472 473 474 475 476 477 478
    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;
}

479
bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor)
con's avatar
con committed
480
{
481
    if (!isCommitEditorOpen())
con's avatar
con committed
482 483
        return true;

484 485
    Core::IFile *fileIFace = submitEditor->file();
    const SubversionSubmitEditor *editor = qobject_cast<SubversionSubmitEditor *>(submitEditor);
con's avatar
con committed
486 487 488 489 490 491
    if (!fileIFace || !editor)
        return true;

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

496 497
    // Prompt user. Force a prompt unless submit was actually invoked (that
    // is, the editor was closed or shutdown).
498
    SubversionSettings newSettings = m_settings;
499 500 501
    const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer =
            editor->promptSubmit(tr("Closing Subversion Editor"),
                                 tr("Do you want to commit the change?"),
502
                                 tr("The commit message check failed. Do you want to commit the change?"),
503
                                 &newSettings.promptToSubmit, !m_submitActionTriggered);
504
    m_submitActionTriggered = false;
con's avatar
con committed
505
    switch (answer) {
506
    case VCSBase::VCSBaseSubmitEditor::SubmitCanceled:
con's avatar
con committed
507
        return false; // Keep editing and change file
508
    case VCSBase::VCSBaseSubmitEditor::SubmitDiscarded:
509
        cleanCommitMessageFile();
con's avatar
con committed
510 511 512 513
        return true; // Cancel all
    default:
        break;
    }
514
    setSettings(newSettings); // in case someone turned prompting off
con's avatar
con committed
515
    const QStringList fileList = editor->checkedFiles();
516
    bool closeEditor = true;
con's avatar
con committed
517 518
    if (!fileList.empty()) {
        // get message & commit
hjk's avatar
hjk committed
519
        Core::ICore::instance()->fileManager()->blockFileChange(fileIFace);
con's avatar
con committed
520
        fileIFace->save();
hjk's avatar
hjk committed
521
        Core::ICore::instance()->fileManager()->unblockFileChange(fileIFace);
522
        closeEditor= commit(m_commitMessageFileName, fileList);
con's avatar
con committed
523
    }
524
    if (closeEditor)
525
        cleanCommitMessageFile();
526
    return closeEditor;
con's avatar
con committed
527 528
}

529
void SubversionPlugin::diffCommitFiles(const QStringList &files)
con's avatar
con committed
530
{
531
    svnDiff(m_commitRepository, files);
con's avatar
con committed
532 533
}

534 535 536 537 538 539
static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db)
{
    if (VCSBase::VCSBaseEditor *ve = qobject_cast<VCSBase::VCSBaseEditor*>(editor->widget()))
        ve->setDiffBaseDirectory(db);
}

540
void SubversionPlugin::svnDiff(const QString &workingDir, const QStringList &files, QString diffname)
con's avatar
con committed
541 542 543
{
    if (Subversion::Constants::debug)
        qDebug() << Q_FUNC_INFO << files << diffname;
544
    const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
545
    QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VCSBase::VCSBaseEditor::getCodec(source);
con's avatar
con committed
546 547 548 549 550 551 552

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

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

553 554
    const SubversionResponse response =
            runSvn(workingDir, args, m_settings.timeOutMS(), 0);
con's avatar
con committed
555 556 557 558 559 560 561
    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
562
        if (Core::IEditor *editor = locateEditor("originalFileName", files.front())) {
con's avatar
con committed
563
            editor->createNew(response.stdOut);
564
            Core::EditorManager::instance()->activateEditor(editor);
565
            setDiffBaseDirectory(editor, workingDir);
con's avatar
con committed
566 567 568
            return;
        }
    }
Oswald Buddenhagen's avatar
Oswald Buddenhagen committed
569
    const QString title = QString::fromLatin1("svn diff %1").arg(diffname);
con's avatar
con committed
570
    Core::IEditor *editor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec);
571
    setDiffBaseDirectory(editor, workingDir);
con's avatar
con committed
572 573 574 575 576 577
    if (files.count() == 1)
        editor->setProperty("originalFileName", files.front());
}

SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName)
{
578
    Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_ID));
con's avatar
con committed
579
    SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor);
hjk's avatar
hjk committed
580
    QTC_ASSERT(submitEditor, /**/);
581
    submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
582
    connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
583
    submitEditor->setCheckScriptWorkingDirectory(m_commitRepository);
con's avatar
con committed
584 585 586
    return submitEditor;
}

587
void SubversionPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
con's avatar
con committed
588
{
Friedemann Kleint's avatar
Friedemann Kleint committed
589 590
    if (!enableMenuAction(as, m_menuAction)) {
        m_commandLocator->setEnabled(false);
591
        return;
Friedemann Kleint's avatar
Friedemann Kleint committed
592 593 594 595
    }
    const bool hasTopLevel = currentState().hasTopLevel();
    m_commandLocator->setEnabled(hasTopLevel);
    m_logRepositoryAction->setEnabled(hasTopLevel);
596

597 598 599 600
    const QString projectName = currentState().currentProjectName();
    m_diffProjectAction->setParameter(projectName);
    m_statusProjectAction->setParameter(projectName);
    m_updateProjectAction->setParameter(projectName);
601
    m_logProjectAction->setParameter(projectName);
602
    m_commitProjectAction->setParameter(projectName);
603 604 605 606

    const bool repoEnabled = currentState().hasTopLevel();
    m_commitAllAction->setEnabled(repoEnabled);
    m_describeAction->setEnabled(repoEnabled);
607
    m_revertRepositoryAction->setEnabled(repoEnabled);
608 609 610
    m_diffRepositoryAction->setEnabled(repoEnabled);
    m_statusRepositoryAction->setEnabled(repoEnabled);
    m_updateRepositoryAction->setEnabled(repoEnabled);
611 612 613 614 615 616 617 618 619 620

    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
621 622 623 624
}

void SubversionPlugin::addCurrentFile()
{
625 626 627
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
628 629
}

630 631 632 633 634 635 636 637 638 639 640
void SubversionPlugin::revertAll()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return)
    const QString title = tr("Revert repository");
    if (QMessageBox::warning(0, title, tr("Would you like to revert all changes to the repository?"),
                             QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
        return;
    // NoteL: Svn "revert ." doesn not work.
    QStringList args;
    args << QLatin1String("revert") << QLatin1String("--recursive") << state.topLevel();
641 642 643
    const SubversionResponse revertResponse =
            runSvn(state.topLevel(), args, m_settings.timeOutMS(),
                   SshPasswordPrompt|ShowStdOutInLogWindow);
644 645 646 647 648 649 650
    if (revertResponse.error) {
        QMessageBox::warning(0, title, tr("Revert failed: %1").arg(revertResponse.message), QMessageBox::Ok);
    } else {
        subVersionControl()->emitRepositoryChanged(state.topLevel());
    }
}

con's avatar
con committed
651 652
void SubversionPlugin::revertCurrentFile()
{
653 654
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
con's avatar
con committed
655 656

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

659 660
    const SubversionResponse diffResponse =
            runSvn(state.currentFileTopLevel(), args, m_settings.timeOutMS(), 0);
con's avatar
con committed
661 662 663 664 665
    if (diffResponse.error)
        return;

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

670

671
    Core::FileChangeBlocker fcb(state.currentFile());
con's avatar
con committed
672 673 674

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

677 678 679 680
    const SubversionResponse revertResponse =
            runSvn(state.currentFileTopLevel(), args, m_settings.timeOutMS(),
                   SshPasswordPrompt|ShowStdOutInLogWindow);

681
    if (!revertResponse.error) {
682
        subVersionControl()->emitFilesChanged(QStringList(state.currentFile()));
con's avatar
con committed
683 684 685 686 687
    }
}

void SubversionPlugin::diffProject()
{
688 689 690
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return)
    svnDiff(state.currentProjectTopLevel(), state.relativeCurrentProject(), state.currentProjectName());
con's avatar
con committed
691 692 693 694
}

void SubversionPlugin::diffCurrentFile()
{
695 696 697
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    svnDiff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
698 699 700 701
}

void SubversionPlugin::startCommitCurrentFile()
{
702 703 704
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    startCommit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
con's avatar
con committed
705 706 707 708
}

void SubversionPlugin::startCommitAll()
{
709 710 711
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return);
    startCommit(state.topLevel());
con's avatar
con committed
712 713
}

714 715 716 717 718 719 720
void SubversionPlugin::startCommitProject()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
    startCommit(state.currentProjectPath());
}

con's avatar
con committed
721 722 723
/* Start commit of files of a single repository by displaying
 * template and files in a submit editor. On closing, the real
 * commit will start. */
724
void SubversionPlugin::startCommit(const QString &workingDir, const QStringList &files)
con's avatar
con committed
725
{
726 727
    if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
        return;
728
    if (isCommitEditorOpen()) {
729
        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed."));
con's avatar
con committed
730 731 732 733 734 735
        return;
    }

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

736 737
    const SubversionResponse response =
            runSvn(workingDir, args, m_settings.timeOutMS(), 0);
con's avatar
con committed
738 739
    if (response.error)
        return;
740

con's avatar
con committed
741
    // Get list of added/modified/deleted files
742
    const StatusList statusOutput = parseStatusOutput(response.stdOut);
con's avatar
con committed
743
    if (statusOutput.empty()) {
744
        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("There are no modified files."));
con's avatar
con committed
745 746
        return;
    }
747
    m_commitRepository = workingDir;
con's avatar
con committed
748
    // Create a new submit change file containing the submit template
749 750 751 752
    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
753 754
        return;
    }
755
    m_commitMessageFileName = changeTmpFile.fileName();
756
    // TODO: Regitctrieve submit template from
con's avatar
con committed
757 758
    const QString submitTemplate;
    // Create a submit
759 760 761
    changeTmpFile.write(submitTemplate.toUtf8());
    changeTmpFile.flush();
    changeTmpFile.close();
con's avatar
con committed
762
    // Create a submit editor and set file list
763
    SubversionSubmitEditor *editor = openSubversionSubmitEditor(m_commitMessageFileName);
764
    editor->setStatusList(statusOutput);
con's avatar
con committed
765 766 767 768 769 770 771 772 773 774 775
}

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"));
776
    args << QLatin1String(nonInteractiveOptionC) << QLatin1String("--file") << messageFile;
con's avatar
con committed
777
    args.append(subVersionFileList);
778 779 780
    const SubversionResponse response =
            runSvn(m_commitRepository, args, m_settings.longTimeOutMS(),
                   SshPasswordPrompt|ShowStdOutInLogWindow);
con's avatar
con committed
781 782 783 784 785
    return !response.error ;
}

void SubversionPlugin::filelogCurrentFile()
{
786 787
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
788 789 790 791 792 793 794 795 796 797 798 799 800 801 802
   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
803 804
}

805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834
void SubversionPlugin::diffRepository()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return)
    svnDiff(state.topLevel(), QStringList());
}

void SubversionPlugin::statusRepository()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return)
    svnStatus(state.topLevel());
}

void SubversionPlugin::updateRepository()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return)
    svnUpdate(state.topLevel());
}

void SubversionPlugin::svnStatus(const QString &workingDir, const QStringList &relativePaths)
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return)
    QStringList args(QLatin1String("status"));
    if (!relativePaths.isEmpty())
        args.append(relativePaths);
    VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance();
    outwin->setRepository(workingDir);
835 836
    runSvn(workingDir, args, m_settings.timeOutMS(),
           ShowStdOutInLogWindow);
837 838 839
    outwin->clearRepository();
}

840 841 842
void SubversionPlugin::filelog(const QString &workingDir,
                               const QStringList &files,
                               bool enableAnnotationContextMenu)
con's avatar
con committed
843
{
844
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(workingDir, files);
con's avatar
con committed
845 846
    // no need for temp file
    QStringList args(QLatin1String("log"));
847 848
    if (m_settings.logCount > 0)
        args << QLatin1String("-l") << QString::number(m_settings.logCount);
849 850
    foreach(const QString &file, files)
        args.append(QDir::toNativeSeparators(file));
con's avatar
con committed
851

852 853 854
    const SubversionResponse response =
            runSvn(workingDir, args, m_settings.timeOutMS(),
                   SshPasswordPrompt, codec);
con's avatar
con committed
855 856 857 858 859 860
    if (response.error)
        return;

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

861 862
    const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir, files);
    if (Core::IEditor *editor = locateEditor("logFileName", id)) {
con's avatar
con committed
863
        editor->createNew(response.stdOut);
864
        Core::EditorManager::instance()->activateEditor(editor);
con's avatar
con committed
865
    } else {
866 867 868 869
        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);
870 871
        if (enableAnnotationContextMenu)
            VCSBase::VCSBaseEditor::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true);
con's avatar
con committed
872 873 874 875 876
    }
}

void SubversionPlugin::updateProject()
{
877 878
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
879 880
    svnUpdate(state.currentProjectTopLevel(), state.relativeCurrentProject());
}
con's avatar
con committed
881

882 883
void SubversionPlugin::svnUpdate(const QString &workingDir, const QStringList &relativePaths)
{
con's avatar
con committed
884
    QStringList args(QLatin1String("update"));
885
    args.push_back(QLatin1String(nonInteractiveOptionC));
886 887
    if (!relativePaths.isEmpty())
        args.append(relativePaths);
888 889 890
        const SubversionResponse response =
                runSvn(workingDir, args, m_settings.longTimeOutMS(),
                       SshPasswordPrompt|ShowStdOutInLogWindow);
891
    if (!response.error)
892
        subVersionControl()->emitRepositoryChanged(workingDir);
con's avatar
con committed
893 894 895 896
}

void SubversionPlugin::annotateCurrentFile()
{
897 898
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return);
899
    vcsAnnotate(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
900 901
}

902 903 904 905 906
void SubversionPlugin::annotateVersion(const QString &file,
                                       const QString &revision,
                                       int lineNr)
{
    const QFileInfo fi(file);
907
    vcsAnnotate(fi.absolutePath(), fi.fileName(), revision, lineNr);
908 909
}

910
void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file,
911 912
                                const QString &revision /* = QString() */,
                                int lineNumber /* = -1 */)
con's avatar
con committed
913
{
914
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file);
con's avatar
con committed
915 916

    QStringList args(QLatin1String("annotate"));
917 918
    if (m_settings.spaceIgnorantAnnotation)
        args << QLatin1String("-x") << QLatin1String("-uw");
919 920
    if (!revision.isEmpty())
        args << QLatin1String("-r") << revision;
con's avatar
con committed
921 922 923
    args.push_back(QLatin1String("-v"));
    args.append(QDir::toNativeSeparators(file));

924 925 926
    const SubversionResponse response =
            runSvn(workingDir, args, m_settings.timeOutMS(),
                   SshPasswordPrompt, codec);
con's avatar
con committed
927 928 929 930 931
    if (response.error)
        return;

    // Re-use an existing view if possible to support
    // the common usage pattern of continuously changing and diffing a file
932
    const QString source = workingDir + QLatin1Char('/') + file;
933 934 935 936
    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
937

938
    if (Core::IEditor *editor = locateEditor("annotateFileName", id)) {
con's avatar
con committed
939
        editor->createNew(response.stdOut);
940
        VCSBase::VCSBaseEditor::gotoLineOfEditor(editor, lineNumber);
941
        Core::EditorManager::instance()->activateEditor(editor);
con's avatar
con committed
942
    } else {
943 944 945
        const QString title = QString::fromLatin1("svn annotate %1").arg(id);
        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, source, codec);
        newEditor