merge: introduce new format for the state file This new format will allow us to address common bugs while doing special merge (graft, backout, rebase…) and record user choice during conflict resolution. The format is open so we can add more record for future usage. This file still store hexified version of node to help human willing to debug it by hand. The overhead or oversize are not expected be an issue. The old format is still used. It will be written to disk along side the newer format. And at parse time we detect if the data from old version of the mergestate are different from the one in the new version file. If its the same, both have most likely be written at the same time and you can trust the extra data from the new file. If it differs, the old file have been written by an older version of mercurial that did not knew about the new file. In that case we use the content of the old file.

     1

import sys, os

     2

import osutil

     3

     4

def _rcfiles(path):

     5

    rcs = [os.path.join(path, 'hgrc')]

     6

    rcdir = os.path.join(path, 'hgrc.d')

     7

    try:

     8

        rcs.extend([os.path.join(rcdir, f)

     9

                    for f, kind in osutil.listdir(rcdir)

    10

                    if f.endswith(".rc")])

    11

    except OSError:

    12

        pass

    13

    return rcs

    14

    15

def systemrcpath():

    16

    path = []

    17

    if sys.platform == 'plan9':

    18

        root = 'lib/mercurial'

    19

    else:

    20

        root = 'etc/mercurial'

    21

    # old mod_python does not set sys.argv

    22

    if len(getattr(sys, 'argv', [])) > 0:

    23

        p = os.path.dirname(os.path.dirname(sys.argv[0]))

    24

        path.extend(_rcfiles(os.path.join(p, root)))

    25

    path.extend(_rcfiles('/' + root))

    26

    return path

    27

    28

def userrcpath():

    29

    if sys.platform == 'plan9':

    30

        return [os.environ['home'] + '/lib/hgrc']

    31

    else:

    32

        return [os.path.expanduser('~/.hgrc')]