2009-07-15 12:28:40 +02:00
|
|
|
/**************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator
|
|
|
|
|
**
|
2012-01-26 18:33:46 +01:00
|
|
|
** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
2009-07-15 12:28:40 +02:00
|
|
|
**
|
2011-11-02 15:59:12 +01:00
|
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
2009-07-15 12:28:40 +02:00
|
|
|
**
|
|
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
|
|
|
|
**
|
2011-04-13 08:42:33 +02:00
|
|
|
** 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.
|
2009-07-15 12:28:40 +02:00
|
|
|
**
|
2010-12-17 16:01:08 +01:00
|
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
2011-04-13 08:42:33 +02:00
|
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
2010-12-17 16:01:08 +01:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
2011-04-13 08:42:33 +02:00
|
|
|
** Other Usage
|
|
|
|
|
**
|
|
|
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
|
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
|
|
|
**
|
2010-12-17 16:01:08 +01:00
|
|
|
** If you have questions regarding the use of this file, please contact
|
2011-11-02 15:59:12 +01:00
|
|
|
** Nokia at qt-info@nokia.com.
|
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 "cvsconstants.h"
|
|
|
|
|
|
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
|
#include <vcsbase/diffhighlighter.h>
|
|
|
|
|
|
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
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
CvsEditor::CvsEditor(const VcsBase::VcsBaseEditorParameters *type,
|
2009-07-15 12:28:40 +02:00
|
|
|
QWidget *parent) :
|
2012-01-07 12:31:48 +01:00
|
|
|
VcsBase::VcsBaseEditorWidget(type, parent),
|
2011-12-29 16:19:58 +01:00
|
|
|
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN ".*$")),
|
2011-11-22 15:50:49 +01:00
|
|
|
m_revisionLogPattern(QLatin1String("^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);
|
2010-01-07 11:33:30 +01:00
|
|
|
setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\""));
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
QSet<QString> CvsEditor::annotationChanges() const
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
|
|
|
|
QSet<QString> changes;
|
|
|
|
|
const QString txt = toPlainText();
|
|
|
|
|
if (txt.isEmpty())
|
|
|
|
|
return changes;
|
|
|
|
|
// Hunt for first change number in annotation: "1.1 (author)"
|
|
|
|
|
QRegExp r(QLatin1String(CVS_REVISION_AT_START_PATTERN));
|
|
|
|
|
QTC_ASSERT(r.isValid(), return changes);
|
|
|
|
|
if (r.indexIn(txt) != -1) {
|
|
|
|
|
changes.insert(r.cap(1));
|
2011-11-22 15:50:49 +01:00
|
|
|
r.setPattern(QLatin1String("\n(" CVS_REVISION_PATTERN ") "));
|
2009-07-15 12:28:40 +02:00
|
|
|
QTC_ASSERT(r.isValid(), return changes);
|
|
|
|
|
int pos = 0;
|
|
|
|
|
while ((pos = r.indexIn(txt, pos)) != -1) {
|
|
|
|
|
pos += r.matchedLength();
|
|
|
|
|
changes.insert(r.cap(1));
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-01-07 16:55:09 +01:00
|
|
|
if (Cvs::Constants::debug)
|
2009-07-15 12:28:40 +02:00
|
|
|
qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size();
|
|
|
|
|
return changes;
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
QString CvsEditor::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()) {
|
2012-01-07 12:31:48 +01:00
|
|
|
case VcsBase::RegularCommandOutput:
|
|
|
|
|
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();
|
|
|
|
|
if (m_revisionAnnotationPattern.exactMatch(line))
|
|
|
|
|
return m_revisionAnnotationPattern.cap(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
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();
|
|
|
|
|
if (c.position() - block.position() > 8 && m_revisionLogPattern.exactMatch(block.text()))
|
|
|
|
|
return m_revisionLogPattern.cap(1);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* \code
|
|
|
|
|
cvs diff -d -u -r1.1 -r1.2:
|
|
|
|
|
--- mainwindow.cpp<\t>13 Jul 2009 13:50:15 -0000 <\t>1.1
|
|
|
|
|
+++ mainwindow.cpp<\t>14 Jul 2009 07:09:24 -0000<\t>1.2
|
|
|
|
|
@@ -6,6 +6,5 @@
|
|
|
|
|
\endcode
|
|
|
|
|
*/
|
|
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
VcsBase::DiffHighlighter *CvsEditor::createDiffHighlighter() const
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
|
|
|
|
const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*1\\.[\\d\\.]+$"));
|
2011-07-29 12:00:11 +02:00
|
|
|
QTC_CHECK(filePattern.isValid());
|
2012-01-07 12:31:48 +01:00
|
|
|
return new VcsBase::DiffHighlighter(filePattern);
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
|
2012-03-06 14:32:32 +01:00
|
|
|
VcsBase::BaseAnnotationHighlighter *CvsEditor::createAnnotationHighlighter(const QSet<QString> &changes,
|
|
|
|
|
const QColor &bg) const
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
2012-03-06 14:32:32 +01:00
|
|
|
return new CvsAnnotationHighlighter(changes, bg);
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
QString CvsEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
|
|
|
|
// "+++ mainwindow.cpp<\t>13 Jul 2009 13:50:15 -0000 1.1"
|
|
|
|
|
// 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.indexOf(QLatin1Char('\t'));
|
|
|
|
|
if (tabIndex != -1)
|
|
|
|
|
diffFileName.truncate(tabIndex);
|
2009-12-09 12:41:10 +01:00
|
|
|
return findDiffFile(diffFileName);
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-07 16:55:09 +01:00
|
|
|
QStringList CvsEditor::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
|
|
|
}
|
|
|
|
|
}
|