This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3487

cvsps: wrap bytes in bytestr before %r-ing it
ClosedPublic

Authored by durin42 on May 8 2018, 9:37 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd4aad0dd69ed: cvsps: wrap bytes in bytestr before %r-ing it
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.May 8 2018, 9:37 AM
indygreg accepted this revision.May 8 2018, 2:20 PM
This revision is now accepted and ready to land.May 8 2018, 2:20 PM
Closed by commit rHGd4aad0dd69ed: cvsps: wrap bytes in bytestr before %r-ing it (authored by durin42). · Explain WhyMay 8 2018, 2:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/cvsps.py (2 lines)

Diff 8539

hgext/convert/cvsps.py

m = m.group(1) m = m.group(1)
if m == 'HEAD': if m == 'HEAD':
m = None m = None
try: try:
candidate = changesets[branches[m]] candidate = changesets[branches[m]]
except KeyError: except KeyError:
ui.warn(_("warning: CVS commit message references " ui.warn(_("warning: CVS commit message references "
"non-existent branch %r:\n%s\n") "non-existent branch %r:\n%s\n")
% (m, c.comment)) % (pycompat.bytestr(m), c.comment))
if m in branches and c.branch != m and not candidate.synthetic: if m in branches and c.branch != m and not candidate.synthetic:
c.parents.append(candidate) c.parents.append(candidate)
if mergeto: if mergeto:
m = mergeto.search(c.comment) m = mergeto.search(c.comment)
if m: if m:
if m.groups(): if m.groups():
m = m.group(1) m = m.group(1)