Skip to content
Snippets Groups Projects
Commit d1244676 authored by Matt Harbison's avatar Matt Harbison
Browse files

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.
parent 5318ac25
No related branches found
No related tags found
2 merge requests!300branching: merge stable into default,!293upgrade: byteify requirement changes written to output
......@@ -852,7 +852,7 @@
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,9 +867,9 @@
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(
......@@ -871,11 +871,11 @@
)
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(
......@@ -877,9 +877,9 @@
)
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 @@
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')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment