/brz/remove-bazaar

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 bzrlib/tests/test_conflicts.py

Replace --interactive by --action.

* bzrlib/tests/test_conflicts.py:
Switch from --interactive to --action.

* bzrlib/tests/blackbox/test_conflicts.py:
(TestResolve): Delete the --interactive tests.

* bzrlib/conflicts.py:
(cmd_resolve.run): Add an 'action' parameter. Refactor to clarify
what action is executed when. Get rid of the --interactive attempt.
(resolve): Add an 'action' parameter. Refactor to make the
conflict deletion depends on the resolution success.
(_resolve_interactive): Deleted.
(ConflictList.remove_files): Use conflict.cleanup()
(Conflict._do): Helper to execute an arbitratry resolution action.
(Conflict.cleanup, Conflict.done, Conflict.keep_mine,
Conflict.take_their): Declare the abstract methods.
(PathConflict.cleanup, PathConflict.done): Do-nothing
implementations.
(ContentsConflict.cleanup): Specific cleanup (strange).
(TextConflict.cleanup): Specific cleanup.
(HandledConflict.done, HandledConflict.cleanup): Do nothing
implementations.
(UnversionedParent.keep_mine, UnversionedParent.take_their): Hmm,
forced do-nothing implementations, something weird is going on
here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
224
224
$ bzr commit --strict -m 'No more conflicts nor unknown files'
225
225
""")
226
226
 
227
 
    def test_take_theirs(self):
 
227
    def test_take_their(self):
228
228
        self.run_script("""
229
229
$ bzr mv file.OTHER file
230
230
$ bzr resolve file
233
233
 
234
234
    def test_resolve_keeping_mine(self):
235
235
        self.run_script("""
236
 
$ bzr resolve --interactive file
237
 
<keep_mine
 
236
$ bzr resolve --keep-mine file
238
237
$ bzr commit --strict -m 'No more conflicts nor unknown files'
239
238
""")
240
239
 
241
 
    def test_resolve_taking_theirs(self):
 
240
    def test_resolve_taking_their(self):
242
241
        self.run_script("""
243
 
$ bzr resolve --interactive file
244
 
<take_theirs
 
242
$ bzr resolve --take-their file
245
243
$ bzr commit --strict -m 'No more conflicts nor unknown files'
246
244
""")
247
245
 
290
288
 
291
289
    def test_resolve_keeping_mine(self):
292
290
        self.run_script("""
293
 
$ bzr resolve --interactive file2
294
 
<keep_mine
 
291
$ bzr resolve --keep-mine file2
295
292
$ bzr commit --strict -m 'No more conflicts nor unknown files'
296
293
""")
297
294
 
298
 
    def test_resolve_taking_theirs(self):
 
295
    def test_resolve_taking_their(self):
299
296
        self.run_script("""
300
 
$ bzr resolve --interactive file2
301
 
<take_theirs
 
297
$ bzr resolve --take-their file2
302
298
$ bzr commit --strict -m 'No more conflicts nor unknown files'
303
299
""")
304
300
 
339
335
$ bzr commit --strict -m 'No more conflicts nor unknown files'
340
336
""")
341
337
 
342
 
    def test_take_theirs(self):
 
338
    def test_take_their(self):
343
339
        self.run_script("""
344
340
$ bzr resolve dir
345
341
$ bzr commit --strict -m 'No more conflicts nor unknown files'
396
392
 
397
393
    def test_resolve_keeping_mine(self):
398
394
        self.run_script("""
399
 
$ bzr resolve --interactive dir
400
 
<keep_mine
 
395
$ bzr resolve --keep-mine dir
401
396
$ bzr commit --strict -m 'No more conflicts nor unknown files'
402
397
""")
403
398
 
404
 
    def test_resolve_taking_theirs(self):
 
399
    def test_resolve_taking_their(self):
405
400
        self.run_script("""
406
 
$ bzr resolve --interactive dir
407
 
<take_theirs
 
401
$ bzr resolve --take-their dir
408
402
$ bzr commit --strict -m 'No more conflicts nor unknown files'
409
403
""")
410
404
 
458
452
 
459
453
    def test_resolve_keeping_mine(self):
