view tests/test-hgweb-bundle.t @ 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

#require serve repobundlerepo

  $ hg init server
  $ cd server
  $ cat >> .hg/hgrc << EOF
  > [extensions]
  > strip=
  > EOF

  $ echo 1 > foo
  $ hg commit -A -m 'first'
  adding foo
  $ echo 2 > bar
  $ hg commit -A -m 'second'
  adding bar

Produce a bundle to use

  $ hg strip -r 1
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg

Serve from a bundle file

  $ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid
  $ cat hg.pid >> $DAEMON_PIDS

Ensure we're serving from the bundle

  $ (get-with-headers.py localhost:$HGPORT 'file/tip/?style=raw')
  200 Script output follows
  
  
  -rw-r--r-- 2 bar
  -rw-r--r-- 2 foo