##// END OF EJS Templates
revlog: add flags argument to _addrevision, update callers use default flags...
Mike Edgar -
r23856:062c3ad8 default
parent child Browse files
Show More
@@ -1179,7 +1179,7 b' class revlog(object):'
1179 ifh = self.opener(self.indexfile, "a+")
1179 ifh = self.opener(self.indexfile, "a+")
1180 try:
1180 try:
1181 return self._addrevision(node, text, transaction, link, p1, p2,
1181 return self._addrevision(node, text, transaction, link, p1, p2,
1182 cachedelta, ifh, dfh)
1182 REVIDX_DEFAULT_FLAGS, cachedelta, ifh, dfh)
1183 finally:
1183 finally:
1184 if dfh:
1184 if dfh:
1185 dfh.close()
1185 dfh.close()
@@ -1214,7 +1214,7 b' class revlog(object):'
1214 return ('u', text)
1214 return ('u', text)
1215 return ("", bin)
1215 return ("", bin)
1216
1216
1217 def _addrevision(self, node, text, transaction, link, p1, p2,
1217 def _addrevision(self, node, text, transaction, link, p1, p2, flags,
1218 cachedelta, ifh, dfh):
1218 cachedelta, ifh, dfh):
1219 """internal function to add revisions to the log
1219 """internal function to add revisions to the log
1220
1220
@@ -1268,7 +1268,6 b' class revlog(object):'
1268 base = chainbase = curr
1268 base = chainbase = curr
1269 chainlen = None
1269 chainlen = None
1270 offset = self.end(prev)
1270 offset = self.end(prev)
1271 flags = 0
1272 d = None
1271 d = None
1273 if self._basecache is None:
1272 if self._basecache is None:
1274 self._basecache = (prev, self.chainbase(prev))
1273 self._basecache = (prev, self.chainbase(prev))
@@ -1399,7 +1398,8 b' class revlog(object):'
1399
1398
1400 baserev = self.rev(deltabase)
1399 baserev = self.rev(deltabase)
1401 chain = self._addrevision(node, None, transaction, link,
1400 chain = self._addrevision(node, None, transaction, link,
1402 p1, p2, (baserev, delta), ifh, dfh)
1401 p1, p2, REVIDX_DEFAULT_FLAGS,
1402 (baserev, delta), ifh, dfh)
1403 if not dfh and not self._inline:
1403 if not dfh and not self._inline:
1404 # addrevision switched from inline to conventional
1404 # addrevision switched from inline to conventional
1405 # reopen the index
1405 # reopen the index
General Comments 0
You need to be logged in to leave comments. Login now