Mercurial > public > mercurial-scm > hg
comparison mercurial/unionrepo.py @ 45815:b6f4a1df91bd
unionrepo: don't insert index tuples with None as int field
None is not a valid size. Use -1 as placeholder instead. This will be
necessary when the index starts enforcing type correctness.
Differential Revision: https://phab.mercurial-scm.org/D9161
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Wed, 07 Oct 2020 03:00:26 +0200 |
| parents | a5206e71c536 |
| children | 711ba0f1057e |
comparison
equal
deleted
inserted
replaced
| 45814:88d5abec8f61 | 45815:b6f4a1df91bd |
|---|---|
| 69 continue | 69 continue |
| 70 | 70 |
| 71 p1node = self.revlog2.node(p1rev) | 71 p1node = self.revlog2.node(p1rev) |
| 72 p2node = self.revlog2.node(p2rev) | 72 p2node = self.revlog2.node(p2rev) |
| 73 | 73 |
| 74 # TODO: it's probably wrong to set compressed length to None, but | 74 # TODO: it's probably wrong to set compressed length to -1, but |
| 75 # I have no idea if csize is valid in the base revlog context. | 75 # I have no idea if csize is valid in the base revlog context. |
| 76 e = ( | 76 e = ( |
| 77 flags, | 77 flags, |
| 78 None, | 78 -1, |
| 79 rsize, | 79 rsize, |
| 80 base, | 80 base, |
| 81 link, | 81 link, |
| 82 self.rev(p1node), | 82 self.rev(p1node), |
| 83 self.rev(p2node), | 83 self.rev(p2node), |