X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/66ad27aba14cdfea777b9ebe1beb161f80f26463..79a6e75b6567e8cf2ef677cea6bb2c34075d07c7:/src/revisioncontrolplugin.cpp diff --git a/src/revisioncontrolplugin.cpp b/src/revisioncontrolplugin.cpp index 1e19ddcf0..683398879 100644 --- a/src/revisioncontrolplugin.cpp +++ b/src/revisioncontrolplugin.cpp @@ -33,28 +33,34 @@ RevisionControlPlugin::~RevisionControlPlugin() #include #include +#include #include #include #include #include -#include #include #include #include +#include #include +#include #include #include SubversionPlugin::SubversionPlugin() : - m_retrievalDir(), m_revisionInfoHash(), + m_revisionInfoKeys(), m_updateAction(0), m_showLocalChangesAction(0), m_commitAction(0), m_addAction(0), m_removeAction(0), + m_command(), + m_errorMsg(), + m_operationCompletedMsg(), m_contextDir(), - m_contextItems() + m_contextItems(), + m_tempFile() { m_updateAction = new KAction(this); m_updateAction->setIcon(KIcon("view-refresh")); @@ -98,27 +104,42 @@ QString SubversionPlugin::fileName() const bool SubversionPlugin::beginRetrieval(const QString& directory) { Q_ASSERT(directory.endsWith('/')); - m_retrievalDir = directory; - const QString path = directory + ".svn/text-base/"; - - QDir dir(path); - const QFileInfoList fileInfoList = dir.entryInfoList(); - const int size = fileInfoList.size(); - QString fileName; - for (int i = 0; i < size; ++i) { - const QFileInfo fileInfo = fileInfoList.at(i); - fileName = fileInfo.fileName(); - // Remove the ".svn-base" postfix to be able to compare the filenames - // in a fast way in SubversionPlugin::revisionState(). - fileName.chop(sizeof(".svn-base") / sizeof(char) - 1); - if (!fileName.isEmpty()) { - RevisionInfo info; - info.size = fileInfo.size(); - info.timeStamp = fileInfo.lastModified(); - m_revisionInfoHash.insert(directory + fileName, info); + + QStringList arguments; + arguments << "status" << "--show-updates" << directory; + + QProcess process; + process.start("svn", arguments); + while (process.waitForReadyRead()) { + char buffer[1024]; + while (process.readLine(buffer, sizeof(buffer)) > 0) { + RevisionState state = NormalRevision; + QString filePath(buffer); + + switch (buffer[0]) { + case '?': state = UnversionedRevision; break; + case 'M': state = LocallyModifiedRevision; break; + case 'A': state = AddedRevision; break; + case 'D': state = RemovedRevision; break; + case 'C': state = ConflictingRevision; break; + default: + if (filePath.contains('*')) { + state = UpdateRequiredRevision; + } + break; + } + + int pos = filePath.indexOf('/'); + const int length = filePath.length() - pos - 1; + filePath = filePath.mid(pos, length); + if (!filePath.isEmpty()) { + m_revisionInfoHash.insert(filePath, state); + } } } - return size > 0; + + m_revisionInfoKeys = m_revisionInfoHash.keys(); + return true; } void SubversionPlugin::endRetrieval() @@ -128,37 +149,37 @@ void SubversionPlugin::endRetrieval() RevisionControlPlugin::RevisionState SubversionPlugin::revisionState(const KFileItem& item) { const QString itemUrl = item.localPath(); - if (item.isDir()) { - QFile file(itemUrl + "/.svn"); - if (file.open(QIODevice::ReadOnly)) { - file.close(); - return RevisionControlPlugin::NormalRevision; - } - } else if (m_revisionInfoHash.contains(itemUrl)) { - const RevisionInfo info = m_revisionInfoHash.value(itemUrl); - const QDateTime localTimeStamp = item.time(KFileItem::ModificationTime).dateTime(); - const QDateTime versionedTimeStamp = info.timeStamp; - - if (localTimeStamp > versionedTimeStamp) { - if ((info.size != item.size()) || !equalRevisionContent(item.name())) { - return RevisionControlPlugin::LocallyModifiedRevision; - } - } else if (localTimeStamp < versionedTimeStamp) { - if ((info.size != item.size()) || !equalRevisionContent(item.name())) { - return RevisionControlPlugin::UpdateRequiredRevision; + if (m_revisionInfoHash.contains(itemUrl)) { + return m_revisionInfoHash.value(itemUrl); + } + + if (!item.isDir()) { + // files that have not been listed by 'svn status' (= m_revisionInfoHash) + // are under revision control per definition + return NormalRevision; + } + + // The item is a directory. Check whether an item listed by 'svn status' (= m_revisionInfoHash) + // is part of this directory. In this case a local modification should be indicated in the + // directory already. + foreach (const QString& key, m_revisionInfoKeys) { + if (key.startsWith(itemUrl)) { + const RevisionState state = m_revisionInfoHash.value(key); + if (state == LocallyModifiedRevision) { + return LocallyModifiedRevision; } } - return RevisionControlPlugin::NormalRevision; } - return RevisionControlPlugin::UnversionedRevision; + return NormalRevision; } QList SubversionPlugin::contextMenuActions(const KFileItemList& items) { Q_ASSERT(!items.isEmpty()); - - m_contextItems = items; + foreach (const KFileItem& item, items) { + m_contextItems.append(item); + } m_contextDir.clear(); // iterate all items and check the revision state to know which @@ -195,8 +216,17 @@ QList SubversionPlugin::contextMenuActions(const KFileItemList& items) QList SubversionPlugin::contextMenuActions(const QString& directory) { - m_contextDir = directory; - m_contextItems.clear(); + const bool enabled = m_contextItems.isEmpty(); + if (enabled) { + m_contextDir = directory; + } + + // Only enable the SVN actions if no SVN commands are + // executed currently (see slotOperationCompleted() and + // startSvnCommandProcess()). + m_updateAction->setEnabled(enabled); + m_showLocalChangesAction->setEnabled(enabled); + m_commitAction->setEnabled(enabled); QList actions; actions.append(m_updateAction); @@ -207,7 +237,10 @@ QList SubversionPlugin::contextMenuActions(const QString& directory) void SubversionPlugin::updateFiles() { - execSvnCommand("update"); + execSvnCommand("update", + i18nc("@info:status", "Updating SVN repository..."), + i18nc("@info:status", "Update of SVN repository failed."), + i18nc("@info:status", "Updated SVN repository.")); } void SubversionPlugin::showLocalChanges() @@ -240,8 +273,24 @@ void SubversionPlugin::commitFiles() dialog.restoreDialogSize(dialogConfig); if (dialog.exec() == QDialog::Accepted) { - const QString description = editor->toPlainText(); - execSvnCommand("commit -m " + KShell::quoteArg(description)); + // Write the commit description into a temporary file, so + // that it can be read by the command "svn commit -F". The temporary + // file must stay alive until slotOperationCompleted() is invoked and will + // be destroyed when the revision plugin is destructed. + if (!m_tempFile.open()) { + emit errorMessage(i18nc("@info:status", "Commit of SVN changes failed.")); + return; + } + + QTextStream out(&m_tempFile); + const QString fileName = m_tempFile.fileName(); + out << editor->toPlainText(); + m_tempFile.close(); + + execSvnCommand("commit -F " + KShell::quoteArg(fileName), + i18nc("@info:status", "Committing SVN changes..."), + i18nc("@info:status", "Commit of SVN changes failed."), + i18nc("@info:status", "Committed SVN changes.")); } dialog.saveDialogSize(dialogConfig, KConfigBase::Persistent); @@ -249,45 +298,68 @@ void SubversionPlugin::commitFiles() void SubversionPlugin::addFiles() { - execSvnCommand("add"); + execSvnCommand("add", + i18nc("@info:status", "Adding files to SVN repository..."), + i18nc("@info:status", "Adding of files to SVN repository failed."), + i18nc("@info:status", "Added files to SVN repository.")); } void SubversionPlugin::removeFiles() { - execSvnCommand("remove"); + execSvnCommand("remove", + i18nc("@info:status", "Removing files from SVN repository..."), + i18nc("@info:status", "Removing of files from SVN repository failed."), + i18nc("@info:status", "Removed files from SVN repository.")); } -void SubversionPlugin::execSvnCommand(const QString& svnCommand) +void SubversionPlugin::slotOperationCompleted() { - const QString command = "svn " + svnCommand + ' '; - if (!m_contextDir.isEmpty()) { - KRun::runCommand(command + KShell::quoteArg(m_contextDir), 0); + if (m_contextItems.isEmpty()) { + emit operationCompletedMessage(m_operationCompletedMsg); + emit revisionStatesChanged(); } else { - foreach (const KFileItem& item, m_contextItems) { - KRun::runCommand(command + KShell::quoteArg(item.localPath()), 0); - } + startSvnCommandProcess(); } } -bool SubversionPlugin::equalRevisionContent(const QString& name) const +void SubversionPlugin::slotOperationError() { - QFile localFile(m_retrievalDir + '/' + name); - if (!localFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - return false; - } + emit errorMessage(m_errorMsg); - QFile revisionedFile(m_retrievalDir + "/.svn/text-base/" + name + ".svn-base"); - if (!revisionedFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - return false; - } + // don't do any operation on other items anymore + m_contextItems.clear(); +} - QTextStream localText(&localFile); - QTextStream revisionedText(&revisionedFile); - while (!localText.atEnd() && !revisionedText.atEnd()) { - if (localText.readLine() != revisionedText.readLine()) { - return false; - } - } +void SubversionPlugin::execSvnCommand(const QString& svnCommand, + const QString& infoMsg, + const QString& errorMsg, + const QString& operationCompletedMsg) +{ + emit infoMessage(infoMsg); + + m_command = svnCommand; + m_errorMsg = errorMsg; + m_operationCompletedMsg = operationCompletedMsg; - return localText.atEnd() && revisionedText.atEnd(); + startSvnCommandProcess(); +} + +void SubversionPlugin::startSvnCommandProcess() +{ + QProcess* process = new QProcess(this); + connect(process, SIGNAL(finished(int)), + this, SLOT(slotOperationCompleted())); + connect(process, SIGNAL(error(QProcess::ProcessError)), + this, SLOT(slotOperationError())); + + const QString program = "svn " + m_command + ' '; + if (!m_contextDir.isEmpty()) { + process->start(program + KShell::quoteArg(m_contextDir)); + m_contextDir.clear(); + } else { + const KFileItem item = m_contextItems.takeLast(); + process->start(program + KShell::quoteArg(item.localPath())); + // the remaining items of m_contextItems will be executed + // after the process has finished (see slotOperationFinished()) + } }