Add test for msgmerge compendium overwrite mode with no comments

 * Implement a test for `msgmerge` that validates the new mode where compendium entries overwrite messages in the output PO file.

 * Include the `no_compendium_comment` option to ensure comments about translations sourced from the compendium are not included.

 * Utilize the `no-location` option to exclude location comments from the output.

Author: soft-suroleb

babel/messages/frontend.py

@@ -1006,6 +1006,7 @@ class MessageMerge(CommandMixin):
         ('directory=', 'D', ''),
         ('compendium=', 'C', ''),
         ('c-overwrite', '', ''),
+        ('no-compendium-comment', '', ''),
         ('update', 'U', ''),
         ('output-file=', 'o', ''),
         ('backup', None, ''),
@@ -1058,6 +1059,7 @@ class MessageMerge(CommandMixin):
         'sort-by-file',
         'c-overwrite',
         'backup',
+        'no-compendium-comment',
     ]
 
     option_choices = {
@@ -1067,8 +1069,11 @@ class MessageMerge(CommandMixin):
     def initialize_options(self):
         self.input_files = None #
         self.directory = None
+
         self.compendium = None #~
         self.c_overwrite = False #
+        self.no_compendium_comment = None #
+
         self.update = None #
         self.output_file = None #
         self.backup = False #
@@ -1086,7 +1091,7 @@ def initialize_options(self):
         self.escape = None
         self.force_po = None
         self.indent = None
-        self.no_location = None
+        self.no_location = None #
         self.add_location = None
         self.strict = None
         self.properties_output = None
@@ -1136,13 +1141,16 @@ def run(self):
 
                     current.string = message.string
                     current.flags = [flag for flag in current.flags if flag != 'fuzzy']
-                    current.auto_comments.append(self.compendium)
+
+                    if not self.no_compendium_comment:
+                        current.auto_comments.append(self.compendium)
 
         output_path = def_file if self.update else self.output_file
         with open(output_path, 'wb') as outfile:
             write_po(
                 outfile,
                 catalog,
+                no_location=self.no_location,
                 width=self.width,
                 sort_by_file=self.sort_by_file,
                 sort_output=self.sort_output,

tests/messages/test_frontend.py

@@ -957,6 +957,8 @@ def setUp(self):
 
         with open(self.compendium, 'wb') as file:
             catalog = Catalog()
+            catalog.add('word1', string='Comp Word 1')
+            catalog.add('word2', string='Comp Word 2')
             catalog.add('word4', string='Word 4')
             catalog.add('word5', string='Word 5')
             pofile.write_po(file, catalog)
@@ -983,10 +985,19 @@ def test_no_output_file(self):
         with pytest.raises(OptionError):
             self.cmd.finalize_options()
 
+        self.cmd.output_file = '2'
+        self.cmd.finalize_options()
+
+        self.cmd.output_file = None
+        self.cmd.update = True
+        self.cmd.finalize_options()
+
+
     @freeze_time("1994-11-11")
     def test_default(self):
         self.cmd.input_files = [self.temp_def, self.temp_ref]
         self.cmd.output_file = self.output_file
+        self.cmd.no_fuzzy_matching = True
         self.cmd.finalize_options()
         self.cmd.run()
 
@@ -996,6 +1007,7 @@ def test_default(self):
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 1994.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
@@ -1018,9 +1030,8 @@ def test_default(self):
 msgid "word3"
 msgstr ""
 
-#, fuzzy
 msgid "word4"
-msgstr "Word 2"
+msgstr ""
 
 """
 
@@ -1033,6 +1044,8 @@ def test_compenidum(self):
         self.cmd.input_files = [self.temp_def, self.temp_ref]
         self.cmd.output_file = self.output_file
         self.cmd.compendium = self.compendium
+        self.cmd.no_fuzzy_matching = True
+        self.cmd.no_compendium_comment = True
         self.cmd.finalize_options()
         self.cmd.run()
 
@@ -1042,6 +1055,7 @@ def test_compenidum(self):
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 1994.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
@@ -1073,6 +1087,60 @@ def test_compenidum(self):
                 actual_content = f.read()
         assert expected_content == actual_content
 
+    @freeze_time("1994-11-11")
+    def test_compenidum(self):
+        self.cmd.input_files = [self.temp_def, self.temp_ref]
+        self.cmd.output_file = self.output_file
+        self.cmd.compendium = self.compendium
+        self.cmd.no_fuzzy_matching = True
+        self.cmd.no_compendium_comment = True
+        self.cmd.c_overwrite = True
+        self.cmd.finalize_options()
+        self.cmd.run()
+
+        date = format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ', tzinfo=LOCALTZ, locale='en')
+        expected_content = fr"""# Translations template for PROJECT.
+# Copyright (C) 1994 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 1994.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: {date}\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel {VERSION}\n"
+
+msgid "word1"
+msgstr "Comp Word 1"
+
+msgid "word2"
+msgstr "Comp Word 2"
+
+msgid "word3"
+msgstr ""
+
+msgid "word4"
+msgstr "Word 4"
+
+#~ msgid "word1"
+#~ msgstr "Word 1"
+
+#~ msgid "word2"
+#~ msgstr "Word 2"
+
+"""
+
+        with open(self.output_file, 'r') as f:
+                actual_content = f.read()
+        assert expected_content == actual_content
 
 class CommandLineInterfaceTestCase(unittest.TestCase):