Mercurial > hg
view tests/test-status-terse.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 | 5cef00cdba7f |
children | 18424aeece7f |
line wrap: on
line source
$ mkdir folder $ cd folder $ hg init $ mkdir x x/l x/m x/n x/l/u x/l/u/a $ touch a b x/aa.o x/bb.o $ hg status ? a ? b ? x/aa.o ? x/bb.o $ hg status --terse u ? a ? b ? x/ $ hg status --terse maudric ? a ? b ? x/ $ hg status --terse madric ? a ? b ? x/aa.o ? x/bb.o $ hg status --terse f abort: 'f' not recognized [255] Add a .hgignore so that we can also have ignored files $ echo ".*\.o" > .hgignore $ hg status ? .hgignore ? a ? b $ hg status -i I x/aa.o I x/bb.o Tersing ignored files $ hg status -t i --ignored I x/ Adding more files $ mkdir y $ touch x/aa x/bb y/l y/m y/l.o y/m.o $ touch x/l/aa x/m/aa x/n/aa x/l/u/bb x/l/u/a/bb $ hg status ? .hgignore ? a ? b ? x/aa ? x/bb ? x/l/aa ? x/l/u/a/bb ? x/l/u/bb ? x/m/aa ? x/n/aa ? y/l ? y/m $ hg status --terse u ? .hgignore ? a ? b ? x/ ? y/ $ hg add x/aa x/bb .hgignore $ hg status --terse au A .hgignore A x/aa A x/bb ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/ Including ignored files $ hg status --terse aui A .hgignore A x/aa A x/bb ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/l ? y/m $ hg status --terse au -i I x/aa.o I x/bb.o I y/l.o I y/m.o Committing some of the files $ hg commit x/aa x/bb .hgignore -m "First commit" $ hg status ? a ? b ? x/l/aa ? x/l/u/a/bb ? x/l/u/bb ? x/m/aa ? x/n/aa ? y/l ? y/m $ hg status --terse mardu ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/ Modifying already committed files $ echo "Hello" >> x/aa $ echo "World" >> x/bb $ hg status --terse maurdc M x/aa M x/bb ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/ Respecting other flags $ hg status --terse marduic --all M x/aa M x/bb ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/l ? y/m I x/aa.o I x/bb.o I y/l.o I y/m.o C .hgignore $ hg status --terse marduic -a $ hg status --terse marduic -c C .hgignore $ hg status --terse marduic -m M x/aa M x/bb Passing 'i' in terse value will consider the ignored files while tersing $ hg status --terse marduic -u ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/l ? y/m Omitting 'i' in terse value does not consider ignored files while tersing $ hg status --terse marduc -u ? a ? b ? x/l/ ? x/m/ ? x/n/ ? y/ Trying with --rev $ hg status --terse marduic --rev 0 --rev 1 abort: cannot use --terse with --rev [255]