forked from qt-creator/qt-creator
Add a CVS plugin for use with UNIX cvs or Tortoise CVS.
This commit is contained in:
Friedemann Kleint
238
src/plugins/cvs/cvsutils.cpp
Normal file
238
src/plugins/cvs/cvsutils.cpp
Normal file
@@ -0,0 +1,238 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** 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
|
||||
** contact the sales department at http://www.qtsoftware.com/contact.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
#include "cvsutils.h"
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QRegExp>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
namespace CVS {
|
||||
namespace Internal {
|
||||
|
||||
CVS_Revision::CVS_Revision(const QString &rev) :
|
||||
revision(rev)
|
||||
{
|
||||
}
|
||||
|
||||
CVS_LogEntry::CVS_LogEntry(const QString &f) :
|
||||
file(f)
|
||||
{
|
||||
}
|
||||
|
||||
QDebug operator<<(QDebug d, const CVS_LogEntry &e)
|
||||
{
|
||||
QDebug nospace = d.nospace();
|
||||
nospace << "File: " << e.file << e.revisions.size() << '\n';
|
||||
foreach(const CVS_Revision &r, e.revisions)
|
||||
nospace << " " << r.revision << ' ' << r.date << ' ' << r.commitId << '\n';
|
||||
return d;
|
||||
}
|
||||
|
||||
/* Parse:
|
||||
\code
|
||||
RCS file: /repo/foo.h
|
||||
Working file: foo.h
|
||||
head: 1.2
|
||||
...
|
||||
----------------------------
|
||||
revision 1.2
|
||||
date: 2009-07-14 13:30:25 +0200; author: <author>; state: dead; lines: +0 -0; commitid: <id>;
|
||||
<message>
|
||||
----------------------------
|
||||
revision 1.1
|
||||
...
|
||||
=============================================================================
|
||||
\endcode */
|
||||
|
||||
QList<CVS_LogEntry> parseLogEntries(const QString &o,
|
||||
const QString &directory,
|
||||
const QString filterCommitId)
|
||||
{
|
||||
enum ParseState { FileState, RevisionState, StatusLineState };
|
||||
|
||||
QList<CVS_LogEntry> rc;
|
||||
const QStringList lines = o.split(QString(QLatin1Char('\n')), QString::SkipEmptyParts);
|
||||
ParseState state = FileState;
|
||||
|
||||
const QString workingFilePrefix = QLatin1String("Working file: ");
|
||||
const QString revisionPrefix = QLatin1String("revision ");
|
||||
const QString statusPrefix = QLatin1String("date: ");
|
||||
const QString commitId = QLatin1String("commitid: ");
|
||||
const QRegExp statusPattern = QRegExp(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
|
||||
const QRegExp revisionPattern = QRegExp(QLatin1String("^revision ([\\d\\.]+)$"));
|
||||
const QChar slash = QLatin1Char('/');
|
||||
Q_ASSERT(statusPattern.isValid() && revisionPattern.isValid());
|
||||
const QString fileSeparator = QLatin1String("=============================================================================");
|
||||
|
||||
// Parse using a state enumeration and regular expressions as not to fall for weird
|
||||
// commit messages in state 'RevisionState'
|
||||
foreach(const QString &line, lines) {
|
||||
switch (state) {
|
||||
case FileState:
|
||||
if (line.startsWith(workingFilePrefix)) {
|
||||
QString file = directory;
|
||||
if (!file.isEmpty())
|
||||
file += slash;
|
||||
file += line.mid(workingFilePrefix.size()).trimmed();
|
||||
rc.push_back(CVS_LogEntry(file));
|
||||
state = RevisionState;
|
||||
}
|
||||
break;
|
||||
case RevisionState:
|
||||
if (revisionPattern.exactMatch(line)) {
|
||||
rc.back().revisions.push_back(CVS_Revision(revisionPattern.cap(1)));
|
||||
state = StatusLineState;
|
||||
} else {
|
||||
if (line == fileSeparator)
|
||||
state = FileState;
|
||||
}
|
||||
break;
|
||||
case StatusLineState:
|
||||
if (statusPattern.exactMatch(line)) {
|
||||
const QString commitId = statusPattern.cap(2);
|
||||
if (filterCommitId.isEmpty() || filterCommitId == commitId) {
|
||||
rc.back().revisions.back().date = statusPattern.cap(1);
|
||||
rc.back().revisions.back().commitId = commitId;
|
||||
} else {
|
||||
rc.back().revisions.pop_back();
|
||||
}
|
||||
state = RevisionState;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Purge out files with no matching commits
|
||||
if (!filterCommitId.isEmpty()) {
|
||||
for (QList<CVS_LogEntry>::iterator it = rc.begin(); it != rc.end(); ) {
|
||||
if (it->revisions.empty()) {
|
||||
it = rc.erase(it);
|
||||
} else {
|
||||
++it;
|
||||
}
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
QString fixDiffOutput(QString d)
|
||||
{
|
||||
if (d.isEmpty())
|
||||
return d;
|
||||
// Kill all lines starting with '?'
|
||||
const QChar questionMark = QLatin1Char('?');
|
||||
const QChar newLine = QLatin1Char('\n');
|
||||
for (int pos = 0; pos < d.size(); ) {
|
||||
const int endOfLinePos = d.indexOf(newLine, pos);
|
||||
if (endOfLinePos == -1)
|
||||
break;
|
||||
const int nextLinePos = endOfLinePos + 1;
|
||||
if (d.at(pos) == questionMark) {
|
||||
d.remove(pos, nextLinePos - pos);
|
||||
} else {
|
||||
pos = nextLinePos;
|
||||
}
|
||||
}
|
||||
return d;
|
||||
}
|
||||
|
||||
// Parse "cvs status" output for added/modified/deleted files
|
||||
// "File: <foo> Status: Up-to-date"
|
||||
// "File: <foo> Status: Locally Modified"
|
||||
// "File: no file <foo> Status: Locally Removed"
|
||||
// "File: hup Status: Locally Added"
|
||||
// Not handled for commit purposes: "Needs Patch/Needs Merge"
|
||||
// In between, we might encounter "cvs status: Examining subdir"...
|
||||
// As we run the status command from the repository directory,
|
||||
// we need to add the full path, again.
|
||||
// stdout/stderr need to be merged to catch directories.
|
||||
|
||||
// Parse out status keywords, return state enum or -1
|
||||
inline int stateFromKeyword(const QString &s)
|
||||
{
|
||||
if (s == QLatin1String("Up-to-date"))
|
||||
return -1;
|
||||
if (s == QLatin1String("Locally Modified"))
|
||||
return CVSSubmitEditor::LocallyModified;
|
||||
if (s == QLatin1String("Locally Added"))
|
||||
return CVSSubmitEditor::LocallyAdded;
|
||||
if (s == QLatin1String("Locally Removed"))
|
||||
return CVSSubmitEditor::LocallyRemoved;
|
||||
return -1;
|
||||
}
|
||||
|
||||
StateList parseStatusOutput(const QString &directory, const QString &output)
|
||||
{
|
||||
StateList changeSet;
|
||||
const QString fileKeyword = QLatin1String("File: ");
|
||||
const QString statusKeyword = QLatin1String("Status: ");
|
||||
const QString noFileKeyword = QLatin1String("no file ");
|
||||
const QString directoryKeyword = QLatin1String("cvs status: Examining ");
|
||||
const QString dotDir = QString(QLatin1Char('.'));
|
||||
const QChar slash = QLatin1Char('/');
|
||||
|
||||
const QStringList list = output.split(QLatin1Char('\n'), QString::SkipEmptyParts);
|
||||
|
||||
QString path = directory;
|
||||
if (!path.isEmpty())
|
||||
path += slash;
|
||||
foreach (const QString &l, list) {
|
||||
// Status line containing file
|
||||
if (l.startsWith(fileKeyword)) {
|
||||
// Parse state
|
||||
const int statusPos = l.indexOf(statusKeyword);
|
||||
if (statusPos == -1)
|
||||
continue;
|
||||
const int state = stateFromKeyword(l.mid(statusPos + statusKeyword.size()).trimmed());
|
||||
if (state == -1)
|
||||
continue;
|
||||
// Concatenate file name, Correct "no file <foo>"
|
||||
QString fileName = l.mid(fileKeyword.size(), statusPos - fileKeyword.size()).trimmed();
|
||||
if (state == CVSSubmitEditor::LocallyRemoved && fileName.startsWith(noFileKeyword))
|
||||
fileName.remove(0, noFileKeyword.size());
|
||||
changeSet.push_back(CVSSubmitEditor::StateFilePair(static_cast<CVSSubmitEditor::State>(state), path + fileName));
|
||||
continue;
|
||||
}
|
||||
// Examining a new subdirectory
|
||||
if (l.startsWith(directoryKeyword)) {
|
||||
path = directory;
|
||||
if (!path.isEmpty())
|
||||
path += slash;
|
||||
const QString newSubDir = l.mid(directoryKeyword.size()).trimmed();
|
||||
if (newSubDir != dotDir) { // Skip Examining '.'
|
||||
path += newSubDir;
|
||||
path += slash;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return changeSet;
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace CVS
|
||||
Reference in New Issue
Block a user