Mercurial > public > mercurial-scm > hg-stable
diff mercurial/manifest.py @ 9420:d0db168136dc
manifest/revlog: do not let the revlog cache mutable objects
If a buffer of an mutable object is passed to revlog.addrevision(), the revlog
will happily store it in its cache. Later when the revlog reuses the cached
entry, if the manifest modified the object in-between, all kind of bugs
appears.
We fix it by:
- passing immutable objects to addrevision() if they are already available
- only storing the text in the cache if it's of str type
Then we can remove the conversion of the cache entry to str() during
retrieval. That was probably just there hiding the bug for the common cases
but not really fixing it.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 04 Sep 2009 10:47:55 +0200 |
| parents | eecbaac5ca88 |
| children | 25e572394f5c |
line wrap: on
line diff
--- a/mercurial/manifest.py Thu Sep 03 21:40:45 2009 +0200 +++ b/mercurial/manifest.py Fri Sep 04 10:47:55 2009 +0200 @@ -132,9 +132,9 @@ # if this is changed to support newlines in filenames, # be sure to check the templates/ dir again (especially *-raw.tmpl) hex, flags = revlog.hex, map.flags - text = ["%s\000%s%s\n" % (f, hex(map[f]), flags(f)) - for f in files] - arraytext = array.array('c', "".join(text)) + text = ''.join("%s\000%s%s\n" % (f, hex(map[f]), flags(f)) + for f in files) + arraytext = array.array('c', text) cachedelta = None else: added, removed = changed @@ -190,9 +190,9 @@ if p1 != self.tip(): cachedelta = None arraytext = addlist + text = buffer(arraytext) - n = self.addrevision(buffer(arraytext), transaction, link, - p1, p2, cachedelta) + n = self.addrevision(text, transaction, link, p1, p2, cachedelta) self._mancache = (n, map, arraytext) return n