D2269: py3: use util.forcebytestr instead of str for converting errors to bytes
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Wed Feb 14 11:26:24 EST 2018
pulkit updated this revision to Diff 5725.
pulkit retitled this revision from "py3: use pycompat.bytestr instead of str for converting errors to bytes" to "py3: use util.forcebytestr instead of str for converting errors to bytes".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2269?vs=5709&id=5725
REVISION DETAIL
https://phab.mercurial-scm.org/D2269
AFFECTED FILES
hgext/transplant.py
mercurial/patch.py
CHANGE DETAILS
diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -1459,7 +1459,7 @@
dec.append(util.b85decode(line[1:])[:l])
except ValueError as e:
raise PatchError(_('could not decode "%s" binary patch: %s')
- % (self._fname, str(e)))
+ % (self._fname, util.forcebytestr(e)))
line = getline(lr, self.hunk)
text = zlib.decompress(''.join(dec))
if len(text) != size:
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -311,7 +311,7 @@
p1 = repo.dirstate.p1()
p2 = node
self.log(user, date, message, p1, p2, merge=merge)
- self.ui.write(str(inst) + '\n')
+ self.ui.write(util.forcebytestr(inst) + '\n')
raise TransplantError(_('fix up the working directory and run '
'hg transplant --continue'))
else:
To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list