# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1585857427 14400
# Node ID 0415a566742a602310157484bb9961a698881fc7
# Parent  0e99b876966a531abaae71cdf06a314097251698
manifest: fix another pure-parsing 20-byte assumption

Differential Revision: https://phab.mercurial-scm.org/D8370

diff -r 0e99b876966a -r 0415a566742a mercurial/manifest.py
--- a/mercurial/manifest.py	Thu Apr 02 15:52:10 2020 -0400
+++ b/mercurial/manifest.py	Thu Apr 02 15:57:07 2020 -0400
@@ -377,8 +377,13 @@
                     t = self.extradata[-cur - 1]
                     l.append(self._pack(t))
                     self.positions[i] = offset
-                    if len(t[1]) > 20:
-                        self.extrainfo[i] = ord(t[1][21])
+                    # Hashes are either 20 bytes (old sha1s) or 32
+                    # bytes (new non-sha1).
+                    hlen = 20
+                    if len(t[1]) > 25:
+                        hlen = 32
+                    if len(t[1]) > hlen:
+                        self.extrainfo[i] = ord(t[1][hlen + 1])
                     offset += len(l[-1])
                     i += 1
         self.data = b''.join(l)