equal
deleted
inserted
replaced
334 pass |
334 pass |
335 except LookupError: |
335 except LookupError: |
336 ui.warn(_(b'ignoring invalid sendcharset: %s\n') % ocs) |
336 ui.warn(_(b'ignoring invalid sendcharset: %s\n') % ocs) |
337 else: |
337 else: |
338 # Everything failed, ascii-armor what we've got and send it. |
338 # Everything failed, ascii-armor what we've got and send it. |
339 return s.encode('ascii', 'backslashreplace') |
339 return s.encode('ascii', 'backslashreplace'), b'us-ascii' |
340 # We have a bytes of unknown encoding. We'll try and guess a valid |
340 # We have a bytes of unknown encoding. We'll try and guess a valid |
341 # encoding, falling back to pretending we had ascii even though we |
341 # encoding, falling back to pretending we had ascii even though we |
342 # know that's wrong. |
342 # know that's wrong. |
343 try: |
343 try: |
344 s.decode('ascii') |
344 s.decode('ascii') |