← 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-01-15 15:19:20 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070115151920-pb4eto22dzk34co2
Add --silent option to patch

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
19
 
20
 
 
 
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
        
21
112
def top_directory(path):
22
113
    """Return the top directory given in a path."""
23
114
    dirname = os.path.dirname(path)
34
125
    possible_prefix = None
35
126
    for name in names:
36
127
        name_top = top_directory(name)
 
128
        if name_top == '':
 
129
            return None
37
130
        if possible_prefix is None:
38
131
            possible_prefix = name_top
39
132
        else:
69
162
    The tarfile may be a gzipped stream.  File ids will be updated.
70
163
    """
71
164
    tar_file = tarfile.open('lala', 'r', tar_input)
72
 
    prefix = common_directory(names_of_files(tar_file))
 
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))
73
177
    tt = TreeTransform(tree)
74
178
 
75
179
    removed = set()
76
180
    for path, entry in tree.inventory.iter_entries():
 
181
        if entry.parent_id is None:
 
182
            continue
77
183
        trans_id = tt.trans_id_tree_path(path)
78
184
        tt.delete_contents(trans_id)
79
185
        removed.add(path)
81
187
    added = set() 
82
188
    implied_parents = set()
83
189
    seen = set()
84
 
    for member in tar_file.getmembers():
 
190
    for member in archive_file.getmembers():
85
191
        if member.type == 'g':
86
192
            # type 'g' is a header
87
193
            continue
95
201
        added.add(relative_path.rstrip('/'))
96
202
        path = tree.abspath(relative_path)
97
203
        if member.name in seen:
 
204
            if tt.final_kind(trans_id) == 'file':
 
205
                tt.set_executability(None, trans_id)
98
206
            tt.cancel_creation(trans_id)
99
207
        seen.add(member.name)
100
208
        if member.isreg():
101
 
            tt.create_file(file_iterator(tar_file.extractfile(member)), 
 
209
            tt.create_file(file_iterator(archive_file.extractfile(member)), 
102
210
                           trans_id)
 
211
            executable = (member.mode & 0111) != 0
 
212
            tt.set_executability(executable, trans_id)
103
213
        elif member.isdir():
104
214
            do_directory(tt, trans_id, tree, relative_path, path)
105
215
        elif member.issym():
106
216
            tt.create_symlink(member.linkname, trans_id)
 
217
        else:
 
218
            continue
 
219
        if tt.tree_file_id(trans_id) is None:
 
220
            name = basename(member.name.rstrip('/'))
 
221
            file_id = generate_ids.gen_file_id(name)
 
222
            tt.version_file(file_id, trans_id)
107
223
 
108
224
    for relative_path in implied_parents.difference(added):
109
225
        if relative_path == "":
111
227
        trans_id = tt.trans_id_tree_path(relative_path)
112
228
        path = tree.abspath(relative_path)
113
229
        do_directory(tt, trans_id, tree, relative_path, path)
 
230
        if tt.tree_file_id(trans_id) is None:
 
231
            tt.version_file(trans_id, trans_id)
114
232
        added.add(relative_path)
115
233
 
 
234
    for path in removed.difference(added):
 
235
        tt.unversion_file(tt.trans_id_tree_path(path))
 
236
 
116
237
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
117
238
        warning(conflict)
118
239
    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
240
 
131
241
 
132
242
def do_import(source, tree_directory=None):
143
253
        tree = WorkingTree.open_containing('.')[0]
144
254
    tree.lock_write()
145
255
    try:
146
 
        if compare_trees(tree, tree.basis_tree()).has_changed():
 
256
        if tree.changes_from(tree.basis_tree()).has_changed():
147
257
            raise BzrCommandError("Working tree has uncommitted changes.")
148
258
 
149
259
        if (source.endswith('.tar') or source.endswith('.tar.gz') or 
161
271
                import_tar(tree, tar_input)
162
272
            finally:
163
273
                tar_input.close()
 
274
        elif source.endswith('.zip'):
 
275
            import_zip(tree, open(source, 'rb'))
 
276
        elif file_kind(source) == 'directory':
 
277
            s = StringIO(source)
 
278
            s.seek(0)
 
279
            import_dir(tree, s)
 
280
        else:
 
281
            raise BzrCommandError('Unhandled import source')
164
282
    finally:
165
283
        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)