Implement basic msgmerge logic for working with a compendium

 * Implement basic functionality of msgmerge

 * Use and validate the main options: input-files and output-file

 * Use and validate options: no-wrap and width

 * Use and validate options: sort-output and sort-by-file, both in msgmerge and msgcat

 * In the basic version of working with a compendium, a translation for a message is taken from the compendium only if the resulting catalog lacks a translation.

Author: soft-suroleb

babel/messages/frontend.py

@@ -937,8 +937,8 @@ def initialize_options(self):
         self.stringtable_output = None
         self.width = None #
         self.no_wrap = None #
-        self.sort_output = None
-        self.sort_by_file = None
+        self.sort_output = False #
+        self.sort_by_file = False #
 
     def finalize_options(self):
         if not self.input_files:
@@ -967,6 +967,11 @@ def finalize_options(self):
         if self.unique:
             self.less_than = 2
 
+        if self.sort_output is None:
+            self.sort_output = False
+        if self.sort_by_file is None:
+            self.sort_by_file = True
+
     def _prepare(self):
         self.message_count = defaultdict(int)
 
@@ -999,7 +1004,9 @@ def run(self):
             write_po(
                 outfile,
                 catalog,
-                width=self.width
+                width=self.width,
+                sort_by_file=self.sort_by_file,
+                sort_output=self.sort_output,
             )
 
 
@@ -1066,11 +1073,11 @@ class MessageMerge(CommandMixin):
     }
 
     def initialize_options(self):
-        self.input_files = None
+        self.input_files = None #
         self.directory = None
-        self.compendium = None
+        self.compendium = None #~
         self.update = None
-        self.output_file = None
+        self.output_file = None #
         self.backup = None
         self.suffix = None
         self.multi_domain = None
@@ -1091,16 +1098,64 @@ def initialize_options(self):
         self.strict = None
         self.properties_output = None
         self.stringtable_output = None
-        self.width = None
-        self.no_wrap = None
-        self.sort_output = None
-        self.sort_by_file = None
+        self.width = None #
+        self.no_wrap = None #
+        self.sort_output = False #
+        self.sort_by_file = False #
 
     def finalize_options(self):
-        pass
+        if len(self.input_files) != 2:
+            raise OptionError('must be two po files')
+        if not self.output_file:
+            raise OptionError('you must specify the output file')
+
+        if self.no_wrap and self.width:
+            raise OptionError("'--no-wrap' and '--width' are mutually exclusive")
+        if not self.no_wrap and not self.width:
+            self.width = 76
+        elif self.width is not None:
+            self.width = int(self.width)
+
+        if self.sort_output is None:
+            self.sort_output = False
+        if self.sort_by_file is None:
+            self.sort_by_file = True
 
     def run(self):
-        pass
+        def_file, ref_file = self.input_files
+        with open(def_file, 'r') as pofile:
+            def_catalog = read_po(pofile)
+
+        with open(ref_file, 'r') as pofile:
+            ref_catalog = read_po(pofile)
+
+        ref_catalog.mime_headers = def_catalog.mime_headers
+        ref_catalog.header_comment = def_catalog.header_comment
+
+        for message in def_catalog:
+            if not message.id:
+                continue
+            if message.id in ref_catalog:
+                ref_catalog[message.id].string = message.string
+            else:
+                ref_catalog.obsolete[message.id] = message
+
+        if self.compendium:
+            with open(self.compendium, 'r') as pofile:
+                compendium_catalog = read_po(pofile)
+            for message in compendium_catalog:
+                if message.id in ref_catalog and not ref_catalog[message.id].string:
+                    ref_catalog[message.id].string = message.string
+
+        ref_catalog.fuzzy = False
+        with open(self.output_file, 'wb') as outfile:
+            write_po(
+                outfile,
+                ref_catalog,
+                width=self.width,
+                sort_by_file=self.sort_by_file,
+                sort_output=self.sort_output,
+            )
 
 
 class CommandLineInterface: