Mercurial > hg
comparison hgext/transplant.py @ 36229:6ea0b78ddcac
py3: use util.forcebytestr instead of str for converting errors to bytes
Differential Revision: https://phab.mercurial-scm.org/D2269
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 14 Feb 2018 17:43:33 +0530 |
parents | 7fda2a8ed24e |
children | 7b74afec6772 |
comparison
equal
deleted
inserted
replaced
36228:ddeb7653b31c | 36229:6ea0b78ddcac |
---|---|
309 if os.path.exists(seriespath): | 309 if os.path.exists(seriespath): |
310 os.unlink(seriespath) | 310 os.unlink(seriespath) |
311 p1 = repo.dirstate.p1() | 311 p1 = repo.dirstate.p1() |
312 p2 = node | 312 p2 = node |
313 self.log(user, date, message, p1, p2, merge=merge) | 313 self.log(user, date, message, p1, p2, merge=merge) |
314 self.ui.write(str(inst) + '\n') | 314 self.ui.write(util.forcebytestr(inst) + '\n') |
315 raise TransplantError(_('fix up the working directory and run ' | 315 raise TransplantError(_('fix up the working directory and run ' |
316 'hg transplant --continue')) | 316 'hg transplant --continue')) |
317 else: | 317 else: |
318 files = None | 318 files = None |
319 if merge: | 319 if merge: |