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
|
|
|
|
2016-02-04 13:07:35 +01:00
|
|
|
#pragma once
|
2009-07-15 12:28:40 +02:00
|
|
|
|
|
|
|
|
#include "cvssubmiteditor.h"
|
|
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QString>
|
|
|
|
|
#include <QList>
|
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 {
|
|
|
|
|
|
|
|
|
|
// Utilities to parse output of a CVS log.
|
|
|
|
|
|
|
|
|
|
// A revision of a file.
|
2016-02-04 13:07:35 +01:00
|
|
|
class CvsRevision
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
2016-02-04 13:07:35 +01:00
|
|
|
public:
|
2012-01-07 16:55:09 +01:00
|
|
|
CvsRevision(const QString &rev);
|
2009-07-15 12:28:40 +02:00
|
|
|
|
|
|
|
|
QString revision;
|
|
|
|
|
QString date; // ISO-Format (YYYY-MM-DD)
|
|
|
|
|
QString commitId;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// A log entry consisting of the file and its revisions.
|
2016-02-04 13:07:35 +01:00
|
|
|
class CvsLogEntry
|
2009-07-15 12:28:40 +02:00
|
|
|
{
|
2016-02-04 13:07:35 +01:00
|
|
|
public:
|
2012-01-07 16:55:09 +01:00
|
|
|
CvsLogEntry(const QString &file);
|
2009-07-15 12:28:40 +02:00
|
|
|
|
|
|
|
|
QString file;
|
2012-01-07 16:55:09 +01:00
|
|
|
QList<CvsRevision> revisions;
|
2009-07-15 12:28:40 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Parse. Pass on a directory to obtain full paths when
|
|
|
|
|
// running from the repository directory.
|
2012-01-07 16:55:09 +01:00
|
|
|
QList<CvsLogEntry> parseLogEntries(const QString &output,
|
|
|
|
|
const QString &directory = QString(),
|
2014-05-19 23:32:33 +03:00
|
|
|
const QString &filterCommitId = QString());
|
2009-07-15 12:28:40 +02:00
|
|
|
|
|
|
|
|
// Tortoise CVS outputs unknown files with question marks in
|
|
|
|
|
// the diff output on stdout ('? foo'); remove
|
|
|
|
|
QString fixDiffOutput(QString d);
|
|
|
|
|
|
|
|
|
|
// Parse the status output of CVS (stdout/stderr merged
|
|
|
|
|
// to catch directories).
|
2012-01-07 16:55:09 +01:00
|
|
|
typedef CvsSubmitEditor::StateFilePairs StateList;
|
2009-07-15 12:28:40 +02:00
|
|
|
StateList parseStatusOutput(const QString &directory, const QString &output);
|
|
|
|
|
|
2010-01-06 17:24:40 +01:00
|
|
|
// Revision number utilities: Decrement version number "1.2" -> "1.1"
|
|
|
|
|
QString previousRevision(const QString &rev);
|
|
|
|
|
// Revision number utilities: Is it "[1.2...].1"?
|
|
|
|
|
bool isFirstRevision(const QString &r);
|
|
|
|
|
|
2009-07-15 12:28:40 +02:00
|
|
|
} // namespace Internal
|
2012-01-07 16:55:09 +01:00
|
|
|
} // namespace Cvs
|