D2617: py3: use bytes() instead of str()
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Mar 3 23:24:06 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9d8ac10da5ce: py3: use bytes() instead of str() (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2617?vs=6501&id=6505
REVISION DETAIL
https://phab.mercurial-scm.org/D2617
AFFECTED FILES
hgext/eol.py
hgext/journal.py
hgext/mq.py
CHANGE DETAILS
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -780,7 +780,7 @@
diffopts = self.patchopts(diffopts, patch)
patchf = self.opener(patch, "w")
- comments = str(ph)
+ comments = bytes(ph)
if comments:
patchf.write(comments)
self.printdiff(repo, diffopts, head, n, fp=patchf)
diff --git a/hgext/journal.py b/hgext/journal.py
--- a/hgext/journal.py
+++ b/hgext/journal.py
@@ -363,7 +363,7 @@
# empty file, write version first
f.write(str(storageversion) + '\0')
f.seek(0, os.SEEK_END)
- f.write(str(entry) + '\0')
+ f.write(bytes(entry) + '\0')
def filtered(self, namespace=None, name=None):
"""Yield all journal entries with the given namespace or name
diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -222,7 +222,7 @@
data = ctx[f].data()
if (target == "to-lf" and "\r\n" in data
or target == "to-crlf" and singlelf.search(data)):
- failed.append((f, target, str(ctx)))
+ failed.append((f, target, bytes(ctx)))
break
return failed
To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list