Mercurial > hg
annotate tests/test-revlog-raw.py.out @ 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 | ec48d57de110 |
children | cca12a31ede5 |
rev | line source |
---|---|
31752
f424fb180fea
revlog: use raw content when building delta
Jun Wu <quark@fb.com>
parents:
31751
diff
changeset
|
1 local test passed |
31753
5d11b5edcb0b
revlog: use raw revisions in revdiff
Jun Wu <quark@fb.com>
parents:
31752
diff
changeset
|
2 addgroupcopy test passed |
31754 | 3 clone test passed |
31755
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31754
diff
changeset
|
4 lowlevelcopy test passed |