-
Notifications
You must be signed in to change notification settings - Fork 3
/
kdevelop-rules
491 lines (419 loc) · 13 KB
/
kdevelop-rules
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
#
# Created by Andreas Pakulat <[email protected]>
#
# When using a gitorious git-hosting these should go into a KDevelop project
# Authors missing from the account map (as of 2010-04-27) but existing in
# kdevelops history have been added manually to account-map
#
# arichardson Alexander Richardson [email protected]
# chcouder Christian Couder [email protected]
# denis Denis Pershin [email protected]
# erbsland Tobias Erbsland [email protected]
# givi Omid Givi [email protected]
# hawkes Ivan Hawkes [email protected]
# hvarotto Hugo Varotto [email protected]
# johnzed John R. Zedlewski [email protected]
# jonasno Jonas Nordin [email protected]
# jorgen Jorgen Olson [email protected]
# kervel Frank Dekervel [email protected]
# koss Matt Koss [email protected]
# lliehu Lasse Liehu [email protected]
# matthewl Matthew James Leach [email protected]
# mcbride Mike McBride [email protected]
# olivierjg Olivier Jean de Gaalon [email protected]
# pascalk Pascal Krahmer [email protected]
# sdmanson Scott Manson [email protected]
# wynnw Wynn Wilkes [email protected]
# The following two tags needed manual redoing them as svn2git is not able to
# find the right commit for a tag, it always takes the last commit on the
# branch for creating a tag
#
# KDevelop: 3.10.2 from r1115446 "RC3 following kdevplatform release of RC3" by apaku 2010-04-16 15:47:59 +0200
#
# The following manual steps where done to fix up the tags created by cvs2svn:
#
# The list of broken tags is: v0.4, v1.0, v1.1, v1.4, v1.4.1, 2.0, v2.0.1, v2.0.2,
# v2.1, v2.1.1, v2.1.2, v2.1.3, v2.1.4, v3.0.0a5, v3.0.0, v3.0.1, v3.0.2,
# v3.0.3, v3.0.4, v3.1.0, v3.1.1, v3.1.2, v3.2.0
#
# Updating an existing tag is done by using:
# GIT_COMITTER_DATE="<original date of the tag-creation>" git tag -f -a <tagname> <commit>
# The commit message should be "kdevelop <version number>"
#
# The usual way of finding the commit info is: svn log -v --stop-on-copy file:///<repo>/tags/<tag-location>
# check where the tag originated from
# svn log -v --stop-on-copy file:///<repo>/<original path>@<original rev>
# find the latest commit from the branch/trunk which was used in the tag for /kdevelop/*
# get the commit info from that commit
#
# for the cvs2svn generated tags the following can help to find the highest svn rev the commit used
# svn log -v --stop-on-copy file:///<repodir>/tags/<tag>@rev | grep ".*RELEASE/kdevelop/.*(from.*/kdevelop/.*)" | grep -v "doc" | sed 's/.*(from .*:\([0-9]\+\))$/\1/' | sort -n -u
# After obtaining the number make sure it really is a commit to kdevelop's
# sources and not some mismatch due to poor regexps.
#
# Each of the above tags needs to be updated to be pointing to an existing commit, the
# following list contains the necessary information to find the commit hash.
# tag v3.2.0 from (r393237) ""KDE Desktop Entry" is deprecated" by waba 2005-02-26 15:19:33 +0100
# tag v3.1.2 from (r367469) "BACKPORT Fix comment # of CCBUG: 83334" by aclu 2004-11-30 22:34:17 +0100
# tag v3.1.1 from (r351402) "update by script" by coolo 2004-10-03 09:19:02 +0200
# tag v3.1.0 from (r337501) "Do not create files in the archive at the top level" by geiseri 2004-08-12 07:06:41 +0200
# tag v3.0.4 from (r316090) "updated lsm files" by coolo 2004-05-30 15:26:26 +0200
# tag v3.0.3 from (r301177) "I almost forgot the CHECKLIST :)" by coolo 2004-04-04 12:08:19 +0200
# tag v3.0.2 from (r292897) "Fix KDE 3.0.x compilation." by aclu 2004-03-01 18:52:00 +0100
# tag v3.0.1 from (r288357) "Updated Credits" by aclu 2004-02-15 23:43:58 +0100
# tag v3.0.0 from (r280428) "updating version number" by coolo 2004-01-17 10:09:06 +0100
# tag v3.0.0a5 from (r234817) "FIXME -> FIXME:" by aclu 2003-07-01 12:10:21 +0200
# tag v2.1.4 from (r186721) "- logged the modified patch of Tim Adleys" by falkbr 2002-10-31 22:37:14 +0100
# tag v2.1.3 from (r168728) "changes" by harald 2002-07-25 20:30:17 +0200
# tag v2.1.2 from (r163093) "* bugfix for #44111: CFLAGS and CPPFLAGS" by tasin 2002-06-25 16:59:59 +0200
# tag v2.1.1 from (r153418) "removed version 2 from Qt and KDE strings" by falkbr 2002-05-03 00:08:59 +0200
# tag v2.1 from (r145111) "argh... QDialog::show is now nonmodal, use ::exec instead..." by harald 2002-03-25 19:21:30 +0100
# tag v2.0.2 from (r121162) "* "make dist" didn't work correctly, because admin/" by tasin 2001-11-07 17:08:09 +0100
# tag v2.0.1 from (r113144) "N'Sync with the latest original QextMDI cvs version" by falkbr 2001-09-03 11:00:06 +0200
# tag v2.0 from (r109237) "bugfix: last fix concerning a grave GUI bug, was application crash" by falkbr 2001-08-05 15:46:55 +0200
# tag v1.4.1 from (r85485) "dirs with ++ in them would cause kimport to fail" by jb 2001-03-05 20:37:01 +0100
# tag v1.4 from (r84224) "Fixed: null param problem in print dialog" by jb 2001-02-25 04:59:58 +0100
# tag v1.1 from (r41953) "*** empty log message ***" by smeier 2000-02-27 20:56:52 +0100
# tag v1.0 from (r35897) "*** empty log message ***" by smeier 1999-12-05 19:59:58 +0100
# tag v0.4 from (r23461) "*** empty log message ***" by smeier 1999-06-14 01:34:54 +0200
#
# Create the KDevelop modules
#
create repository kdevelop
end repository
# Ignore some upheaval in KDE's SVN history.
match /
min revision 409202
max revision 409210
end match
match /
min revision 411973
max revision 411973
end match
#
# KDevelop master rules
#
match /trunk/kdevelop/
repository kdevelop
branch master
end match
match /branches/work/kdevelop4-merge/
repository kdevelop
min revision 446110
max revision 454224
branch master
end match
match /trunk/KDE/kdevelop/
repository kdevelop
branch master
end match
match /trunk/extragear/sdk/kdevelop/
repository kdevelop
branch master
end match
#
# KDevelop branches
#
# Most of these need to be done manually as kdevelop moved
# around a lot and additionally has different versions than
# the KDE branches it was part of
#
match /branches/__KDEVELOP1_0FINAL/kdevelop/
repository kdevelop
branch 1.0
end match
match /branches/__KDEVELOP_1_1_FINAL/kdevelop/
repository kdevelop
branch 1.1
end match
match /branches/KDEVELOP_1_4/kdevelop/
repository kdevelop
branch 1.4
end match
match /branches/kdevelop/1.4/
repository kdevelop
branch 1.4
end match
match /branches/KDEVELOP_2_BRANCH/kdevelop/
repository kdevelop
branch 2
end match
match /branches/kdevelop/2/
repository kdevelop
branch 2
end match
match /branches/KDE_2_1_BRANCH/kdevelop/
repository kdevelop
branch 2.0
end match
match /branches/KDE/2.1/kdevelop/
repository kdevelop
branch 2.0
end match
match /branches/KDE_2_2_BRANCH/kdevelop/
repository kdevelop
branch 2.1
end match
match /branches/KDE/2.2/kdevelop/
repository kdevelop
branch 2.1
end match
match /branches/KDE_3_2_BRANCH/kdevelop/
repository kdevelop
branch 3.0
end match
match /branches/KDE/3.2/kdevelop/
repository kdevelop
branch 3.0
end match
match /branches/KDE_3_3_BRANCH/kdevelop/
repository kdevelop
branch 3.1
end match
match /branches/KDE/3.3/kdevelop/
repository kdevelop
branch 3.1
end match
match /branches/KDE_3_4_BRANCH/kdevelop/
repository kdevelop
branch 3.2
end match
match /branches/KDE/3.4/kdevelop/
repository kdevelop
branch 3.2
end match
match /branches/kdevelop/3.3/
repository kdevelop
branch 3.3
end match
match /branches/KDE/3.5/kdevelop/
max revision 646825
repository kdevelop
branch 3.3
end match
match /branches/KDE/3.5/kdevelop/
max revision 453965
repository kdevelop
branch 3.4
end match
match /branches/work/kdevelop3/
repository kdevelop
branch 3.4
end match
match /branches/work/kdevelop/3.4/
repository kdevelop
branch 3.4
end match
match /branches/kdevelop/3.4/
repository kdevelop
branch 3.4
end match
match /branches/KDE/3.5/kdevelop/
min revision 646828
max revision 722529
repository kdevelop
branch 3.4
end match
match /branches/kdevelop/3.5/
repository kdevelop
branch 3.5
end match
match /branches/KDE/3.5/kdevelop/
min revision 722530
repository kdevelop
branch 3.5
end match
match /branches/kdevelop/make_kdevelop_cool/kdevelop/
repository kdevelop
branch make_kdevelop_cool
end match
match /branches/kdevelop/sublime_rework/kdevelop/
repository kdevelop
branch sublime_rework
end match
match /branches/kdevelop/interfaces_cleanup/kdevelop/
repository kdevelop
branch interfaces_cleanup
end match
match /branches/kdevelop/class-generation-extraction/kdevelop/
repository kdevelop
branch class-generation-extraction
end match
#
# Tags from kdevelop
#
# 3.9.93 tag was re-created 3 times, so only take the last one
match /tags/kdevelop/3.9.93/
min revision 972085
max revision 975679
end match
match /tags/kdevelop/3.9.93/
min revision 975680
max revision 975680
repository kdevelop
annotated true
branch refs/tags/v3.9.93
end match
# KDE 2.1 release KDevelop 1.4
match /tags/KDE/2.1/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v1.4
end match
# KDE 2.1.1 release KDevelop 1.4.1
match /tags/KDE/2.1.1/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v1.4.1
end match
# KDE 2.2 released with KDevelop 2.0.x
match /tags/KDE/2.2/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v2.0
end match
# KDE 2.2.x released with KDevelop 2.0.x
match /tags/KDE/2.2.([^/])/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v2.0.\1
end match
# KDevelop 3.0.x, x>1 was a bit messy, its always KDE patch-level+1
# _except 3.0.0, which matches 3.2.0
match /tags/KDE/3.2.0/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.0.0
end match
match /tags/KDE/3.2.1/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.0.2
end match
match /tags/KDE/3.2.2/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.0.3
end match
match /tags/KDE/3.2.3/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.0.4
end match
# KDE/3.3.x/kdevelop shipped KDevelop 3.1.x
match /tags/KDE/3.3.([^/])/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.1.\1
end match
# KDE/3.4.3 was tagged twice, ignore the first tagging
match /tags/KDE/3.4.3/kdevelop/
min revision 467472
max revision 467490
end match
# KDE/3.4.x/kdevelop shipped KDevelop 3.2.x
match /tags/KDE/3.4.([^/])/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.2.\1
end match
# KDE/3.5.2 was tagged twice, ignore the first tagging
match /tags/KDE/3.5.2/kdevelop/
min revision 519755
max revision 519761
end match
# KDE/3.5.5 was tagged twice, ignore the first tagging
match /tags/KDE/3.5.5/kdevelop/
min revision 591372
max revision 591395
end match
# KDE/3.5.[0-6] are equal to KDevelop 3.3.x
match /tags/KDE/3.5.([0-6])/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.3.\1
end match
# KDE 3.5.7 shipped 3.4.1 (3.4.0 was released independently)
match /tags/KDE/3.5.7/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.4.1
end match
# KDE 3.5.8 shipped 3.5.0
match /tags/KDE/3.5.8/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.5.0
end match
# KDE 3.5.8 shipped 3.5.1, use this instead of tags/kdevelop/3.5.1, see below
# for more info
match /tags/KDE/3.5.9/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.5.1
end match
# KDE 3.5.10 shipped 3.5.3 which wasn't tagged separately
# all other 3.5.x releases are tagged under tags/kdevelop
match /tags/KDE/3.5.10/kdevelop/
repository kdevelop
annotated true
branch refs/tags/v3.5.3
end match
# Ignore some of the tags as they don't make any sense to keep
match /tags/kdevelop/2-KACTION_START/
end match
match /tags/kdevelop/2-MERGE/
end match
match /tags/kdevelop/soc-teamwork-submission/
end match
# 3.5.2 was also re-tagged
match /tags/kdevelop/3.5.2/
min revision 807258
max revision 807267
end match
# Ignore the 3.5.1 tag in tags/kdevelop as it doesn't
# seem to be matching with a branch created by git, hence is "floating"
# Instead we'll use the KDE 3.5.9 as tag for 3.5.1
match /tags/kdevelop/3.5.1/
end match
# 3.4.0 was re-tagged, so ignore the original tag
match /tags/kdevelop/3.4.0/
min revision 624322
max revision 627086
end match
# Match all other tags as they are in svn
match /tags/kdevelop/([^/]+)/
repository kdevelop
annotated true
branch refs/tags/v\1
end match
match /trunk/$
action recurse
end match
match /trunk/KDE/$
action recurse
end match
match /trunk/KDE/[^/]+/$
action recurse
end match
match /branches/KDE/[^/]+/$
action recurse
end match
match /branches/KDE_[^/]+/$
action recurse
end match
match /branches/__KDEVELOP1_0FINAL/$
action recurse
end match
match /branches/__KDEVELOP_1_1_FINAL/$
action recurse
end match
match /branches/KDEVELOP_1_4/$
action recurse
end match
match /branches/KDEVELOP_2_BRANCH/$
action recurse
end match
# Ignore everything else
match /
end match