← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to upstream_import.py

  • Committer: Aaron Bentley
  • Date: 2006-08-14 13:34:01 UTC
  • mfrom: (0.7.3 shelf-dev)
  • Revision ID: abentley@panoramicfeedback.com-20060814133401-5f4158ff6fa20347
Merge latest changes from Shelf

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
3
3
from bz2 import BZ2File
4
4
import errno
5
5
import os
 
6
from shutil import rmtree
6
7
from StringIO import StringIO
7
 
import stat
8
8
import tarfile
9
 
import zipfile
 
9
from unittest import makeSuite
10
10
 
11
 
from bzrlib import generate_ids
12
11
from bzrlib.bzrdir import BzrDir
13
12
from bzrlib.errors import NoSuchFile, BzrCommandError, NotBranchError
14
 
from bzrlib.osutils import (pathjoin, isdir, file_iterator, basename,
15
 
                            file_kind)
 
13
from bzrlib.osutils import pathjoin, isdir, file_iterator
 
14
from bzrlib.tests import TestCaseInTempDir
16
15
from bzrlib.trace import warning
17
16
from bzrlib.transform import TreeTransform, resolve_conflicts, cook_conflicts
18
17
from bzrlib.workingtree import WorkingTree
19
 
from bzrlib.plugins.bzrtools.bzrtools import open_from_url
20
 
 
21
 
class ZipFileWrapper(object):
22
 
 
23
 
    def __init__(self, fileobj, mode):
24
 
        self.zipfile = zipfile.ZipFile(fileobj, mode)
25
 
 
26
 
    def getmembers(self):
27
 
        for info in self.zipfile.infolist():
28
 
            yield ZipInfoWrapper(self.zipfile, info)
29
 
 
30
 
    def extractfile(self, infowrapper):
31
 
        return StringIO(self.zipfile.read(infowrapper.name))
32
 
 
33
 
    def add(self, filename):
34
 
        if isdir(filename):
35
 
            self.zipfile.writestr(filename+'/', '')
36
 
        else:
37
 
            self.zipfile.write(filename)
38
 
 
39
 
    def close(self):
40
 
        self.zipfile.close()
41
 
 
42
 
 
43
 
class ZipInfoWrapper(object):
44
 
 
45
 
    def __init__(self, zipfile, info):
46
 
        self.info = info
47
 
        self.type = None
48
 
        self.name = info.filename
49
 
        self.zipfile = zipfile
50
 
        self.mode = 0666
51
 
 
52
 
    def isdir(self):
53
 
        # Really? Eeeew!
54
 
        return bool(self.name.endswith('/'))
55
 
 
56
 
    def isreg(self):
57
 
        # Really? Eeeew!
58
 
        return not self.isdir()
59
 
 
60
 
 
61
 
class DirWrapper(object):
62
 
    def __init__(self, fileobj, mode='r'):
63
 
        assert mode == 'r', mode
64
 
        self.root = os.path.realpath(fileobj.read())
65
 
 
66
 
    def __repr__(self):
67
 
        return 'DirWrapper(%r)' % self.root
68
 
 
69
 
    def getmembers(self, subdir=None):
70
 
        if subdir is not None:
71
 
            mydir = pathjoin(self.root, subdir)
72
 
        else:
73
 
            mydir = self.root
74
 
        for child in os.listdir(mydir):
75
 
            if subdir is not None:
76
 
                child = pathjoin(subdir, child)
77
 
            fi = FileInfo(self.root, child)
78
 
            yield fi
79
 
            if fi.isdir():
80
 
                for v in self.getmembers(child):
81
 
                    yield v
82
 
 
83
 
    def extractfile(self, member):
84
 
        return open(member.fullpath)
85
 
 
86
 
 
87
 
class FileInfo(object):
88
 
 
89
 
    def __init__(self, root, filepath):
90
 
        self.fullpath = pathjoin(root, filepath)
91
 
        self.root = root
92
 
        if filepath != '':
93
 
            self.name = pathjoin(basename(root), filepath)
94
 
        else:
95
 
            print 'root %r' % root
96
 
            self.name = basename(root)
97
 
        self.type = None
98
 
        stat = os.lstat(self.fullpath)
99
 
        self.mode = stat.st_mode
100
 
        if self.isdir():
101
 
            self.name += '/'
102
 
 
103
 
    def __repr__(self):
104
 
        return 'FileInfo(%r)' % self.name
105
 
 
106
 
    def isreg(self):
107
 
        return stat.S_ISREG(self.mode)
108
 
 
109
 
    def isdir(self):
110
 
        return stat.S_ISDIR(self.mode)
111
 
 
112
 
    def issym(self):
113
 
        if stat.S_ISLNK(self.mode):
114
 
            self.linkname = os.readlink(self.fullpath)
115
 
            return True
116
 
        else:
117
 
            return False
118
18
 
119
19
 
120
20
def top_directory(path):
133
33
    possible_prefix = None
134
34
    for name in names:
135
35
        name_top = top_directory(name)
136
 
        if name_top == '':
137
 
            return None
138
36
        if possible_prefix is None:
139
37
            possible_prefix = name_top
140
38
        else:
170
68
    The tarfile may be a gzipped stream.  File ids will be updated.
171
69
    """
172
70
    tar_file = tarfile.open('lala', 'r', tar_input)
173
 
    import_archive(tree, tar_file)
174
 
 
175
 
def import_zip(tree, zip_input):
176
 
    zip_file = ZipFileWrapper(zip_input, 'r')
177
 
    import_archive(tree, zip_file)
178
 
 
179
 
def import_dir(tree, dir_input):
180
 
    dir_file = DirWrapper(dir_input)
181
 
    import_archive(tree, dir_file)
182
 
 
183
 
def import_archive(tree, archive_file):
184
 
    prefix = common_directory(names_of_files(archive_file))
 
71
    prefix = common_directory(names_of_files(tar_file))
185
72
    tt = TreeTransform(tree)
186
73
 
187
74
    removed = set()
188
75
    for path, entry in tree.inventory.iter_entries():
189
 
        if entry.parent_id is None:
190
 
            continue
191
76
        trans_id = tt.trans_id_tree_path(path)
192
77
        tt.delete_contents(trans_id)
193
78
        removed.add(path)
194
79
 
195
 
    added = set()
 
80
    added = set() 
196
81
    implied_parents = set()
197
82
    seen = set()
198
 
    for member in archive_file.getmembers():
 
83
    for member in tar_file.getmembers():
199
84
        if member.type == 'g':
200
85
            # type 'g' is a header
201
86
            continue
202
 
        relative_path = member.name
 
87
        relative_path = member.name 
203
88
        if prefix is not None:
204
89
            relative_path = relative_path[len(prefix)+1:]
205
 
            relative_path = relative_path.rstrip('/')
206
90
        if relative_path == '':
207
91
            continue
208
92
        add_implied_parents(implied_parents, relative_path)
210
94
        added.add(relative_path.rstrip('/'))
211
95
        path = tree.abspath(relative_path)
212
96
        if member.name in seen:
213
 
            if tt.final_kind(trans_id) == 'file':
214
 
                tt.set_executability(None, trans_id)
215
97
            tt.cancel_creation(trans_id)
216
98
        seen.add(member.name)
217
99
        if member.isreg():
218
 
            tt.create_file(file_iterator(archive_file.extractfile(member)),
 
100
            tt.create_file(file_iterator(tar_file.extractfile(member)), 
219
101
                           trans_id)
220
 
            executable = (member.mode & 0111) != 0
221
 
            tt.set_executability(executable, trans_id)
222
102
        elif member.isdir():
223
103
            do_directory(tt, trans_id, tree, relative_path, path)
224
104
        elif member.issym():
225
105
            tt.create_symlink(member.linkname, trans_id)
226
 
        else:
227
 
            continue
228
 
        if tt.tree_file_id(trans_id) is None:
229
 
            name = basename(member.name.rstrip('/'))
230
 
            file_id = generate_ids.gen_file_id(name)
231
 
            tt.version_file(file_id, trans_id)
232
106
 
233
107
    for relative_path in implied_parents.difference(added):
234
108
        if relative_path == "":
236
110
        trans_id = tt.trans_id_tree_path(relative_path)
237
111
        path = tree.abspath(relative_path)
238
112
        do_directory(tt, trans_id, tree, relative_path, path)
239
 
        if tt.tree_file_id(trans_id) is None:
240
 
            tt.version_file(trans_id, trans_id)
241
113
        added.add(relative_path)
242
114
 
243
 
    for path in removed.difference(added):
244
 
        tt.unversion_file(tt.trans_id_tree_path(path))
245
 
 
246
115
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
247
116
        warning(conflict)
248
117
    tt.apply()
 
118
    update_ids(tree, added, removed)
 
119
 
 
120
 
 
121
def update_ids(tree, added, removed):
 
122
    """Make sure that all present files files have file_ids.
 
