annotate tests/mocktime.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
author |
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
date |
Wed, 22 Aug 2018 13:57:01 +0900 |
parents |
12b355964de8 |
children |
2372284d9457 |
rev |
line source |
34316
|
1 from __future__ import absolute_import
|
|
2
|
|
3 import os
|
|
4 import time
|
|
5
|
|
6 class mocktime(object):
|
|
7 def __init__(self, increment):
|
|
8 self.time = 0
|
|
9 self.increment = [float(s) for s in increment.split()]
|
|
10 self.pos = 0
|
|
11
|
|
12 def __call__(self):
|
|
13 self.time += self.increment[self.pos % len(self.increment)]
|
|
14 self.pos += 1
|
|
15 return self.time
|
|
16
|
|
17 def uisetup(ui):
|
|
18 time.time = mocktime(os.environ.get('MOCKTIME', '0.1'))
|