~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to upstream_import.py

  • Committer: Aaron Bentley
  • Date: 2007-01-08 15:58:30 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070108155830-8frcn2keo0c5v06d
Fix tests for importing directories

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
"""Import upstream source into a branch"""
 
2
 
 
3
from bz2 import BZ2File
 
4
import errno
 
5
import os
 
6
from StringIO import StringIO
 
7
import stat
 
8
import tarfile
 
9
import zipfile
 
10
 
 
11
from bzrlib import generate_ids
 
12
from bzrlib.bzrdir import BzrDir
 
13
from bzrlib.errors import NoSuchFile, BzrCommandError, NotBranchError
 
14
from bzrlib.osutils import pathjoin, isdir, file_iterator, basename
 
15
from bzrlib.trace import warning
 
16
from bzrlib.transform import TreeTransform, resolve_conflicts, cook_conflicts
 
17
from bzrlib.workingtree import WorkingTree
 
18
 
 
19
class ZipFileWrapper(object):
 
20
 
 
21
    def __init__(self, fileobj, mode):
 
22
        self.zipfile = zipfile.ZipFile(fileobj, mode)
 
23
 
 
24
    def getmembers(self):
 
25
        for info in self.zipfile.infolist():
 
26
            yield ZipInfoWrapper(self.zipfile, info)
 
27
 
 
28
    def extractfile(self, infowrapper):
 
29
        return StringIO(self.zipfile.read(infowrapper.name))
 
30
 
 
31
    def add(self, filename):
 
32
        if isdir(filename):
 
33
            self.zipfile.writestr(filename+'/', '')
 
34
        else:
 
35
            self.zipfile.write(filename)
 
36
 
 
37
    def close(self):
 
38
        self.zipfile.close()
 
39
 
 
40
 
 
41
class ZipInfoWrapper(object):
 
42
    
 
43
    def __init__(self, zipfile, info):
 
44
        self.info = info
 
45
        self.type = None
 
46
        self.name = info.filename
 
47
        self.zipfile = zipfile
 
48
        self.mode = 0666
 
49
 
 
50
    def isdir(self):
 
51
        # Really? Eeeew!
 
52
        return bool(self.name.endswith('/'))
 
53
 
 
54
    def isreg(self):
 
55
        # Really? Eeeew!
 
56
        return not self.isdir()
 
57
 
 
58
 
 
59
class DirWrapper(object):
 
60
    def __init__(self, fileobj, mode='r'):
 
61
        assert mode == 'r', mode
 
62
        self.root = os.path.realpath(fileobj.read())
 
63
 
 
64
    def __repr__(self):
 
65
        return 'DirWrapper(%r)' % self.root
 
66
 
 
67
    def getmembers(self, subdir=None):
 
68
        if subdir is not None:
 
69
            mydir = pathjoin(self.root, subdir)
 
70
        else:
 
71
            mydir = self.root
 
72
        for child in os.listdir(mydir):
 
73
            if subdir is not None:
 
74
                child = pathjoin(subdir, child)
 
75
            fi = FileInfo(self.root, child)
 
76
            yield fi
 
77
            if fi.isdir():
 
78
                for v in self.getmembers(child):
 
79
                    yield v
 
80
 
 
81
    def extractfile(self, member):
 
82
        return open(member.fullpath)
 
83
 
 
84
 
 
85
class FileInfo(object):
 
86
 
 
87
    def __init__(self, root, filepath):
 
88
        self.fullpath = pathjoin(root, filepath)
 
89
        self.root = root
 
90
        self.name = filepath 
 
91
        self.type = None
 
92
        stat = os.lstat(self.fullpath)
 
93
        self.mode = stat.st_mode
 
94
        if self.isdir():
 
95
            self.name += '/'
 
96
 
 
97
    def __repr__(self):
 
98
        return 'FileInfo(%r)' % self.name
 
99
 
 
100
    def isreg(self):
 
101
        return stat.S_ISREG(self.mode)
 
102
 
 
103
    def isdir(self):
 
104
        return stat.S_ISDIR(self.mode)
 
105
 
 
106
        
 
107
def top_directory(path):
 
108
    """Return the top directory given in a path."""
 
109
    dirname = os.path.dirname(path)
 
110
    last_dirname = dirname
 
111
    while True:
 
112
        dirname = os.path.dirname(dirname)
 
113
        if dirname == '' or dirname == last_dirname:
 
114
            return last_dirname
 
115
        last_dirname = dirname
 
116
 
 
117
 
 
118
def common_directory(names):
 
119
    """Determine a single directory prefix from a list of names"""
 
120
    possible_prefix = None
 
121
    for name in names:
 
122
        name_top = top_directory(name)
 
123
        if name_top == '':
 
124
            return None
 
125
        if possible_prefix is None:
 
126
            possible_prefix = name_top
 
127
        else:
 
128
            if name_top != possible_prefix:
 
129
                return None
 
130
    return possible_prefix
 
131
 
 
132
 
 
133
def do_directory(tt, trans_id, tree, relative_path, path):
 
134
    if isdir(path) and tree.path2id(relative_path) is not None:
 
135
        tt.cancel_deletion(trans_id)
 
136
    else:
 
137
        tt.create_directory(trans_id)
 
138
 
 
139
 
 
140
def add_implied_parents(implied_parents, path):
 
141
    """Update the set of implied parents from a path"""
 
142
    parent = os.path.dirname(path)
 
143
    if parent in implied_parents:
 
144
        return
 
145
    implied_parents.add(parent)
 
146
    add_implied_parents(implied_parents, parent)
 
