mercurial/unionrepo.py
changeset 47256 2b69555e4875
parent 47249 130c9f7ed914
child 48499 52034c42c09d
equal deleted inserted replaced
47255:ff9fd7107d11 47256:2b69555e4875
    68                 p2rev,
    68                 p2rev,
    69                 node,
    69                 node,
    70                 _sdo,
    70                 _sdo,
    71                 _sds,
    71                 _sds,
    72                 _dcm,
    72                 _dcm,
       
    73                 _sdcm,
    73             ) = rev
    74             ) = rev
    74             flags = _start & 0xFFFF
    75             flags = _start & 0xFFFF
    75 
    76 
    76             if linkmapper is None:  # link is to same revlog
    77             if linkmapper is None:  # link is to same revlog
    77                 assert linkrev == rev2  # we never link back
    78                 assert linkrev == rev2  # we never link back
   102                 self.rev(p1node),
   103                 self.rev(p1node),
   103                 self.rev(p2node),
   104                 self.rev(p2node),
   104                 node,
   105                 node,
   105                 0,  # sidedata offset
   106                 0,  # sidedata offset
   106                 0,  # sidedata size
   107                 0,  # sidedata size
       
   108                 revlog_constants.COMP_MODE_INLINE,
   107                 revlog_constants.COMP_MODE_INLINE,
   109                 revlog_constants.COMP_MODE_INLINE,
   108             )
   110             )
   109             self.index.append(e)
   111             self.index.append(e)
   110             self.bundlerevs.add(n)
   112             self.bundlerevs.add(n)
   111             n += 1
   113             n += 1