view tests/lockdelay.py @ 39266:82555d7186d0

filemerge: make capability check for internal tools ignore merge-tools section

This is follow up of 4d7b11877dd0.

Before this patch, capability check of internal merge tools falls back
to _toolbool(), which examines configurations in "merge-tools" section.

But "hg help config" explicitly says that "merge-tools" section
configures external merge tools.

Therefore, this patch makes capability check for internal tools in
hascapability() always ignore configurations in merge-tools section.

In this patch, command line configurations below are added at tests in
tests/test-merge-tools.t, in order to confirm that explicit
configuration is intentionally ignored at tool selection.

  --config merge-tools.:INTERNAL_TOOL.CAPABILITY=true

# Dummy extension that adds a delay after acquiring a lock.
#
# This extension can be used to test race conditions between lock acquisition.

from __future__ import absolute_import

import os
import time

def reposetup(ui, repo):

    class delayedlockrepo(repo.__class__):
        def lock(self):
            delay = float(os.environ.get('HGPRELOCKDELAY', '0.0'))
            if delay:
                time.sleep(delay)
            res = super(delayedlockrepo, self).lock()
            delay = float(os.environ.get('HGPOSTLOCKDELAY', '0.0'))
            if delay:
                time.sleep(delay)
            return res
    repo.__class__ = delayedlockrepo