147
 
 
148
 
 
149
def names_of_files(tar_file):
 
150
    for member in tar_file.getmembers():
 
151
        if member.type != "g":
 
152
            yield member.name
 
153
 
 
154
 
 
155
def import_tar(tree, tar_input):
 
156
    """Replace the contents of a working directory with tarfile contents.
 
157
    The tarfile may be a gzipped stream.  File ids will be updated.
 
158
    """
 
159
    tar_file = tarfile.open('lala', 'r', tar_input)
 
160
    import_archive(tree, tar_file)
 
161
 
 
162
def import_zip(tree, zip_input):
 
163
    zip_file = ZipFileWrapper(zip_input, 'r')
 
164
    import_archive(tree, zip_file)
 
165
 
 
166
def import_dir(tree, dir_input):
 
167
    dir_file = DirWrapper(dir_input)
 
168
    import_archive(tree, dir_file)
 
169
 
 
170
def import_archive(tree, archive_file):
 
171
    prefix = common_directory(names_of_files(archive_file))
 
172
    tt = TreeTransform(tree)
 
173
 
 
174
    removed = set()
 
175
    for path, entry in tree.inventory.iter_entries():
 
176
        if entry.parent_id is None:
 
177
            continue
 
178
        trans_id = tt.trans_id_tree_path(path)
 
179
        tt.delete_contents(trans_id)
 
180
        removed.add(path)
 
181
 
 
182
    added = set() 
 
183
    implied_parents = set()
 
184
    seen = set()
 
185
    for member in archive_file.getmembers():
 
186
        if member.type == 'g':
 
187
            # type 'g' is a header
 
188
            continue
 
189
        relative_path = member.name 
 
190
        if prefix is not None:
 
191
            relative_path = relative_path[len(prefix)+1:]
 
192
        if relative_path == '':
 
193
            continue
 
194
        add_implied_parents(implied_parents, relative_path)
 
195
        trans_id = tt.trans_id_tree_path(relative_path)
 
196
        added.add(relative_path.rstrip('/'))
 
197
        path = tree.abspath(relative_path)
 
198
        if member.name in seen:
 
199
            if tt.final_kind(trans_id) == 'file':
 
200
                tt.set_executability(None, trans_id)
 
201
            tt.cancel_creation(trans_id)
 
202
        seen.add(member.name)
 
203
        if member.isreg():
 
204
            tt.create_file(file_iterator(archive_file.extractfile(member)), 
 
205
                           trans_id)
 
206
            executable = (member.mode & 0111) != 0
 
207
            tt.set_executability(executable, trans_id)
 
208
        elif member.isdir():
 
209
            do_directory(tt, trans_id, tree, relative_path, path)
 
210
        elif member.issym():
 
211
            tt.create_symlink(member.linkname, trans_id)
 
212
        else:
 
213
            continue
 
214
        if tt.tree_file_id(trans_id) is None:
 
215
            name = basename(member.name.rstrip('/'))
 
216
            file_id = generate_ids.gen_file_id(name)
 
217
            tt.version_file(file_id, trans_id)
 
218
 
 
219
    for relative_path in implied_parents.difference(added):
 
220
        if relative_path == "":
 
221
            continue
 
222
        trans_id = tt.trans_id_tree_path(relative_path)
 
223
        path = tree.abspath(relative_path)
 
224
        do_directory(tt, trans_id, tree, relative_path, path)
 
225
        if tt.tree_file_id(trans_id) is None:
 
226
            tt.version_file(trans_id, trans_id)
 
227
        added.add(relative_path)
 
228
 
 
229
    for path in removed.difference(added):
 
230
        tt.unversion_file(tt.trans_id_tree_path(path))
 
231
 
 
232
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
 
233
        warning(conflict)
 
234
    tt.apply()
 
235
 
 
236
 
 
237
def do_import(source, tree_directory=None):
 
238
    """Implementation of import command.  Intended for UI only"""
 
239
    if tree_directory is not None:
 
240
        try:
 
241
            tree = WorkingTree.open(tree_directory)
 
242
        except NotBranchError:
 
243
            if not os.path.exists(tree_directory):
 
244
                os.mkdir(tree_directory)
 
245
            branch = BzrDir.create_branch_convenience(tree_directory)
 
246
            tree = branch.bzrdir.open_workingtree()
 
247
    else:
 
248
        tree = WorkingTree.open_containing('.')[0]
 
249
    tree.lock_write()
 
250
    try:
 
251
        if tree.changes_from(tree.basis_tree()).has_changed():
 
252
            raise BzrCommandError("Working tree has uncommitted changes.")
 
253
 
 
254
        if (source.endswith('.tar') or source.endswith('.tar.gz') or 
 
255
            source.endswith('.tar.bz2')) or source.endswith('.tgz'):
 
256
            try:
 
257
                if source.endswith('.bz2'):
 
258
                    tar_input = BZ2File(source, 'r')
 
259
                    tar_input = StringIO(tar_input.read())
 
260
                else:
 
261
                    tar_input = file(source, 'rb')
 
262
            except IOError, e:
 
263
                if e.errno == errno.ENOENT:
 
264
                    raise NoSuchFile(source)
 
265
            try:
 
266
                import_tar(tree, tar_input)
 
267
            finally:
 
268
                tar_input.close()
 
269
        elif source.endswith('.zip'):
 
270
            import_zip(tree, open(source, 'rb'))
 
271
        else:
 
272
            raise BzrCommandError('Unhandled import source')
 
273
    finally:
 
274
        tree.unlock()