460
454
        self.run_script("""
461
 
$ bzr resolve --interactive dir
462
 
<keep_mine
 
455
$ bzr resolve --keep-mine dir
463
456
$ bzr commit --strict -m 'No more conflicts nor unknown files'
464
457
""")
465
458
 
466
 
    def test_resolve_taking_theirs(self):
 
459
    def test_resolve_taking_their(self):
467
460
        self.run_script("""
468
 
$ bzr resolve --interactive dir
469
 
<take_theirs
 
461
$ bzr resolve --take-their dir
470
462
$ bzr commit --strict -m 'No more conflicts nor unknown files'
471
463
""")
472
464
 
508
500
 
509
501
    def test_resolve_keeping_mine(self):
510
502
        self.run_script("""
511
 
$ bzr resolve --interactive file-in-branch
512
 
<keep_mine
 
503
$ bzr resolve --keep-mine file-in-branch
513
504
$ bzr commit --strict -m 'No more conflicts nor unknown files'
514
505
""")
515
506
 
516
 
    def test_resolve_taking_theirs(self):
 
507
    def test_resolve_taking_their(self):
517
508
        self.run_script("""
518
 
$ bzr resolve --interactive file-in-branch
519
 
<take_theirs
 
509
$ bzr resolve --take-their file-in-branch
520
510
$ bzr commit --strict -m 'No more conflicts nor unknown files'
521
511
""")
522
512
 
548
538
$ bzr commit --strict -m 'No more conflicts nor unknown files'
549
539
""")
550
540
 
551
 
    def test_take_theirs(self):
 
541
    def test_take_their(self):
552
542
        self.run_script("""
553
543
$ bzr mv dir2/dir1 dir1
554
544
$ bzr mv dir2 dir1
558
548
 
559
549
    def test_resolve_keeping_mine(self):
560
550
        self.run_script("""
561
 
$ bzr resolve --interactive dir2
562
 
<keep_mine
 
551
$ bzr resolve --keep-mine dir2
563
552
$ bzr commit --strict -m 'No more conflicts nor unknown files'
564
553
""")
565
554
 
566
 
    def test_resolve_taking_theirs(self):
 
555
    def test_resolve_taking_their(self):
567
556
        self.run_script("""
568
 
$ bzr resolve --interactive dir2
569
 
<take_theirs
 
557
$ bzr resolve --take-their dir2
570
558
$ bzr commit --strict -m 'No more conflicts nor unknown files'
571
559
""")
572
560
 
607
595
$ bzr commit --strict -m 'No more conflicts nor unknown files'
608
596
""")
609
597
 
610
 
    def test_take_theirs(self):
 
598
    def test_take_their(self):
611
599
        self.run_script("""
612
600
$ bzr rm foo --force
613
601
$ bzr mv foo.new foo
617
605
 
618
606
    def test_resolve_keeping_mine(self):
619
607
        self.run_script("""
620
 
$ bzr resolve --interactive foo.new
621
 
<keep_mine
 
608
$ bzr resolve --keep-mine foo.new
622
609
$ bzr commit --strict -m 'No more conflicts nor unknown files'
623
610
""")
624
611
 
625
 
    def test_resolve_taking_theirs(self):
 
612
    def test_resolve_taking_their(self):
626
613
        self.run_script("""
627
 
$ bzr resolve --interactive foo.new
628
 
<take_theirs
 
614
$ bzr resolve --take-their foo.new
629
615
$ bzr commit --strict -m 'No more conflicts nor unknown files'
630
616
""")
631
617
 
681
667
        opts, args = self.parse(['--keep-mine'])
682
668
        self.assertEqual({'action': 'keep_mine'}, opts)
683
669
 
684
 
    def test_take_theirs(self):
685
 
        opts, args = self.parse(['--action', 'take-theirs'])
686
 
        self.assertEqual({'action': 'take_theirs'}, opts)
687
 
        opts, args = self.parse(['--take-theirs'])
688
 
        self.assertEqual({'action': 'take_theirs'}, opts)
 
670
    def test_take_their(self):
 
671
        opts, args = self.parse(['--action', 'take-their'])
 
672
        self.assertEqual({'action': 'take_their'}, opts)
 
673
        opts, args = self.parse(['--take-their'])
 
674
        self.assertEqual({'action': 'take_their'}, opts)