431 # But, thanks to localrepository.destroyed(), it also means none |
431 # But, thanks to localrepository.destroyed(), it also means none |
432 # have been destroyed by strip or rollback.) |
432 # have been destroyed by strip or rollback.) |
433 if ( |
433 if ( |
434 cacherev == tiprev |
434 cacherev == tiprev |
435 and cachenode == tipnode |
435 and cachenode == tipnode |
436 and cachehash == scmutil.filteredhash(repo, tiprev) |
436 and cachehash |
|
437 == scmutil.combined_filtered_and_obsolete_hash( |
|
438 repo, |
|
439 tiprev, |
|
440 ) |
437 ): |
441 ): |
438 tags = _readtags(ui, repo, cachelines, cachefile.name) |
442 tags = _readtags(ui, repo, cachelines, cachefile.name) |
439 cachefile.close() |
443 cachefile.close() |
440 return (None, None, None, tags, False) |
444 return (None, None, None, tags, False) |
441 if cachefile: |
445 if cachefile: |
442 cachefile.close() # ignore rest of file |
446 cachefile.close() # ignore rest of file |
443 |
447 |
444 valid = (tiprev, tipnode, scmutil.filteredhash(repo, tiprev)) |
448 valid = ( |
|
449 tiprev, |
|
450 tipnode, |
|
451 scmutil.combined_filtered_and_obsolete_hash( |
|
452 repo, |
|
453 tiprev, |
|
454 ), |
|
455 ) |
445 |
456 |
446 repoheads = repo.heads() |
457 repoheads = repo.heads() |
447 # Case 2 (uncommon): empty repo; get out quickly and don't bother |
458 # Case 2 (uncommon): empty repo; get out quickly and don't bother |
448 # writing an empty cache. |
459 # writing an empty cache. |
449 if repoheads == [repo.nullid]: |
460 if repoheads == [repo.nullid]: |