# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2022-11-06 17:15:35
# Node ID d12446766a359e79ce1e7a8e27d909b586f2d59d
# Parent  5318ac25dfdc5c0b22e02e1fbc2543948491a7ac

upgrade: byteify requirement changes written to output

ui.write() expects bytes, and internally uses `b''` as the default when getting
the `label` keyword from `*args`.  So either we're missing test coverage, or
there's some very subtle conversion from unicode somewhere.

Also, slip in a type hint to flag this in the future.

diff --git a/mercurial/upgrade_utils/actions.py b/mercurial/upgrade_utils/actions.py
--- a/mercurial/upgrade_utils/actions.py
+++ b/mercurial/upgrade_utils/actions.py
@@ -852,7 +852,7 @@ class UpgradeOperation(BaseOperation):
 
         return False
 
-    def _write_labeled(self, l, label):
+    def _write_labeled(self, l, label: bytes):
         """
         Utility function to aid writing of a list under one label
         """
@@ -867,19 +867,19 @@ class UpgradeOperation(BaseOperation):
         self.ui.write(_(b'requirements\n'))
         self.ui.write(_(b'   preserved: '))
         self._write_labeled(
-            self._preserved_requirements, "upgrade-repo.requirement.preserved"
+            self._preserved_requirements, b"upgrade-repo.requirement.preserved"
         )
         self.ui.write((b'\n'))
         if self._removed_requirements:
             self.ui.write(_(b'   removed: '))
             self._write_labeled(
-                self._removed_requirements, "upgrade-repo.requirement.removed"
+                self._removed_requirements, b"upgrade-repo.requirement.removed"
             )
             self.ui.write((b'\n'))
         if self._added_requirements:
             self.ui.write(_(b'   added: '))
             self._write_labeled(
-                self._added_requirements, "upgrade-repo.requirement.added"
+                self._added_requirements, b"upgrade-repo.requirement.added"
             )
             self.ui.write((b'\n'))
         self.ui.write(b'\n')
@@ -893,7 +893,7 @@ class UpgradeOperation(BaseOperation):
             self.ui.write(_(b'optimisations: '))
             self._write_labeled(
                 [a.name for a in optimisations],
-                "upgrade-repo.optimisation.performed",
+                b"upgrade-repo.optimisation.performed",
             )
             self.ui.write(b'\n\n')