/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: Jelmer Vernooij
  • Date: 2018-07-01 21:13:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180701211321-dazu15ry3tcvny2l
Fix some git tests.

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)