← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
117
117
            ResolveActionOption(),
118
118
            ]
119
119
    _see_also = ['conflicts']
120
 
    def run(self, file_list=None, all=False, action=None, directory=u'.'):
 
120
    def run(self, file_list=None, all=False, action=None, directory=None):
121
121
        if all:
122
122
            if file_list:
123
123
                raise errors.BzrCommandError("If --all is specified,"
124
124
                                             " no FILE may be provided")
 
125
            if directory is None:
 
126
                directory = u'.'
125
127
            tree = workingtree.WorkingTree.open_containing(directory)[0]
126
128
            if action is None:
127
129
                action = 'done'
128
130
        else:
129
131
            tree, file_list = workingtree.WorkingTree.open_containing_paths(
130
 
                file_list)
 
132
                file_list, directory)
131
133
            if file_list is None:
132
134
                if action is None:
133
135
                    # FIXME: There is a special case here related to the option
157
159
                # conflict.auto(tree) --vila 091242
158
160
                pass
159
161
        else:
160
 
            resolve(tree, file_list, action=action)
 
162
            before, after = resolve(tree, file_list, action=action)
 
163
            trace.note('%d conflict(s) resolved, %d remaining'
 
164
                       % (before - after, after))
161
165
 
162
166
 
163
167
def resolve(tree, paths=None, ignore_misses=False, recursive=False,
176
180
    :param action: How the conflict should be resolved,
177
181
    """
178
182
    tree.lock_tree_write()
 
183
    nb_conflicts_after = None
179
184
    try:
180
185
        tree_conflicts = tree.conflicts()
 
186
        nb_conflicts_before = len(tree_conflicts)
181
187
        if paths is None:
182
188
            new_conflicts = ConflictList()
183
189
            to_process = tree_conflicts
191
197
            except NotImplementedError:
192
198
                new_conflicts.append(conflict)
193
199
        try:
 
200
            nb_conflicts_after = len(new_conflicts)
194
201
            tree.set_conflicts(new_conflicts)
195
202
        except errors.UnsupportedOperation:
196
203
            pass
197
204
    finally:
198
205
        tree.unlock()
 
206
    if nb_conflicts_after is None:
 
207
        nb_conflicts_after = nb_conflicts_before
 
208
    return nb_conflicts_before, nb_conflicts_after
199
209
 
200
210
 
201
211
def restore(filename):
600
610
        self._resolve_with_cleanups(tree, 'THIS')
601
611
 
602
612
 
603
 
# FIXME: TextConflict is about a single file-id, there never is a conflict_path
604
 
# attribute so we shouldn't inherit from PathConflict but simply from Conflict
605
 
 
606
613
# TODO: There should be a base revid attribute to better inform the user about
607
614
# how the conflicts were generated.
608
 
class TextConflict(PathConflict):
 
615
class TextConflict(Conflict):
609
616
    """The merge algorithm could not resolve all differences encountered."""
610
617
 
611
618
    has_files = True
614
621
 
615
622
    format = 'Text conflict in %(path)s'
616
623
 
 
624
    rformat = '%(class)s(%(path)r, %(file_id)r)'
 
625
 
617
626
    def associated_filenames(self):
618
627
        return [self.path + suffix for suffix in CONFLICT_SUFFIXES]
619
628