Patchwork D1906: revlog: correct type in check to verify rawtext is immutable

login
register
mail settings
Submitter phabricator
Date Jan. 18, 2018, 4:13 p.m.
Message ID <differential-rev-PHID-DREV-2dwjtfdlchbpemdme7ko-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/26914/
State Superseded
Headers show

Comments

phabricator - Jan. 18, 2018, 4:13 p.m.
durin42 created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This fixes far more failures than I feel like it has any right to, so
  there's clearly some subtle interaction between self._cache and other
  parts of this code. :(

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1906

AFFECTED FILES
  mercurial/revlog.py

CHANGE DETAILS




To: durin42, indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -2060,7 +2060,7 @@ 
         if alwayscache and rawtext is None:
             rawtext = self._buildtext(revinfo, fh)
 
-        if type(rawtext) == str: # only accept immutable objects
+        if type(rawtext) == bytes: # only accept immutable objects
             self._cache = (node, curr, rawtext)
         self._chainbasecache[curr] = chainbase
         return node