Mercurial > public > mercurial-scm > hg-stable

diff mercurial/revlog.py @ 31378:b6f5af372c0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: use bytes() instead of str() to get data from memoryview Fixes `files -v` on Python 3.
author Augie Fackler <augie@google.com>
date Sun, 12 Mar 2017 15:27:02 -0400
parents c233cbda5b1e
children 73aa13bc8dac
line wrap: on
line diff
--- a/mercurial/revlog.py	Sun Mar 12 03:33:22 2017 -0400
+++ b/mercurial/revlog.py	Sun Mar 12 15:27:02 2017 -0400
@@ -1234,7 +1234,7 @@
     def revdiff(self, rev1, rev2):
         """return or calculate a delta between two revisions"""
         if rev1 != nullrev and self.deltaparent(rev2) == rev1:
-            return str(self._chunk(rev2))
+            return bytes(self._chunk(rev2))
 
         return mdiff.textdiff(self.revision(rev1),
                               self.revision(rev2))