mercurial/bundle2.py
changeset 40398 0ac794e0e285
parent 40372 81c80ed7c991
child 40399 4ab6e7b4fe8a
equal deleted inserted replaced
40397:36b134c436b8 40398:0ac794e0e285
  1695                                       'stream-narrow-clones')
  1695                                       'stream-narrow-clones')
  1696 
  1696 
  1697     if (includepats or excludepats) and not narrowstream:
  1697     if (includepats or excludepats) and not narrowstream:
  1698         raise error.Abort(_('server does not support narrow stream clones'))
  1698         raise error.Abort(_('server does not support narrow stream clones'))
  1699 
  1699 
       
  1700     includeobsmarkers = False
       
  1701     if repo.obsstore:
       
  1702         remoteversions = obsmarkersversion(bundler.capabilities)
       
  1703         if repo.obsstore._version in remoteversions:
       
  1704             includeobsmarkers = True
       
  1705 
  1700     filecount, bytecount, it = streamclone.generatev2(repo, includepats,
  1706     filecount, bytecount, it = streamclone.generatev2(repo, includepats,
  1701                                                       excludepats)
  1707                                                       excludepats,
       
  1708                                                       includeobsmarkers)
  1702     requirements = _formatrequirementsspec(repo.requirements)
  1709     requirements = _formatrequirementsspec(repo.requirements)
  1703     part = bundler.newpart('stream2', data=it)
  1710     part = bundler.newpart('stream2', data=it)
  1704     part.addparam('bytecount', '%d' % bytecount, mandatory=True)
  1711     part.addparam('bytecount', '%d' % bytecount, mandatory=True)
  1705     part.addparam('filecount', '%d' % filecount, mandatory=True)
  1712     part.addparam('filecount', '%d' % filecount, mandatory=True)
  1706     part.addparam('requirements', requirements, mandatory=True)
  1713     part.addparam('requirements', requirements, mandatory=True)