← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 10:47:43 UTC
  • mto: (6321.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6322.
  • Revision ID: v.ladeuil+lp@free.fr-20111124104743-rxqwhmzqu5k17f24
First cut at a working plugin to avoid conflicts in .po files by shelling out to msgmerge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
139
139
            params.winner == 'other' or
140
140
            # THIS and OTHER aren't both files.
141
141
            not params.is_file_merge() or
142
 
            # The filename doesn't match *.xml
 
142
            # The filename doesn't match
143
143
            not self.file_matches(params)):
144
144
            return 'not_applicable', None
145
145
        return self.merge_matching(params)
854
854
        else:
855
855
            entries = self._entries_lca()
856
856
            resolver = self._lca_multi_way
 
857
        # Prepare merge hooks
 
858
        factories = Merger.hooks['merge_file_content']
 
859
        # One hook for each registered one plus our default merger
 
860
        hooks = [factory(self) for factory in factories] + [self]
 
861
        self.active_hooks = [hook for hook in hooks if hook is not None]
857
862
        child_pb = ui.ui_factory.nested_progress_bar()
858
863
        try:
859
 
            factories = Merger.hooks['merge_file_content']
860
 
            hooks = [factory(self) for factory in factories] + [self]
861
 
            self.active_hooks = [hook for hook in hooks if hook is not None]
862
864
            for num, (file_id, changed, parents3, names3,
863
865
                      executable3) in enumerate(entries):
864
 
                child_pb.update(gettext('Preparing file merge'), num, len(entries))
 
866
                # Try merging each entry
 
867
                child_pb.update(gettext('Preparing file merge'),
 
868
                                num, len(entries))
865
869
                self._merge_names(file_id, parents3, names3, resolver=resolver)
866
870
                if changed:
867
871
                    file_status = self._do_merge_contents(file_id)