← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
24
24
import errno
25
25
 
26
26
from bzrlib import (
 
27
    builtins,
27
28
    cleanup,
 
29
    commands,
28
30
    errors,
29
31
    osutils,
30
32
    rio,
32
34
    transform,
33
35
    workingtree,
34
36
    )
35
 
from bzrlib.i18n import gettext, ngettext
36
37
""")
37
38
from bzrlib import (
38
 
    commands,
39
39
    option,
40
40
    registry,
41
41
    )
59
59
    Use bzr resolve when you have fixed a problem.
60
60
    """
61
61
    takes_options = [
62
 
            'directory',
63
62
            option.Option('text',
64
63
                          help='List paths of files with text conflicts.'),
65
64
        ]
66
65
    _see_also = ['resolve', 'conflict-types']
67
66
 
68
 
    def run(self, text=False, directory=u'.'):
69
 
        wt = workingtree.WorkingTree.open_containing(directory)[0]
 
67
    def run(self, text=False):
 
68
        wt = workingtree.WorkingTree.open_containing(u'.')[0]
70
69
        for conflict in wt.conflicts():
71
70
            if text:
72
71
                if conflict.typestring != 'text conflict':
73
72
                    continue
74
73
                self.outf.write(conflict.path + '\n')
75
74
            else:
76
 
                self.outf.write(unicode(conflict) + '\n')
 
75
                self.outf.write(str(conflict) + '\n')
77
76
 
78
77
 
79
78
resolve_action_registry = registry.Registry()
113
112
    aliases = ['resolved']
114
113
    takes_args = ['file*']
115
114
    takes_options = [
116
 
            'directory',
117
115
            option.Option('all', help='Resolve all conflicts in this tree.'),
118
116
            ResolveActionOption(),
119
117
            ]
120
118
    _see_also = ['conflicts']
121
 
    def run(self, file_list=None, all=False, action=None, directory=None):
 
119
    def run(self, file_list=None, all=False, action=None):
122
120
        if all:
123
121
            if file_list:
124
 
                raise errors.BzrCommandError(gettext("If --all is specified,"
125
 
                                             " no FILE may be provided"))
126
 
            if directory is None:
127
 
                directory = u'.'
128
 
            tree = workingtree.WorkingTree.open_containing(directory)[0]
 
122
                raise errors.BzrCommandError("If --all is specified,"
 
123
                                             " no FILE may be provided")
 
124
            tree = workingtree.WorkingTree.open_containing('.')[0]
129
125
            if action is None:
130
126
                action = 'done'
131
127
        else:
132
 
            tree, file_list = workingtree.WorkingTree.open_containing_paths(
133
 
                file_list, directory)
 
128
            tree, file_list = builtins.tree_files(file_list)
134
129
            if file_list is None:
135
130
                if action is None:
136
131
                    # FIXME: There is a special case here related to the option
146
141
            if file_list is None:
147
142
                un_resolved, resolved = tree.auto_resolve()
148
143
                if len(un_resolved) > 0:
149
 
                    trace.note(ngettext('%d conflict auto-resolved.',
150
 
                        '%d conflicts auto-resolved.', len(resolved)),
151
 
                        len(resolved))
152
 
                    trace.note(gettext('Remaining conflicts:'))
 
144
                    trace.note('%d conflict(s) auto-resolved.', len(resolved))
 
145
                    trace.note('Remaining conflicts:')
153
146
                    for conflict in un_resolved:
154
 
                        trace.note(unicode(conflict))
 
147
                        trace.note(conflict)
155
148
                    return 1
156
149
                else:
157
 
                    trace.note(gettext('All conflicts resolved.'))
 
150
                    trace.note('All conflicts resolved.')
158
151
                    return 0
159
152
            else:
160
153
                # FIXME: This can never occur but the block above needs some
162
155
                # conflict.auto(tree) --vila 091242
163
156
                pass
164
157
        else:
165
 
            before, after = resolve(tree, file_list, action=action)
166
 
            trace.note(ngettext('{0} conflict resolved, {1} remaining',
167
 
                                '{0} conflicts resolved, {1} remaining',
168
 
                                before-after).format(before - after, after))
 
158
            resolve(tree, file_list, action=action)
169
159
 
170
160
 
