subversionplugin.cpp 51.3 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

#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/filemanager.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/mimedatabase.h>
52
#include <coreplugin/actionmanager/actionmanager.h>
53 54
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
con's avatar
con committed
55
#include <coreplugin/editormanager/editormanager.h>
Friedemann Kleint's avatar
Friedemann Kleint committed
56 57 58

#include <locator/commandlocator.h>

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

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

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

using namespace Subversion::Internal;

79 80 81 82 83 84 85 86 87
static const char * const CMD_ID_SUBVERSION_MENU    = "Subversion.Menu";
static const char * const CMD_ID_ADD                = "Subversion.Add";
static const char * const CMD_ID_DELETE_FILE        = "Subversion.Delete";
static const char * const CMD_ID_REVERT             = "Subversion.Revert";
static const char * const CMD_ID_SEPARATOR0         = "Subversion.Separator0";
static const char * const CMD_ID_DIFF_PROJECT       = "Subversion.DiffAll";
static const char * const CMD_ID_DIFF_CURRENT       = "Subversion.DiffCurrent";
static const char * const CMD_ID_SEPARATOR1         = "Subversion.Separator1";
static const char * const CMD_ID_COMMIT_ALL         = "Subversion.CommitAll";
88
static const char * const CMD_ID_REVERT_ALL         = "Subversion.RevertAll";
89 90 91 92 93
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";
94
static const char * const CMD_ID_SEPARATOR4         = "Subversion.Separator4";
95
static const char * const CMD_ID_STATUS             = "Subversion.Status";
96 97
static const char * const CMD_ID_PROJECTLOG         = "Subversion.ProjectLog";
static const char * const CMD_ID_REPOSITORYLOG      = "Subversion.RepositoryLog";
98 99 100
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";
101
static const char * const CMD_ID_UPDATE             = "Subversion.Update";
102
static const char * const CMD_ID_COMMIT_PROJECT     = "Subversion.CommitProject";
103
static const char * const CMD_ID_DESCRIBE           = "Subversion.Describe";
con's avatar
con committed
104

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

107 108


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

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

        }
    }
    return changeSet;
}

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

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

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

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

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

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

251 252 253
static inline Core::Command *createSeparator(QObject *parent,
                                             Core::ActionManager *ami,
                                             const char*id,
254
                                             const Core::Context &globalcontext)
255 256 257 258 259 260
{
    QAction *tmpaction = new QAction(parent);
    tmpaction->setSeparator(true);
    return ami->registerAction(tmpaction, id, globalcontext);
}

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

    using namespace Core::Constants;
    using namespace ExtensionSystem;

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

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

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

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

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

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

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

290 291
    addAutoReleasedObject(new CheckoutWizard);

Friedemann Kleint's avatar
Friedemann Kleint committed
292 293 294 295 296
    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
297
    //register actions
hjk's avatar
hjk committed
298
    Core::ActionManager *ami = core->actionManager();
299
    Core::ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS);
con's avatar
con committed
300

301
    Core::ActionContainer *subversionMenu =
302
        ami->createMenu(QLatin1String(CMD_ID_SUBVERSION_MENU));
con's avatar
con committed
303 304
    subversionMenu->menu()->setTitle(tr("&Subversion"));
    toolsContainer->addMenu(subversionMenu);
305
    m_menuAction = subversionMenu->menu()->menuAction();
306
    Core::Context globalcontext(C_GLOBAL);
con's avatar
con committed
307
    Core::Command *command;
308 309 310 311

    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
312
    command->setAttribute(Core::Command::CA_UpdateText);
313 314
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+D")));
    connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
con's avatar
con committed
315
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
316
    m_commandLocator->appendCommand(command);
con's avatar
con committed
317

318 319 320
    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
321
    command->setAttribute(Core::Command::CA_UpdateText);
322 323
    connect(m_filelogCurrentAction, SIGNAL(triggered()), this,
        SLOT(filelogCurrentFile()));
con's avatar
con committed
324
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
325
    m_commandLocator->appendCommand(command);
con's avatar
con committed
326

327 328 329
    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
330
    command->setAttribute(Core::Command::CA_UpdateText);
331 332
    connect(m_annotateCurrentAction, SIGNAL(triggered()), this,
        SLOT(annotateCurrentFile()));
con's avatar
con committed
333
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
334
    m_commandLocator->appendCommand(command);
con's avatar
con committed
335

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

338 339
    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
340
        globalcontext);
341
    command->setAttribute(Core::Command::CA_UpdateText);
342 343
    command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A")));
    connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
con's avatar
con committed
344
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
345
    m_commandLocator->appendCommand(command);
con's avatar
con committed
346

347
    m_commitCurrentAction = new Utils::ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
con's avatar
con committed
348
    command = ami->registerAction(m_commitCurrentAction,
349
        CMD_ID_COMMIT_CURRENT, globalcontext);
con's avatar
con committed
350
    command->setAttribute(Core::Command::CA_UpdateText);
con's avatar
con committed
351 352 353
    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
354
    m_commandLocator->appendCommand(command);
con's avatar
con committed
355

356 357 358
    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
359
    command->setAttribute(Core::Command::CA_UpdateText);
360
    connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile()));
con's avatar
con committed
361
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
362
    m_commandLocator->appendCommand(command);
con's avatar
con committed
363

364 365 366
    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
367
    command->setAttribute(Core::Command::CA_UpdateText);
368
    connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
con's avatar
con committed
369
    subversionMenu->addAction(command);
Friedemann Kleint's avatar
Friedemann Kleint committed
370
    m_commandLocator->appendCommand(command);
con's avatar
con committed
371

372
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR1, globalcontext));
373

374 375 376 377 378 379
    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
