Mercurial > hg
comparison hgext/convert/cvsps.py @ 37889:d4aad0dd69ed
cvsps: wrap bytes in bytestr before %r-ing it
Differential Revision: https://phab.mercurial-scm.org/D3487
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 27 Apr 2018 01:28:56 -0400 |
parents | dd071b34e60b |
children | 120c343c38b7 |
comparison
equal
deleted
inserted
replaced
37888:73ca1c5e65f8 | 37889:d4aad0dd69ed |
---|---|
796 try: | 796 try: |
797 candidate = changesets[branches[m]] | 797 candidate = changesets[branches[m]] |
798 except KeyError: | 798 except KeyError: |
799 ui.warn(_("warning: CVS commit message references " | 799 ui.warn(_("warning: CVS commit message references " |
800 "non-existent branch %r:\n%s\n") | 800 "non-existent branch %r:\n%s\n") |
801 % (m, c.comment)) | 801 % (pycompat.bytestr(m), c.comment)) |
802 if m in branches and c.branch != m and not candidate.synthetic: | 802 if m in branches and c.branch != m and not candidate.synthetic: |
803 c.parents.append(candidate) | 803 c.parents.append(candidate) |
804 | 804 |
805 if mergeto: | 805 if mergeto: |
806 m = mergeto.search(c.comment) | 806 m = mergeto.search(c.comment) |