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
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
|
/* ****************************************************************************
This file is part of KBabel
Copyright (C) 2002-2003 by Marco Wegner <mail@marcowegner.de>
Copyright (C) 2005, 2006 by Nicolas GOUTTE <goutte@kde.org>
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.
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
the TQt library by Trolltech AS, Norway (or with modified versions
of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
**************************************************************************** */
// System include files
#include <unistd.h>
#include <sys/stat.h>
#include <time.h>
// TQt include files
#include <tqdir.h>
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqregexp.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqdom.h>
// KDE include files
#include <kapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <ktempfile.h>
#include <kdebug.h>
#include <kprocess.h>
// project specific include files
#include "svnhandler.h"
SVNHandler::SVNHandler( const TQString& poBaseDir, const TQString& potBaseDir )
{
setPOBaseDir( poBaseDir );
setPOTBaseDir( potBaseDir );
_autoUpdateTemplates = false;
}
void SVNHandler::setPOBaseDir( const TQString& dir )
{
// check if '.svn/entries' exists in the PO base directory
if ( TQFileInfo( dir + "/.svn/entries" ).exists( ) ) {
_isPORepository = true;
_poBaseDir = dir;
} else
_isPORepository = false;
emit signalIsPORepository( _isPORepository );
}
void SVNHandler::setPOTBaseDir( const TQString& dir )
{
// check if '.svn/entries' exists in the POT base directory
if ( TQFileInfo( dir + "/.svn/entries" ).exists( ) ) {
_isPOTRepository = true;
_potBaseDir = dir;
} else
_isPOTRepository = false;
emit signalIsPOTRepository( _isPOTRepository );
}
TQString SVNHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
return i18n( "No SVN repository" );
break;
case NOT_IN_SVN:
return i18n( "Not in SVN" );
break;
case LOCALLY_ADDED:
return i18n( "Locally added" );
break;
case LOCALLY_REMOVED:
return i18n( "Locally removed" );
break;
case LOCALLY_MODIFIED:
return i18n( "Locally modified" );
break;
case UP_TO_DATE:
return i18n( "Up-to-date" );
break;
case CONFLICT:
return i18n( "Conflict" );
break;
case ERROR_IN_WC:
return i18n( "Error in Working Copy" );
default:
return i18n( "Unknown" );
break;
}
}
SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
return NO_REPOSITORY;
TQString fn( filename );
fn = fn.remove( TQRegExp( "/$" ) );
TQFileInfo info( fn );
// check if '.svn/entries' exists.
TQFile entries( info.dir( true ).path( ) + "/.svn/entries" );
if ( !entries.exists() )
return NOT_IN_SVN;
TDEProcess proc;
SVNOutputCollector out( &proc );
proc << "svn" << "status" << "-v" << "--xml" << info.absFilePath();
if( !proc.start( TDEProcess::Block, TDEProcess::Stdout ) )
return ERROR_IN_WC;
TQDomDocument doc;
TQString errorMsg;
int errorLine, errorCol;
TQDomNodeList nodelist;
TQDomNode node;
TQDomElement entry, wcStatus;
// Parse the output.
if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
kdDebug(8109) << "Cannot parse \"svn status -v --xml\" output for"
<< filename << endl << "Line: " << errorLine << " Column: "
<< errorCol << " Error: " << errorMsg << endl;
goto no_status_xml;
}
// There should be only one "entry" element. If it doesn't exist, path
// isn't repo path at all.
nodelist = doc.elementsByTagName("entry");
if (nodelist.count() < 1)
return NOT_IN_SVN;
entry = nodelist.item(0).toElement();
// Shouldn't fail, but just in case there is some weird error.
if ( entry.attributeNode("path").value() != info.absFilePath() )
return ERROR_IN_WC;
for ( node = entry.firstChild(); !node.isNull(); node = node.nextSibling() ) {
if ( !node.isElement() )
continue;
if (node.toElement().tagName() == "wc-status")
break;
}
if ( node.isNull() )
return ERROR_IN_WC;
wcStatus = node.toElement();
if ( wcStatus.attributeNode("item").value() == "normal" )
return UP_TO_DATE;
if ( wcStatus.attributeNode("item").value() == "modified" )
return LOCALLY_MODIFIED;
if ( wcStatus.attributeNode("item").value() == "conflicted" )
return CONFLICT;
if ( wcStatus.attributeNode("item").value() == "unversioned" )
return NOT_IN_SVN;
// TODO Ignored entry should have separate return value probably.
if ( wcStatus.attributeNode("item").value() == "ignored" )
return NOT_IN_SVN;
if ( wcStatus.attributeNode("item").value() == "added" )
return LOCALLY_ADDED;
if ( wcStatus.attributeNode("item").value() == "deleted" )
return LOCALLY_REMOVED;
// TODO What to do with "missing", "incomplete", "replaced", "merged",
// "obstructed", "external"? Can these appear at all in our case?
return ERROR_IN_WC;
no_status_xml:
if ( !entries.open( IO_ReadOnly ) )
return ERROR_IN_WC; // we already know that it is a repository
// Parse the entries file
if ( !doc.setContent( &entries, &errorMsg, &errorLine, &errorCol ) ) {
kdDebug() << "Cannot parse .svn/entries file for " << filename << endl
<< "Line: " << errorLine << " Column: " << errorCol << " Error: " << errorMsg << endl;
return ERROR_IN_WC;
}
entries.close();
TQDomElement element;
// File name that we are searching
const TQString findName = info.fileName();
// The entries are <entry> elements, so we have to check them
TQDomNode child = doc.documentElement().firstChild();
for ( ; !child.isNull() ; child = child.nextSibling() )
{
if ( !child.isElement() )
continue;
element = child.toElement();
if ( element.tagName() != "entry" ) {
// We have another kind of element, so skip it
// Should not happend with svn 1.1.x
continue;
}
const TQString name = element.attribute("name");
if ( name == findName )
break;
}
if ( child.isNull() ) {
// We have not found an entry for the file
return NOT_IN_SVN;
}
// ### TODO: should we check the attribute kind to be file and not dir?
// ### TODO: what do copy and move add here?
const TQString onSchedule = element.attribute( "schedule" );
if ( onSchedule == "delete" )
return LOCALLY_REMOVED;
else if ( onSchedule == "added" )
return LOCALLY_ADDED;
if ( element.hasAttribute( "conflict-new" ) || element.hasAttribute( "conflict-old" ) || element.hasAttribute( "conflict-wrk" ) ) {
return CONFLICT;
}
// Note: we do not check the property time stamp
const TQString textTimeStamp( element.attribute( "text-time" ) );
// calculate the UTC time from the file's last modified date
struct stat st;
lstat( TQFile::encodeName(fn), &st );
struct tm * tm_p = gmtime( &st.st_mtime );
const int year = tm_p->tm_year + 1900;
const int month = tm_p->tm_mon + 1;
TQString fileTime;
fileTime.sprintf( "%04i-%02i-%02iT%02i:%02i:%02i.000000Z",
year, month, tm_p->tm_mday, tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec );
//kdDebug() << "File: " << filename << " SVN time: " << textTimeStamp << " File time: " << fileTime << endl;
if ( fileTime > textTimeStamp ) // ISO 8601 dates/times can be compared as strings if they have the exact same format.
return LOCALLY_MODIFIED;
return UP_TO_DATE;
}
TQString SVNHandler::svnStatus( const TQString& filename ) const
{
return map[filename];
}
void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, TDESharedConfig* config)
{
// Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!)
// ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one
execSVNCommand( parent, cmd, TQStringList( filename ), templates, config );
}
void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, TDESharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
KMessageBox::sorry( parent, i18n( "This is not a valid SVN repository. "
"The SVN commands cannot be executed." ) );
return;
}
// ### TODO: instead of making a TQString, use TDEProcess directly, so that it cares about quoting.
// ### TODO: use TDEProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use TDEProcess without a shell.)
TQString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && svn ");
switch ( cmd ) {
case SVN::Update:
command += "update --non-interactive";
break;
case SVN::Commit:
// The svn client allows to choose the encoding, so we select UTF-8
command += "commit -F @LOG@FILE@ --encoding UTF-8 --non-interactive";
checkToAdd( files );
break;
case SVN::StatusRemote:
command += "status -u --non-interactive";
break;
case SVN::StatusLocal:
command += "status --non-interactive";
break;
case SVN::Diff:
command += "diff --non-interactive";
break;
case SVN::Info:
command += "info"; // Does not allow --non-interactive (at least svn 1.1.4).
}
TQRegExp rx;
if (templates)
rx.setPattern(_potBaseDir + "/?");
else
rx.setPattern(_poBaseDir + "/?");
TQStringList::ConstIterator it;
for ( it = files.begin( ); it != files.end( ); ++it ) {
TQString temp = *it;
temp.remove(rx);
command += " \'" + temp + "\'";
}
showDialog( parent, cmd, files, command, config );
}
void SVNHandler::setAutoUpdateTemplates( bool update )
{
_autoUpdateTemplates = update;
}
void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, TDESharedConfig* config )
{
SVNDialog * dia = new SVNDialog( cmd, parent, config );
dia->setFiles( files );
dia->setCommandLine( commandLine );
if ( cmd == SVN::Commit ) {
dia->setAddCommand( _addCommand );
}
if ( dia->exec( ) == KDialog::Accepted ) {
if ( cmd == SVN::StatusLocal || cmd == SVN::StatusRemote )
processStatusOutput( dia->statusOutput( ) );
if ( cmd == SVN::Diff )
processDiff( dia->statusOutput( ) );
}
delete dia;
// file status display update necessary in Catalog Manager
if ( cmd == SVN::Commit )
emit signalFilesCommitted( files );
}
bool SVNHandler::isInSvn( const TQString& path )
{
if ( path.isEmpty() )
return false;
/*
* We need to check if a file is in a SVN repository.
*
* But as we want to do it quickly (because this function will be called for a few files in a row)
* we should avoid to parse the .svn/entries files
*
* Therefore we only check for the SVN auxilary files that are typical for a file controlled by SVN:
* - for a directory: checks if the directory has a .svn/entries file
* - for a file: check if there is a corresponding file in .svn/text-base/
*/
const TQFileInfo info( path );
if ( info.isDir() ) {
// It is a directory, so find a .svn/entries file
TQDir dir( path );
return dir.exists( ".svn/entries", true );
}
else {
// It is a file, so find the corresponding file in .svn/text-base
TQDir dir( info.dirPath() );
if ( ! dir.cd( ".svn/text-base" ) ) {
// There is not even a .svn/text-base directory, so the file is not under control
return false;
}
const TQString textBaseFilename( info.fileName() + ".svn-base" );
return dir.exists( textBaseFilename, true );
}
}
void SVNHandler::checkToAdd( const TQStringList& files )
{
if ( files.isEmpty( ) )
return;
TQStringList toBeAdded;
TQStringList::ConstIterator it;
for ( it = files.begin( ); it != files.end( ); ++it ) {
// check for every entry if it needs to be added
if ( ! isInSvn( *it ) ) {
TQFileInfo info( *it );
TQString temp; // will hold the dir path
if ( info.isDir( ) ) {
toBeAdded << *it;
temp = *it;
} else {
toBeAdded << *it;
temp = TQFileInfo( *it ).dirPath( true );
}
// ### TODO: does SVN really needs this or does it do it automatically?
// check recursivlely if parent dirs have to be added as well
while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
}
}
}
// remove an old command
_addCommand = TQString();
// ### TODO: does SVN really need this?
// make sure the directories are added before the files
toBeAdded.sort( );
// ### TODO: try to make this better
// create a command line for adding the files and dirs
for ( it = toBeAdded.begin( ); it != toBeAdded.end( ); ++it ) {
TQFileInfo info( *it );
_addCommand += "cd " + info.dirPath( true ) + " && svn add " + info.fileName( ) + "; ";
}
}
// ### TODO: convert to SVN
void SVNHandler::processStatusOutput( const TQString& status )
{
if ( !_isPORepository )
return;
#if 0
// at first we need to extract the name of the base directory on the server
TQFile f( _poBaseDir + "/SVN/Root" ); // ### FIXME
if ( !f.open( IO_ReadOnly ) )
return;
TQTextStream stream( &f );
// extract the string after the last colon in the first line
TQString basedir = stream.readLine( ).section( ':', -1 );
f.close( );
// divide the complete status output in little chunks for every file
TQStringList entries = TQStringList::split( TQRegExp( "={67,67}" ), status );
TQStringList::Iterator it;
for ( it = entries.begin( ); it != entries.end( ); ++it ) {
TQString entr = *it;
// translate the filename from repository to local
TQRegExp rx( basedir + ".*,v" );
int pos = entr.find( rx );
TQString file = _poBaseDir + entr.mid( pos + basedir.length( ),
rx.matchedLength( ) - basedir.length( ) - 2 );
entr = "<qt>" + entr + "</qt>";
// TODO: do some markup
map.replace( file, entr );
}
#endif
}
void SVNHandler::processDiff( TQString output )
{
output.remove( TQRegExp( "\\[ .* \\]$" ));
output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]")));
KTempFile tmpFile;
*(tmpFile.textStream()) << output;
tmpFile.close();
TQString error;
if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
KMessageBox::error( 0, error );
}
bool SVNHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
* - locally modified for SVN
* - directory under SVN control but not the file
*/
// ### TODO: what about moved and copied?
return status == LOCALLY_MODIFIED || status == NOT_IN_SVN;
}
SVNOutputCollector::SVNOutputCollector( TDEProcess* p )
: m_process(0)
{
setProcess( p );
}
void SVNOutputCollector::setProcess( TDEProcess* p )
{
if( m_process )
m_process->disconnect( this );
m_process = p;
if( p ) {
connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
}
m_gatheredOutput.truncate( 0 );
m_stderrOutput.truncate( 0 );
m_stdoutOutput.truncate( 0 );
}
void SVNOutputCollector::slotGatherStderr( TDEProcess*, char* data, int len )
{
m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) );
}
void SVNOutputCollector::slotGatherStdout( TDEProcess*, char* data, int len )
{
m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) );
}
#include "svnhandler.moc"
// kate: space-indent on; indent-width 2; replace-tabs on;
|