annotate tests/test-convert-bzr-treeroot.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 89872688893f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
1
12517
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
2 $ . "$TESTDIR/bzr-definitions"
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
3 $ cat > treeset.py <<EOF
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
4 > import sys
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
5 > from bzrlib import workingtree
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
6 > wt = workingtree.WorkingTree.open('.')
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
7 >
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
8 > message, rootid = sys.argv[1:]
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
9 > wt.set_root_id('tree_root-%s' % rootid)
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
10 > wt.commit(message)
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
11 > EOF
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
12
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
13 change the id of the tree root
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
14
12517
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
15 $ mkdir test-change-treeroot-id
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
16 $ cd test-change-treeroot-id
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
17 $ bzr init -q source
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
18 $ cd source
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
19 $ echo content > file
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
20 $ bzr add -q file
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
21 $ bzr commit -q -m 'Initial add'
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
22 $ python ../../treeset.py 'Changed root' new
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
23 $ cd ..
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
24 $ hg convert source source-hg
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
25 initializing destination source-hg repository
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
26 scanning source...
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
27 sorting...
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
28 converting...
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
29 1 Initial add
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
30 0 Changed root
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
31 $ manifest source-hg tip
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
32 % manifest of tip
cc8f1083e8be tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
33 644 file
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12517
diff changeset
34
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12517
diff changeset
35 $ cd ..