##// END OF EJS Templates
revlog: rename _chunkraw to _getsegmentforrevs()...
Gregory Szorc -
r32224:75e93d95 default
parent child Browse files
Show More
@@ -887,7 +887,12 b' def perfrevlogchunks(ui, repo, file_=Non'
887 see ``perfrevlog`` and ``perfrevlogrevision``.
887 see ``perfrevlog`` and ``perfrevlogrevision``.
888 """
888 """
889 rl = cmdutil.openrevlog(repo, 'perfrevlogchunks', file_, opts)
889 rl = cmdutil.openrevlog(repo, 'perfrevlogchunks', file_, opts)
890 segmentforrevs = rl._chunkraw
890
891 # _chunkraw was renamed to _getsegmentforrevs.
892 try:
893 segmentforrevs = rl._getsegmentforrevs
894 except AttributeError:
895 segmentforrevs = rl._chunkraw
891
896
892 # Verify engines argument.
897 # Verify engines argument.
893 if engines:
898 if engines:
@@ -1003,7 +1008,13 b' def perfrevlogrevision(ui, repo, file_, '
1003 raise error.CommandError('perfrevlogrevision', 'invalid arguments')
1008 raise error.CommandError('perfrevlogrevision', 'invalid arguments')
1004
1009
1005 r = cmdutil.openrevlog(repo, 'perfrevlogrevision', file_, opts)
1010 r = cmdutil.openrevlog(repo, 'perfrevlogrevision', file_, opts)
1006 segmentforrevs = r._chunkraw
1011
1012 # _chunkraw was renamed to _getsegmentforrevs.
1013 try:
1014 segmentforrevs = r._getsegmentforrevs
1015 except AttributeError:
1016 segmentforrevs = r._chunkraw
1017
1007 node = r.lookup(rev)
1018 node = r.lookup(rev)
1008 rev = r.rev(node)
1019 rev = r.rev(node)
1009
1020
@@ -1707,9 +1707,9 b' def debugrevlog(ui, repo, file_=None, **'
1707 numother += 1
1707 numother += 1
1708
1708
1709 # Obtain data on the raw chunks in the revlog.
1709 # Obtain data on the raw chunks in the revlog.
1710 chunk = r._chunkraw(rev, rev)[1]
1710 segment = r._getsegmentforrevs(rev, rev)[1]
1711 if chunk:
1711 if segment:
1712 chunktype = chunk[0]
1712 chunktype = segment[0]
1713 else:
1713 else:
1714 chunktype = 'empty'
1714 chunktype = 'empty'
1715
1715
@@ -1147,7 +1147,7 b' class revlog(object):'
1147
1147
1148 return self._readsegment(offset, length, df=df)
1148 return self._readsegment(offset, length, df=df)
1149
1149
1150 def _chunkraw(self, startrev, endrev, df=None):
1150 def _getsegmentforrevs(self, startrev, endrev, df=None):
1151 """Obtain a segment of raw data corresponding to a range of revisions.
1151 """Obtain a segment of raw data corresponding to a range of revisions.
1152
1152
1153 Accepts the start and end revisions and an optional already-open
1153 Accepts the start and end revisions and an optional already-open
@@ -1190,7 +1190,7 b' class revlog(object):'
1190
1190
1191 Returns a str holding uncompressed data for the requested revision.
1191 Returns a str holding uncompressed data for the requested revision.
1192 """
1192 """
1193 return self.decompress(self._chunkraw(rev, rev, df=df)[1])
1193 return self.decompress(self._getsegmentforrevs(rev, rev, df=df)[1])
1194
1194
1195 def _chunks(self, revs, df=None):
1195 def _chunks(self, revs, df=None):
1196 """Obtain decompressed chunks for the specified revisions.
1196 """Obtain decompressed chunks for the specified revisions.
@@ -1217,7 +1217,7 b' class revlog(object):'
1217 ladd = l.append
1217 ladd = l.append
1218
1218
1219 try:
1219 try:
1220 offset, data = self._chunkraw(revs[0], revs[-1], df=df)
1220 offset, data = self._getsegmentforrevs(revs[0], revs[-1], df=df)
1221 except OverflowError:
1221 except OverflowError:
1222 # issue4215 - we can't cache a run of chunks greater than
1222 # issue4215 - we can't cache a run of chunks greater than
1223 # 2G on Windows
1223 # 2G on Windows
@@ -1443,7 +1443,7 b' class revlog(object):'
1443 df = self.opener(self.datafile, 'w')
1443 df = self.opener(self.datafile, 'w')
1444 try:
1444 try:
1445 for r in self:
1445 for r in self:
1446 df.write(self._chunkraw(r, r)[1])
1446 df.write(self._getsegmentforrevs(r, r)[1])
1447 finally:
1447 finally:
1448 df.close()
1448 df.close()
1449
1449
General Comments 0
You need to be logged in to leave comments. Login now