Rev 6290: We don't need select_po_file, we directly use the contents provided by merge for {this} and {other}. in file:///home/vila/src/bzr/bugs/884270-merge-po/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/884270-merge-po/

------------------------------------------------------------
revno: 6290
revision-id: v.ladeuil+lp at free.fr-20111129074655-u10pfmd09kgn7pa0
parent: v.ladeuil+lp at free.fr-20111129074621-tg0ajf4wi7vhkqpn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 884270-merge-po
timestamp: Tue 2011-11-29 08:46:55 +0100
message:
  We don't need select_po_file, we directly use the contents provided by merge for {this} and {other}.
-------------- next part --------------
=== modified file 'bzrlib/plugins/po_merge/po_merge.py'
--- a/bzrlib/plugins/po_merge/po_merge.py	2011-11-28 16:31:24 +0000
+++ b/bzrlib/plugins/po_merge/po_merge.py	2011-11-29 07:46:55 +0000
@@ -91,7 +91,6 @@
         self.pot_glob = self.conf.get('po_merge.pot_glob')
         self.command = self.conf.get('po_merge.command', expand=False)
         # file_matches() will set the following for merge_text()
-        self.selected_po_file = None
         self.selected_pot_file = None
         trace.mutter('PoMerger created')
 
@@ -117,7 +116,6 @@
             pot_name = inv_entry[0]
             if fnmatch.fnmatch(pot_name, self.pot_glob):
                 self.selected_pot_file = osutils.pathjoin(po_dir, pot_name)
-                self.selected_po_file = po_path
                 # FIXME: I can't find an easy way to know if the .pot file has
                 # conflicts *during* the merge itself. So either the actual
                 # content on disk is fine and msgmerge will work OR it's not
@@ -125,8 +123,8 @@
                 # user and he's happy OR the user needs to resolve the
                 # conflicts in the .pot file and use remerge.
                 # -- vila 2011-11-24
-                trace.mutter('will msgmerge with %s and %s'
-                             % (self.selected_po_file, self.selected_pot_file))
+                trace.mutter('will msgmerge %s using %s'
+                             % (po_path, self.selected_pot_file))
                 return True
         else:
             return False