blob: 5b6b819615e16ba0dec67719911ad0c932b14b99 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** 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 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.
**
** 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.
**
****************************************************************************/
#include "subversioneditor.h"
#include "subversionplugin.h"
#include "annotationhighlighter.h"
#include "subversionconstants.h"
#include <utils/qtcassert.h>
#include <vcsbase/diffandloghighlighter.h>
#include <QDebug>
#include <QFileInfo>
#include <QTextCursor>
#include <QTextBlock>
using namespace Subversion;
using namespace Subversion::Internal;
SubversionEditorWidget::SubversionEditorWidget() :
m_changeNumberPattern("^\\s*(?<area>(?<rev>\\d+))\\s+.*$"),
m_revisionNumberPattern("\\b(?<area>(r|[rR]evision )(?<rev>\\d+))\\b")
{
QTC_ASSERT(m_changeNumberPattern.isValid(), return);
QTC_ASSERT(m_revisionNumberPattern.isValid(), return);
/* Diff pattern:
\code
Index: main.cpp
===================================================================
--- main.cpp<tab>(revision 2)
+++ main.cpp<tab>(working copy)
@@ -6,6 +6,5 @@
\endcode
*/
setDiffFilePattern("^[-+]{3} ([^\\t]+)|^Index: .*|^=+$");
setLogEntryPattern("^(r\\d+) \\|");
setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\""));
setAnnotationEntryPattern("^(\\d+):");
}
QString SubversionEditorWidget::changeUnderCursor(const QTextCursor &c) const
{
QTextCursor cursor = c;
// Any number is regarded as change number.
cursor.select(QTextCursor::LineUnderCursor);
if (!cursor.hasSelection())
return QString();
QString change = cursor.selectedText();
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;
}
return QString();
}
VcsBase::BaseAnnotationHighlighter *SubversionEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
{
return new SubversionAnnotationHighlighter(changes);
}
QStringList SubversionEditorWidget::annotationPreviousVersions(const QString &v) const
{
bool ok;
const int revision = v.toInt(&ok);
if (!ok || revision < 2)
return QStringList();
return QStringList(QString::number(revision - 1));
}
|