← 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: 2011-02-01 23:25:27 UTC
  • mfrom: (749.1.1 2.3)
  • Revision ID: aaron@aaronbentley.com-20110201232527-8yjkmelpj1udx4w7
Merged 2.3 into bzrtools.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
163
163
            yield member.name
164
164
 
165
165
 
 
166
def should_ignore(relative_path):
 
167
    return top_path(relative_path) == '.bzr'
 
168
 
 
169
 
166
170
def import_tar(tree, tar_input):
167
171
    """Replace the contents of a working directory with tarfile contents.
168
172
    The tarfile may be a gzipped stream.  File ids will be updated.
203
207
            relative_path = relative_path.rstrip('/')
204
208
        if relative_path == '':
205
209
            continue
 
210
        if should_ignore(relative_path):
 
211
            continue
206
212
        add_implied_parents(implied_parents, relative_path)
207
213
        trans_id = tt.trans_id_tree_path(relative_path)
208
214
        added.add(relative_path.rstrip('/'))