mercurial/exchange.py
changeset 30342 318a24b52eeb
parent 30187 3e86261bf110
child 30449 c3944ab1443a
equal deleted inserted replaced
30341:b19291e5d506 30342:318a24b52eeb
    62 
    62 
    63        <compression>-<type>[;<parameter0>[;<parameter1>]]
    63        <compression>-<type>[;<parameter0>[;<parameter1>]]
    64 
    64 
    65     Where <compression> is one of the supported compression formats
    65     Where <compression> is one of the supported compression formats
    66     and <type> is (currently) a version string. A ";" can follow the type and
    66     and <type> is (currently) a version string. A ";" can follow the type and
    67     all text afterwards is interpretted as URI encoded, ";" delimited key=value
    67     all text afterwards is interpreted as URI encoded, ";" delimited key=value
    68     pairs.
    68     pairs.
    69 
    69 
    70     If ``strict`` is True (the default) <compression> is required. Otherwise,
    70     If ``strict`` is True (the default) <compression> is required. Otherwise,
    71     it is optional.
    71     it is optional.
    72 
    72 
   280     """return true if a pull/push must use bundle1
   280     """return true if a pull/push must use bundle1
   281 
   281 
   282     This function is used to allow testing of the older bundle version"""
   282     This function is used to allow testing of the older bundle version"""
   283     ui = op.repo.ui
   283     ui = op.repo.ui
   284     forcebundle1 = False
   284     forcebundle1 = False
   285     # The goal is this config is to allow developper to choose the bundle
   285     # The goal is this config is to allow developer to choose the bundle
   286     # version used during exchanged. This is especially handy during test.
   286     # version used during exchanged. This is especially handy during test.
   287     # Value is a list of bundle version to be picked from, highest version
   287     # Value is a list of bundle version to be picked from, highest version
   288     # should be used.
   288     # should be used.
   289     #
   289     #
   290     # developer config: devel.legacy.exchange
   290     # developer config: devel.legacy.exchange
  1423     if 'phases' in pullop.stepsdone:
  1423     if 'phases' in pullop.stepsdone:
  1424         return
  1424         return
  1425     pullop.stepsdone.add('phases')
  1425     pullop.stepsdone.add('phases')
  1426     publishing = bool(remotephases.get('publishing', False))
  1426     publishing = bool(remotephases.get('publishing', False))
  1427     if remotephases and not publishing:
  1427     if remotephases and not publishing:
  1428         # remote is new and unpublishing
  1428         # remote is new and non-publishing
  1429         pheads, _dr = phases.analyzeremotephases(pullop.repo,
  1429         pheads, _dr = phases.analyzeremotephases(pullop.repo,
  1430                                                  pullop.pulledsubset,
  1430                                                  pullop.pulledsubset,
  1431                                                  remotephases)
  1431                                                  remotephases)
  1432         dheads = pullop.pulledsubset
  1432         dheads = pullop.pulledsubset
  1433     else:
  1433     else: