Mercurial > hg
view tests/test-empty-file.t @ 21564:2e91d4964ecd stable
subrepo: make "_sanitize()" work
"_sanitize()" was introduced by 224e96078708 on "stable" branch, but
it has done nothing for sanitizing since 224e96078708.
"_sanitize()" assumes "Visitor" design pattern:
"os.walk()" should invoke specified function ("v" in this case)
for each directory elements under specified path
but "os.walk()" assumes "Iterator" design pattern:
callers of it should drive loop to scan each directory elements
under specified path by themselves with the returned generator
object
Because of this mismatching, "_sanitize()" just discards the generator
object returned by "os.walk()" and does nothing for sanitizing.
This patch makes "_sanitize()" work.
This patch also changes the format of warning message to show each
unlinked files, for multiple appearances of "potentially hostile
.hg/hgrc".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 08 May 2014 19:03:00 +0900 |
parents | f2719b387380 |
children |
line wrap: on
line source
$ hg init a $ cd a $ touch empty1 $ hg add empty1 $ hg commit -m 'add empty1' $ touch empty2 $ hg add empty2 $ hg commit -m 'add empty2' $ hg up -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ touch empty3 $ hg add empty3 $ hg commit -m 'add empty3' created new head $ hg heads changeset: 2:a1cb177e0d44 tag: tip parent: 0:1e1d9c4e5b64 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add empty3 changeset: 1:097d2b0e17f6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add empty2 $ hg merge 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Before changeset 05257fd28591, we didn't notice the empty file that came from rev 1: $ hg status M empty2 $ hg commit -m merge $ hg manifest --debug tip b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3 $ cd ..