171
161
def resolve(tree, paths=None, ignore_misses=False, recursive=False,
184
174
    :param action: How the conflict should be resolved,
185
175
    """
186
176
    tree.lock_tree_write()
187
 
    nb_conflicts_after = None
188
177
    try:
189
178
        tree_conflicts = tree.conflicts()
190
 
        nb_conflicts_before = len(tree_conflicts)
191
179
        if paths is None:
192
180
            new_conflicts = ConflictList()
193
181
            to_process = tree_conflicts
201
189
            except NotImplementedError:
202
190
                new_conflicts.append(conflict)
203
191
        try:
204
 
            nb_conflicts_after = len(new_conflicts)
205
192
            tree.set_conflicts(new_conflicts)
206
193
        except errors.UnsupportedOperation:
207
194
            pass
208
195
    finally:
209
196
        tree.unlock()
210
 
    if nb_conflicts_after is None:
211
 
        nb_conflicts_after = nb_conflicts_before
212
 
    return nb_conflicts_before, nb_conflicts_after
213
197
 
214
198
 
215
199
def restore(filename):
295
279
    def to_strings(self):
296
280
        """Generate strings for the provided conflicts"""
297
281
        for conflict in self:
298
 
            yield unicode(conflict)
 
282
            yield str(conflict)
299
283
 
300
284
    def remove_files(self, tree):
301
285
        """Remove the THIS, BASE and OTHER files for listed conflicts"""
394
378
    def __ne__(self, other):
395
379
        return not self.__eq__(other)
396
380
 
397
 
    def __unicode__(self):
 
381
    def __str__(self):
398
382
        return self.format % self.__dict__
399
383
 
400
384
    def __repr__(self):
511
495
        if path_to_create is not None:
512
496
            tid = tt.trans_id_tree_path(path_to_create)
513
497
            transform.create_from_tree(
514
 
                tt, tid, self._revision_tree(tt._tree, revid), file_id)
 
498
                tt, tt.trans_id_tree_path(path_to_create),
 
499
                self._revision_tree(tt._tree, revid), file_id)
515
500
            tt.version_file(file_id, tid)
516
 
        else:
517
 
            tid = tt.trans_id_file_id(file_id)
 
501
 
518
502
        # Adjust the path for the retained file id
 
503
        tid = tt.trans_id_file_id(file_id)
519
504
        parent_tid = tt.get_tree_parent(tid)
520
 
        tt.adjust_path(osutils.basename(path), parent_tid, tid)
 
505
        tt.adjust_path(path, parent_tid, tid)
521
506
        tt.apply()
522
507
 
523
508
    def _revision_tree(self, tree, revid):
586
571
        :param tt: The TreeTransform where the conflict is resolved.
587
572
        :param suffix_to_remove: Either 'THIS' or 'OTHER'
588
573
 
589
 
        The resolution is symmetric: when taking THIS, OTHER is deleted and
 
574
        The resolution is symmetric, when taking THIS, OTHER is deleted and
590
575
        item.THIS is renamed into item and vice-versa.
591
576
        """
592
577
        try:
599
584
            # never existed or was already deleted (including the case
600
585
            # where the user deleted it)
601
586
            pass
602
 
        try:
603
 
            this_path = tt._tree.id2path(self.file_id)
604
 
        except errors.NoSuchId:
605
 
            # The file is not present anymore. This may happen if the user
606
 
            # deleted the file either manually or when resolving a conflict on
607
 
            # the parent.  We may raise some exception to indicate that the
608
 
            # conflict doesn't exist anymore and as such doesn't need to be
609
 
            # resolved ? -- vila 20110615 
610
 
            this_tid = None
611
 
        else:
612
 
            this_tid = tt.trans_id_tree_path(this_path)
613
 
        if this_tid is not None:
614
 
            # Rename 'item.suffix_to_remove' (note that if
615
 
            # 'item.suffix_to_remove' has been deleted, this is a no-op)
616
 
            parent_tid = tt.get_tree_parent(this_tid)
617
 
            tt.adjust_path(osutils.basename(self.path), parent_tid, this_tid)
618
 
            tt.apply()
 
587
        # Rename 'item.suffix_to_remove' (note that if
 
588
        # 'item.suffix_to_remove' has been deleted, this is a no-op)
 
589
        this_tid = tt.trans_id_file_id(self.file_id)
 
590
        parent_tid = tt.get_tree_parent(this_tid)
 
591
        tt.adjust_path(self.path, parent_tid, this_tid)
 
592
        tt.apply()
619
593
 
620
594
    def action_take_this(self, tree):
621
595
        self._resolve_with_cleanups(tree, 'OTHER')
624
598
        self._resolve_with_cleanups(tree, 'THIS')
625
599
 
626
600
 
 
601
# FIXME: TextConflict is about a single file-id, there never is a conflict_path
 
602
# attribute so we shouldn't inherit from PathConflict but simply from Conflict
 
603
 
627
604
# TODO: There should be a base revid attribute to better inform the user about
628
605
# how the conflicts were generated.
629
 
class TextConflict(Conflict):
 
606
class TextConflict(PathConflict):
630
607
    """The merge algorithm could not resolve all differences encountered."""
631
608
 
632
609
    has_files = True
635
612
 
636
613
    format = 'Text conflict in %(path)s'
637
614
 
638
 
    rformat = '%(class)s(%(path)r, %(file_id)r)'
639
 
 
640
615
    def associated_filenames(self):
641
616
        return [self.path + suffix for suffix in CONFLICT_SUFFIXES]
642
617
 
643
 
    def _resolve(self, tt, winner_suffix):
644
 
        """Resolve the conflict by copying one of .THIS or .OTHER into file.
645
 
 
646
 
        :param tt: The TreeTransform where the conflict is resolved.
647
 
        :param winner_suffix: Either 'THIS' or 'OTHER'
648
 
 
649
 
        The resolution is symmetric, when taking THIS, item.THIS is renamed
650
 
        into item and vice-versa. This takes one of the files as a whole
651
 
        ignoring every difference that could have been merged cleanly.
652
 
        """
653
 
        # To avoid useless copies, we switch item and item.winner_suffix, only
654
 
        # item will exist after the conflict has been resolved anyway.
655
 
        item_tid = tt.trans_id_file_id(self.file_id)
656
 
        item_parent_tid = tt.get_tree_parent(item_tid)
657
 
        winner_path = self.path + '.' + winner_suffix
658
 
        winner_tid = tt.trans_id_tree_path(winner_path)
659
 
        winner_parent_tid = tt.get_tree_parent(winner_tid)
660
 
        # Switch the paths to preserve the content
661
 
        tt.adjust_path(osutils.basename(self.path),
662
 
                       winner_parent_tid, winner_tid)
663
 
        tt.adjust_path(osutils.basename(winner_path), item_parent_tid, item_tid)
664
 
        # Associate the file_id to the right content
665
 
        tt.unversion_file(item_tid)
666
 
        tt.version_file(self.file_id, winner_tid)
667
 
        tt.apply()
668
 
 
669
 
    def action_take_this(self, tree):
670
 
        self._resolve_with_cleanups(tree, 'THIS')
671
 
 
672
 
    def action_take_other(self, tree):
673
 
        self._resolve_with_cleanups(tree, 'OTHER')
674
 
 
675
618
 
676
619
class HandledConflict(Conflict):
677
620
    """A path problem that has been provisionally resolved.
770
713
        pass
771
714
 
772
715
    def action_take_other(self, tree):
 
716
        # FIXME: We shouldn't have to manipulate so many paths here (and there
 
717
        # is probably a bug or two...)
 
718
        base_path = osutils.basename(self.path)
 
719
        conflict_base_path = osutils.basename(self.conflict_path)
773
720
        tt = transform.TreeTransform(tree)
774
721
        try:
775
722
            p_tid = tt.trans_id_file_id(self.file_id)
776
723
            parent_tid = tt.get_tree_parent(p_tid)
777
724
            cp_tid = tt.trans_id_file_id(self.conflict_file_id)
778
725
            cparent_tid = tt.get_tree_parent(cp_tid)
779
 
            tt.adjust_path(osutils.basename(self.path), cparent_tid, cp_tid)
780
 
            tt.adjust_path(osutils.basename(self.conflict_path),
781
 
                           parent_tid, p_tid)
 
726
            tt.adjust_path(base_path, cparent_tid, cp_tid)
 
727
            tt.adjust_path(conflict_base_path, parent_tid, p_tid)
782
728
            tt.apply()
783
729
        finally:
784
730
            tt.finalize()