Mercurial > hg
view tests/test-casecollision.t @ 34107:4f60720cf0df
blackbox: fix rotation with chg
The added test will show:
$ $PYTHON showsize.py .hg/blackbox*
.hg/blackbox.log: < 500
.hg/blackbox.log.1: < 500
.hg/blackbox.log.2: < 500
.hg/blackbox.log.3: < 500
.hg/blackbox.log.4: < 500
.hg/blackbox.log.5: >= 500
with previous code.
The issue is caused by blackbox caching file objects *by path*, and the
rotation size check could run on a wrong file object (i.e. it should check
"blackbox.log", but `filehandles["blackbox.log"]` contains a file object
that has been renamed to "blackbox.log.5").
This patch removes the "filehandlers" global cache added by 45313f5a3a8c to
solve the issue.
I think the original patch was trying to make different ui objects use a same
file object if their blackbox.log path is the same. In theory it could also
be problematic in the rotation case. Anyway, that should become unnecessary
after D650.
Differential Revision: https://phab.mercurial-scm.org/D648
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 06 Sep 2017 19:27:30 -0700 |
parents | 7a9cbb315d84 |
children | 0b8e076e878c |
line wrap: on
line source
#require no-icasefs test file addition with colliding case $ hg init repo1 $ cd repo1 $ echo a > a $ echo A > A $ hg add a $ hg st A a ? A $ hg add --config ui.portablefilenames=abort A abort: possible case-folding collision for A [255] $ hg st A a ? A $ hg add A warning: possible case-folding collision for A $ hg st A A A a $ hg forget A $ hg st A a ? A $ hg add --config ui.portablefilenames=no A $ hg st A A A a $ mkdir b $ touch b/c b/D $ hg add b adding b/D adding b/c $ touch b/d b/C $ hg add b/C warning: possible case-folding collision for b/C $ hg add b/d warning: possible case-folding collision for b/d $ touch b/a1 b/a2 $ hg add b adding b/a1 adding b/a2 $ touch b/A2 b/a1.1 $ hg add b/a1.1 b/A2 warning: possible case-folding collision for b/A2 $ touch b/f b/F $ hg add b/f b/F warning: possible case-folding collision for b/f $ touch g G $ hg add g G warning: possible case-folding collision for g $ mkdir h H $ touch h/x H/x $ hg add h/x H/x warning: possible case-folding collision for h/x $ touch h/s H/s $ hg add h/s $ hg add H/s warning: possible case-folding collision for H/s case changing rename must not warn or abort $ echo c > c $ hg ci -qAmx $ hg mv c C $ cd ..