store: move __contains__() implementation from class fncache into fncachestore
This restores the previous semantics of fncache.__contains__().
(a followup to
b9a56b816ff2)
test-log: fix / vs \ issues on Windows introduced with
6d218e47cf9b
test-log.t fails on Windows with
--- c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-log.t
+++ c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-log.t.err
@@ -1225,12 +1225,12 @@
$ echo 1 > d5.d/f1
$ echo 1 > .d6/f1
$ hg add .
- adding .d6/f1
- adding D2/f1
- adding D3.i/f1
- adding d1/f1
- adding d4.hg/f1
- adding d5.d/f1
+ adding .d6\f1
+ adding D2\f1
+ adding D3.i\f1
+ adding d1\f1
+ adding d4.hg\f1
+ adding d5.d\f1
$ hg commit -m "a bunch of weird directories"
$ hg log -l1 d1/f1 | grep changeset
changeset: 0:
65624cd9070a
perf: simply use repo.store for perffncache* commands
This makes sure that .hg/requires is observed and the correct kind of store
object is created. Otherwise we might mutilate our test repos when experimenting
with new repo formats.
test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows
Regression was introduced in
6047947afb6b.
Resolved by using the fine line noise '\r (no-eol) (glob) (esc)'.
run-tests: make it possible to combine (esc) with (glob) and (re)
This makes it possible to combine the annotations ... if done in the right
order.
run-tests: alternative way of handling \r on Windows
After
f71d60da58fb all \r was stripped from output on Windows, and the places
where a \r explicitly was expected it was accepted that it was missing. Ugly
hack.
Instead we now accept that an extra \r might appear at the end of lines on
Windows. That is more to the point and less ugly.