← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/po_merge/po_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-29 07:46:55 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-20111129074655-u10pfmd09kgn7pa0
We don't need select_po_file, we directly use the contents provided by merge for {this} and {other}.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/po_merge/po_merge.py
91
91
        self.pot_glob = self.conf.get('po_merge.pot_glob')
92
92
        self.command = self.conf.get('po_merge.command', expand=False)
93
93
        # file_matches() will set the following for merge_text()
94
 
        self.selected_po_file = None
95
94
        self.selected_pot_file = None
96
95
        trace.mutter('PoMerger created')
97
96
 
117
116
            pot_name = inv_entry[0]
118
117
            if fnmatch.fnmatch(pot_name, self.pot_glob):
119
118
                self.selected_pot_file = osutils.pathjoin(po_dir, pot_name)
120
 
                self.selected_po_file = po_path
121
119
                # FIXME: I can't find an easy way to know if the .pot file has
122
120
                # conflicts *during* the merge itself. So either the actual
123
121
                # content on disk is fine and msgmerge will work OR it's not
125
123
                # user and he's happy OR the user needs to resolve the
126
124
                # conflicts in the .pot file and use remerge.
127
125
                # -- vila 2011-11-24
128
 
                trace.mutter('will msgmerge with %s and %s'
129
 
                             % (self.selected_po_file, self.selected_pot_file))
 
126
                trace.mutter('will msgmerge %s using %s'
 
127
                             % (po_path, self.selected_pot_file))
130
128
                return True
131
129
        else:
132
130
            return False