##// END OF EJS Templates
revlog: rename variable in `rewrite_sidedata` to match other code...
marmoute -
r47989:042388bb default
parent child Browse files
Show More
@@ -3145,10 +3145,10 b' class revlog(object):'
3145
3145
3146 new_entries = []
3146 new_entries = []
3147 # append the new sidedata
3147 # append the new sidedata
3148 with self._datafp(b'a+') as fp:
3148 with self._datafp(b'a+') as dfh:
3149 # Maybe this bug still exists, see revlog._writeentry
3149 # Maybe this bug still exists, see revlog._writeentry
3150 fp.seek(0, os.SEEK_END)
3150 dfh.seek(0, os.SEEK_END)
3151 current_offset = fp.tell()
3151 current_offset = dfh.tell()
3152 for rev in range(startrev, endrev + 1):
3152 for rev in range(startrev, endrev + 1):
3153 entry = self.index[rev]
3153 entry = self.index[rev]
3154 new_sidedata, flags = sidedatautil.run_sidedata_helpers(
3154 new_sidedata, flags = sidedatautil.run_sidedata_helpers(
@@ -3174,12 +3174,12 b' class revlog(object):'
3174 entry = (new_offset_flags,) + entry[1:8]
3174 entry = (new_offset_flags,) + entry[1:8]
3175 entry += (current_offset, len(serialized_sidedata))
3175 entry += (current_offset, len(serialized_sidedata))
3176
3176
3177 fp.write(serialized_sidedata)
3177 dfh.write(serialized_sidedata)
3178 new_entries.append(entry)
3178 new_entries.append(entry)
3179 current_offset += len(serialized_sidedata)
3179 current_offset += len(serialized_sidedata)
3180
3180
3181 # rewrite the new index entries
3181 # rewrite the new index entries
3182 with self._indexfp(b'r+') as fp:
3182 with self._indexfp(b'r+') as ifh:
3183 fp.seek(startrev * self.index.entry_size)
3183 fp.seek(startrev * self.index.entry_size)
3184 for i, e in enumerate(new_entries):
3184 for i, e in enumerate(new_entries):
3185 rev = startrev + i
3185 rev = startrev + i
@@ -3189,4 +3189,4 b' class revlog(object):'
3189 header = self._format_flags | self._format_version
3189 header = self._format_flags | self._format_version
3190 header = self.index.pack_header(header)
3190 header = self.index.pack_header(header)
3191 packed = header + packed
3191 packed = header + packed
3192 fp.write(packed)
3192 ifh.write(packed)
General Comments 0
You need to be logged in to leave comments. Login now