Merge lp:~danilo/launchpad/bug-669831 into lp:launchpad

[Данило Шеган]

[r=allenap][ui=none][bug=669831] Export POFiles to bzr branch when only a template is changed.

= Bug 669831 =

In our export translations to bzr branches feature, we optimize the export so as not to repeatedly export translation files (POFile objects) if they have not changed. However, it's possible that a PO file is changed (or at least needs to be re-exported) even if it was not directly changed: this happens if a new template has been imported (in i18n terminology, this is called "merging PO file with the template": Launchpad does this transparently and cheaply without having to change any data structures, but other tools depend on it happening explicitely, thus bug 669831 was filed).

When a new template is imported, POTemplate's date_last_updated attribute is updated. So, let's use that in addition to checking if POFile is directly changed to decide if a POFile needs exporting.

= Tests =

bin/test -cvvt translations_to_branch

= Demo & QA =

We'll have to set-up a translation for a project with translation export to bzr and then simply re-import the POTemplate and then do another translation export seeing how all PO files for the template are exported. Basically, just try it out.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/translations/doc/translations-export-to-branch.txt'
--- lib/lp/translations/doc/translations-export-to-branch.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/translations/doc/translations-export-to-branch.txt	2010-11-19 17:43:29 +0000
@@ -186,6 +186,8 @@
     >>> script.simulated_latest_commit = now
     >>> main_pofile.date_changed = now - timedelta(days=3)
     >>> module_pofile.date_changed = now - timedelta(days=4)
+    >>> module_pofile.potemplate.date_last_updated = now - timedelta(days=5)
+    >>> transaction.commit()
     >>> old_pofile.date_changed = now - timedelta(days=5)
 
     >>> script.main()

=== modified file 'lib/lp/translations/scripts/tests/test_translations_to_branch.py'
--- lib/lp/translations/scripts/tests/test_translations_to_branch.py	2010-11-18 20:31:20 +0000
+++ lib/lp/translations/scripts/tests/test_translations_to_branch.py	2010-11-19 17:43:29 +0000
@@ -318,6 +318,24 @@
                 pofile.potemplate.productseries,
                 date_in_the_future)))
 
+    def test_findChangedPOFiles_unchanged_template_changed(self):
+        # If a POFile has been changed before changed_since date,
+        # and template has been updated after it, POFile is still
+        # considered changed and thus returned.
+        pofile = self.factory.makePOFile()
+        date_in_the_future = (
+            datetime.datetime.now(pytz.UTC) + datetime.timedelta(1))
+        date_in_the_far_future = (
+            datetime.datetime.now(pytz.UTC) + datetime.timedelta(2))
+        pofile.potemplate.date_last_updated = date_in_the_far_future
+
+        exporter = ExportTranslationsToBranch(test_args=[])
+        self.assertEquals(
+            [pofile],
+            list(exporter._findChangedPOFiles(
+                pofile.potemplate.productseries,
+                date_in_the_future)))
+
 
 class TestExportToStackedBranch(TestCaseWithFactory):
     """Test workaround for bzr bug 375013."""

=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py	2010-11-18 20:31:20 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py	2010-11-19 17:43:29 +0000
@@ -174,7 +174,8 @@
         for template in subset:
             for pofile in template.pofiles:
                 if (changed_since is None or
-                    pofile.date_changed > changed_since):
+                    pofile.date_changed > changed_since or
+                    template.date_last_updated > changed_since):
                     yield pofile