← 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-07-13 13:12:22 UTC
  • mfrom: (415.1.1 bzrtools)
  • Revision ID: abentley@panoramicfeedback.com-20060713131222-2bfdeff06434967b
clean-tree --detritus no longer implies --unknown

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