/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/git/remote.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 03:20:44 UTC
  • mfrom: (7018.3.10 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180703032044-t5a5w5y0tmzrbezc
Port a few more bits of the git plugin to python 3.

Merged from https://code.launchpad.net/~jelmer/brz/git-fixes2/+merge/348803

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/remote.py
334
334
        self.pb = pb
335
335
 
336
336
    def progress(self, text):
337
 
        text = text.rstrip("\r\n")
 
337
        text = text.rstrip(b"\r\n")
 
338
        text = text.decode('utf-8')
338
339
        if text.startswith('error: '):
339
 
            trace.show_error('git: %s', text[len('error: '):])
 
340
            trace.show_error('git: %s', text[len(b'error: '):])
340
341
        else:
341
342
            trace.mutter("git: %s", text)
342
343
            g = self._GIT_PROGRESS_PARTIAL_RE.match(text)