1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
/*
* Copyright (c) 2002-2003 Christian Loose <christian.loose@hamburg.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "annotatecontroller.h"
#include <qdatetime.h>
#include <qmap.h>
#include <KLocalizedString>
#include "annotatedialog.h"
#include "cvsjobinterface.h"
#include "cvsserviceinterface.h"
#include "loginfo.h"
#include "progressdialog.h"
using namespace Cervisia;
struct AnnotateController::Private {
using RevisionCommentMap = QMap<QString, QString>;
RevisionCommentMap comments; // maps comment to a revision
OrgKdeCervisia5CvsserviceCvsserviceInterface *cvsService;
AnnotateDialog *dialog;
ProgressDialog *progress;
bool execute(const QString &fileName, const QString &revision);
void parseCvsLogOutput();
void parseCvsAnnotateOutput();
};
AnnotateController::AnnotateController(AnnotateDialog *dialog, OrgKdeCervisia5CvsserviceCvsserviceInterface *cvsService)
: d(new Private)
{
// initialize private data
d->cvsService = cvsService;
d->dialog = dialog;
d->progress = 0;
}
AnnotateController::~AnnotateController()
{
delete d;
}
void AnnotateController::showDialog(const QString &fileName, const QString &revision)
{
if (!d->execute(fileName, revision)) {
delete d->dialog;
return;
}
d->parseCvsLogOutput();
d->parseCvsAnnotateOutput();
// hide progress dialog
delete d->progress;
d->progress = 0;
d->dialog->setWindowTitle(i18n("CVS Annotate: %1", fileName));
d->dialog->show();
}
bool AnnotateController::Private::execute(const QString &fileName, const QString &revision)
{
QDBusReply<QDBusObjectPath> job = cvsService->annotate(fileName, revision);
if (!job.isValid())
return false;
progress = new ProgressDialog(dialog, "Annotate", cvsService->service(), job, "annotate", i18n("CVS Annotate"));
return progress->execute();
}
void AnnotateController::Private::parseCvsLogOutput()
{
QString line, comment, rev;
enum { Begin, Tags, Admin, Revision, Author, Branches, Comment, Finished } state;
state = Begin;
while (progress->getLine(line)) {
switch (state) {
case Begin:
if (line == "symbolic names:")
state = Tags;
break;
case Tags:
if (line[0] != '\t')
state = Admin;
break;
case Admin:
if (line == "----------------------------")
state = Revision;
break;
case Revision:
rev = line.section(' ', 1, 1);
state = Author;
break;
case Author:
state = Branches;
break;
case Branches:
if (!line.startsWith(QLatin1String("branches:"))) {
state = Comment;
comment = line;
}
break;
case Comment:
if (line == "----------------------------")
state = Revision;
else if (line == "=============================================================================")
state = Finished;
if (state == Comment)
comment += QString("\n") + line;
else
comments[rev] = comment;
break;
case Finished:;
}
if (state == Finished)
break;
}
// skip header part of cvs annotate output
bool notEof = true;
while (notEof && !line.startsWith(QLatin1String("*****")))
notEof = progress->getLine(line);
}
void AnnotateController::Private::parseCvsAnnotateOutput()
{
LogInfo logInfo;
QString rev, content, line;
QString oldRevision;
bool odd = false;
while (progress->getLine(line)) {
int startIdxC2 = line.indexOf(QLatin1Char('(')); // column 2 "(author date):"
QString authorDate = line.mid(startIdxC2 + 1, line.indexOf(QLatin1Char(')'), startIdxC2 + 1) - startIdxC2 - 1);
QString dateString = authorDate.mid(authorDate.lastIndexOf(QLatin1Char(' '))).trimmed();
if (!dateString.isEmpty()) {
QDate date(QLocale::c().toDate(dateString, QLatin1String("dd-MMM-yy")));
if (date.year() < 1970)
date = date.addYears(100);
logInfo.m_dateTime = QDateTime(date, QTime(), Qt::UTC);
}
rev = line.left(startIdxC2).trimmed();
logInfo.m_author = authorDate.left(authorDate.indexOf(QLatin1Char(' '))).trimmed();
content = line.mid(line.indexOf(QLatin1String("): "), startIdxC2 + 1) + 3);
logInfo.m_comment = comments[rev];
if (rev == oldRevision) {
// don't remove revision/author info on following lines, since the user can not easily get
// the revision nor show the check-in comment tooltip when the first line of a large
// block with the same revision is already scrolled out of the viewport
// logInfo.m_author.clear();
// rev.clear();
} else {
oldRevision = rev;
odd = !odd;
}
logInfo.m_revision = rev;
dialog->addLine(logInfo, content, odd);
}
}
|
