Mercurial > public > mercurial-scm > hg
comparison mercurial/revlog.py @ 31357:c233cbda5b1e
revlog: use bytes() to ensure text from _chunks is a reasonable type
author | Augie Fackler <augie@google.com> |
---|---|
date | Sun, 12 Mar 2017 03:32:38 -0400 |
parents | ef6888172437 |
children | b6f5af372c0c |
comparison
equal
deleted
inserted
replaced
31356:ef6888172437 | 31357:c233cbda5b1e |
---|---|
1275 # drop cache to save memory | 1275 # drop cache to save memory |
1276 self._cache = None | 1276 self._cache = None |
1277 | 1277 |
1278 bins = self._chunks(chain, df=_df) | 1278 bins = self._chunks(chain, df=_df) |
1279 if text is None: | 1279 if text is None: |
1280 text = str(bins[0]) | 1280 text = bytes(bins[0]) |
1281 bins = bins[1:] | 1281 bins = bins[1:] |
1282 | 1282 |
1283 text = mdiff.patches(text, bins) | 1283 text = mdiff.patches(text, bins) |
1284 | 1284 |
1285 text, validatehash = self._processflags(text, self.flags(rev), 'read', | 1285 text, validatehash = self._processflags(text, self.flags(rev), 'read', |