Remove fuzzy flag mutation from add_conflict

The add_conflict method was mutating the message's fuzzy flag as a side
effect, which is unexpected. The caller (ConcatenateCatalog.run) now
explicitly sets the fuzzy flag when adding a conflicting message.

Author: soft-suroleb

babel/messages/catalog.py

@@ -790,7 +790,7 @@ def __setitem__(self, id: _MessageID, message: Message) -> None:
                 )
             self._messages[key] = message
 
-    def add_conflict(self, message: Message, filename: str, project: str, version: str, fuzzy: bool = True):
+    def add_conflict(self, message: Message, filename: str, project: str, version: str):
         key = message.id
         self._conflicts[key].append({
             'message': message,
@@ -799,9 +799,6 @@ def add_conflict(self, message: Message, filename: str, project: str, version: s
             'version': version,
         })
 
-        if fuzzy:
-            message.flags |= {'fuzzy'}
-
     def get_conflicts(self, id: _MessageID) -> list[ConflictInfo]:
         return self._conflicts.get(id, [])
 

babel/messages/frontend.py

@@ -995,6 +995,7 @@ def run(self):
                 if count > 1 and not self.use_first and diff_string_count > 1:
                     filename = os.path.basename(path)
                     catalog.add_conflict(message, filename, template.project, template.version)
+                    message.flags |= {'fuzzy'}
 
                 catalog[message.id] = message