123
    """
 
124
    # XXX detect renames
 
125
    new = added.difference(removed)
 
126
    deleted = removed.difference(added)
 
127
    tree.add(sorted(new))
 
128
    tree.remove(sorted(deleted, reverse=True))
249
129
 
250
130
 
251
131
def do_import(source, tree_directory=None):
265
145
        if tree.changes_from(tree.basis_tree()).has_changed():
266
146
            raise BzrCommandError("Working tree has uncommitted changes.")
267
147
 
268
 
        if (source.endswith('.tar') or source.endswith('.tar.gz') or
 
148
        if (source.endswith('.tar') or source.endswith('.tar.gz') or 
269
149
            source.endswith('.tar.bz2')) or source.endswith('.tgz'):
270
150
            try:
271
 
                tar_input = open_from_url(source)
272
151
                if source.endswith('.bz2'):
273
 
                    tar_input = StringIO(tar_input.read().decode('bz2'))
 
152
                    tar_input = BZ2File(source, 'r')
 
153
                    tar_input = StringIO(tar_input.read())
 
154
                else:
 
155
                    tar_input = file(source, 'rb')
274
156
            except IOError, e:
275
157
                if e.errno == errno.ENOENT:
276
158
                    raise NoSuchFile(source)
278
160
                import_tar(tree, tar_input)
279
161
            finally:
280
162
                tar_input.close()
281
 
        elif source.endswith('.zip'):
282
 
            import_zip(tree, open_from_url(source))
283
 
        elif file_kind(source) == 'directory':
284
 
            s = StringIO(source)
285
 
            s.seek(0)
286
 
            import_dir(tree, s)
287
 
        else:
288
 
            raise BzrCommandError('Unhandled import source')
289
163
    finally:
290
164
        tree.unlock()
 
165
 
 
166
class TestImport(TestCaseInTempDir):
 
167
 
 
168
    def make_tar(self, mode='w'):
 
169
        result = StringIO()
 
170
        tar_file = tarfile.open('project-0.1.tar', mode, result)
 
171
        os.mkdir('project-0.1')
 
172
        tar_file.add('project-0.1')
 
173
        os.mkdir('project-0.1/junk')
 
174
        tar_file.add('project-0.1/junk')
 
175
        
 
176
        f = file('project-0.1/README', 'wb')
 
177
        f.write('What?')
 
178
        f.close()
 
179
        tar_file.add('project-0.1/README')
 
180
 
 
181
        f = file('project-0.1/FEEDME', 'wb')
 
182
        f.write('Hungry!!')
 
183
        f.close()
 
184
        tar_file.add('project-0.1/FEEDME')
 
185
 
 
186
        tar_file.close()
 
187
        rmtree('project-0.1')
 
188
        result.seek(0)
 
189
        return result
 
190
 
 
191
    def make_tar2(self):
 
192
        result = StringIO()
 
193
        tar_file = tarfile.open('project-0.2.tar', 'w', result)
 
194
        os.mkdir('project-0.2')
 
195
        tar_file.add('project-0.2')
 
196
        
 
197
        os.mkdir('project-0.2/junk')
 
198
        tar_file.add('project-0.2/junk')
 
199
 
 
200
        f = file('project-0.2/README', 'wb')
 
201
        f.write('Now?')
 
202
        f.close()
 
203
        tar_file.add('project-0.2/README')
 
204
        tar_file.close()
 
205
 
 
206
        tar_file = tarfile.open('project-0.2.tar', 'a', result)
 
207
        tar_file.add('project-0.2/README')
 
208
 
 
209
        rmtree('project-0.2')
 
210
        return result
 
211
 
 
212
    def make_messed_tar(self):
 
213
        result = StringIO()
 
214
        tar_file = tarfile.open('project-0.1.tar', 'w', result)
 
215
        os.mkdir('project-0.1')
 
216
        tar_file.add('project-0.1')
 
217
 
 
218
        os.mkdir('project-0.2')
 
219
        tar_file.add('project-0.2')
 
220
        
 
221
        f = file('project-0.1/README', 'wb')
 
222
        f.write('What?')
 
223
        f.close()
 
224
        tar_file.add('project-0.1/README')
 
225
        tar_file.close()
 
226
        rmtree('project-0.1')
 
227
        result.seek(0)
 
228
        return result
 
229
 
 
230
    def test_top_directory(self):
 
231
        self.assertEqual(top_directory('ab/b/c'), 'ab')
 
232
        self.assertEqual(top_directory('/etc'), '/')
 
233
 
 
234
    def test_common_directory(self):
 
235
        self.assertEqual(common_directory(['ab/c/d', 'ab/c/e']), 'ab')
 
236
        self.assertIs(common_directory(['ab/c/d', 'ac/c/e']), None)
 
237
 
 
238
    def test_untar(self):
 
239
        tar_file = self.make_tar()
 
240
        tree = BzrDir.create_standalone_workingtree('tree')
 
241
        import_tar(tree, tar_file)
 
242
        self.assertTrue(tree.path2id('README') is not None) 
 
243
        self.assertTrue(tree.path2id('FEEDME') is not None)
 
244
        self.assertTrue(os.path.isfile(tree.abspath('README')))
 
245
        self.assertEqual(tree.inventory[tree.path2id('README')].kind, 'file')
 
246
        self.assertEqual(tree.inventory[tree.path2id('FEEDME')].kind, 'file')
 
247
        
 
248
        f = file(tree.abspath('junk/food'), 'wb')
 
249
        f.write('I like food\n')
 
250
        f.close()
 
251
 
 
252
        tar_file = self.make_tar2()
 
253
        import_tar(tree, tar_file)
 
254
        self.assertTrue(tree.path2id('README') is not None) 
 
255
        self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
 
256
 
 
257
 
 
258
    def test_untar2(self):
 
259
        tar_file = self.make_messed_tar()
 
260
        tree = BzrDir.create_standalone_workingtree('tree')
 
261
        import_tar(tree, tar_file)
 
262
        self.assertTrue(tree.path2id('project-0.1/README') is not None) 
 
263
 
 
264
    def test_untar_gzip(self):
 
265
        tar_file = self.make_tar(mode='w:gz')
 
266
        tree = BzrDir.create_standalone_workingtree('tree')
 
267
        import_tar(tree, tar_file)
 
268
        self.assertTrue(tree.path2id('README') is not None) 
 
269
 
 
270
 
 
271
def test_suite():
 
272
    return makeSuite(TestImport)