##// END OF EJS Templates
changelog-delay: move "delayed" check to a more official API...
marmoute -
r51997:1c0f3994 default
parent child Browse files
Show More
@@ -374,13 +374,17 b' class changelog(revlog.revlog):'
374 self._filteredrevs_hashcache = {}
374 self._filteredrevs_hashcache = {}
375
375
376 def _write_docket(self, tr):
376 def _write_docket(self, tr):
377 if not self._delayed:
377 if not self.is_delaying:
378 super(changelog, self)._write_docket(tr)
378 super(changelog, self)._write_docket(tr)
379
379
380 @property
381 def is_delaying(self):
382 return self._delayed
383
380 def delayupdate(self, tr):
384 def delayupdate(self, tr):
381 """delay visibility of index updates to other readers"""
385 """delay visibility of index updates to other readers"""
382 assert not self._inner.is_open
386 assert not self._inner.is_open
383 if self._docket is None and not self._delayed:
387 if self._docket is None and not self.is_delaying:
384 if len(self) == 0:
388 if len(self) == 0:
385 self._divert = True
389 self._divert = True
386 if self._realopener.exists(self._indexfile + b'.a'):
390 if self._realopener.exists(self._indexfile + b'.a'):
@@ -456,7 +460,7 b' class changelog(revlog.revlog):'
456 return False
460 return False
457
461
458 def _enforceinlinesize(self, tr, side_write=True):
462 def _enforceinlinesize(self, tr, side_write=True):
459 if not self._delayed:
463 if not self.is_delaying:
460 revlog.revlog._enforceinlinesize(self, tr, side_write=side_write)
464 revlog.revlog._enforceinlinesize(self, tr, side_write=side_write)
461
465
462 def read(self, nodeorrev):
466 def read(self, nodeorrev):
@@ -3019,7 +3019,7 b' class localrepository:'
3019 if (
3019 if (
3020 k == b'changelog'
3020 k == b'changelog'
3021 and self.currenttransaction()
3021 and self.currenttransaction()
3022 and self.changelog._delayed
3022 and self.changelog.is_delaying
3023 ):
3023 ):
3024 # The changelog object may store unwritten revisions. We don't
3024 # The changelog object may store unwritten revisions. We don't
3025 # want to lose them.
3025 # want to lose them.
@@ -416,7 +416,7 b' class repoview:'
416 with util.timedcm('repo filter for %s', self.filtername):
416 with util.timedcm('repo filter for %s', self.filtername):
417 revs = filterrevs(unfi, self.filtername, self._visibilityexceptions)
417 revs = filterrevs(unfi, self.filtername, self._visibilityexceptions)
418 cl = self._clcache
418 cl = self._clcache
419 newkey = (unfilen, unfinode, hash(revs), unfichangelog._delayed)
419 newkey = (unfilen, unfinode, hash(revs), unfichangelog.is_delaying)
420 # if cl.index is not unfiindex, unfi.changelog would be
420 # if cl.index is not unfiindex, unfi.changelog would be
421 # recreated, and our clcache refers to garbage object
421 # recreated, and our clcache refers to garbage object
422 if cl is not None and (
422 if cl is not None and (
General Comments 0
You need to be logged in to leave comments. Login now