diff -r 7a8ea1397816 -r d718eddf01d9 hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py Thu Dec 08 15:33:19 2022 +0100 +++ b/hgext/convert/cvsps.py Thu Aug 31 23:56:15 2023 +0200 @@ -198,9 +198,9 @@ oldlog = pickle.load(open(cachefile, b'rb')) for e in oldlog: if not ( - util.safehasattr(e, b'branchpoints') - and util.safehasattr(e, b'commitid') - and util.safehasattr(e, b'mergepoint') + hasattr(e, b'branchpoints') + and hasattr(e, b'commitid') + and hasattr(e, b'mergepoint') ): ui.status(_(b'ignoring old cache\n')) oldlog = []