/************************************************************************** ** ** This file is part of Qt Creator ** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** Commercial Usage ** ** 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. ** ** GNU Lesser General Public License Usage ** ** 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. ** ** If you are unsure which license is appropriate for your use, please ** contact the sales department at http://www.qtsoftware.com/contact. ** **************************************************************************/ #include "subversionplugin.h" #include "settingspage.h" #include "subversioneditor.h" #include "subversionoutputwindow.h" #include "subversionsubmiteditor.h" #include "subversionconstants.h" #include "subversioncontrol.h" #include "checkoutwizard.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include using namespace Subversion::Internal; // Timeout for normal output commands enum { subversionShortTimeOut = 10000 }; // Timeout for submit, update enum { subversionLongTimeOut = 120000 }; static const char * const CMD_ID_SUBVERSION_MENU = "Subversion.Menu"; static const char * const CMD_ID_ADD = "Subversion.Add"; static const char * const CMD_ID_DELETE_FILE = "Subversion.Delete"; static const char * const CMD_ID_REVERT = "Subversion.Revert"; static const char * const CMD_ID_SEPARATOR0 = "Subversion.Separator0"; static const char * const CMD_ID_DIFF_PROJECT = "Subversion.DiffAll"; static const char * const CMD_ID_DIFF_CURRENT = "Subversion.DiffCurrent"; static const char * const CMD_ID_SEPARATOR1 = "Subversion.Separator1"; static const char * const CMD_ID_COMMIT_ALL = "Subversion.CommitAll"; static const char * const CMD_ID_COMMIT_CURRENT = "Subversion.CommitCurrent"; static const char * const CMD_ID_SEPARATOR2 = "Subversion.Separator2"; static const char * const CMD_ID_FILELOG_CURRENT = "Subversion.FilelogCurrent"; static const char * const CMD_ID_ANNOTATE_CURRENT = "Subversion.AnnotateCurrent"; static const char * const CMD_ID_SEPARATOR3 = "Subversion.Separator3"; static const char * const CMD_ID_STATUS = "Subversion.Status"; static const char * const CMD_ID_UPDATE = "Subversion.Update"; static const char * const CMD_ID_DESCRIBE = "Subversion.Describe"; static const char *nonInteractiveOptionC = "--non-interactive"; static const VCSBase::VCSBaseEditorParameters editorParameters[] = { { VCSBase::RegularCommandOutput, "Subversion Command Log Editor", // kind "Subversion Command Log Editor", // context "application/vnd.nokia.text.scs_svn_commandlog", "scslog"}, { VCSBase::LogOutput, "Subversion File Log Editor", // kind "Subversion File Log Editor", // context "application/vnd.nokia.text.scs_svn_filelog", "scsfilelog"}, { VCSBase::AnnotateOutput, "Subversion Annotation Editor", // kind "Subversion Annotation Editor", // context "application/vnd.nokia.text.scs_svn_annotation", "scsannotate"}, { VCSBase::DiffOutput, "Subversion Diff Editor", // kind "Subversion Diff Editor", // context "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(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"); } Core::IEditor* locateEditor(const char *property, const QString &entry) { foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors()) if (ed->property(property).toString() == entry) return ed; return 0; } // Parse "svn status" output for added/modified/deleted files // "M<7blanks>file" typedef QList 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')) { const QString fileName = line.mid(7); // Column 8 starting from svn 1.6 changeSet.push_back(SubversionSubmitEditor::StatusFilePair(QString(state), fileName.trimmed())); } } } return changeSet; } // 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; } // ------------- SubversionPlugin SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0; SubversionPlugin::SubversionPlugin() : m_svnDirectories(svnDirectories()), m_versionControl(0), m_changeTmpFile(0), m_subversionOutputWindow(0), m_projectExplorer(0), m_addAction(0), m_deleteAction(0), m_revertAction(0), m_diffProjectAction(0), m_diffCurrentAction(0), m_commitAllAction(0), m_commitCurrentAction(0), m_filelogCurrentAction(0), m_annotateCurrentAction(0), m_statusAction(0), m_updateProjectAction(0), m_describeAction(0), m_submitCurrentLogAction(0), m_submitDiffAction(0), m_submitUndoAction(0), m_submitRedoAction(0), m_submitActionTriggered(false) { } SubversionPlugin::~SubversionPlugin() { cleanChangeTmpFile(); } void SubversionPlugin::cleanChangeTmpFile() { if (m_changeTmpFile) { if (m_changeTmpFile->isOpen()) m_changeTmpFile->close(); delete m_changeTmpFile; m_changeTmpFile = 0; } } static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = { Subversion::Constants::SUBVERSION_SUBMIT_MIMETYPE, Subversion::Constants::SUBVERSIONCOMMITEDITOR_KIND, Subversion::Constants::SUBVERSIONCOMMITEDITOR }; static inline Core::Command *createSeparator(QObject *parent, Core::ActionManager *ami, const char*id, const QList &globalcontext) { QAction *tmpaction = new QAction(parent); tmpaction->setSeparator(true); return ami->registerAction(tmpaction, id, globalcontext); } bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMessage) { Q_UNUSED(arguments) typedef VCSBase::VCSSubmitEditorFactory SubversionSubmitEditorFactory; typedef VCSBase::VCSEditorFactory SubversionEditorFactory; using namespace Constants; using namespace Core::Constants; using namespace ExtensionSystem; m_subversionPluginInstance = this; Core::ICore *core = Core::ICore::instance(); if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.subversion/Subversion.mimetypes.xml"), errorMessage)) return false; m_versionControl = new SubversionControl(this); addAutoReleasedObject(m_versionControl); if (QSettings *settings = core->settings()) m_settings.fromSettings(settings); addAutoReleasedObject(new CoreListener(this)); addAutoReleasedObject(new SettingsPage); addAutoReleasedObject(new SubversionSubmitEditorFactory(&submitParameters)); static const char *describeSlot = SLOT(describe(QString,QString)); const int editorCount = sizeof(editorParameters)/sizeof(VCSBase::VCSBaseEditorParameters); for (int i = 0; i < editorCount; i++) addAutoReleasedObject(new SubversionEditorFactory(editorParameters + i, this, describeSlot)); m_subversionOutputWindow = new SubversionOutputWindow(this); addAutoReleasedObject(m_subversionOutputWindow); addAutoReleasedObject(new CheckoutWizard); //register actions Core::ActionManager *ami = core->actionManager(); Core::ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS); Core::ActionContainer *subversionMenu = ami->createMenu(QLatin1String(CMD_ID_SUBVERSION_MENU)); subversionMenu->menu()->setTitle(tr("&Subversion")); toolsContainer->addMenu(subversionMenu); if (QAction *ma = subversionMenu->menu()->menuAction()) { ma->setEnabled(m_versionControl->isEnabled()); connect(m_versionControl, SIGNAL(enabledChanged(bool)), ma, SLOT(setVisible(bool))); } QList globalcontext; globalcontext << core->uniqueIDManager()->uniqueIdentifier(C_GLOBAL); Core::Command *command; m_addAction = new Core::Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_addAction, CMD_ID_ADD, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); #ifndef Q_WS_MAC command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A"))); #endif connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile())); subversionMenu->addAction(command); m_deleteAction = new Core::Utils::ParameterAction(tr("Delete"), tr("Delete \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_deleteAction, CMD_ID_DELETE_FILE, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(deleteCurrentFile())); subversionMenu->addAction(command); m_revertAction = new Core::Utils::ParameterAction(tr("Revert"), tr("Revert \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_revertAction, CMD_ID_REVERT, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile())); subversionMenu->addAction(command); subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR0, globalcontext)); m_diffProjectAction = new QAction(tr("Diff Project"), this); command = ami->registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT, globalcontext); connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffProject())); subversionMenu->addAction(command); m_diffCurrentAction = new Core::Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_diffCurrentAction, CMD_ID_DIFF_CURRENT, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); #ifndef Q_WS_MAC command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+D"))); #endif connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); subversionMenu->addAction(command); subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR1, globalcontext)); 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); m_commitCurrentAction = new Core::Utils::ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_commitCurrentAction, CMD_ID_COMMIT_CURRENT, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); #ifndef Q_WS_MAC command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+C"))); #endif connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile())); subversionMenu->addAction(command); subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR2, globalcontext)); m_filelogCurrentAction = new Core::Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_filelogCurrentAction, CMD_ID_FILELOG_CURRENT, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); connect(m_filelogCurrentAction, SIGNAL(triggered()), this, SLOT(filelogCurrentFile())); subversionMenu->addAction(command); m_annotateCurrentAction = new Core::Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Core::Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_annotateCurrentAction, CMD_ID_ANNOTATE_CURRENT, globalcontext); command->setAttribute(Core::Command::CA_UpdateText); connect(m_annotateCurrentAction, SIGNAL(triggered()), this, SLOT(annotateCurrentFile())); subversionMenu->addAction(command); 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); subversionMenu->addAction(createSeparator(this, ami, CMD_ID_SEPARATOR3, globalcontext)); m_statusAction = new QAction(tr("Project Status"), this); command = ami->registerAction(m_statusAction, CMD_ID_STATUS, globalcontext); connect(m_statusAction, SIGNAL(triggered()), this, SLOT(projectStatus())); subversionMenu->addAction(command); m_updateProjectAction = new QAction(tr("Update Project"), this); command = ami->registerAction(m_updateProjectAction, CMD_ID_UPDATE, globalcontext); connect(m_updateProjectAction, SIGNAL(triggered()), this, SLOT(updateProject())); subversionMenu->addAction(command); // Actions of the submit editor QList svncommitcontext; svncommitcontext << Core::UniqueIDManager::instance()->uniqueIdentifier(Constants::SUBVERSIONCOMMITEDITOR); m_submitCurrentLogAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this); command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, svncommitcontext); connect(m_submitCurrentLogAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog())); m_submitDiffAction = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff Selected Files"), this); 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); connect(Core::ICore::instance(), SIGNAL(contextChanged(Core::IContext *)), this, SLOT(updateActions())); return true; } void SubversionPlugin::extensionsInitialized() { m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance(); if (m_projectExplorer) { connect(m_projectExplorer, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), m_subversionPluginInstance, SLOT(updateActions())); } updateActions(); } bool SubversionPlugin::editorAboutToClose(Core::IEditor *iEditor) { if (!m_changeTmpFile || !iEditor || qstrcmp(Constants::SUBVERSIONCOMMITEDITOR, iEditor->kind())) return true; Core::IFile *fileIFace = iEditor->file(); const SubversionSubmitEditor *editor = qobject_cast(iEditor); if (!fileIFace || !editor) return true; // Submit editor closing. Make it write out the commit message // and retrieve files const QFileInfo editorFile(fileIFace->fileName()); const QFileInfo changeFile(m_changeTmpFile->fileName()); if (editorFile.absoluteFilePath() != changeFile.absoluteFilePath()) return true; // Oops?! // Prompt user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). SubversionSettings newSettings = m_settings; const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer = editor->promptSubmit(tr("Closing Subversion Editor"), tr("Do you want to commit the change?"), tr("The commit message check failed. Do you want to commit the change?"), &newSettings.promptToSubmit, !m_submitActionTriggered); m_submitActionTriggered = false; switch (answer) { case VCSBase::VCSBaseSubmitEditor::SubmitCanceled: return false; // Keep editing and change file case VCSBase::VCSBaseSubmitEditor::SubmitDiscarded: cleanChangeTmpFile(); return true; // Cancel all default: break; } setSettings(newSettings); // in case someone turned prompting off const QStringList fileList = editor->checkedFiles(); bool closeEditor = true; if (!fileList.empty()) { // get message & commit Core::ICore::instance()->fileManager()->blockFileChange(fileIFace); fileIFace->save(); Core::ICore::instance()->fileManager()->unblockFileChange(fileIFace); closeEditor= commit(m_changeTmpFile->fileName(), fileList); } if (closeEditor) cleanChangeTmpFile(); return closeEditor; } void SubversionPlugin::diffFiles(const QStringList &files) { svnDiff(files); } void SubversionPlugin::svnDiff(const QStringList &files, QString diffname) { if (Subversion::Constants::debug) qDebug() << Q_FUNC_INFO << files << diffname; const QString source = files.empty() ? QString() : files.front(); QTextCodec *codec = source.isEmpty() ? static_cast(0) : VCSBase::VCSBaseEditor::getCodec(source); if (files.count() == 1 && diffname.isEmpty()) diffname = QFileInfo(files.front()).fileName(); QStringList args(QLatin1String("diff")); args << files; const SubversionResponse response = runSvn(args, subversionShortTimeOut, false, codec); 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 if (Core::IEditor *editor = locateEditor("originalFileName", files.front())) { editor->createNew(response.stdOut); Core::EditorManager::instance()->activateEditor(editor); return; } } const QString title = QString::fromLatin1("svn diff %1").arg(diffname); Core::IEditor *editor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec); if (files.count() == 1) editor->setProperty("originalFileName", files.front()); } SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName) { Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_KIND)); SubversionSubmitEditor *submitEditor = qobject_cast(editor); QTC_ASSERT(submitEditor, /**/); submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction); connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffFiles(QStringList))); return submitEditor; } void SubversionPlugin::updateActions() { m_diffProjectAction->setEnabled(true); m_commitAllAction->setEnabled(true); m_statusAction->setEnabled(true); m_describeAction->setEnabled(true); const QString fileName = currentFileName(); const QString baseName = fileName.isEmpty() ? fileName : QFileInfo(fileName).fileName(); m_addAction->setParameter(baseName); m_deleteAction->setParameter(baseName); m_revertAction->setParameter(baseName); m_diffCurrentAction->setParameter(baseName); m_commitCurrentAction->setParameter(baseName); m_filelogCurrentAction->setParameter(baseName); m_annotateCurrentAction->setParameter(baseName); } void SubversionPlugin::addCurrentFile() { const QString file = currentFileName(); if (!file.isEmpty()) vcsAdd(file); } void SubversionPlugin::deleteCurrentFile() { const QString file = currentFileName(); if (!file.isEmpty()) vcsDelete(file); } void SubversionPlugin::revertCurrentFile() { const QString file = QDir::toNativeSeparators(currentFileName()); if (file.isEmpty()) return; QStringList args(QLatin1String("diff")); args.push_back(file); const SubversionResponse diffResponse = runSvn(args, subversionShortTimeOut, false); if (diffResponse.error) return; if (diffResponse.stdOut.isEmpty()) return; if (QMessageBox::warning(0, QLatin1String("svn revert"), tr("The file has been changed. Do you want to revert it?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) return; Core::FileChangeBlocker fcb(file); // revert args.clear(); args.push_back(QLatin1String("revert")); args.append(file); const SubversionResponse revertResponse = runSvn(args, subversionShortTimeOut, true); if (!revertResponse.error) { fcb.setModifiedReload(true); } } // Get a unique set of toplevel directories for the current projects. // To be used for "diff all" or "commit all". QStringList SubversionPlugin::currentProjectsTopLevels(QString *name) const { typedef QList ProjectList; ProjectList projects; // Compile list of projects if (ProjectExplorer::Project *currentProject = m_projectExplorer->currentProject()) { projects.push_back(currentProject); } else { if (const ProjectExplorer::SessionManager *session = m_projectExplorer->session()) projects.append(session->projects()); } // Get unique set of toplevels and concat project names QStringList toplevels; const QChar blank(QLatin1Char(' ')); foreach (const ProjectExplorer::Project *p, projects) { if (name) { if (!name->isEmpty()) name->append(blank); name->append(p->name()); } const QString projectPath = QFileInfo(p->file()->fileName()).absolutePath(); const QString topLevel = findTopLevelForDirectory(projectPath); if (!topLevel.isEmpty() && !toplevels.contains(topLevel)) toplevels.push_back(topLevel); } return toplevels; } void SubversionPlugin::diffProject() { QString diffName; const QStringList topLevels = currentProjectsTopLevels(&diffName); if (!topLevels.isEmpty()) svnDiff(topLevels, diffName); } void SubversionPlugin::diffCurrentFile() { svnDiff(QStringList(currentFileName())); } void SubversionPlugin::startCommitCurrentFile() { const QString file = QDir::toNativeSeparators(currentFileName()); if (!file.isEmpty()) startCommit(QStringList(file)); } void SubversionPlugin::startCommitAll() { // Make sure we have only repository for commit const QStringList files = currentProjectsTopLevels(); switch (files.size()) { case 0: break; case 1: startCommit(files); break; default: { const QString msg = tr("The commit list spans several repositories (%1). Please commit them one by one."). arg(files.join(QString(QLatin1Char(' ')))); QMessageBox::warning(0, QLatin1String("svn commit"), msg, QMessageBox::Ok); } break; } } /* Start commit of files of a single repository by displaying * template and files in a submit editor. On closing, the real * commit will start. */ void SubversionPlugin::startCommit(const QStringList &files) { if (files.empty()) return; if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor()) return; if (m_changeTmpFile) { showOutput(tr("Another commit is currently being executed.")); return; } QStringList args(QLatin1String("status")); args += files; if (args.size() == 1) return; const SubversionResponse response = runSvn(args, subversionShortTimeOut, false); if (response.error) return; // Get list of added/modified/deleted files const StatusList statusOutput = parseStatusOutput(response.stdOut); if (statusOutput.empty()) { showOutput(tr("There are no modified files."), true); return; } // Create a new submit change file containing the submit template QTemporaryFile *changeTmpFile = new QTemporaryFile(this); changeTmpFile->setAutoRemove(true); if (!changeTmpFile->open()) { showOutput(tr("Cannot create temporary file: %1").arg(changeTmpFile->errorString())); delete changeTmpFile; return; } m_changeTmpFile = changeTmpFile; // TODO: Retrieve submit template from const QString submitTemplate; // Create a submit m_changeTmpFile->write(submitTemplate.toUtf8()); m_changeTmpFile->flush(); m_changeTmpFile->seek(0); // Create a submit editor and set file list SubversionSubmitEditor *editor = openSubversionSubmitEditor(m_changeTmpFile->fileName()); editor->setStatusList(statusOutput); } 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]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")); args << QLatin1String(nonInteractiveOptionC) << QLatin1String("--file") << messageFile; args.append(subVersionFileList); const SubversionResponse response = runSvn(args, subversionLongTimeOut, true); return !response.error ; } void SubversionPlugin::filelogCurrentFile() { const QString file = currentFileName(); if (!file.isEmpty()) filelog(file); } void SubversionPlugin::filelog(const QString &file) { QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file); // no need for temp file QStringList args(QLatin1String("log")); args.append(QDir::toNativeSeparators(file)); const SubversionResponse response = runSvn(args, subversionShortTimeOut, false, codec); if (response.error) return; // Re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file if (Core::IEditor *editor = locateEditor("logFileName", file)) { editor->createNew(response.stdOut); Core::EditorManager::instance()->activateEditor(editor); } else { const QString title = QString::fromLatin1("svn log %1").arg(QFileInfo(file).fileName()); Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, file, codec); newEditor->setProperty("logFileName", file); } } void SubversionPlugin::updateProject() { const QStringList topLevels = currentProjectsTopLevels(); if (topLevels.empty()) return; QStringList args(QLatin1String("update")); args.push_back(QLatin1String(nonInteractiveOptionC)); args.append(topLevels); runSvn(args, subversionLongTimeOut, true); } void SubversionPlugin::annotateCurrentFile() { const QString file = currentFileName(); if (!file.isEmpty()) annotate(file); } void SubversionPlugin::annotate(const QString &file) { QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file); QStringList args(QLatin1String("annotate")); args.push_back(QLatin1String("-v")); args.append(QDir::toNativeSeparators(file)); const SubversionResponse response = runSvn(args, subversionShortTimeOut, false, codec); if (response.error) return; // Re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file if (Core::IEditor *editor = locateEditor("annotateFileName", file)) { editor->createNew(response.stdOut); Core::EditorManager::instance()->activateEditor(editor); } else { const QString title = QString::fromLatin1("svn annotate %1").arg(QFileInfo(file).fileName()); Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, file, codec); newEditor->setProperty("annotateFileName", file); } } void SubversionPlugin::projectStatus() { if (!m_projectExplorer) return; QStringList args(QLatin1String("status")); args += currentProjectsTopLevels(); if (args.size() == 1) return; runSvn(args, subversionShortTimeOut, true); } void SubversionPlugin::describe(const QString &source, const QString &changeNr) { // To describe a complete change, find the top level and then do //svn diff -r 472958:472959 const QFileInfo fi(source); const QString topLevel = findTopLevelForDirectory(fi.isDir() ? source : fi.absolutePath()); if (topLevel.isEmpty()) return; if (Subversion::Constants::debug) qDebug() << Q_FUNC_INFO << source << topLevel << changeNr; // Number must be > 1 bool ok; const int number = changeNr.toInt(&ok); if (!ok || number < 2) return; // Run log to obtain message (local utf8) QString description; QStringList args(QLatin1String("log")); args.push_back(QLatin1String("-r")); args.push_back(changeNr); args.push_back(topLevel); const SubversionResponse logResponse = runSvn(args, subversionShortTimeOut, false); if (logResponse.error) return; description = logResponse.stdOut; // Run diff (encoding via source codec) args.clear(); args.push_back(QLatin1String("diff")); args.push_back(QLatin1String("-r")); QString diffArg; QTextStream(&diffArg) << (number - 1) << ':' << number; args.push_back(diffArg); args.push_back(topLevel); QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(source); const SubversionResponse response = runSvn(args, subversionShortTimeOut, false, codec); if (response.error) return; description += response.stdOut; // Re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file const QString id = diffArg + source; if (Core::IEditor *editor = locateEditor("describeChange", id)) { editor->createNew(description); Core::EditorManager::instance()->activateEditor(editor); } else { const QString title = QString::fromLatin1("svn describe %1#%2").arg(QFileInfo(source).fileName(), changeNr); Core::IEditor *newEditor = showOutputInEditor(title, description, VCSBase::DiffOutput, source, codec); newEditor->setProperty("describeChange", id); } } void SubversionPlugin::slotDescribe() { const QStringList topLevels = currentProjectsTopLevels(); if (topLevels.size() != 1) return; QInputDialog inputDialog(Core::ICore::instance()->mainWindow()); inputDialog.setWindowFlags(inputDialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); inputDialog.setInputMode(QInputDialog::IntInput); inputDialog.setIntRange(2, INT_MAX); inputDialog.setWindowTitle(tr("Describe")); inputDialog.setLabelText(tr("Revision number:")); if (inputDialog.exec() != QDialog::Accepted) return; const int revision = inputDialog.intValue(); describe(topLevels.front(), QString::number(revision)); } void SubversionPlugin::submitCurrentLog() { m_submitActionTriggered = true; Core::EditorManager::instance()->closeEditors(QList() << Core::EditorManager::instance()->currentEditor()); } QString SubversionPlugin::currentFileName() const { const QString fileName = Core::ICore::instance()->fileManager()->currentFile(); if (!fileName.isEmpty()) { const QFileInfo fi(fileName); if (fi.exists()) return fi.canonicalFilePath(); } return QString(); } static inline QString processStdErr(QProcess &proc) { return QString::fromLocal8Bit(proc.readAllStandardError()).remove(QLatin1Char('\r')); } static inline QString processStdOut(QProcess &proc, QTextCodec *outputCodec = 0) { const QByteArray stdOutData = proc.readAllStandardOutput(); QString stdOut = outputCodec ? outputCodec->toUnicode(stdOutData) : QString::fromLocal8Bit(stdOutData); return stdOut.remove(QLatin1Char('\r')); } SubversionResponse SubversionPlugin::runSvn(const QStringList &arguments, int timeOut, bool showStdOutInOutputWindow, QTextCodec *outputCodec) { const QString executable = m_settings.svnCommand; SubversionResponse response; if (executable.isEmpty()) { response.error = true; response.message =tr("No subversion executable specified!"); return response; } const QStringList allArgs = m_settings.addOptions(arguments); // Hide passwords, etc in the log window const QString timeStamp = QTime::currentTime().toString(QLatin1String("HH:mm")); //: Executing: const QString outputText = tr("%1 Executing: %2 %3\n").arg(timeStamp, executable, SubversionSettings::formatArguments(allArgs)); showOutput(outputText, false); if (Subversion::Constants::debug) qDebug() << "runSvn" << timeOut << outputText; // Run, connect stderr to the output window Core::Utils::SynchronousProcess process; process.setTimeout(timeOut); process.setStdOutCodec(outputCodec); process.setStdErrBufferedSignalsEnabled(true); connect(&process, SIGNAL(stdErrBuffered(QString,bool)), m_subversionOutputWindow, SLOT(append(QString,bool))); // connect stdout to the output window if desired if (showStdOutInOutputWindow) { process.setStdOutBufferedSignalsEnabled(true); connect(&process, SIGNAL(stdOutBuffered(QString,bool)), m_subversionOutputWindow, SLOT(append(QString,bool))); } const Core::Utils::SynchronousProcessResponse sp_resp = process.run(executable, allArgs); response.error = true; response.stdErr = sp_resp.stdErr; response.stdOut = sp_resp.stdOut; switch (sp_resp.result) { case Core::Utils::SynchronousProcessResponse::Finished: response.error = false; break; case Core::Utils::SynchronousProcessResponse::FinishedError: response.message = tr("The process terminated with exit code %1.").arg(sp_resp.exitCode); break; case Core::Utils::SynchronousProcessResponse::TerminatedAbnormally: response.message = tr("The process terminated abnormally."); break; case Core::Utils::SynchronousProcessResponse::StartFailed: response.message = tr("Could not start subversion '%1'. Please check your settings in the preferences.").arg(executable); break; case Core::Utils::SynchronousProcessResponse::Hang: response.message = tr("Subversion did not respond within timeout limit (%1 ms).").arg(timeOut); break; } if (response.error) m_subversionOutputWindow->append(response.message, true); return response; } void SubversionPlugin::showOutput(const QString &output, bool bringToForeground) { m_subversionOutputWindow->append(output); if (bringToForeground) m_subversionOutputWindow->popup(); } Core::IEditor * SubversionPlugin::showOutputInEditor(const QString& title, const QString &output, int editorType, const QString &source, QTextCodec *codec) { const VCSBase::VCSBaseEditorParameters *params = findType(editorType); QTC_ASSERT(params, return 0); const QString kind = QLatin1String(params->kind); if (Subversion::Constants::debug) qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); QString s = title; Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output.toLocal8Bit()); SubversionEditor *e = qobject_cast(editor->widget()); if (!e) return 0; s.replace(QLatin1Char(' '), QLatin1Char('_')); e->setSuggestedFileName(s); if (!source.isEmpty()) e->setSource(source); if (codec) e->setCodec(codec); Core::IEditor *ie = e->editableInterface(); Core::EditorManager::instance()->activateEditor(ie); return ie; } SubversionSettings SubversionPlugin::settings() const { return m_settings; } void SubversionPlugin::setSettings(const SubversionSettings &s) { if (s != m_settings) { m_settings = s; if (QSettings *settings = Core::ICore::instance()->settings()) m_settings.toSettings(settings); } } SubversionPlugin *SubversionPlugin::subversionPluginInstance() { QTC_ASSERT(m_subversionPluginInstance, return m_subversionPluginInstance); return m_subversionPluginInstance; } bool SubversionPlugin::vcsAdd(const QString &rawFileName) { const QString file = QDir::toNativeSeparators(rawFileName); QStringList args(QLatin1String("add")); args.push_back(file); const SubversionResponse response = runSvn(args, subversionShortTimeOut, true); return !response.error; } bool SubversionPlugin::vcsDelete(const QString &rawFileName) { const QString file = QDir::toNativeSeparators(rawFileName); QStringList args(QLatin1String("delete")); args.push_back(file); const SubversionResponse response = runSvn(args, subversionShortTimeOut, true); return !response.error; } /* Subversion has ".svn" directory in each directory * it manages. The top level is the first directory * under the directory that does not have a ".svn". */ bool SubversionPlugin::managesDirectory(const QString &directory) const { const QDir dir(directory); const bool rc = dir.exists() && managesDirectory(dir); if (Subversion::Constants::debug) qDebug() << "SubversionPlugin::managesDirectory" << directory << rc; return rc; } bool SubversionPlugin::managesDirectory(const QDir &directory) const { const int dirCount = m_svnDirectories.size(); for (int i = 0; i < dirCount; i++) { const QString svnDir = directory.absoluteFilePath(m_svnDirectories.at(i)); if (QFileInfo(svnDir).isDir()) return true; } return false; } QString SubversionPlugin::findTopLevelForDirectory(const QString &directory) const { // Debug wrapper const QString rc = findTopLevelForDirectoryI(directory); if (Subversion::Constants::debug) qDebug() << "SubversionPlugin::findTopLevelForDirectory" << directory << rc; return rc; } QString SubversionPlugin::findTopLevelForDirectoryI(const QString &directory) const { /* Recursing up, the top level is a child of the first directory that does * not have a ".svn" directory. The starting directory must be a managed * one. Go up and try to find the first unmanaged parent dir. */ QDir lastDirectory = QDir(directory); if (!lastDirectory.exists() || !managesDirectory(lastDirectory)) return QString(); for (QDir parentDir = lastDirectory; parentDir.cdUp() ; lastDirectory = parentDir) { if (!managesDirectory(parentDir)) return QDir::toNativeSeparators(lastDirectory.absolutePath()); } return QString(); } Q_EXPORT_PLUGIN(SubversionPlugin)