2012-10-02 09:12:39 +02:00
|
|
|
/****************************************************************************
|
2009-07-15 12:28:40 +02:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
2009-07-15 12:28:40 +02:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** This file is part of Qt Creator.
|
2009-07-15 12:28:40 +02: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.
|
2009-07-15 12:28:40 +02: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
|
|
|
****************************************************************************/
|
2009-07-15 12:28:40 +02:00
|
|
|
|
|
|
|
|
#include "cvseditor.h"
|
2010-01-06 17:24:40 +01:00
|
|
|
#include "cvsutils.h"
|
2009-07-15 12:28:40 +02:00
|
|
|
|
|
|
|
|
#include "annotationhighlighter.h"
|
|
|
|
|
|
|
|
|
|
#include <utils/qtcassert.h>
|
2015-03-25 10:31:55 +02:00
|
|
|
#include <vcsbase/diffandloghighlighter.h>
|
2009-07-15 12:28:40 +02:00
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QDebug>
|
|
|
|
|
#include <QTextCursor>
|
|
|
|
|
#include <QTextBlock>
|
2009-07-15 12:28:40 +02:00
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
namespace Cvs {
|
2009-07-15 12:28:40 +02:00
|
|
|
namespace Internal {
|
|
|
|
|
|
|
|
|
|
// Match a CVS revision ("1.1.1.1")
|
|
|
|
|
#define CVS_REVISION_PATTERN "[\\d\\.]+"
|
2011-11-22 15:50:49 +01:00
|
|
|
#define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") "
|
2009-07-15 12:28:40 +02:00
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
CvsEditorWidget::CvsEditorWidget() :
|
2020-02-19 23:26:24 +02:00
|
|
|
m_revisionAnnotationPattern(CVS_REVISION_AT_START_PATTERN),
|
|
|
|
|
m_revisionLogPattern("^revision *(" CVS_REVISION_PATTERN ")$")
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
2009-10-30 13:57:06 +01:00
|
|
|
QTC_ASSERT(m_revisionAnnotationPattern.isValid(), return);
|
|
|
|
|
QTC_ASSERT(m_revisionLogPattern.isValid(), return);
|
2013-01-19 23:19:38 +02:00
|
|
|
/* Diff format:
|
|
|
|
|
\code
|
|
|
|
|
cvs diff -d -u -r1.1 -r1.2:
|
|
|
|
|
--- mainwindow.cpp<\t>13 Jul 2009 13:50:15 -0000<tab>1.1
|
|
|
|
|
+++ mainwindow.cpp<\t>14 Jul 2009 07:09:24 -0000<tab>1.2
|
|
|
|
|
@@ -6,6 +6,5 @@
|
|
|
|
|
\endcode
|
|
|
|
|
*/
|
2020-02-19 23:26:24 +02:00
|
|
|
setDiffFilePattern("^[-+]{3} ([^\\t]+)");
|
|
|
|
|
setLogEntryPattern("^revision (.+)$");
|
2010-01-07 11:33:30 +01:00
|
|
|
setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\""));
|
2020-02-19 23:23:36 +02:00
|
|
|
setAnnotationEntryPattern("^(" CVS_REVISION_PATTERN ") ");
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
QString CvsEditorWidget::changeUnderCursor(const QTextCursor &c) const
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
2009-10-30 13:57:06 +01:00
|
|
|
// Try to match "1.1" strictly:
|
|
|
|
|
// 1) Annotation: Check for a revision number at the beginning of the line.
|
|
|
|
|
// Note that "cursor.select(QTextCursor::WordUnderCursor)" will
|
|
|
|
|
// only select the part up until the dot.
|
|
|
|
|
// Check if we are at the beginning of a line within a reasonable offset.
|
|
|
|
|
// 2) Log: check for lines like "revision 1.1", cursor past "revision"
|
|
|
|
|
switch (contentType()) {
|
2013-05-22 21:32:07 +03:00
|
|
|
case VcsBase::OtherContent:
|
2012-01-07 12:31:48 +01:00
|
|
|
case VcsBase::DiffOutput:
|
2009-10-30 13:57:06 +01:00
|
|
|
break;
|
2012-01-07 12:31:48 +01:00
|
|
|
case VcsBase::AnnotateOutput: {
|
2009-10-30 13:57:06 +01:00
|
|
|
const QTextBlock block = c.block();
|
|
|
|
|
if (c.atBlockStart() || (c.position() - block.position() < 3)) {
|
|
|
|
|
const QString line = block.text();
|
2020-02-19 23:26:24 +02:00
|
|
|
const QRegularExpressionMatch match = m_revisionAnnotationPattern.match(line);
|
|
|
|
|
if (match.hasMatch())
|
|
|
|
|
return match.captured(1);
|
2009-10-30 13:57:06 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2012-01-07 12:31:48 +01:00
|
|
|
case VcsBase::LogOutput: {
|
2009-10-30 13:57:06 +01:00
|
|
|
const QTextBlock block = c.block();
|
2020-02-19 23:26:24 +02:00
|
|
|
if (c.position() - block.position() > 8) {
|
|
|
|
|
const QRegularExpressionMatch match = m_revisionLogPattern.match(block.text());
|
|
|
|
|
if (match.hasMatch())
|
|
|
|
|
return match.captured(1);
|
|
|
|
|
}
|
2009-10-30 13:57:06 +01:00
|
|
|
}
|
|
|
|
|
break;
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
VcsBase::BaseAnnotationHighlighter *CvsEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
2013-08-13 12:57:31 +02:00
|
|
|
return new CvsAnnotationHighlighter(changes);
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
|
2014-08-21 20:43:33 +02:00
|
|
|
QStringList CvsEditorWidget::annotationPreviousVersions(const QString &revision) const
|
2010-01-06 17:24:40 +01:00
|
|
|
{
|
|
|
|
|
if (isFirstRevision(revision))
|
|
|
|
|
return QStringList();
|
|
|
|
|
return QStringList(previousRevision(revision));
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
}
|