24
24
import os, tempfile, types, osutils, gzip, errno
25
25
from stat import ST_SIZE
26
26
from StringIO import StringIO
27
from bzrlib.errors import BzrError
28
from bzrlib.trace import mutter
27
from trace import mutter
31
29
######################################################################
68
66
def __init__(self, basedir):
69
67
self._basedir = basedir
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)
70
if '\\' in id or '/' in id:
71
raise ValueError("invalid store id %r" % id)
72
return os.path.join(self._basedir, id)
78
74
def __repr__(self):
79
75
return "%s(%r)" % (self.__class__.__name__, self._basedir)
95
91
p = self._path(fileid)
96
92
if os.access(p, os.F_OK) or os.access(p + '.gz', os.F_OK):
93
from bzrlib.errors import bailout
97
94
raise BzrError("store %r already contains id %r" % (self._basedir, fileid))
116
def copy_multi(self, other, ids, permit_failure=False):
113
def copy_multi(self, other, ids):
117
114
"""Copy texts for ids from other into self.
119
If an id is present in self, it is skipped.
121
Returns (count_copied, failed), where failed is a collection of ids
122
that could not be copied.
116
If an id is present in self, it is skipped. A count of copied
117
ids is returned, which may be less than len(ids).
124
pb = bzrlib.ui.ui_factory.progress_bar()
119
from bzrlib.progress import ProgressBar
126
121
pb.update('preparing to copy')
127
122
to_copy = [id for id in ids if id not in self]
128
123
if isinstance(other, ImmutableStore):
129
return self.copy_multi_immutable(other, to_copy, pb,
130
permit_failure=permit_failure)
124
return self.copy_multi_immutable(other, to_copy, pb)
133
126
for id in to_copy:
135
128
pb.update('copy', count, len(to_copy))
136
if not permit_failure:
137
self.add(other[id], id)
146
if not permit_failure:
147
assert count == len(to_copy)
129
self.add(other[id], id)
130
assert count == len(to_copy)
151
def copy_multi_immutable(self, other, to_copy, pb, permit_failure=False):
135
def copy_multi_immutable(self, other, to_copy, pb):
152
136
from shutil import copyfile
155
138
for id in to_copy:
156
139
p = self._path(id)
157
140
other_p = other._path(id)
159
142
copyfile(other_p, p)
160
143
except IOError, e:
161
144
if e.errno == errno.ENOENT:
162
if not permit_failure:
163
copyfile(other_p+".gz", p+".gz")
166
copyfile(other_p+".gz", p+".gz")
168
if e.errno == errno.ENOENT:
145
copyfile(other_p+".gz", p+".gz")
added
removed
bzrlib/store.py
