« back to all changes in this revision
Viewing changes to bzrlib/conflicts.py
- browse files at revision 4597.3.67
- compare with another revision
- compare with revision 6015.9.12
- download diff
- download tarball
- view history from revision 4597.3.67
- Committer: Vincent Ladeuil
- Date: 2010-02-02 12:52:13 UTC
- mto: (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100202125213-h08auwpb9zbtvjmb
Settle with --take-this and --take-other as action names.
added
removed
bzrlib/conflicts.py
81
81
resolve_action_registry.register(
82
82
'done', 'done', 'Marks the conflict as resolved' )
83
83
resolve_action_registry.register(
84
'keep-mine', 'keep_mine',
84
'take-this', 'take_this',
85
85
'Resolve the conflict preserving the version in the working tree' )
86
86
resolve_action_registry.register(
87
'take-theirs', 'take_theirs',
87
'take-other', 'take_other',
88
88
'Resolve the conflict taking the merged version into account' )
89
89
resolve_action_registry.default_key = 'done'
90
90
420
420
# This method does nothing but simplifies the design of upper levels.
421
421
pass
422
422
423
def keep_mine(self, tree):
424
raise NotImplementedError(self.keep_mine)
423
def take_this(self, tree):
424
raise NotImplementedError(self.take_this)
425
425
426
def take_theirs(self, tree):
427
raise NotImplementedError(self.take_theirs)
426
def take_other(self, tree):
427
raise NotImplementedError(self.take_other)
428
428
429
429
430
430
class PathConflict(Conflict):
450
450
# No additional files have been generated here
451
451
pass
452
452
453
def keep_mine(self, tree):
453
def take_this(self, tree):
454
454
tree.rename_one(self.conflict_path, self.path)
455
455
456
def take_theirs(self, tree):
456
def take_other(self, tree):
457
457
# just acccept bzr proposal
458
458
pass
459
459
477
477
478
478
# FIXME: I smell something weird here and it seems we should be able to be
479
479
# more coherent with some other conflict ? bzr *did* a choice there but
480
# neither keep_mine nor take_theirs reflect that... -- vila 091224
481
def keep_mine(self, tree):
480
# neither take_this nor take_other reflect that... -- vila 091224
481
def take_this(self, tree):
482
482
tree.remove([self.path + '.OTHER'], force=True, keep_files=False)
483
483
484
def take_theirs(self, tree):
484
def take_other(self, tree):
485
485
tree.remove([self.path], force=True, keep_files=False)
486
486
487
487
578
578
579
579
format = 'Conflict adding file %(conflict_path)s. %(action)s %(path)s.'
580
580
581
def keep_mine(self, tree):
581
def take_this(self, tree):
582
582
tree.remove([self.conflict_path], force=True, keep_files=False)
583
583
tree.rename_one(self.path, self.conflict_path)
584
584
585
def take_theirs(self, tree):
585
def take_other(self, tree):
586
586
tree.remove([self.path], force=True, keep_files=False)
587
587
588
588
601
601
602
602
format = 'Conflict moving %(conflict_path)s into %(path)s. %(action)s.'
603
603
604
def keep_mine(self, tree):
604
def take_this(self, tree):
605
605
# just acccept bzr proposal
606
606
pass
607
607
608
def take_theirs(self, tree):
608
def take_other(self, tree):
609
609
# FIXME: We shouldn't have to manipulate so many paths here (and there
610
610
# is probably a bug or two...)
611
611
base_path = osutils.basename(self.path)
637
637
# FIXME: We silently do nothing to make tests pass, but most probably the
638
638
# conflict shouldn't exist (the long story is that the conflict is
639
639
# generated with another one that can be resolved properly) -- vila 091224
640
def keep_mine(self, tree):
640
def take_this(self, tree):
641
641
pass
642
642
643
def take_theirs(self, tree):
643
def take_other(self, tree):
644
644
pass
645
645
646
646
655
655
656
656
format = 'Conflict adding files to %(path)s. %(action)s.'
657
657
658
def keep_mine(self, tree):
658
def take_this(self, tree):
659
659
tree.remove([self.path], force=True, keep_files=False)
660
660
661
def take_theirs(self, tree):
661
def take_other(self, tree):
662
662
# just acccept bzr proposal
663
663
pass
664
664
677
677
# FIXME: It's a bit strange that the default action is not coherent with
678
678
# MissingParent from the *user* pov.
679
679
680
def keep_mine(self, tree):
680
def take_this(self, tree):
681
681
# just acccept bzr proposal
682
682
pass
683
683
684
def take_theirs(self, tree):
684
def take_other(self, tree):
685
685
tree.remove([self.path], force=True, keep_files=False)
686
686
687
687
695
695
format = "Conflict: %(path)s is not a directory, but has files in it."\
696
696
" %(action)s."
697
697
698
def keep_mine(self, tree):
698
def take_this(self, tree):
699
699
# FIXME: we should preserve that path when the conflict is generated !
700
700
if self.path.endswith('.new'):
701
701
conflict_path = self.path[:-(len('.new'))]
702
702
tree.remove([self.path], force=True, keep_files=False)
703
703
tree.add(conflict_path)
704
704
else:
705
raise NotImplementedError(self.keep_mine)
705
raise NotImplementedError(self.take_this)
706
706
707
def take_theirs(self, tree):
707
def take_other(self, tree):
708
708
# FIXME: we should preserve that path when the conflict is generated !
709
709
if self.path.endswith('.new'):
710
710
conflict_path = self.path[:-(len('.new'))]
711
711
tree.remove([conflict_path], force=True, keep_files=False)
712
712
tree.rename_one(self.path, conflict_path)
713
713
else:
714
raise NotImplementedError(self.take_theirs)
714
raise NotImplementedError(self.take_other)
715
715
716
716
717
717
ctype = {}
Loggerhead is a web-based interface for Breezy
Version: 2.0.1