2009-02-25 09:15:00 +01:00
|
|
|
/**************************************************************************
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator
|
|
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2009-06-17 00:01:27 +10:00
|
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** Commercial Usage
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** 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.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** GNU Lesser General Public License Usage
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** 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.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** If you are unsure which license is appropriate for your use, please
|
2009-08-14 09:30:56 +02:00
|
|
|
** contact the sales department at http://qt.nokia.com/contact.
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
**************************************************************************/
|
2008-12-02 16:19:05 +01:00
|
|
|
|
2008-12-02 12:01:29 +01:00
|
|
|
#include "subversioneditor.h"
|
2009-12-08 16:50:27 +01:00
|
|
|
#include "subversionplugin.h"
|
2008-12-09 15:25:01 +01:00
|
|
|
|
2008-12-02 12:01:29 +01:00
|
|
|
#include "annotationhighlighter.h"
|
|
|
|
|
#include "subversionconstants.h"
|
|
|
|
|
|
2008-12-09 15:25:01 +01:00
|
|
|
#include <utils/qtcassert.h>
|
2008-12-02 12:01:29 +01:00
|
|
|
#include <vcsbase/diffhighlighter.h>
|
|
|
|
|
|
|
|
|
|
#include <QtCore/QDebug>
|
2009-12-08 16:50:27 +01:00
|
|
|
#include <QtCore/QFileInfo>
|
2008-12-02 12:01:29 +01:00
|
|
|
#include <QtGui/QTextCursor>
|
|
|
|
|
|
2008-12-02 16:19:05 +01:00
|
|
|
using namespace Subversion;
|
|
|
|
|
using namespace Subversion::Internal;
|
2008-12-02 12:01:29 +01:00
|
|
|
|
|
|
|
|
SubversionEditor::SubversionEditor(const VCSBase::VCSBaseEditorParameters *type,
|
|
|
|
|
QWidget *parent) :
|
|
|
|
|
VCSBase::VCSBaseEditor(type, parent),
|
|
|
|
|
m_changeNumberPattern(QLatin1String("^\\d+$")),
|
|
|
|
|
m_revisionNumberPattern(QLatin1String("^r\\d+$"))
|
|
|
|
|
{
|
2008-12-09 15:25:01 +01:00
|
|
|
QTC_ASSERT(m_changeNumberPattern.isValid(), return);
|
|
|
|
|
QTC_ASSERT(m_revisionNumberPattern.isValid(), return);
|
2008-12-02 12:01:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QSet<QString> SubversionEditor::annotationChanges() const
|
|
|
|
|
{
|
|
|
|
|
QSet<QString> changes;
|
|
|
|
|
const QString txt = toPlainText();
|
|
|
|
|
if (txt.isEmpty())
|
|
|
|
|
return changes;
|
|
|
|
|
// Hunt for first change number in annotation: "<change>:"
|
|
|
|
|
QRegExp r(QLatin1String("^(\\d+):"));
|
2008-12-09 15:25:01 +01:00
|
|
|
QTC_ASSERT(r.isValid(), return changes);
|
2008-12-02 12:01:29 +01:00
|
|
|
if (r.indexIn(txt) != -1) {
|
|
|
|
|
changes.insert(r.cap(1));
|
|
|
|
|
r.setPattern(QLatin1String("\n(\\d+):"));
|
2008-12-09 15:25:01 +01:00
|
|
|
QTC_ASSERT(r.isValid(), return changes);
|
2008-12-02 12:01:29 +01:00
|
|
|
int pos = 0;
|
|
|
|
|
while ((pos = r.indexIn(txt, pos)) != -1) {
|
|
|
|
|
pos += r.matchedLength();
|
|
|
|
|
changes.insert(r.cap(1));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (Subversion::Constants::debug)
|
|
|
|
|
qDebug() << "SubversionEditor::annotationChanges() returns #" << changes.size();
|
|
|
|
|
return changes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString SubversionEditor::changeUnderCursor(const QTextCursor &c) const
|
|
|
|
|
{
|
|
|
|
|
QTextCursor cursor = c;
|
|
|
|
|
// Any number is regarded as change number.
|
|
|
|
|
cursor.select(QTextCursor::WordUnderCursor);
|
|
|
|
|
if (!cursor.hasSelection())
|
|
|
|
|
return QString();
|
|
|
|
|
QString change = cursor.selectedText();
|
|
|
|
|
// Annotation output has number, log output has revision numbers
|
|
|
|
|
// as r1, r2...
|
|
|
|
|
if (m_changeNumberPattern.exactMatch(change))
|
|
|
|
|
return change;
|
|
|
|
|
if (m_revisionNumberPattern.exactMatch(change)) {
|
|
|
|
|
change.remove(0, 1);
|
|
|
|
|
return change;
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* code:
|
|
|
|
|
Index: main.cpp
|
|
|
|
|
===================================================================
|
|
|
|
|
--- main.cpp (revision 2)
|
|
|
|
|
+++ main.cpp (working copy)
|
|
|
|
|
@@ -6,6 +6,5 @@
|
|
|
|
|
\endcode
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
VCSBase::DiffHighlighter *SubversionEditor::createDiffHighlighter() const
|
|
|
|
|
{
|
|
|
|
|
const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*|^Index: .*|^==*$"));
|
2008-12-09 15:25:01 +01:00
|
|
|
QTC_ASSERT(filePattern.isValid(), /**/);
|
2008-12-02 12:01:29 +01:00
|
|
|
return new VCSBase::DiffHighlighter(filePattern);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
VCSBase::BaseAnnotationHighlighter *SubversionEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
|
|
|
|
|
{
|
|
|
|
|
return new SubversionAnnotationHighlighter(changes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString SubversionEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
|
|
|
|
|
{
|
|
|
|
|
// "+++ /depot/.../mainwindow.cpp<tab>(revision 3)"
|
|
|
|
|
// Go back chunks
|
|
|
|
|
const QString diffIndicator = QLatin1String("+++ ");
|
|
|
|
|
for (QTextBlock block = inBlock; block.isValid() ; block = block.previous()) {
|
|
|
|
|
QString diffFileName = block.text();
|
|
|
|
|
if (diffFileName.startsWith(diffIndicator)) {
|
|
|
|
|
diffFileName.remove(0, diffIndicator.size());
|
|
|
|
|
const int tabIndex = diffFileName.lastIndexOf(QLatin1Char('\t'));
|
|
|
|
|
if (tabIndex != -1)
|
|
|
|
|
diffFileName.truncate(tabIndex);
|
2009-12-08 16:50:27 +01:00
|
|
|
const QString rc = findDiffFile(diffFileName, SubversionPlugin::subversionPluginInstance()->versionControl());
|
2008-12-02 12:01:29 +01:00
|
|
|
if (Subversion::Constants::debug)
|
2009-12-08 16:50:27 +01:00
|
|
|
qDebug() << Q_FUNC_INFO << diffFileName << rc << source();
|
|
|
|
|
return rc;
|
2008-12-02 12:01:29 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|