Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/revlog.py @ 47171:3a9f3470922c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: use revlog.display_id in format related errors Differential Revision: https://phab.mercurial-scm.org/D10583
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 May 2021 12:23:48 +0200
parents 96ee8ca99f5a
children e1936ae27897
comparison
equal deleted inserted replaced
47170:89e11a6da785 47171:3a9f3470922c
488 488
489 if fmt == REVLOGV0: 489 if fmt == REVLOGV0:
490 if flags: 490 if flags:
491 raise error.RevlogError( 491 raise error.RevlogError(
492 _(b'unknown flags (%#04x) in version %d revlog %s') 492 _(b'unknown flags (%#04x) in version %d revlog %s')
493 % (flags >> 16, fmt, self._indexfile) 493 % (flags >> 16, fmt, self.display_id)
494 ) 494 )
495 495
496 self._inline = False 496 self._inline = False
497 self._generaldelta = False 497 self._generaldelta = False
498 498
499 elif fmt == REVLOGV1: 499 elif fmt == REVLOGV1:
500 if flags & ~REVLOGV1_FLAGS: 500 if flags & ~REVLOGV1_FLAGS:
501 raise error.RevlogError( 501 raise error.RevlogError(
502 _(b'unknown flags (%#04x) in version %d revlog %s') 502 _(b'unknown flags (%#04x) in version %d revlog %s')
503 % (flags >> 16, fmt, self._indexfile) 503 % (flags >> 16, fmt, self.display_id)
504 ) 504 )
505 505
506 self._inline = versionflags & FLAG_INLINE_DATA 506 self._inline = versionflags & FLAG_INLINE_DATA
507 self._generaldelta = versionflags & FLAG_GENERALDELTA 507 self._generaldelta = versionflags & FLAG_GENERALDELTA
508 508
509 elif fmt == REVLOGV2: 509 elif fmt == REVLOGV2:
510 if flags & ~REVLOGV2_FLAGS: 510 if flags & ~REVLOGV2_FLAGS:
511 raise error.RevlogError( 511 raise error.RevlogError(
512 _(b'unknown flags (%#04x) in version %d revlog %s') 512 _(b'unknown flags (%#04x) in version %d revlog %s')
513 % (flags >> 16, fmt, self._indexfile) 513 % (flags >> 16, fmt, self.display_id)
514 ) 514 )
515 515
516 # There is a bug in the transaction handling when going from an 516 # There is a bug in the transaction handling when going from an
517 # inline revlog to a separate index and data file. Turn it off until 517 # inline revlog to a separate index and data file. Turn it off until
518 # it's fixed, since v2 revlogs sometimes get rewritten on exchange. 518 # it's fixed, since v2 revlogs sometimes get rewritten on exchange.
521 # generaldelta implied by version 2 revlogs. 521 # generaldelta implied by version 2 revlogs.
522 self._generaldelta = True 522 self._generaldelta = True
523 523
524 else: 524 else:
525 raise error.RevlogError( 525 raise error.RevlogError(
526 _(b'unknown version (%d) in revlog %s') % (fmt, self._indexfile) 526 _(b'unknown version (%d) in revlog %s') % (fmt, self.display_id)
527 ) 527 )
528 528
529 self.nodeconstants = sha1nodeconstants 529 self.nodeconstants = sha1nodeconstants
530 self.nullid = self.nodeconstants.nullid 530 self.nullid = self.nodeconstants.nullid
531 531
2988 2988
2989 # The verifier tells us what version revlog we should be. 2989 # The verifier tells us what version revlog we should be.
2990 if version != state[b'expectedversion']: 2990 if version != state[b'expectedversion']:
2991 yield revlogproblem( 2991 yield revlogproblem(
2992 warning=_(b"warning: '%s' uses revlog format %d; expected %d") 2992 warning=_(b"warning: '%s' uses revlog format %d; expected %d")
2993 % (self._indexfile, version, state[b'expectedversion']) 2993 % (self.display_id, version, state[b'expectedversion'])
2994 ) 2994 )
2995 2995
2996 state[b'skipread'] = set() 2996 state[b'skipread'] = set()
2997 state[b'safe_renamed'] = set() 2997 state[b'safe_renamed'] = set()
2998 2998