← 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: 2007-08-16 03:30:21 UTC
  • mto: This revision was merged to the branch mainline in revision 576.
  • Revision ID: aaron.bentley@utoronto.ca-20070816033021-e9k6t6rj25ndlhrk
Allow zap --force to delete modified checkouts

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
7
6
from StringIO import StringIO
 
7
import stat
8
8
import tarfile
9
 
from unittest import makeSuite
 
9
import zipfile
10
10
 
 
11
from bzrlib import generate_ids
11
12
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
15
 
from bzrlib.tests import TestCaseInTempDir
 
14
from bzrlib.osutils import (pathjoin, isdir, file_iterator, basename,
 
15
                            file_kind)
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
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
19
118
 
20
119
 
21
120
def top_directory(path):
34
133
    possible_prefix = None
35
134
    for name in names:
36
135
        name_top = top_directory(name)
 
136
        if name_top == '':
 
137
            return None
37
138
        if possible_prefix is None:
38
139
            possible_prefix = name_top
39
140
        else:
69
170
    The tarfile may be a gzipped stream.  File ids will be updated.
70
171
    """
71
172
    tar_file = tarfile.open('lala', 'r', tar_input)
72
 
    prefix = common_directory(names_of_files(tar_file))
 
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))
73
185
    tt = TreeTransform(tree)
74
186
 
75
187
    removed = set()
76
188
    for path, entry in tree.inventory.iter_entries():
 
189
        if entry.parent_id is None:
 
190
            continue
77
191
        trans_id = tt.trans_id_tree_path(path)
78
192
        tt.delete_contents(trans_id)
79
193
        removed.add(path)
80
194
 
81
 
    added = set() 
 
195
    added = set()
82
196
    implied_parents = set()
83
197
    seen = set()
84
 
    for member in tar_file.getmembers():
 
198
    for member in archive_file.getmembers():
85
199
        if member.type == 'g':
86
200
            # type 'g' is a header
87
201
            continue
88
 
        relative_path = member.name 
 
202
        relative_path = member.name
89
203
        if prefix is not None:
90
204
            relative_path = relative_path[len(prefix)+1:]
 
205
            relative_path = relative_path.rstrip('/')
91
206
        if relative_path == '':
92
207
            continue
93
208
        add_implied_parents(implied_parents, relative_path)
95
210
        added.add(relative_path.rstrip('/'))
96
211
        path = tree.abspath(relative_path)
97
212
        if member.name in seen:
 
213
            if tt.final_kind(trans_id) == 'file':
 
214
                tt.set_executability(None, trans_id)
98
215
            tt.cancel_creation(trans_id)
99
216
        seen.add(member.name)
100
217
        if member.isreg():
101
 
            tt.create_file(file_iterator(tar_file.extractfile(member)), 
 
218
            tt.create_file(file_iterator(archive_file.extractfile(member)),
102
219
                           trans_id)
 
220
            executable = (member.mode & 0111) != 0
 
221
            tt.set_executability(executable, trans_id)
103
222
        elif member.isdir():
104
223
            do_directory(tt, trans_id, tree, relative_path, path)
105
224
        elif member.issym():
106
225
            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)
107
232
 
108
233
    for relative_path in implied_parents.difference(added):
109
234
        if relative_path == "":
111
236
        trans_id = tt.trans_id_tree_path(relative_path)
112
237
        path = tree.abspath(relative_path)
113
238
        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)
114
241
        added.add(relative_path)
115
242
 
 
243
    for path in removed.difference(added):
 
244
        tt.unversion_file(tt.trans_id_tree_path(path))
 
245
 
116
246
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
117
247
        warning(conflict)
118
248
    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))
130
249
 
131
250
 
132
251
def do_import(source, tree_directory=None):
143
262
        tree = WorkingTree.open_containing('.')[0]
144
263
    tree.lock_write()
145
264
    try:
146
 
        if compare_trees(tree, tree.basis_tree()).has_changed():
 
265
        if tree.changes_from(tree.basis_tree()).has_changed():
147
266
            raise BzrCommandError("Working tree has uncommitted changes.")
148
267
 
149
 
        if (source.endswith('.tar') or source.endswith('.tar.gz') or 
 
268
        if (source.endswith('.tar') or source.endswith('.tar.gz') or
150
269
            source.endswith('.tar.bz2')) or source.endswith('.tgz'):
151
270
            try:
 
271
                tar_input = open_from_url(source)
152
272
                if source.endswith('.bz2'):
153
 
                    tar_input = BZ2File(source, 'r')
154
 
                    tar_input = StringIO(tar_input.read())
155
 
                else:
156
 
                    tar_input = file(source, 'rb')
 
273
                    tar_input = StringIO(tar_input.read().decode('bz2'))
157
274
            except IOError, e:
158
275
                if e.errno == errno.ENOENT:
159
276
                    raise NoSuchFile(source)
161
278
                import_tar(tree, tar_input)
162
279
            finally:
163
280
                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')
164
289
    finally:
165
290
        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)