380
    m_commandLocator->appendCommand(command);
con's avatar
con committed
381

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

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

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

404 405 406 407 408 409 410
    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);

411 412
    subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR2, globalcontext));

413 414 415 416 417 418 419 420 421 422 423 424 425
    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);
426 427 428
    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
429
    m_commandLocator->appendCommand(command);
430

431 432 433
    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()));
434
    subversionMenu->addAction(command);
435
    m_commandLocator->appendCommand(command);
436 437 438 439 440 441

    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
442
    m_commandLocator->appendCommand(command);
443

444 445 446 447 448
    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);

449 450 451 452 453
    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
454
    m_commandLocator->appendCommand(command);
455

con's avatar
con committed
456
    // Actions of the submit editor
457
    Core::Context svncommitcontext(Constants::SUBVERSIONCOMMITEDITOR);
con's avatar
con committed
458

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

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

475
bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor)
con's avatar
con committed
476
{
477
    if (!isCommitEditorOpen())
con's avatar
con committed
478 479
        return true;

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

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

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

525
void SubversionPlugin::diffCommitFiles(const QStringList &files)
con's avatar
con committed
526
{
527
    svnDiff(m_commitRepository, files);
con's avatar
con committed
528 529
}

530 531 532 533 534 535
static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db)
{
    if (VCSBase::VCSBaseEditor *ve = qobject_cast<VCSBase::VCSBaseEditor*>(editor->widget()))
        ve->setDiffBaseDirectory(db);
}

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

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

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

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

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

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

593 594 595 596
    const QString projectName = currentState().currentProjectName();
    m_diffProjectAction->setParameter(projectName);
    m_statusProjectAction->setParameter(projectName);
    m_updateProjectAction->setParameter(projectName);
597
    m_logProjectAction->setParameter(projectName);
598
    m_commitProjectAction->setParameter(projectName);
599 600 601 602

    const bool repoEnabled = currentState().hasTopLevel();
    m_commitAllAction->setEnabled(repoEnabled);
    m_describeAction->setEnabled(repoEnabled);
603
    m_revertRepositoryAction->setEnabled(repoEnabled);
604 605 606
    m_diffRepositoryAction->setEnabled(repoEnabled);
    m_statusRepositoryAction->setEnabled(repoEnabled);
    m_updateRepositoryAction->setEnabled(repoEnabled);
607 608 609 610 611 612 613 614 615 616

    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
617 618 619 620
}

void SubversionPlugin::addCurrentFile()
{
621 622 623
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
    vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
624 625
}

626 627 628 629 630 631 632 633 634 635 636
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();
637 638 639
    const SubversionResponse revertResponse =
            runSvn(state.topLevel(), args, m_settings.timeOutMS(),
                   SshPasswordPrompt|ShowStdOutInLogWindow);
640 641 642 643 644 645 646
    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
647 648
void SubversionPlugin::revertCurrentFile()
{
649 650
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return)
con's avatar
con committed
651 652

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

655 656
    const SubversionResponse diffResponse =
            runSvn(state.currentFileTopLevel(), args, m_settings.timeOutMS(), 0);
con's avatar
con committed
657 658 659 660 661
    if (diffResponse.error)
        return;

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

666

667
    Core::FileChangeBlocker fcb(state.currentFile());
con's avatar
con committed
668 669 670

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

673 674 675 676
    const SubversionResponse revertResponse =
            runSvn(state.currentFileTopLevel(), args, m_settings.timeOutMS(),
                   SshPasswordPrompt|ShowStdOutInLogWindow);

677
    if (!revertResponse.error) {
678
        subVersionControl()->emitFilesChanged(QStringList(state.currentFile()));
con's avatar
con committed
679 680 681 682 683
    }
}

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

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

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

void SubversionPlugin::startCommitAll()
{
705 706 707
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasTopLevel(), return);
    startCommit(state.topLevel());
con's avatar
con committed
708 709
}

710 711 712 713 714 715 716
void SubversionPlugin::startCommitProject()
{
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
    startCommit(state.currentProjectPath());
}

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

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

732 733
    const SubversionResponse response =
            runSvn(workingDir, args, m_settings.timeOutMS(), 0);
con's avatar
con committed
734 735
    if (response.error)
        return;
736

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

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

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

801 802 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
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);
831 832
    runSvn(workingDir, args, m_settings.timeOutMS(),
           ShowStdOutInLogWindow);
833 834 835
    outwin->clearRepository();
}

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

848 849 850
    const SubversionResponse response =
            runSvn(workingDir, args, m_settings.timeOutMS(),
                   SshPasswordPrompt, codec);
con's avatar
con committed
851 852 853 854 855 856
    if (response.error)
        return;

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

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

void SubversionPlugin::updateProject()
{
873 874
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasProject(), return);
875 876
    svnUpdate(state.currentProjectTopLevel(), state.relativeCurrentProject());
}
con's avatar
con committed
877

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

void SubversionPlugin::annotateCurrentFile()
{
893 894
    const VCSBase::VCSBasePluginState state = currentState();
    QTC_ASSERT(state.hasFile(), return);
895
    vcsAnnotate(state.currentFileTopLevel(), state.relativeCurrentFile());
con's avatar
con committed
896 897
}

898 899 900 901 902
void SubversionPlugin::annotateVersion(const QString &file,
                                       const QString &revision,
                                       int lineNr)
{
    const QFileInfo fi(file);
903
    vcsAnnotate(fi.absolutePath(), fi.fileName(), revision, lineNr);
904 905
}

906
void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file,
907 908
                                const QString &revision /* = QString() */,
                                int lineNumber /* = -1 */)
con's avatar
con committed
909
{
910
    QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file);
con's avatar