annotate tests/sitecustomize.py @ 27954:9960b6369e7f stable

backout: disable --merge with --no-commit (issue4874)

Because "backout --merge" have to make a commit before merging, it doesn't
work with --no-commit. We could change "backout --merge" to make a merge
commit automatically, and --no-commit to bypass a merge commit, but that
change would be undesirable because:

 a) it's hard to fix bad merges in general
 b) two commits would be created with the same --message

So, this patch simply disables "--merge --no-commit".

import os

if os.environ.get('COVERAGE_PROCESS_START'):
    try:
        import coverage
        import random

        # uuid is better, but not available in Python 2.4.
        covpath = os.path.join(os.environ['COVERAGE_DIR'],
                               'cov.%s' % random.randrange(0, 1000000000000))
        cov = coverage.coverage(data_file=covpath, auto_data=True)
        cov._warn_no_data = False
        cov._warn_unimported_source = False
        cov.start()
    except ImportError:
        pass