equal
deleted
inserted
replaced
1673 sidedata = {} |
1673 sidedata = {} |
1674 if raw: |
1674 if raw: |
1675 validatehash = flagutil.processflagsraw(self, rawtext, flags) |
1675 validatehash = flagutil.processflagsraw(self, rawtext, flags) |
1676 text = rawtext |
1676 text = rawtext |
1677 else: |
1677 else: |
1678 r = flagutil.processflagsread(self, rawtext, flags) |
1678 try: |
|
1679 r = flagutil.processflagsread(self, rawtext, flags) |
|
1680 except error.SidedataHashError as exc: |
|
1681 msg = _("integrity check failed on %s:%s sidedata key %d") |
|
1682 msg %= (self.indexfile, pycompat.bytestr(rev), |
|
1683 exc.sidedatakey) |
|
1684 raise error.RevlogError(msg) |
1679 text, validatehash, sidedata = r |
1685 text, validatehash, sidedata = r |
1680 if validatehash: |
1686 if validatehash: |
1681 self.checkhash(text, node, rev=rev) |
1687 self.checkhash(text, node, rev=rev) |
1682 if not validated: |
1688 if not validated: |
1683 self._revisioncache = (node, rev, rawtext) |
1689 self._revisioncache = (node, rev, rawtext) |