comparison mercurial/revlog.py @ 20965:774ff56cbe34

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2014 12:41:39 -0400
parents 514d32de6646 469d949a7cb8
children 40ace21cb3a1
comparison
equal deleted inserted replaced
20964:a939eeb94833 20965:774ff56cbe34
911 911
912 l = [] 912 l = []
913 ladd = l.append 913 ladd = l.append
914 914
915 # preload the cache 915 # preload the cache
916 self._chunkraw(revs[0], revs[-1]) 916 try:
917 offset, data = self._chunkcache 917 self._chunkraw(revs[0], revs[-1])
918 offset, data = self._chunkcache
919 except OverflowError:
920 # issue4215 - we can't cache a run of chunks greater than
921 # 2G on Windows
922 return [self._chunk(rev) for rev in revs]
918 923
919 for rev in revs: 924 for rev in revs:
920 chunkstart = start(rev) 925 chunkstart = start(rev)
921 if inline: 926 if inline:
922 chunkstart += (rev + 1) * iosize 927 chunkstart += (rev + 1) * iosize