Patchwork D9161: unionrepo: don't insert index tuples with None as int field

login
register
mail settings
Submitter phabricator
Date Oct. 7, 2020, 1:26 a.m.
Message ID <differential-rev-PHID-DREV-a6m43a7itxnvfg7d4wnv-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47390/
State Superseded
Headers show

Comments

phabricator - Oct. 7, 2020, 1:26 a.m.
joerg.sonnenberger created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9161

AFFECTED FILES
  mercurial/unionrepo.py

CHANGE DETAILS




To: joerg.sonnenberger, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py
--- a/mercurial/unionrepo.py
+++ b/mercurial/unionrepo.py
@@ -71,11 +71,11 @@ 
             p1node = self.revlog2.node(p1rev)
             p2node = self.revlog2.node(p2rev)
 
-            # TODO: it's probably wrong to set compressed length to None, but
+            # TODO: it's probably wrong to set compressed length to -1, but
             # I have no idea if csize is valid in the base revlog context.
             e = (
                 flags,
-                None,
+                -1,
                 rsize,
                 base,
                 link,