← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.py

merge from aaron - fixes bare excepts, adds ancestor namespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store.py
126
126
        pb.update('preparing to copy')
127
127
        to_copy = [id for id in ids if id not in self]
128
128
        if isinstance(other, ImmutableStore):
129
 
            return self.copy_multi_immutable(other, to_copy, pb)
 
129
            return self.copy_multi_immutable(other, to_copy, pb, 
 
130
                                             permit_failure=permit_failure)
130
131
        count = 0
131
132
        failed = set()
132
133
        for id in to_copy:
137
138
            else:
138
139
                try:
139
140
                    entry = other[id]
140
 
                except IndexError:
 
141
                except KeyError:
141
142
                    failed.add(id)
142
143
                    continue
143
144
                self.add(entry, id)
213
214
            if e.errno != errno.ENOENT:
214
215
                raise
215
216
 
216
 
        raise IndexError(fileid)
 
217
        raise KeyError(fileid)
217
218
 
218
219
 
219
220
    def total_size(self):