← 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-17 13:45:16 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070117134516-zr1ceu07gz0jdvc8
Tags: release-0.14.0
Release bzrtools 0.14.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
40
40
 
41
41
 
42
42
class ZipInfoWrapper(object):
43
 
 
 
43
    
44
44
    def __init__(self, zipfile, info):
45
45
        self.info = info
46
46
        self.type = None
108
108
    def isdir(self):
109
109
        return stat.S_ISDIR(self.mode)
110
110
 
111
 
    def issym(self):
112
 
        if stat.S_ISLNK(self.mode):
113
 
            self.linkname = os.readlink(self.fullpath)
114
 
            return True
115
 
        else:
116
 
            return False
117
 
 
118
 
 
 
111
        
119
112
def top_directory(path):
120
113
    """Return the top directory given in a path."""
121
114
    dirname = os.path.dirname(path)
191
184
        tt.delete_contents(trans_id)
192
185
        removed.add(path)
193
186
 
194
 
    added = set()
 
187
    added = set() 
195
188
    implied_parents = set()
196
189
    seen = set()
197
190
    for member in archive_file.getmembers():
198
191
        if member.type == 'g':
199
192
            # type 'g' is a header
200
193
            continue
201
 
        relative_path = member.name
 
194
        relative_path = member.name 
202
195
        if prefix is not None:
203
196
            relative_path = relative_path[len(prefix)+1:]
204
 
            relative_path = relative_path.rstrip('/')
205
197
        if relative_path == '':
206
198
            continue
207
199
        add_implied_parents(implied_parents, relative_path)
214
206
            tt.cancel_creation(trans_id)
215
207
        seen.add(member.name)
216
208
        if member.isreg():
217
 
            tt.create_file(file_iterator(archive_file.extractfile(member)),
 
209
            tt.create_file(file_iterator(archive_file.extractfile(member)), 
218
210
                           trans_id)
219
211
            executable = (member.mode & 0111) != 0
220
212
            tt.set_executability(executable, trans_id)
264
256
        if tree.changes_from(tree.basis_tree()).has_changed():
265
257
            raise BzrCommandError("Working tree has uncommitted changes.")
266
258
 
267
 
        if (source.endswith('.tar') or source.endswith('.tar.gz') or
 
259
        if (source.endswith('.tar') or source.endswith('.tar.gz') or 
268
260
            source.endswith('.tar.bz2')) or source.endswith('.tgz'):
269
261
            try:
270
262
                if source.endswith('.bz2'):