1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
"""Import upstream source into a branch"""
import os
from shutil import rmtree
from StringIO import StringIO
import tarfile
from unittest import makeSuite
from bzrlib.bzrdir import BzrDir
from bzrlib.osutils import pathjoin
from bzrlib.tests import TestCaseInTempDir
def top_directory(path):
dirname = os.path.dirname(path)
last_dirname = dirname
while True:
dirname = os.path.dirname(dirname)
if dirname == '' or dirname == last_dirname:
return last_dirname
last_dirname = dirname
def common_directory(names):
"""Determine a single directory prefix from a list of names"""
possible_prefix = None
for name in names:
name_top = top_directory(name)
if possible_prefix is None:
possible_prefix = name_top
else:
if name_top != possible_prefix:
return None
return possible_prefix
def import_tar(tree, tar_input):
tar_file = tarfile.open('lala', 'r', tar_input)
prefix = common_directory(tar_file.getnames())
added = []
for name in tar_file.getnames():
relative_path = name
if prefix is not None:
relative_path = relative_path[len(prefix)+1:]
added.append(relative_path)
tar_file.extract(name, tree.abspath(relative_path))
for path in added:
if tree.path2id(path) is None:
tree.add(path)
class TestImport(TestCaseInTempDir):
def make_tar(self):
result = StringIO()
tar_file = tarfile.open('project-0.1.tar', 'w', result)
os.mkdir('project-0.1')
tar_file.add('project-0.1')
f = file('project-0.1/README', 'wb')
f.write('What?')
f.close()
tar_file.add('project-0.1/README')
f = file('project-0.1/FEEDME', 'wb')
f.write('Hungry!!')
f.close()
tar_file.add('project-0.1/FEEDME')
tar_file.close()
rmtree('project-0.1')
result.seek(0)
return result
def make_tar2(self):
result = StringIO()
tar_file = tarfile.open('project-0.2.tar', 'w', result)
os.mkdir('project-0.2')
tar_file.add('project-0.2')
f = file('project-0.2/README', 'wb')
f.write('Now?')
f.close()
tar_file.add('project-0.2/README')
tar_file.add('project-0.2/README')
tar_file.close()
rmtree('project-0.2')
result.seek(0)
return result
def make_messed_tar(self):
result = StringIO()
tar_file = tarfile.open('project-0.1.tar', 'w', result)
os.mkdir('project-0.1')
tar_file.add('project-0.1')
os.mkdir('project-0.2')
tar_file.add('project-0.2')
f = file('project-0.1/README', 'wb')
f.write('What?')
f.close()
tar_file.add('project-0.1/README')
tar_file.close()
rmtree('project-0.1')
result.seek(0)
return result
def test_top_directory(self):
self.assertEqual(top_directory('ab/b/c'), 'ab')
self.assertEqual(top_directory('/etc'), '/')
def test_common_directory(self):
self.assertEqual(common_directory(['ab/c/d', 'ab/c/e']), 'ab')
self.assertIs(common_directory(['ab/c/d', 'ac/c/e']), None)
def test_untar(self):
tar_file = self.make_tar()
tree = BzrDir.create_standalone_workingtree('tree')
import_tar(tree, tar_file)
self.assertTrue(tree.path2id('README') is not None)
self.assertTrue(tree.path2id('FEEDME') is not None)
tar_file = self.make_tar2()
import_tar(tree, tar_file)
self.assertTrue(tree.path2id('README') is not None)
self.assertTrue(tree.path2id('FEEDME') is None)
def test_untar2(self):
tar_file = self.make_messed_tar()
tree = BzrDir.create_standalone_workingtree('tree')
import_tar(tree, tar_file)
self.assertTrue(tree.path2id('project-0.1/README') is not None)
def test_suite():
return makeSuite(TestImport)
|