config: update evolution-related config Update the evolution helpers function to support both old-style configuration and new-style configuration: experimental.evolution=all is renamed into experimental.evolution=true experimental.evolution=createmarkers is renamed into experimental.evolution.createmarkers=true experimental.evolution=allowunstable is renamed into experimental.evolution.allowunstable=true experimental.evolution=exchange is renamed into experimental.evolution.exchange=true We choose to not rename individual config options; keeping the same names would easy the transition for users but it's something that could be easily done in the future. Differential Revision: https://phab.mercurial-scm.org/D1147

     1

# Extension to write out fake unsupported records into the merge state

     2

#

     3

#

     4

     5

from __future__ import absolute_import

     6

     7

from mercurial import (

     8

    merge,

     9

    registrar,

    10

)

    11

    12

cmdtable = {}

    13

command = registrar.command(cmdtable)

    14

    15

@command('fakemergerecord',

    16

         [('X', 'mandatory', None, 'add a fake mandatory record'),

    17

          ('x', 'advisory', None, 'add a fake advisory record')], '')

    18

def fakemergerecord(ui, repo, *pats, **opts):

    19

    with repo.wlock():

    20

        ms = merge.mergestate.read(repo)

    21

        records = ms._makerecords()

    22

        if opts.get('mandatory'):

    23

            records.append(('X', 'mandatory record'))

    24

        if opts.get('advisory'):

    25

            records.append(('x', 'advisory record'))

    26

        ms._writerecords(records)