2012-10-02 09:12:39 +02:00
|
|
|
/****************************************************************************
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
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
|
2016-01-15 14:57:40 +01:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** GNU General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
2010-12-17 16:01:08 +01:00
|
|
|
**
|
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>
|
2015-03-25 10:31:55 +02:00
|
|
|
#include <vcsbase/diffandloghighlighter.h>
|
2008-12-02 12:01:29 +01:00
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QDebug>
|
|
|
|
|
#include <QFileInfo>
|
2017-03-09 23:02:32 +01:00
|
|
|
#include <QRegExp>
|
2012-02-15 10:42:41 +01:00
|
|
|
#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
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
SubversionEditorWidget::SubversionEditorWidget() :
|
2014-11-04 15:41:41 +01:00
|
|
|
m_changeNumberPattern(QLatin1String("^\\s*(?<area>(?<rev>\\d+))\\s+.*$")),
|
|
|
|
|
m_revisionNumberPattern(QLatin1String("\\b(?<area>(r|[rR]evision )(?<rev>\\d+))\\b"))
|
2008-12-02 12:01:29 +01:00
|
|
|
{
|
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
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
QSet<QString> SubversionEditorWidget::annotationChanges() const
|
2008-12-02 12:01:29 +01:00
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
QString SubversionEditorWidget::changeUnderCursor(const QTextCursor &c) const
|
2008-12-02 12:01:29 +01:00
|
|
|
{
|
|
|
|
|
QTextCursor cursor = c;
|
|
|
|
|
// Any number is regarded as change number.
|
2014-11-04 15:41:41 +01:00
|
|
|
cursor.select(QTextCursor::LineUnderCursor);
|
2008-12-02 12:01:29 +01:00
|
|
|
if (!cursor.hasSelection())
|
|
|
|
|
return QString();
|
|
|
|
|
QString change = cursor.selectedText();
|
2014-11-04 15:41:41 +01:00
|
|
|
const int pos = c.position() - cursor.selectionStart() + 1;
|
|
|
|
|
// Annotation output has number, log output has revision numbers,
|
|
|
|
|
// both at the start of the line.
|
|
|
|
|
auto matchIter = m_changeNumberPattern.globalMatch(change);
|
|
|
|
|
if (!matchIter.hasNext())
|
|
|
|
|
matchIter = m_revisionNumberPattern.globalMatch(change);
|
|
|
|
|
|
|
|
|
|
// We may have several matches of our regexp and we way have
|
|
|
|
|
// several () in the regexp
|
|
|
|
|
const QString areaName = QLatin1String("area");
|
|
|
|
|
while (matchIter.hasNext()) {
|
|
|
|
|
auto match = matchIter.next();
|
|
|
|
|
const QString rev = match.captured(QLatin1String("rev"));
|
|
|
|
|
if (rev.isEmpty())
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
const QString area = match.captured(areaName);
|
|
|
|
|
QTC_ASSERT(area.contains(rev), continue);
|
|
|
|
|
|
|
|
|
|
const int start = match.capturedStart(areaName);
|
|
|
|
|
const int end = match.capturedEnd(areaName);
|
|
|
|
|
if (pos > start && pos <= end)
|
|
|
|
|
return rev;
|
2008-12-02 12:01:29 +01:00
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
VcsBase::BaseAnnotationHighlighter *SubversionEditorWidget::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
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
QStringList SubversionEditorWidget::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));
|
|
|
|
|
}
|