-
Notifications
You must be signed in to change notification settings - Fork 102
/
svn.cpp
1354 lines (1182 loc) · 51 KB
/
svn.cpp
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
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
/*
* Copyright (C) 2007 Thiago Macieira <thiago@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 3 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, see <http://www.gnu.org/licenses/>.
*/
/*
* Based on svn-fast-export by Chris Lee <clee@kde.org>
* License: MIT <http://www.opensource.org/licenses/mit-license.php>
* URL: git://repo.or.cz/fast-import.git http://repo.or.cz/w/fast-export.git
*/
#define _XOPEN_SOURCE
#define _LARGEFILE_SUPPORT
#define _LARGEFILE64_SUPPORT
#include "svn.h"
#include "CommandLineParser.h"
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include <unistd.h>
#include <apr_lib.h>
#include <apr_getopt.h>
#include <apr_general.h>
#include <svn_fs.h>
#include <svn_pools.h>
#include <svn_repos.h>
#include <svn_types.h>
#include <svn_version.h>
#include <QFile>
#include <QDebug>
#include "repository.h"
#undef SVN_ERR
#define SVN_ERR(expr) SVN_INT_ERR(expr)
#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 9
#define svn_stream_read_full svn_stream_read
#endif
typedef QList<Rules::Match> MatchRuleList;
typedef QHash<QString, Repository *> RepositoryHash;
typedef QHash<QByteArray, QByteArray> IdentityHash;
class AprAutoPool
{
apr_pool_t *pool;
AprAutoPool(const AprAutoPool &);
AprAutoPool &operator=(const AprAutoPool &);
public:
inline AprAutoPool(apr_pool_t *parent = NULL)
{
pool = svn_pool_create(parent);
}
inline ~AprAutoPool()
{
svn_pool_destroy(pool);
}
inline void clear() { svn_pool_clear(pool); }
inline apr_pool_t *data() const { return pool; }
inline operator apr_pool_t *() const { return pool; }
};
class SvnPrivate
{
public:
QList<MatchRuleList> allMatchRules;
RepositoryHash repositories;
IdentityHash identities;
QString userdomain;
SvnPrivate(const QString &pathToRepository);
~SvnPrivate();
int youngestRevision();
int exportRevision(int revnum);
int openRepository(const QString &pathToRepository);
private:
AprAutoPool global_pool;
AprAutoPool scratch_pool;
svn_fs_t *fs;
svn_revnum_t youngest_rev;
};
void Svn::initialize()
{
// initialize APR or exit
if (apr_initialize() != APR_SUCCESS) {
fprintf(stderr, "You lose at apr_initialize().\n");
exit(1);
}
// static destructor
static struct Destructor { ~Destructor() { apr_terminate(); } } destructor;
}
Svn::Svn(const QString &pathToRepository)
: d(new SvnPrivate(pathToRepository))
{
}
Svn::~Svn()
{
delete d;
}
void Svn::setMatchRules(const QList<MatchRuleList> &allMatchRules)
{
d->allMatchRules = allMatchRules;
}
void Svn::setRepositories(const RepositoryHash &repositories)
{
d->repositories = repositories;
}
void Svn::setIdentityMap(const IdentityHash &identityMap)
{
d->identities = identityMap;
}
void Svn::setIdentityDomain(const QString &identityDomain)
{
d->userdomain = identityDomain;
}
int Svn::youngestRevision()
{
return d->youngestRevision();
}
bool Svn::exportRevision(int revnum)
{
return d->exportRevision(revnum) == EXIT_SUCCESS;
}
SvnPrivate::SvnPrivate(const QString &pathToRepository)
: global_pool(NULL) , scratch_pool(NULL)
{
if( openRepository(pathToRepository) != EXIT_SUCCESS) {
qCritical() << "Failed to open repository";
exit(1);
}
// get the youngest revision
svn_fs_youngest_rev(&youngest_rev, fs, global_pool);
}
SvnPrivate::~SvnPrivate() {}
int SvnPrivate::youngestRevision()
{
return youngest_rev;
}
int SvnPrivate::openRepository(const QString &pathToRepository)
{
svn_repos_t *repos;
QString path = pathToRepository;
while (path.endsWith('/')) // no trailing slash allowed
path = path.mid(0, path.length()-1);
#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 7
SVN_ERR(svn_repos_open(&repos, QFile::encodeName(path), global_pool));
#elif SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 9
SVN_ERR(svn_repos_open2(&repos, QFile::encodeName(path), NULL, global_pool));
#else
SVN_ERR(svn_repos_open3(&repos, QFile::encodeName(path), NULL, global_pool, scratch_pool));
#endif
fs = svn_repos_fs(repos);
return EXIT_SUCCESS;
}
enum RuleType { AnyRule = 0, NoIgnoreRule = 0x01, NoRecurseRule = 0x02 };
static MatchRuleList::ConstIterator
findMatchRule(const MatchRuleList &matchRules, int revnum, const QString ¤t,
int ruleMask = AnyRule)
{
MatchRuleList::ConstIterator it = matchRules.constBegin(),
end = matchRules.constEnd();
for ( ; it != end; ++it) {
if (it->minRevision > revnum)
continue;
if (it->maxRevision != -1 && it->maxRevision < revnum)
continue;
if (it->action == Rules::Match::Ignore && ruleMask & NoIgnoreRule)
continue;
if (it->action == Rules::Match::Recurse && ruleMask & NoRecurseRule)
continue;
if (it->rx.indexIn(current) == 0) {
Stats::instance()->ruleMatched(*it, revnum);
return it;
}
}
// no match
return end;
}
static int pathMode(svn_fs_root_t *fs_root, const char *pathname, apr_pool_t *pool)
{
svn_string_t *propvalue;
SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:executable", pool));
int mode = 0100644;
if (propvalue)
mode = 0100755;
return mode;
}
svn_error_t *QIODevice_write(void *baton, const char *data, apr_size_t *len)
{
QIODevice *device = reinterpret_cast<QIODevice *>(baton);
device->write(data, *len);
while (device->bytesToWrite() > 32*1024) {
if (!device->waitForBytesWritten(-1)) {
qFatal("Failed to write to process: %s", qPrintable(device->errorString()));
return svn_error_createf(APR_EOF, SVN_NO_ERROR, "Failed to write to process: %s",
qPrintable(device->errorString()));
}
}
return SVN_NO_ERROR;
}
static svn_stream_t *streamForDevice(QIODevice *device, apr_pool_t *pool)
{
svn_stream_t *stream = svn_stream_create(device, pool);
svn_stream_set_write(stream, QIODevice_write);
return stream;
}
static int dumpBlob(Repository::Transaction *txn, svn_fs_root_t *fs_root,
const char *pathname, const QString &finalPathName, apr_pool_t *pool)
{
AprAutoPool dumppool(pool);
// what type is it?
int mode = pathMode(fs_root, pathname, dumppool);
svn_filesize_t stream_length;
SVN_ERR(svn_fs_file_length(&stream_length, fs_root, pathname, dumppool));
svn_stream_t *in_stream, *out_stream;
if (!CommandLineParser::instance()->contains("dry-run")) {
// open the file
SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, dumppool));
}
// maybe it's a symlink?
svn_string_t *propvalue;
SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:special", dumppool));
if (propvalue) {
apr_size_t len = strlen("link ");
if (!CommandLineParser::instance()->contains("dry-run")) {
QByteArray buf;
buf.reserve(len);
SVN_ERR(svn_stream_read_full(in_stream, buf.data(), &len));
if (len == strlen("link ") && strncmp(buf, "link ", len) == 0) {
mode = 0120000;
stream_length -= len;
} else {
//this can happen if a link changed into a file in one commit
qWarning("file %s is svn:special but not a symlink", pathname);
// re-open the file as we tried to read "link "
svn_stream_close(in_stream);
SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, dumppool));
}
}
}
QIODevice *io = txn->addFile(finalPathName, mode, stream_length);
if (!CommandLineParser::instance()->contains("dry-run")) {
// open a generic svn_stream_t for the QIODevice
out_stream = streamForDevice(io, dumppool);
SVN_ERR(svn_stream_copy3(in_stream, out_stream, NULL, NULL, dumppool));
// print an ending newline
io->putChar('\n');
}
return EXIT_SUCCESS;
}
static bool wasDir(svn_fs_t *fs, int revnum, const char *pathname, apr_pool_t *pool)
{
AprAutoPool subpool(pool);
svn_fs_root_t *fs_root;
if (svn_fs_revision_root(&fs_root, fs, revnum, subpool) != SVN_NO_ERROR)
return false;
svn_boolean_t is_dir;
if (svn_fs_is_dir(&is_dir, fs_root, pathname, subpool) != SVN_NO_ERROR)
return false;
return is_dir;
}
time_t get_epoch(const char* svn_date)
{
struct tm tm;
memset(&tm, 0, sizeof tm);
QByteArray date(svn_date, strlen(svn_date) - 8);
strptime(date, "%Y-%m-%dT%H:%M:%S", &tm);
return timegm(&tm);
}
class SvnRevision
{
public:
AprAutoPool pool;
QHash<QString, Repository::Transaction *> transactions;
QList<MatchRuleList> allMatchRules;
RepositoryHash repositories;
IdentityHash identities;
QString userdomain;
svn_fs_t *fs;
svn_fs_root_t *fs_root;
int revnum;
// must call fetchRevProps first:
QByteArray authorident;
QByteArray log;
uint epoch;
bool ruledebug;
bool propsFetched;
bool needCommit;
SvnRevision(int revision, svn_fs_t *f, apr_pool_t *parent_pool)
: pool(parent_pool), fs(f), fs_root(0), revnum(revision), propsFetched(false)
{
ruledebug = CommandLineParser::instance()->contains( QLatin1String("debug-rules"));
}
int open()
{
SVN_ERR(svn_fs_revision_root(&fs_root, fs, revnum, pool));
return EXIT_SUCCESS;
}
int prepareTransactions();
int fetchRevProps();
int commit();
int exportEntry(const char *path, const svn_fs_path_change2_t *change, apr_hash_t *changes);
int exportDispatch(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
apr_hash_t *changes, const QString ¤t, const Rules::Match &rule,
const MatchRuleList &matchRules, apr_pool_t *pool);
int exportInternal(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
const QString ¤t, const Rules::Match &rule, const MatchRuleList &matchRules);
int recurse(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, const MatchRuleList &matchRules, svn_revnum_t rev_from,
apr_hash_t *changes, apr_pool_t *pool);
int addGitIgnore(apr_pool_t *pool, const char *key, QString path,
svn_fs_root_t *fs_root, Repository::Transaction *txn, const char *content = NULL);
int checkParentNotEmpty(apr_pool_t *pool, const char *key, QString path,
svn_fs_root_t *fs_root, Repository::Transaction *txn);
int addGitIgnoreOnBranch(apr_pool_t *pool, QString key, QString path,
svn_fs_root_t *fs_root, Repository::Transaction *txn);
int fetchIgnoreProps(QString *ignore, apr_pool_t *pool, const char *key, svn_fs_root_t *fs_root);
int fetchUnknownProps(apr_pool_t *pool, const char *key, svn_fs_root_t *fs_root);
private:
int checkParentNoLongerEmpty(apr_pool_t *pool, const char *key, QString path, Repository::Transaction *txn);
void splitPathName(const Rules::Match &rule, const QString &pathName, QString *svnprefix_p,
QString *repository_p, QString *effectiveRepository_p, QString *branch_p, QString *path_p);
int recursiveDumpDir(Repository::Transaction *txn, svn_fs_t *fs, svn_fs_root_t *fs_root,
const QByteArray &pathname, const QString &finalPathName,
apr_pool_t *pool, svn_revnum_t revnum,
const Rules::Match &rule, const MatchRuleList &matchRules,
bool ruledebug, int ignoreSet);
};
int SvnPrivate::exportRevision(int revnum)
{
SvnRevision rev(revnum, fs, global_pool);
rev.allMatchRules = allMatchRules;
rev.repositories = repositories;
rev.identities = identities;
rev.userdomain = userdomain;
// open this revision:
printf("Exporting revision %d ", revnum);
fflush(stdout);
if (rev.open() == EXIT_FAILURE)
return EXIT_FAILURE;
if (rev.prepareTransactions() == EXIT_FAILURE)
return EXIT_FAILURE;
if (!rev.needCommit) {
printf(" nothing to do\n");
return EXIT_SUCCESS; // no changes?
}
if (rev.commit() == EXIT_FAILURE)
return EXIT_FAILURE;
printf(" done\n");
return EXIT_SUCCESS;
}
void SvnRevision::splitPathName(const Rules::Match &rule, const QString &pathName, QString *svnprefix_p,
QString *repository_p, QString *effectiveRepository_p, QString *branch_p, QString *path_p)
{
QString svnprefix = pathName;
svnprefix.truncate(rule.rx.matchedLength());
if (svnprefix_p) {
*svnprefix_p = svnprefix;
}
if (repository_p) {
*repository_p = svnprefix;
repository_p->replace(rule.rx, rule.repository);
foreach (Rules::Match::Substitution subst, rule.repo_substs) {
subst.apply(*repository_p);
}
}
if (effectiveRepository_p) {
*effectiveRepository_p = svnprefix;
effectiveRepository_p->replace(rule.rx, rule.repository);
foreach (Rules::Match::Substitution subst, rule.repo_substs) {
subst.apply(*effectiveRepository_p);
}
Repository *repository = repositories.value(*effectiveRepository_p, 0);
if (repository) {
*effectiveRepository_p = repository->getEffectiveRepository()->getName();
}
}
if (branch_p) {
*branch_p = svnprefix;
branch_p->replace(rule.rx, rule.branch);
foreach (Rules::Match::Substitution subst, rule.branch_substs) {
subst.apply(*branch_p);
}
}
if (path_p) {
QString prefix = svnprefix;
prefix.replace(rule.rx, rule.prefix);
*path_p = prefix + pathName.mid(svnprefix.length());
}
}
int SvnRevision::prepareTransactions()
{
// find out what was changed in this revision:
apr_hash_t *changes;
SVN_ERR(svn_fs_paths_changed2(&changes, fs_root, pool));
QMap<QByteArray, svn_fs_path_change2_t*> map;
for (apr_hash_index_t *i = apr_hash_first(pool, changes); i; i = apr_hash_next(i)) {
const void *vkey;
void *value;
apr_hash_this(i, &vkey, NULL, &value);
const char *key = reinterpret_cast<const char *>(vkey);
svn_fs_path_change2_t *change = reinterpret_cast<svn_fs_path_change2_t *>(value);
// If we mix path deletions with path adds/replaces we might erase a
// branch after that it has been reset -> history truncated
if (map.contains(QByteArray(key))) {
// If the same path is deleted and added, we need to put the
// deletions into the map first, then the addition.
if (change->change_kind == svn_fs_path_change_delete) {
// XXX
}
fprintf(stderr, "\nDuplicate key found in rev %d: %s\n", revnum, key);
fprintf(stderr, "This needs more code to be handled, file a bug report\n");
fflush(stderr);
exit(1);
}
map.insertMulti(QByteArray(key), change);
}
QMapIterator<QByteArray, svn_fs_path_change2_t*> i(map);
while (i.hasNext()) {
i.next();
if (exportEntry(i.key(), i.value(), changes) == EXIT_FAILURE)
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
int SvnRevision::fetchRevProps()
{
if( propsFetched )
return EXIT_SUCCESS;
apr_hash_t *revprops;
SVN_ERR(svn_fs_revision_proplist(&revprops, fs, revnum, pool));
svn_string_t *svnauthor = (svn_string_t*)apr_hash_get(revprops, "svn:author", APR_HASH_KEY_STRING);
svn_string_t *svndate = (svn_string_t*)apr_hash_get(revprops, "svn:date", APR_HASH_KEY_STRING);
svn_string_t *svnlog = (svn_string_t*)apr_hash_get(revprops, "svn:log", APR_HASH_KEY_STRING);
if (svnlog)
log = svnlog->data;
else
log.clear();
authorident = svnauthor ? identities.value(svnauthor->data) : QByteArray();
epoch = svndate ? get_epoch(svndate->data) : 0;
if (authorident.isEmpty()) {
if (!svnauthor || svn_string_isempty(svnauthor))
authorident = "nobody <nobody@localhost>";
else
authorident = svnauthor->data + QByteArray(" <") + svnauthor->data +
QByteArray("@") + userdomain.toUtf8() + QByteArray(">");
}
propsFetched = true;
return EXIT_SUCCESS;
}
int SvnRevision::commit()
{
// now create the commit
if (fetchRevProps() != EXIT_SUCCESS)
return EXIT_FAILURE;
foreach (Repository *repo, repositories.values()) {
repo->commit();
}
foreach (Repository::Transaction *txn, transactions) {
txn->setAuthor(authorident);
txn->setDateTime(epoch);
txn->setLog(log);
if (txn->commit() != EXIT_SUCCESS)
return EXIT_FAILURE;
delete txn;
}
return EXIT_SUCCESS;
}
int SvnRevision::exportEntry(const char *key, const svn_fs_path_change2_t *change,
apr_hash_t *changes)
{
AprAutoPool revpool(pool.data());
QString current = QString::fromUtf8(key);
// was this copied from somewhere?
svn_revnum_t rev_from = SVN_INVALID_REVNUM;
const char *path_from = NULL;
if (change->change_kind != svn_fs_path_change_delete) {
// svn_fs_copied_from would fail on deleted paths, because the path
// obviously no longer exists in the current revision
SVN_ERR(svn_fs_copied_from(&rev_from, &path_from, fs_root, key, revpool));
}
// is this a directory?
svn_boolean_t is_dir;
SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, revpool));
// Adding newly created directories
if (is_dir && change->change_kind == svn_fs_path_change_add && path_from == NULL
&& CommandLineParser::instance()->contains("empty-dirs")) {
QString keyQString = key;
// Skipping SVN-directory-layout
if (keyQString.endsWith("/trunk") || keyQString.endsWith("/branches") || keyQString.endsWith("/tags")) {
//qDebug() << "Skipping SVN-directory-layout:" << keyQString;
return EXIT_SUCCESS;
}
needCommit = true;
//qDebug() << "Adding directory:" << key;
}
// svn:ignore-properties
else if (is_dir && (change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_modify || change->change_kind == svn_fs_path_change_replace)
&& path_from == NULL && CommandLineParser::instance()->contains("svn-ignore")) {
needCommit = true;
}
else if (is_dir) {
if (change->change_kind == svn_fs_path_change_modify ||
change->change_kind == svn_fs_path_change_add) {
if (path_from == NULL) {
// freshly added directory, or modified properties
// Git doesn't handle directories, so we don't either
//qDebug() << " mkdir ignored:" << key;
return EXIT_SUCCESS;
}
qDebug() << " " << key << "was copied from" << path_from << "rev" << rev_from;
} else if (change->change_kind == svn_fs_path_change_replace) {
if (path_from == NULL)
qDebug() << " " << key << "was replaced";
else
qDebug() << " " << key << "was replaced from" << path_from << "rev" << rev_from;
} else if (change->change_kind == svn_fs_path_change_reset) {
qCritical() << " " << key << "was reset, panic!";
return EXIT_FAILURE;
} else {
// if change_kind == delete, it shouldn't come into this arm of the 'is_dir' test
qCritical() << " " << key << "has unhandled change kind " << change->change_kind << ", panic!";
return EXIT_FAILURE;
}
} else if (change->change_kind == svn_fs_path_change_delete) {
is_dir = wasDir(fs, revnum - 1, key, revpool);
}
if (is_dir)
current += '/';
//MultiRule: loop start
//Replace all returns with continue,
bool isHandled = false;
foreach ( const MatchRuleList matchRules, allMatchRules ) {
// find the first rule that matches this pathname
MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, current);
if (match != matchRules.constEnd()) {
const Rules::Match &rule = *match;
if ( exportDispatch(key, change, path_from, rev_from, changes, current, rule, matchRules, revpool) == EXIT_FAILURE )
return EXIT_FAILURE;
isHandled = true;
} else if (is_dir && path_from != NULL) {
qDebug() << current << "is a copy-with-history, auto-recursing";
if ( recurse(key, change, path_from, matchRules, rev_from, changes, revpool) == EXIT_FAILURE )
return EXIT_FAILURE;
isHandled = true;
} else if (is_dir && change->change_kind == svn_fs_path_change_delete) {
qDebug() << current << "deleted, auto-recursing";
if ( recurse(key, change, path_from, matchRules, rev_from, changes, revpool) == EXIT_FAILURE )
return EXIT_FAILURE;
isHandled = true;
}
}
if ( isHandled ) {
return EXIT_SUCCESS;
}
if (wasDir(fs, revnum - 1, key, revpool)) {
qDebug() << current << "was a directory; ignoring";
} else if (change->change_kind == svn_fs_path_change_delete) {
qDebug() << current << "is being deleted but I don't know anything about it; ignoring";
} else {
qCritical() << current << "did not match any rules; cannot continue";
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
int SvnRevision::exportDispatch(const char *key, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
apr_hash_t *changes, const QString ¤t,
const Rules::Match &rule, const MatchRuleList &matchRules, apr_pool_t *pool)
{
//if(ruledebug)
// qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.lineNumber << "(" << rule.rx.pattern() << ")";
switch (rule.action) {
case Rules::Match::Ignore:
//if(ruledebug)
// qDebug() << " " << "ignoring.";
return EXIT_SUCCESS;
case Rules::Match::Recurse:
if(ruledebug)
qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.info() << " " << "recursing.";
return recurse(key, change, path_from, matchRules, rev_from, changes, pool);
case Rules::Match::Export:
if(ruledebug)
qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.info() << " " << "exporting.";
if (exportInternal(key, change, path_from, rev_from, current, rule, matchRules) == EXIT_SUCCESS)
return EXIT_SUCCESS;
if (change->change_kind != svn_fs_path_change_delete) {
if(ruledebug)
qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.info() << " " << "Unable to export non path removal.";
return EXIT_FAILURE;
}
// we know that the default action inside recurse is to recurse further or to ignore,
// either of which is reasonably safe for deletion
qWarning() << "WARN: deleting unknown path" << current << "; auto-recursing";
return recurse(key, change, path_from, matchRules, rev_from, changes, pool);
}
// never reached
return EXIT_FAILURE;
}
int SvnRevision::exportInternal(const char *key, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
const QString ¤t, const Rules::Match &rule, const MatchRuleList &matchRules)
{
needCommit = true;
QString svnprefix, repository, effectiveRepository, branch, path;
splitPathName(rule, current, &svnprefix, &repository, &effectiveRepository, &branch, &path);
Repository *repo = repositories.value(repository, 0);
if (!repo) {
if (change->change_kind != svn_fs_path_change_delete)
qCritical() << "Rule" << rule
<< "references unknown repository" << repository;
return EXIT_FAILURE;
}
printf(".");
fflush(stdout);
// qDebug() << " " << qPrintable(current) << "rev" << revnum << "->"
// << qPrintable(repository) << qPrintable(branch) << qPrintable(path);
if (change->change_kind == svn_fs_path_change_delete && current == svnprefix && path.isEmpty() && !repo->hasPrefix()) {
if(ruledebug)
qDebug() << "repository" << repository << "branch" << branch << "deleted";
return repo->deleteBranch(branch, revnum);
}
QString previous;
QString prevsvnprefix, prevrepository, preveffectiverepository, prevbranch, prevpath;
bool needRecursiveDump = false;
if (path_from != NULL) {
previous = QString::fromUtf8(path_from);
if (wasDir(fs, rev_from, path_from, pool.data())) {
previous += '/';
}
MatchRuleList::ConstIterator prevmatch =
findMatchRule(matchRules, rev_from, previous, NoIgnoreRule);
if (prevmatch != matchRules.constEnd()) {
splitPathName(*prevmatch, previous, &prevsvnprefix, &prevrepository,
&preveffectiverepository, &prevbranch, &prevpath);
} else {
qWarning() << "WARN: SVN reports a \"copy from\" @" << revnum << "from" << path_from << "@" << rev_from << "but no matching rules found! Ignoring copy, treating as a modification";
path_from = NULL;
needRecursiveDump = true;
}
}
// current == svnprefix => we're dealing with the contents of the whole branch here
if (path_from != NULL && current == svnprefix && path.isEmpty()) {
if (previous != prevsvnprefix) {
// source is not the whole of its branch
qDebug() << qPrintable(current) << "is a partial branch of repository"
<< qPrintable(prevrepository) << "branch"
<< qPrintable(prevbranch) << "subdir"
<< qPrintable(prevpath);
} else if (preveffectiverepository != effectiveRepository) {
qWarning() << "WARN:" << qPrintable(current) << "rev" << revnum
<< "is a cross-repository copy (from repository"
<< qPrintable(prevrepository) << "branch"
<< qPrintable(prevbranch) << "path"
<< qPrintable(prevpath) << "rev" << rev_from << ")";
} else if (path != prevpath) {
qDebug() << qPrintable(current)
<< "is a branch copy which renames base directory of all contents"
<< qPrintable(prevpath) << "to" << qPrintable(path);
// FIXME: Handle with fast-import 'file rename' facility
// ??? Might need special handling when path == / or prevpath == /
} else {
if (prevbranch == branch) {
// same branch and same repository
qDebug() << qPrintable(current) << "rev" << revnum
<< "is reseating branch" << qPrintable(branch)
<< "to an earlier revision"
<< qPrintable(previous) << "rev" << rev_from;
} else {
// same repository but not same branch
// this means this is a plain branch
qDebug() << qPrintable(repository) << ": branch"
<< qPrintable(branch) << "is branching from"
<< qPrintable(prevbranch);
}
if (repo->createBranch(branch, revnum, prevbranch, rev_from) == EXIT_FAILURE) {
return EXIT_FAILURE;
}
if(CommandLineParser::instance()->contains("empty-dirs")) {
Repository::Transaction *txn = transactions.value(repository + branch, 0);
if (!txn) {
txn = repo->newTransaction(branch, svnprefix, revnum);
if (!txn)
return EXIT_FAILURE;
transactions.insert(repository + branch, txn);
}
AprAutoPool pool_from(pool.data());
svn_fs_root_t *fs_root_from;
if (svn_fs_revision_root(&fs_root_from, fs, rev_from, pool_from) != SVN_NO_ERROR) {
return EXIT_FAILURE;
}
QString qkey = QString::fromUtf8(key);
addGitIgnoreOnBranch(pool_from, qkey, "", fs_root_from, txn);
}
if(CommandLineParser::instance()->contains("svn-branches")) {
Repository::Transaction *txn = transactions.value(repository + branch, 0);
if (!txn) {
txn = repo->newTransaction(branch, svnprefix, revnum);
if (!txn)
return EXIT_FAILURE;
transactions.insert(repository + branch, txn);
}
if(ruledebug)
qDebug() << "Create a true SVN copy of branch (" << key << "->" << branch << path << ")";
txn->deleteFile(path);
checkParentNotEmpty(pool, key, path, fs_root, txn);
recursiveDumpDir(txn, fs, fs_root, key, path, pool, revnum, rule, matchRules, ruledebug, false);
if (CommandLineParser::instance()->contains("empty-dirs")) {
addGitIgnoreOnBranch(pool, key, path, fs_root, txn);
}
}
if (rule.annotate) {
// create an annotated tag
fetchRevProps();
repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
epoch, log);
}
return EXIT_SUCCESS;
}
}
Repository::Transaction *txn = transactions.value(repository + branch, 0);
if (!txn) {
txn = repo->newTransaction(branch, svnprefix, revnum);
if (!txn)
return EXIT_FAILURE;
transactions.insert(repository + branch, txn);
}
//
// If this path was copied from elsewhere, use it to infer _some_
// merge points. This heuristic is fairly useful for tracking
// changes across directory re-organizations and wholesale branch
// imports.
//
if (path_from != NULL && preveffectiverepository == effectiveRepository && prevbranch != branch) {
if(ruledebug)
qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from;
txn->noteCopyFromBranch (prevbranch, rev_from);
}
if (change->change_kind == svn_fs_path_change_replace && path_from == NULL) {
if(ruledebug)
qDebug() << "replaced with empty path (" << branch << path << ")";
txn->deleteFile(path);
checkParentNotEmpty(pool, key, path, fs_root, txn);
}
if (change->change_kind == svn_fs_path_change_delete) {
if(ruledebug)
qDebug() << "delete (" << branch << path << ")";
txn->deleteFile(path);
checkParentNotEmpty(pool, key, path, fs_root, txn);
} else if (!current.endsWith('/')) {
if(ruledebug)
qDebug() << "add/change file (" << key << "->" << branch << path << ")";
dumpBlob(txn, fs_root, key, path, pool);
checkParentNoLongerEmpty(pool, key, path, txn);
} else {
if(ruledebug)
qDebug() << "add/change dir (" << key << "->" << branch << path << ")";
// Check unknown svn-properties
if (((path_from == NULL && change->prop_mod==1) || (path_from != NULL && (change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_replace)))
&& CommandLineParser::instance()->contains("propcheck")) {
if (fetchUnknownProps(pool, key, fs_root) != EXIT_SUCCESS) {
qWarning() << "Error checking svn-properties (" << key << ")";
}
}
// if adding, modifying or replacing directory from empty path,
// we only came here to handle empty-dirs and svn-ignore
// do not redump the directory recursively, as all added files are
// included as separate file changes anyway, otherwise the whole
// directory tree is dumped multiple times
//
// needRecursiveDump is true if we come here because it actually was
// a copy, but the source is not available in the target repo, so
// we make a full dump instead here.
bool dumpDirectory = needRecursiveDump
|| !((change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_modify || change->change_kind == svn_fs_path_change_replace)
&& (path_from == NULL));
if (dumpDirectory) {
txn->deleteFile(path);
checkParentNotEmpty(pool, key, path, fs_root, txn);
}
checkParentNoLongerEmpty(pool, key, path, txn);
// Add GitIgnore with svn:ignore
int ignoreSet = false;
if (((path_from == NULL && change->prop_mod==1) || (path_from != NULL && (change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_replace)))
&& CommandLineParser::instance()->contains("svn-ignore")) {
QString svnignore;
// TODO: Check if svn:ignore or other property was changed, but always set on copy/rename (path_from != NULL)
if (fetchIgnoreProps(&svnignore, pool, key, fs_root) != EXIT_SUCCESS) {
qWarning() << "Error fetching svn-properties (" << key << ")";
} else if (svnignore.isNull()) {
QString gitIgnorePath = path == "/" ? ".gitignore" : path + ".gitignore";
txn->deleteFile(gitIgnorePath);
} else {
addGitIgnore(pool, key, path, fs_root, txn, svnignore.toStdString().c_str());
ignoreSet = true;
}
}
// Add GitIgnore for empty directories (if GitIgnore was not set previously)
if (CommandLineParser::instance()->contains("empty-dirs") && ignoreSet == false) {
if (addGitIgnore(pool, key, path, fs_root, txn) == EXIT_SUCCESS) {
return EXIT_SUCCESS;
}
}
if (dumpDirectory) {
recursiveDumpDir(txn, fs, fs_root, key, path, pool, revnum, rule, matchRules, ruledebug, ignoreSet);
if (CommandLineParser::instance()->contains("empty-dirs")) {
addGitIgnoreOnBranch(pool, key, path, fs_root, txn);
}
}
}
if (rule.annotate) {
// create an annotated tag
fetchRevProps();
repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
epoch, log);
}
return EXIT_SUCCESS;
}
int SvnRevision::recursiveDumpDir(Repository::Transaction *txn, svn_fs_t *fs, svn_fs_root_t *fs_root,
const QByteArray &pathname, const QString &finalPathName,
apr_pool_t *pool, svn_revnum_t revnum,
const Rules::Match &rule, const MatchRuleList &matchRules,
bool ruledebug, int ignoreSet)
{
if (!wasDir(fs, revnum, pathname.data(), pool)) {
if (dumpBlob(txn, fs_root, pathname, finalPathName, pool) == EXIT_FAILURE)
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
if ((ignoreSet == false) && CommandLineParser::instance()->contains("svn-ignore")) {
QString svnignore;
if (fetchIgnoreProps(&svnignore, pool, pathname, fs_root) != EXIT_SUCCESS) {
qWarning() << "Error fetching svn-properties (" << pathname << ")";
} else if (!svnignore.isNull()) {
addGitIgnore(pool, pathname, finalPathName, fs_root, txn, svnignore.toStdString().c_str());
}
}
// get the dir listing
apr_hash_t *entries;
SVN_ERR(svn_fs_dir_entries(&entries, fs_root, pathname, pool));
AprAutoPool dirpool(pool);
// While we get a hash, put it in a map for sorted lookup, so we can
// repeat the conversions and get the same git commit hashes.
QMap<QByteArray, svn_node_kind_t> map;
for (apr_hash_index_t *i = apr_hash_first(pool, entries); i; i = apr_hash_next(i)) {
const void *vkey;
void *value;
apr_hash_this(i, &vkey, NULL, &value);
svn_fs_dirent_t *dirent = reinterpret_cast<svn_fs_dirent_t *>(value);
map.insertMulti(QByteArray(dirent->name), dirent->kind);
}
QMapIterator<QByteArray, svn_node_kind_t> i(map);
while (i.hasNext()) {
dirpool.clear();
i.next();
QByteArray entryName = pathname + '/' + i.key();
QString entryFinalName = finalPathName + QString::fromUtf8(i.key());
if (i.value() == svn_node_dir) {
entryFinalName += '/';
QString entryNameQString = entryName + '/';
MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, entryNameQString);
if (match == matchRules.constEnd()) continue; // no match of parent repo? (should not happen)