2009-07-15 12:28:40 +02:00
|
|
|
/**************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator
|
|
|
|
|
**
|
|
|
|
|
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
|
|
|
|
**
|
|
|
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
|
|
|
**
|
|
|
|
|
** Commercial Usage
|
|
|
|
|
**
|
|
|
|
|
** Licensees holding valid Qt Commercial licenses may use this file in
|
|
|
|
|
** accordance with the Qt Commercial License Agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and Nokia.
|
|
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
|
|
|
|
**
|
|
|
|
|
** 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.
|
|
|
|
|
**
|
|
|
|
|
** If you are unsure which license is appropriate for your use, please
|
2009-08-14 09:30:56 +02:00
|
|
|
** contact the sales department at http://qt.nokia.com/contact.
|
2009-07-15 12:28:40 +02:00
|
|
|
**
|
|
|
|
|
**************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "cvseditor.h"
|
|
|
|
|
|
|
|
|
|
#include "annotationhighlighter.h"
|
|
|
|
|
#include "cvsconstants.h"
|
|
|
|
|
|
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
|
#include <vcsbase/diffhighlighter.h>
|
|
|
|
|
|
|
|
|
|
#include <QtCore/QDebug>
|
|
|
|
|
#include <QtGui/QTextCursor>
|
|
|
|
|
|
|
|
|
|
namespace CVS {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
|
|
|
|
// Match a CVS revision ("1.1.1.1")
|
|
|
|
|
#define CVS_REVISION_PATTERN "[\\d\\.]+"
|
|
|
|
|
#define CVS_REVISION_AT_START_PATTERN "^("CVS_REVISION_PATTERN") "
|
|
|
|
|
|
|
|
|
|
CVSEditor::CVSEditor(const VCSBase::VCSBaseEditorParameters *type,
|
|
|
|
|
QWidget *parent) :
|
|
|
|
|
VCSBase::VCSBaseEditor(type, parent),
|
2009-10-30 13:57:06 +01:00
|
|
|
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")),
|
|
|
|
|
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);
|
2009-07-15 12:28:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QSet<QString> CVSEditor::annotationChanges() const
|
|
|
|
|
{
|
|
|
|
|
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));
|
|
|
|
|
r.setPattern(QLatin1String("\n("CVS_REVISION_PATTERN") "));
|
|
|
|
|
QTC_ASSERT(r.isValid(), return changes);
|
|
|
|
|
int pos = 0;
|
|
|
|
|
while ((pos = r.indexIn(txt, pos)) != -1) {
|
|
|
|
|
pos += r.matchedLength();
|
|
|
|
|
changes.insert(r.cap(1));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (CVS::Constants::debug)
|
|
|
|
|
qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size();
|
|
|
|
|
return changes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString CVSEditor::changeUnderCursor(const QTextCursor &c) const
|
|
|
|
|
{
|
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()) {
|
|
|
|
|
case VCSBase::RegularCommandOutput:
|
|
|
|
|
case VCSBase::DiffOutput:
|
|
|
|
|
break;
|
|
|
|
|
case VCSBase::AnnotateOutput: {
|
|
|
|
|
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;
|
|
|
|
|
case VCSBase::LogOutput: {
|
|
|
|
|
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
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
VCSBase::DiffHighlighter *CVSEditor::createDiffHighlighter() const
|
|
|
|
|
{
|
|
|
|
|
const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*1\\.[\\d\\.]+$"));
|
|
|
|
|
QTC_ASSERT(filePattern.isValid(), /**/);
|
|
|
|
|
return new VCSBase::DiffHighlighter(filePattern);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
VCSBase::BaseAnnotationHighlighter *CVSEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
|
|
|
|
|
{
|
|
|
|
|
return new CVSAnnotationHighlighter(changes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString CVSEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
|
|
|
|
|
{
|
|
|
|
|
// "+++ 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);
|
|
|
|
|
// Add base dir
|
|
|
|
|
if (!m_diffBaseDir.isEmpty()) {
|
|
|
|
|
diffFileName.insert(0, QLatin1Char('/'));
|
|
|
|
|
diffFileName.insert(0, m_diffBaseDir);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (CVS::Constants::debug)
|
|
|
|
|
qDebug() << "fileNameFromDiffSpecification" << m_diffBaseDir << diffFileName;
|
|
|
|
|
return diffFileName;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString CVSEditor::diffBaseDir() const
|
|
|
|
|
{
|
|
|
|
|
return m_diffBaseDir;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CVSEditor::setDiffBaseDir(const QString &d)
|
|
|
|
|
{
|
|
|
|
|
m_diffBaseDir = d;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CVSEditor::setDiffBaseDir(Core::IEditor *editor, const QString &db)
|
|
|
|
|
{
|
|
|
|
|
if (CVSEditor *cvsEditor = qobject_cast<CVSEditor*>(editor->widget()))
|
|
|
|
|
cvsEditor->setDiffBaseDir(db);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|