Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revlog.py @ 31378:b6f5af372c0c
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 |
comparison
equal
deleted
inserted
replaced
| 31377:6e59397b08d8 | 31378:b6f5af372c0c |
|---|---|
| 1232 return rev - 1 | 1232 return rev - 1 |
| 1233 | 1233 |
| 1234 def revdiff(self, rev1, rev2): | 1234 def revdiff(self, rev1, rev2): |
| 1235 """return or calculate a delta between two revisions""" | 1235 """return or calculate a delta between two revisions""" |
| 1236 if rev1 != nullrev and self.deltaparent(rev2) == rev1: | 1236 if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
| 1237 return str(self._chunk(rev2)) | 1237 return bytes(self._chunk(rev2)) |
| 1238 | 1238 |
| 1239 return mdiff.textdiff(self.revision(rev1), | 1239 return mdiff.textdiff(self.revision(rev1), |
| 1240 self.revision(rev2)) | 1240 self.revision(rev2)) |
| 1241 | 1241 |
| 1242 def revision(self, nodeorrev, _df=None, raw=False): | 1242 def revision(self, nodeorrev, _df=None, raw=False): |