2012-10-02 09:12:39 +02:00
|
|
|
/****************************************************************************
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2014-01-07 13:27:11 +01:00
|
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
2012-10-02 09:12:39 +02:00
|
|
|
** Contact: http://www.qt-project.org/legal
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** This file is part of Qt Creator.
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
|
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
|
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2009-02-25 09:15:00 +01:00
|
|
|
** GNU Lesser General Public License Usage
|
2012-10-02 09:12:39 +02: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.
|
|
|
|
|
**
|
|
|
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
|
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
2010-12-17 16:01:08 +01:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
2012-10-02 09:12:39 +02: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>
|
|
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QDebug>
|
|
|
|
|
#include <QFileInfo>
|
|
|
|
|
#include <QTextCursor>
|
|
|
|
|
#include <QTextBlock>
|
2008-12-02 12:01:29 +01:00
|
|
|
|
2008-12-02 16:19:05 +01:00
|
|
|
using namespace Subversion;
|
|
|
|
|
using namespace Subversion::Internal;
|
2008-12-02 12:01:29 +01:00
|
|
|
|
2012-01-07 12:31:48 +01:00
|
|
|
SubversionEditor::SubversionEditor(const VcsBase::VcsBaseEditorParameters *type,
|
2008-12-02 12:01:29 +01:00
|
|
|
QWidget *parent) :
|
2012-01-07 12:31:48 +01:00
|
|
|
VcsBase::VcsBaseEditorWidget(type, parent),
|
2008-12-02 12:01:29 +01:00
|
|
|
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);
|
2013-01-19 23:19:38 +02:00
|
|
|
/* Diff pattern:
|
|
|
|
|
\code
|
|
|
|
|
Index: main.cpp
|
|
|
|
|
===================================================================
|
|
|
|
|
--- main.cpp<tab>(revision 2)
|
|
|
|
|
+++ main.cpp<tab>(working copy)
|
|
|
|
|
@@ -6,6 +6,5 @@
|
|
|
|
|
\endcode
|
|
|
|
|
*/
|
|
|
|
|
setDiffFilePattern(QRegExp(QLatin1String("^[-+]{3} ([^\\t]+)|^Index: .*|^=+$")));
|
2013-01-28 22:02:35 +02:00
|
|
|
setLogEntryPattern(QRegExp(QLatin1String("^(r\\d+) \\|")));
|
2010-01-07 11:33:30 +01:00
|
|
|
setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\""));
|
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();
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-13 12:57:31 +02:00
|
|
|
VcsBase::BaseAnnotationHighlighter *SubversionEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
|
2008-12-02 12:01:29 +01:00
|
|
|
{
|
2013-08-13 12:57:31 +02:00
|
|
|
return new SubversionAnnotationHighlighter(changes);
|
2008-12-02 12:01:29 +01:00
|
|
|
}
|
|
|
|
|
|
2010-01-07 11:33:30 +01:00
|
|
|
QStringList SubversionEditor::annotationPreviousVersions(const QString &v) const
|
2010-01-06 17:24:40 +01:00
|
|
|
{
|
|
|
|
|
bool ok;
|
|
|
|
|
const int revision = v.toInt(&ok);
|
|
|
|
|
if (!ok || revision < 2)
|
|
|
|
|
return QStringList();
|
|
|
|
|
return QStringList(QString::number(revision - 1));
|
|
|
|
|
}
|