← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.py

  • Committer: Aaron Bentley
  • Date: 2005-09-19 02:33:09 UTC
  • mfrom: (1185.3.27)
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050919023309-24e8871f7f8b31cf
Merged latest from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store.py
68
68
    def __init__(self, basedir):
69
69
        self._basedir = basedir
70
70
 
71
 
    def _path(self, id):
72
 
        if '\\' in id or '/' in id:
73
 
            raise ValueError("invalid store id %r" % id)
74
 
        return os.path.join(self._basedir, id)
 
71
    def _path(self, entry_id):
 
72
        if not isinstance(entry_id, basestring):
 
73
            raise TypeError(type(entry_id))
 
74
        if '\\' in entry_id or '/' in entry_id:
 
75
            raise ValueError("invalid store id %r" % entry_id)
 
76
        return os.path.join(self._basedir, entry_id)
75
77
 
76
78
    def __repr__(self):
77
79
        return "%s(%r)" % (self.__class__.__name__, self._basedir)
124
126
        pb.update('preparing to copy')
125
127
        to_copy = [id for id in ids if id not in self]
126
128
        if isinstance(other, ImmutableStore):
127
 
            return self.copy_multi_immutable(other, to_copy, pb)
 
129
            return self.copy_multi_immutable(other, to_copy, pb, 
 
130
                                             permit_failure=permit_failure)
128
131
        count = 0
129
132
        failed = set()
130
133
        for id in to_copy:
135
138
            else:
136
139
                try:
137
140
                    entry = other[id]
138
 
                except IndexError:
 
141
                except KeyError:
139
142
                    failed.add(id)
140
143
                    continue
141
144
                self.add(entry, id)
211
214
            if e.errno != errno.ENOENT:
212
215
                raise
213
216
 
214
 
        raise IndexError(fileid)
 
217
        raise KeyError(fileid)
215
218
 
216
219
 
217
220
    def total_size(self):