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
|
#!/usr/bin/env python
#
# mergeinfo_tests.py: testing Merge Tracking reporting
#
# Subversion is a tool for revision control.
# See http://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
######################################################################
# General modules
import shutil, sys, re, os
# Our testing module
import svntest
from svntest import wc
# (abbreviation)
Item = wc.StateItem
Skip = svntest.testcase.Skip_deco
SkipUnless = svntest.testcase.SkipUnless_deco
XFail = svntest.testcase.XFail_deco
Issues = svntest.testcase.Issues_deco
Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
exp_noop_up_out = svntest.actions.expected_noop_update_output
from svntest.main import SVN_PROP_MERGEINFO
from svntest.main import server_has_mergeinfo
# Get a couple merge helpers from merge_tests.py
import merge_tests
from merge_tests import set_up_branch
from merge_tests import expected_merge_output
def adjust_error_for_server_version(expected_err):
"Return the expected error regexp appropriate for the server version."
if server_has_mergeinfo():
return expected_err
else:
return ".*Retrieval of mergeinfo unsupported by '.+'"
######################################################################
# Tests
#
# Each test must return on success or raise on failure.
#----------------------------------------------------------------------
def no_mergeinfo(sbox):
"'mergeinfo' on a URL that lacks mergeinfo"
sbox.build(create_wc=False)
sbox.simple_repo_copy('A', 'A2')
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
[],
sbox.repo_url + '/A',
sbox.repo_url + '/A2',
"--show-revs=merged")
def mergeinfo(sbox):
"'mergeinfo' on a path with mergeinfo"
sbox.build()
wc_dir = sbox.wc_dir
# make a branch 'A2'
sbox.simple_repo_copy('A', 'A2') # r2
# make a change in branch 'A'
sbox.simple_mkdir('A/newdir')
sbox.simple_commit() # r3
sbox.simple_update()
# Dummy up some mergeinfo.
svntest.actions.run_and_verify_svn(None, None, [],
'ps', SVN_PROP_MERGEINFO, '/A:3',
sbox.ospath('A2'))
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['3'],
sbox.repo_url + '/A',
sbox.ospath('A2'),
"--show-revs=merged")
@SkipUnless(server_has_mergeinfo)
def explicit_mergeinfo_source(sbox):
"'mergeinfo' with source selection"
# The idea is the target has mergeinfo pertaining to two or more different
# source branches and we're asking about just one of them.
sbox.build()
def url(relpath):
return sbox.repo_url + '/' + relpath
def path(relpath):
return sbox.ospath(relpath)
B = 'A/B'
# make some branches
B2 = 'A/B2'
B3 = 'A/B3'
sbox.simple_repo_copy(B, B2) # r2
sbox.simple_repo_copy(B, B3) # r3
sbox.simple_update()
# make changes in the branches
sbox.simple_mkdir('A/B2/newdir')
sbox.simple_commit() # r4
sbox.simple_mkdir('A/B3/newdir')
sbox.simple_commit() # r5
# Put dummy mergeinfo on branch root
mergeinfo = '/A/B2:2-5\n/A/B3:2-5\n'
sbox.simple_propset(SVN_PROP_MERGEINFO, mergeinfo, B)
sbox.simple_commit()
# Check using each of our recorded merge sources (as paths and URLs).
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['2', '4'], url(B2), path(B),
"--show-revs=merged")
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['2', '4'], path(B2), path(B),
"--show-revs=merged")
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['3', '5'], url(B3), path(B),
"--show-revs=merged")
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['3', '5'], path(B3), path(B),
"--show-revs=merged")
@SkipUnless(server_has_mergeinfo)
def mergeinfo_non_source(sbox):
"'mergeinfo' with uninteresting source selection"
sbox.build()
wc_dir = sbox.wc_dir
H_path = os.path.join(wc_dir, 'A', 'D', 'H')
H2_path = os.path.join(wc_dir, 'A', 'D', 'H2')
B_url = sbox.repo_url + '/A/B'
B_path = os.path.join(wc_dir, 'A', 'B')
G_url = sbox.repo_url + '/A/D/G'
G_path = os.path.join(wc_dir, 'A', 'D', 'G')
H2_url = sbox.repo_url + '/A/D/H2'
# Make a copy, and dummy up some mergeinfo.
mergeinfo = '/A/B:1\n/A/D/G:1\n'
svntest.actions.set_prop(SVN_PROP_MERGEINFO, mergeinfo, H_path)
svntest.main.run_svn(None, "cp", H_path, H2_path)
svntest.main.run_svn(None, "ci", "-m", "r2", wc_dir)
# Check on a source we haven't "merged" from.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
[], H2_url, H_path,
"--show-revs=merged")
#----------------------------------------------------------------------
# Issue #3138
@Issue(3138)
def mergeinfo_on_unknown_url(sbox):
"mergeinfo of an unknown url should return error"
sbox.build()
wc_dir = sbox.wc_dir
# remove a path from the repo and commit.
iota_path = os.path.join(wc_dir, 'iota')
svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota_path)
svntest.actions.run_and_verify_svn("", None, [],
"ci", wc_dir, "-m", "log message")
url = sbox.repo_url + "/iota"
expected_err = adjust_error_for_server_version(".*File not found.*iota.*|"
".*iota.*path not found.*")
svntest.actions.run_and_verify_svn("", None, expected_err,
"mergeinfo", "--show-revs", "eligible",
url, wc_dir)
# Test for issue #3126 'svn mergeinfo shows too few or too many
# eligible revisions'. Specifically
# http://subversion.tigris.org/issues/show_bug.cgi?id=3126#desc5.
@Issue(3126)
def non_inheritable_mergeinfo(sbox):
"non-inheritable mergeinfo shows as merged"
sbox.build()
wc_dir = sbox.wc_dir
expected_disk, expected_status = set_up_branch(sbox)
# Some paths we'll care about
A_COPY_path = os.path.join(wc_dir, "A_COPY")
D_COPY_path = os.path.join(wc_dir, "A_COPY", "D")
rho_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "G", "rho")
# Update the WC, then merge r4 from A to A_COPY and r6 from A to A_COPY
# at --depth empty and commit the merges as r7.
svntest.actions.run_and_verify_svn(None, exp_noop_up_out(6), [], 'up',
wc_dir)
expected_status.tweak(wc_rev=6)
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[4]],
['U ' + rho_COPY_path + '\n',
' U ' + A_COPY_path + '\n',]),
[], 'merge', '-c4',
sbox.repo_url + '/A',
A_COPY_path)
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[6]], ' G ' + A_COPY_path + '\n'),
[], 'merge', '-c6',
sbox.repo_url + '/A',
A_COPY_path, '--depth', 'empty')
expected_output = wc.State(wc_dir, {
'A_COPY' : Item(verb='Sending'),
'A_COPY/D/G/rho' : Item(verb='Sending'),
})
expected_status.tweak('A_COPY', 'A_COPY/D/G/rho', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
# Update the WC a last time to ensure full inheritance.
svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [], 'up',
wc_dir)
# Despite being non-inheritable, r6 should still show as merged to A_COPY
# and not eligible for merging.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['4','6*'],
sbox.repo_url + '/A',
A_COPY_path,
'--show-revs', 'merged')
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['3','5','6*'],
sbox.repo_url + '/A',
A_COPY_path,
'--show-revs', 'eligible')
# But if we drop down to A_COPY/D, r6 should show as eligible because it
# was only merged into A_COPY, no deeper.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['4'],
sbox.repo_url + '/A/D',
D_COPY_path,
'--show-revs', 'merged')
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['3','6'],
sbox.repo_url + '/A/D',
D_COPY_path,
'--show-revs', 'eligible')
# Test for -R option with svn mergeinfo subcommand.
#
# Test for issue #3242 'Subversion demands unnecessary access to parent
# directories of operations'
@Issue(3242)
@SkipUnless(server_has_mergeinfo)
def recursive_mergeinfo(sbox):
"test svn mergeinfo -R"
sbox.build()
wc_dir = sbox.wc_dir
expected_disk, expected_status = set_up_branch(sbox)
# Some paths we'll care about
A_path = os.path.join(wc_dir, "A")
A_COPY_path = os.path.join(wc_dir, "A_COPY")
B_COPY_path = os.path.join(wc_dir, "A_COPY", "B")
C_COPY_path = os.path.join(wc_dir, "A_COPY", "C")
rho_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "G", "rho")
H_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "H")
F_COPY_path = os.path.join(wc_dir, "A_COPY", "B", "F")
omega_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "H", "omega")
beta_COPY_path = os.path.join(wc_dir, "A_COPY", "B", "E", "beta")
A2_path = os.path.join(wc_dir, "A2")
nu_path = os.path.join(wc_dir, "A2", "B", "F", "nu")
nu_COPY_path = os.path.join(wc_dir, "A_COPY", "B", "F", "nu")
nu2_path = os.path.join(wc_dir, "A2", "C", "nu2")
# Rename A to A2 in r7.
svntest.actions.run_and_verify_svn(None, exp_noop_up_out(6), [], 'up', wc_dir)
svntest.actions.run_and_verify_svn(None, None, [],
'ren', A_path, A2_path)
svntest.actions.run_and_verify_svn(None, None, [],
'ci', wc_dir, '-m', 'rename A to A2')
# Add the files A/B/F/nu and A/C/nu2 and commit them as r8.
svntest.main.file_write(nu_path, "A new file.\n")
svntest.main.file_write(nu2_path, "Another new file.\n")
svntest.main.run_svn(None, "add", nu_path, nu2_path)
svntest.actions.run_and_verify_svn(None, None, [],
'ci', wc_dir, '-m', 'Add 2 new files')
# Do several merges to create varied subtree mergeinfo
# Merge r4 from A2 to A_COPY at depth empty
svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [], 'up',
wc_dir)
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[4]], ' U ' + A_COPY_path + '\n'),
[], 'merge', '-c4', '--depth', 'empty',
sbox.repo_url + '/A2',
A_COPY_path)
# Merge r6 from A2/D/H to A_COPY/D/H
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[6]],
['U ' + omega_COPY_path + '\n',
' G ' + H_COPY_path + '\n']),
[], 'merge', '-c6',
sbox.repo_url + '/A2/D/H',
H_COPY_path)
# Merge r5 from A2 to A_COPY
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[5]],
['U ' + beta_COPY_path + '\n',
' G ' + A_COPY_path + '\n',
' G ' + B_COPY_path + '\n',
' U ' + B_COPY_path + '\n',], # Elision
elides=True),
[], 'merge', '-c5',
sbox.repo_url + '/A2',
A_COPY_path)
# Reverse merge -r5 from A2/C to A_COPY/C leaving empty mergeinfo on
# A_COPY/C.
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[-5]],
' G ' + C_COPY_path + '\n'),
[], 'merge', '-c-5',
sbox.repo_url + '/A2/C', C_COPY_path)
# Merge r8 from A2/B/F to A_COPY/B/F
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[8]],
['A ' + nu_COPY_path + '\n',
' G ' + F_COPY_path + '\n']),
[], 'merge', '-c8',
sbox.repo_url + '/A2/B/F',
F_COPY_path)
# Commit everything this far as r9
svntest.actions.run_and_verify_svn(None, None, [],
'ci', wc_dir, '-m', 'Many merges')
svntest.actions.run_and_verify_svn(None, exp_noop_up_out(9), [], 'up',
wc_dir)
# Test svn mergeinfo -R / --depth infinity.
# Asking for eligible revisions from A2 to A_COPY should show:
#
# r3 - Was never merged.
#
# r4 - Was merged at depth empty, so while there is mergeinfo for the
# revision, the actual text change to A_COPY/D/G/rho hasn't yet
# happened.
#
# r8* - Was only partially merged to the subtree at A_COPY/B/F. The
# addition of A_COPY/C/nu2 is still outstanding.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['3', '4*', '8*'],
sbox.repo_url + '/A2',
sbox.repo_url + '/A_COPY',
'--show-revs', 'eligible', '-R')
# Do the same as above, but test that we can request the revisions
# in reverse order.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['8*', '4*', '3'],
sbox.repo_url + '/A2',
sbox.repo_url + '/A_COPY',
'--show-revs', 'eligible', '-R',
'-r', '9:0')
# Asking for merged revisions from A2 to A_COPY should show:
#
# r4* - Was merged at depth empty, so while there is mergeinfo for the
# revision, the actual text change to A_COPY/D/G/rho hasn't yet
# happened.
#
# r5 - Was merged at depth infinity to the root of the 'branch', so it
# should show as fully merged.
#
# r6 - This was a subtree merge, but since the subtree A_COPY/D/H was
# the ancestor of the only change made in r6 it is considered
# fully merged.
#
# r8* - Was only partially merged to the subtree at A_COPY/B/F. The
# addition of A_COPY/C/nu2 is still outstanding.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['4*', '5', '6', '8*'],
A2_path,
A_COPY_path,
'--show-revs', 'merged',
'--depth', 'infinity')
# Do the same as above, but test that we can request the revisions
# in reverse order.
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
['8*', '6', '5', '4*'],
A2_path,
A_COPY_path,
'--show-revs', 'merged',
'--depth', 'infinity',
'-r', '9:0')
# A couple tests of problems found with initial issue #3242 fixes.
# We should be able to check for the merged revs from a URL to a URL
# when the latter has explicit mergeinfo...
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''), ['6'],
sbox.repo_url + '/A2/D/H',
sbox.repo_url + '/A_COPY/D/H',
'--show-revs', 'merged')
# ...and when the latter has inherited mergeinfo.
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''), ['6'],
sbox.repo_url + '/A2/D/H/omega',
sbox.repo_url + '/A_COPY/D/H/omega',
'--show-revs', 'merged')
# Test for issue #3180 'svn mergeinfo ignores peg rev for WC target'.
@SkipUnless(server_has_mergeinfo)
def mergeinfo_on_pegged_wc_path(sbox):
"svn mergeinfo on pegged working copy target"
sbox.build()
wc_dir = sbox.wc_dir
expected_disk, expected_status = set_up_branch(sbox)
# Some paths we'll care about
A_path = os.path.join(wc_dir, "A")
A_COPY_path = os.path.join(wc_dir, "A_COPY")
psi_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "H", "psi")
omega_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "H", "omega")
beta_COPY_path = os.path.join(wc_dir, "A_COPY", "B", "E", "beta")
# Do a couple merges
#
# r7 - Merge -c3,6 from A to A_COPY.
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[3],[6]],
['U ' + psi_COPY_path + '\n',
'U ' + omega_COPY_path + '\n',
' U ' + A_COPY_path + '\n',
' G ' + A_COPY_path + '\n',]),
[], 'merge', '-c3,6', sbox.repo_url + '/A', A_COPY_path)
svntest.actions.run_and_verify_svn(None, None, [],
'ci', wc_dir,
'-m', 'Merge r3 and r6')
# r8 - Merge -c5 from A to A_COPY.
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[5]],
['U ' + beta_COPY_path + '\n',
' U ' + A_COPY_path + '\n']),
[], 'merge', '-c5', '--allow-mixed-revisions',
sbox.repo_url + '/A', A_COPY_path)
svntest.actions.run_and_verify_svn(None, None, [],
'ci', wc_dir,
'-m', 'Merge r5')
# Ask for merged and eligible revisions to A_COPY pegged at various values.
# Prior to issue #3180 fix the peg revision was ignored.
#
# A_COPY pegged to non-existent revision
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version('.*No such revision 99'),
[], A_path, A_COPY_path + '@99', '--show-revs', 'merged')
# A_COPY@BASE
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3','5','6'], A_path, A_COPY_path + '@BASE', '--show-revs', 'merged')
# A_COPY@HEAD
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3','5','6'], A_path, A_COPY_path + '@HEAD', '--show-revs', 'merged')
# A_COPY@4 (Prior to any merges)
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
[], A_path, A_COPY_path + '@4', '--show-revs', 'merged')
# A_COPY@COMMITTED (r8)
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3','5','6'], A_path, A_COPY_path + '@COMMITTED', '--show-revs',
'merged')
# A_COPY@PREV (r7)
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3', '6'], A_path, A_COPY_path + '@PREV', '--show-revs', 'merged')
# A_COPY@BASE
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4'], A_path, A_COPY_path + '@BASE', '--show-revs', 'eligible')
# A_COPY@HEAD
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4'], A_path, A_COPY_path + '@HEAD', '--show-revs', 'eligible')
# A_COPY@4 (Prior to any merges)
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3', '4', '5', '6'], A_path, A_COPY_path + '@4', '--show-revs', 'eligible')
# A_COPY@COMMITTED (r8)
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4'], A_path, A_COPY_path + '@COMMITTED', '--show-revs',
'eligible')
# A_COPY@PREV (r7)
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4', '5'], A_path, A_COPY_path + '@PREV', '--show-revs', 'eligible')
#----------------------------------------------------------------------
# A test for issue 3986 'svn_client_mergeinfo_log API is broken'.
@Issue(3986)
@SkipUnless(server_has_mergeinfo)
def wc_target_inherits_mergeinfo_from_repos(sbox):
"wc target inherits mergeinfo from repos"
sbox.build()
wc_dir = sbox.wc_dir
wc_disk, wc_status = set_up_branch(sbox, nbr_of_branches=2)
A_COPY_path = os.path.join(wc_dir, 'A_COPY')
rho_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D', 'G', 'rho')
gamma_2_path = os.path.join(wc_dir, 'A_COPY_2', 'D', 'gamma')
tau_path = os.path.join(wc_dir, 'A', 'D', 'G', 'tau')
D_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D')
# Merge -c5 ^/A/D/G/rho A_COPY\D\G\rho
# Merge -c7 ^/A A_COPY
# Commit as r8
#
# This gives us some explicit mergeinfo on the "branch" root and
# one of its subtrees:
#
# Properties on 'A_COPY\D\G\rho':
# svn:mergeinfo
# /A/D/G/rho:5
# Properties on 'A_COPY':
# svn:mergeinfo
# /A:7
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A/D/G/rho',
rho_COPY_path, '-c5')
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A',
A_COPY_path, '-c7')
svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
'Cherrypicks to branch subtree and root',
wc_dir)
# Checkout a new wc rooted at ^/A_COPY/D.
subtree_wc = sbox.add_wc_path('D_COPY')
svntest.actions.run_and_verify_svn(None, None, [], 'co',
sbox.repo_url + '/A_COPY/D',
subtree_wc)
# Check the merged and eligible revisions both recursively and
# non-recursively.
# Eligible : Non-recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4','5'], sbox.repo_url + '/A/D', subtree_wc,
'--show-revs', 'eligible')
# Eligible : Recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4'], sbox.repo_url + '/A/D', subtree_wc,
'--show-revs', 'eligible', '-R')
# Merged : Non-recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['7'], sbox.repo_url + '/A/D', subtree_wc,
'--show-revs', 'merged')
# Merged : Recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['5','7'], sbox.repo_url + '/A/D', subtree_wc,
'--show-revs', 'merged', '-R')
# Test that intersecting revisions in the 'svn mergeinfo' target
# from one source don't show up as merged when asking about a different
# source.
#
# In r9 make a change that effects two branches:
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
svntest.main.file_write(gamma_2_path, "New content.\n")
svntest.main.file_write(tau_path, "New content.\n")
svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
'Make changes under both A and A_COPY_2',
wc_dir)
# In r10 merge r9 from A_COPY_2 to A_COPY.
#
# This gives us this mergeinfo:
#
# Properties on 'A_COPY':
# svn:mergeinfo
# /A:7
# /A_COPY_2:9
# Properties on 'A_COPY\D\G\rho':
# svn:mergeinfo
# /A/D/G/rho:5
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A_COPY_2',
A_COPY_path, '-c9')
svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
'Merge r8 from A_COPY_2 to A_COPY',
wc_dir)
def test_svn_mergeinfo_4_way(wc_target):
# Eligible : Non-recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4','5','9'], sbox.repo_url + '/A/D', wc_target,
'--show-revs', 'eligible')
# Eligible : Recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4','9'], sbox.repo_url + '/A/D', wc_target,
'--show-revs', 'eligible', '-R')
# Merged : Non-recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['7'], sbox.repo_url + '/A/D', wc_target,
'--show-revs', 'merged')
# Merged : Recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['5','7'], sbox.repo_url + '/A/D', wc_target,
'--show-revs', 'merged', '-R')
# Test while the target is the full WC and then with the subtree WC:
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'up', subtree_wc)
test_svn_mergeinfo_4_way(D_COPY_path)
test_svn_mergeinfo_4_way(subtree_wc)
#----------------------------------------------------------------------
# A test for issue 3791 'svn mergeinfo shows natural history of added
# subtrees as eligible'.
@Issue(3791)
@SkipUnless(server_has_mergeinfo)
def natural_history_is_not_eligible_nor_merged(sbox):
"natural history is not eligible nor merged"
sbox.build()
wc_dir = sbox.wc_dir
wc_disk, wc_status = set_up_branch(sbox)
nu_path = os.path.join(wc_dir, 'A', 'C', 'nu')
A_COPY_path = os.path.join(wc_dir, 'A_COPY')
nu_COPY_path = os.path.join(wc_dir, 'A_COPY', 'C', 'nu')
# r7 - Add a new file A/C/nu
svntest.main.file_write(nu_path, "This is the file 'nu'.\n")
svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_path)
svntest.actions.run_and_verify_svn(None, None, [], 'ci',
'-m', 'Add a file', wc_dir)
# r8 - Sync merge ^/A to A_COPY
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A', A_COPY_path)
svntest.actions.run_and_verify_svn(None, None, [], 'ci',
'-m', 'Add a file', wc_dir)
# r9 - Modify the file added in r7
svntest.main.file_write(nu_path, "Modification to file 'nu'.\n")
svntest.actions.run_and_verify_svn(None, None, [], 'ci',
'-m', 'Modify added file', wc_dir)
# r10 - Merge ^/A/C/nu to A_COPY/C/nu, creating subtree mergeinfo.
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A/C/nu', nu_COPY_path)
svntest.actions.run_and_verify_svn(None, None, [], 'ci',
'-m', 'Add a file', wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
# We've effectively merged everything from ^/A to A_COPY, check
# that svn mergeinfo -R agrees.
#
# First check if there are eligible revisions, there should be none.
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
[], sbox.repo_url + '/A',
A_COPY_path, '--show-revs', 'eligible', '-R')
# Now check that all operative revisions show as merged.
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3','4','5','6','7','9'], sbox.repo_url + '/A',
A_COPY_path, '--show-revs', 'merged', '-R')
#----------------------------------------------------------------------
# A test for issue 4050 "'svn mergeinfo' always considers non-inheritable
# ranges as partially merged".
@Issue(4050)
@SkipUnless(server_has_mergeinfo)
def noninheritable_mergeinfo_not_always_eligible(sbox):
"noninheritable mergeinfo not always eligible"
sbox.build()
wc_dir = sbox.wc_dir
A_path = os.path.join(wc_dir, 'A')
branch_path = os.path.join(wc_dir, 'branch')
# r2 - Branch ^/A to ^/branch.
svntest.main.run_svn(None, 'copy', sbox.repo_url + '/A',
sbox.repo_url + '/branch', '-m', 'make a branch')
# r3 - Make prop edit to A.
svntest.main.run_svn(None, 'ps', 'prop', 'val', A_path)
svntest.main.run_svn(None, 'commit', '-m', 'file edit', wc_dir)
svntest.main.run_svn(None, 'up', wc_dir)
# r4 - Merge r3 from ^/A to branch at depth=empty.
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A', branch_path,
'-c3', '--depth=empty')
# Forcibly set non-inheritable mergeinfo to replicate the pre-1.8 behavior,
# where prior to the fix for issue #4057, non-inheritable mergeinfo was
# unconditionally set for merges with shallow operational depths.
svntest.actions.run_and_verify_svn(None, None, [],
'propset', SVN_PROP_MERGEINFO,
'/A:3*\n', branch_path)
svntest.main.run_svn(None, 'commit', '-m', 'shallow merge', wc_dir)
# Now check that r3 is reported as fully merged from ^/A to ^/branch
# and does not show up all when asking for eligible revs.
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['3'], sbox.repo_url + '/A', sbox.repo_url + '/branch',
'--show-revs', 'merged', '-R')
# Likewise r3 shows up as partially eligible when asking about
# for --show-revs=eligible.
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
[], sbox.repo_url + '/A', sbox.repo_url + '/branch',
'--show-revs', 'eligible', '-R')
########################################################################
# Run the tests
# list all tests here, starting with None:
test_list = [ None,
no_mergeinfo,
mergeinfo,
explicit_mergeinfo_source,
mergeinfo_non_source,
mergeinfo_on_unknown_url,
non_inheritable_mergeinfo,
recursive_mergeinfo,
mergeinfo_on_pegged_wc_path,
wc_target_inherits_mergeinfo_from_repos,
natural_history_is_not_eligible_nor_merged,
noninheritable_mergeinfo_not_always_eligible,
]
if __name__ == '__main__':
svntest.main.run_tests(test_list)
# NOTREACHED
|
