← 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-05-23 03:14:51 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060523031451-4a6d3bdba58d889e
Fix double-add bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
80
80
 
81
81
    added = set() 
82
82
    implied_parents = set()
 
83
    seen = set()
83
84
    for member in tar_file.getmembers():
84
85
        if member.type == 'g':
85
86
            # type 'g' is a header
93
94
        trans_id = tt.trans_id_tree_path(relative_path)
94
95
        added.add(relative_path.rstrip('/'))
95
96
        path = tree.abspath(relative_path)
 
97
        if member.name in seen:
 
98
            tt.cancel_creation(trans_id)
 
99
        seen.add(member.name)
96
100
        if member.isreg():
97
101
            tt.create_file(file_iterator(tar_file.extractfile(member)), 
98
102
                           trans_id)
198
202
        f.write('Now?')
199
203
        f.close()
200
204
        tar_file.add('project-0.2/README')
201
 
 
202
 
        tar_file.add('project-0.2/README')
203
 
 
204
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
 
205
210
        rmtree('project-0.2')
206
 
        result.seek(0)
207
211
        return result
208
212
 
209
213
    def make_messed_tar(self):