comparison mercurial/repoview.py @ 22367:c5df4af17110

merge with stable
author Augie Fackler <raf@durin42.com>
date Thu, 04 Sep 2014 09:59:23 -0400
parents 4092d12ba18a e1d5fcab58b6
children 90200e864ffc
comparison
equal deleted inserted replaced
22364:5c153c69fdb2 22367:c5df4af17110
285 # we need to check curkey too for some obscure reason. 285 # we need to check curkey too for some obscure reason.
286 # MQ test show a corruption of the underlying repo (in _clcache) 286 # MQ test show a corruption of the underlying repo (in _clcache)
287 # without change in the cachekey. 287 # without change in the cachekey.
288 oldfilter = cl.filteredrevs 288 oldfilter = cl.filteredrevs
289 try: 289 try:
290 cl.filterrevs = () # disable filtering for tip 290 cl.filteredrevs = () # disable filtering for tip
291 curkey = (len(cl), cl.tip(), hash(oldfilter)) 291 curkey = (len(cl), cl.tip(), hash(oldfilter))
292 finally: 292 finally:
293 cl.filteredrevs = oldfilter 293 cl.filteredrevs = oldfilter
294 if newkey != self._clcachekey or newkey != curkey: 294 if newkey != self._clcachekey or newkey != curkey:
295 cl = None 295 cl = None