To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/tests/test_merge.py
- browse files at revision 6724
- compare with another revision
- download diff
- download tarball
- view history from revision 6724
- Committer: Breezy landing bot
- Author(s): Jelmer Vernooij
- Date: 2017-06-27 16:29:55 UTC
- mfrom: (6719.1.4 more-deprecations)
- Revision ID: breezy.the.bot@gmail.com-20170627162955-9krxsz2s68v7h24i
Remove some more already deprecated arguments.
Merged from https://code.launchpad.net/~jelmer/brz/more-deprecations/+merge/326342
Merged from https://code.launchpad.net/~jelmer/brz/more-deprecations/+merge/326342
- files modified:
- breezy/builtins.py
added
removed
breezy/tests/test_merge.py
373
373
374
374
def test_weave_cherrypick(self):
375
375
this_tree, other_tree = self.prepare_cherrypick()
376
merger = _mod_merge.Merger.from_revision_ids(None,
376
merger = _mod_merge.Merger.from_revision_ids(
377
377
this_tree, 'rev3b', 'rev2b', other_tree.branch)
378
378
merger.merge_type = _mod_merge.WeaveMerger
379
379
merger.do_merge()
381
381
382
382
def test_weave_cannot_reverse_cherrypick(self):
383
383
this_tree, other_tree = self.prepare_cherrypick()
384
merger = _mod_merge.Merger.from_revision_ids(None,
384
merger = _mod_merge.Merger.from_revision_ids(
385
385
this_tree, 'rev2b', 'rev3b', other_tree.branch)
386
386
merger.merge_type = _mod_merge.WeaveMerger
387
387
self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
388
388
389
389
def test_merge3_can_reverse_cherrypick(self):
390
390
this_tree, other_tree = self.prepare_cherrypick()
391
merger = _mod_merge.Merger.from_revision_ids(None,
391
merger = _mod_merge.Merger.from_revision_ids(
392
392
this_tree, 'rev2b', 'rev3b', other_tree.branch)
393
393
merger.merge_type = _mod_merge.Merge3Merger
394
394
merger.do_merge()
406
406
this_tree.lock_write()
407
407
self.addCleanup(this_tree.unlock)
408
408
409
merger = _mod_merge.Merger.from_revision_ids(None,
409
merger = _mod_merge.Merger.from_revision_ids(
410
410
this_tree, 'rev3b', 'rev2b', other_tree.branch)
411
411
merger.merge_type = _mod_merge.Merge3Merger
412
412
merger.do_merge()
424
424
self.build_tree(['a'])
425
425
tree.add('a')
426
426
first_rev = tree.commit("added a")
427
merger = _mod_merge.Merger.from_revision_ids(None, tree,
427
merger = _mod_merge.Merger.from_revision_ids(tree,
428
428
_mod_revision.NULL_REVISION,
429
429
first_rev)
430
430
merger.merge_type = _mod_merge.Merge3Merger
444
444
other_tree.commit('rev2', rev_id='rev2b')
445
445
this_tree.lock_write()
446
446
self.addCleanup(this_tree.unlock)
447
merger = _mod_merge.Merger.from_revision_ids(None,
447
merger = _mod_merge.Merger.from_revision_ids(
448
448
this_tree, 'rev2b', other_branch=other_tree.branch)
449
449
merger.merge_type = _mod_merge.Merge3Merger
450
450
tree_merger = merger.make_merger()
467
467
other_tree.commit('rev2', rev_id='rev2b')
468
468
this_tree.lock_write()
469
469
self.addCleanup(this_tree.unlock)
470
merger = _mod_merge.Merger.from_revision_ids(None,
470
merger = _mod_merge.Merger.from_revision_ids(
471
471
this_tree, 'rev2b', other_branch=other_tree.branch)
472
472
merger.merge_type = _mod_merge.Merge3Merger
473
473
tree_merger = merger.make_merger()
497
497
other_tree.commit('rev2', rev_id='rev2b')
498
498
this_tree.lock_write()
499
499
self.addCleanup(this_tree.unlock)
500
merger = _mod_merge.Merger.from_revision_ids(None,
500
merger = _mod_merge.Merger.from_revision_ids(
501
501
this_tree, 'rev2b', other_branch=other_tree.branch)
502
502
merger.merge_type = _mod_merge.Merge3Merger
503
503
tree_merger = merger.make_merger()
516
516
tree.add('a')
517
517
first_rev = tree.commit("added a")
518
518
old_root_id = tree.get_root_id()
519
merger = _mod_merge.Merger.from_revision_ids(None, tree,
519
merger = _mod_merge.Merger.from_revision_ids(tree,
520
520
_mod_revision.NULL_REVISION,
521
521
first_rev)
522
522
merger.merge_type = _mod_merge.Merge3Merger
1270
1270
mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch())
1271
1271
mem_tree.lock_write()
1272
1272
self.addCleanup(mem_tree.unlock)
1273
merger = _mod_merge.Merger.from_revision_ids(None,
1273
merger = _mod_merge.Merger.from_revision_ids(
1274
1274
mem_tree, other_revision_id)
1275
1275
merger.set_interesting_files(interesting_files)
1276
1276
# It seems there is no matching function for set_interesting_ids
2072
2072
2073
2073
def do_merge(self, builder, other_revision_id):
2074
2074
wt = self.get_wt_from_builder(builder)
2075
merger = _mod_merge.Merger.from_revision_ids(None,
2075
merger = _mod_merge.Merger.from_revision_ids(
2076
2076
wt, other_revision_id)
2077
2077
merger.merge_type = _mod_merge.Merge3Merger
2078
2078
return wt, merger.do_merge()
2338
2338
wt.commit('D merges B & C', rev_id='D-id')
2339
2339
self.assertEqual('barry', wt.id2path('foo-id'))
2340
2340
# Check the output of the Merger object directly
2341
merger = _mod_merge.Merger.from_revision_ids(None,
2342
wt, 'F-id')
2341
merger = _mod_merge.Merger.from_revision_ids(wt, 'F-id')
2343
2342
merger.merge_type = _mod_merge.Merge3Merger
2344
2343
merge_obj = merger.make_merger()
2345
2344
root_id = wt.path2id('')
2394
2393
wt.commit('F foo => bing', rev_id='F-id')
2395
2394
2396
2395
# Check the output of the Merger object directly
2397
merger = _mod_merge.Merger.from_revision_ids(None,
2398
wt, 'E-id')
2396
merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2399
2397
merger.merge_type = _mod_merge.Merge3Merger
2400
2398
merge_obj = merger.make_merger()
2401
2399
# Nothing interesting happened in OTHER relative to BASE
2445
2443
list(wt.iter_changes(wt.basis_tree()))
2446
2444
wt.commit('D merges B & C, makes it a file', rev_id='D-id')
2447
2445
2448
merger = _mod_merge.Merger.from_revision_ids(None,
2449
wt, 'E-id')
2446
merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2450
2447
merger.merge_type = _mod_merge.Merge3Merger
2451
2448
merge_obj = merger.make_merger()
2452
2449
entries = list(merge_obj._entries_lca())
2660
2657
wt.branch.set_last_revision_info(2, 'B-id')
2661
2658
wt.commit('D', rev_id='D-id', recursive=None)
2662
2659
2663
merger = _mod_merge.Merger.from_revision_ids(None,
2664
wt, 'E-id')
2660
merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2665
2661
merger.merge_type = _mod_merge.Merge3Merger
2666
2662
merge_obj = merger.make_merger()
2667
2663
entries = list(merge_obj._entries_lca())
2697
2693
wt.branch.set_last_revision_info(2, 'B-id')
2698
2694
wt.commit('D', rev_id='D-id', recursive=None)
2699
2695
2700
merger = _mod_merge.Merger.from_revision_ids(None,
2701
wt, 'E-id')
2696
merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2702
2697
merger.merge_type = _mod_merge.Merge3Merger
2703
2698
merge_obj = merger.make_merger()
2704
2699
entries = list(merge_obj._entries_lca())
2737
2732
wt.branch.set_last_revision_info(2, 'B-id')
2738
2733
wt.commit('D', rev_id='D-id', recursive=None)
2739
2734
2740
merger = _mod_merge.Merger.from_revision_ids(None,
2741
wt, 'E-id')
2735
merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2742
2736
merger.merge_type = _mod_merge.Merge3Merger
2743
2737
merge_obj = merger.make_merger()
2744
2738
entries = list(merge_obj._entries_lca())
2782
2776
wt.branch.set_last_revision_info(2, 'B-id')
2783
2777
wt.commit('D', rev_id='D-id', recursive=None)
2784
2778
2785
merger = _mod_merge.Merger.from_revision_ids(None,
2786
wt, 'E-id')
2779
merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2787
2780
merger.merge_type = _mod_merge.Merge3Merger
2788
2781
merge_obj = merger.make_merger()
2789
2782
entries = list(merge_obj._entries_lca())
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0