bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
711
by Martin Pool
- store docs |
1 |
# Copyright (C) 2005 by Canonical Development Ltd
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
2 |
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
|
1374
by Martin Pool
todo |
17 |
# TODO: Could remember a bias towards whether a particular store is typically
|
18 |
# compressed or not.
|
|
19 |
||
|
711
by Martin Pool
- store docs |
20 |
"""
|
21 |
Stores are the main data-storage mechanism for Bazaar-NG.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
22 |
|
23 |
A store is a simple write-once container indexed by a universally
|
|
|
711
by Martin Pool
- store docs |
24 |
unique ID.
|
25 |
"""
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
26 |
|
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
27 |
import errno |
28 |
import gzip |
|
29 |
import os |
|
30 |
import tempfile |
|
31 |
import types |
|
|
81
by mbp at sourcefrog
show space usage for various stores in the info command |
32 |
from stat import ST_SIZE |
|
1
by mbp at sourcefrog
import from baz patch-364 |
33 |
from StringIO import StringIO |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
34 |
|
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
35 |
from bzrlib.errors import BzrError, UnlistableStore |
|
1104
by Martin Pool
- Add a simple UIFactory |
36 |
from bzrlib.trace import mutter |
37 |
import bzrlib.ui |
|
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
38 |
import bzrlib.osutils as osutils |
39 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
40 |
|
41 |
######################################################################
|
|
42 |
# stores
|
|
43 |
||
44 |
class StoreError(Exception): |
|
45 |
pass
|
|
46 |
||
47 |
||
|
558
by Martin Pool
- All top-level classes inherit from object |
48 |
class ImmutableStore(object): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
49 |
"""Store that holds files indexed by unique names. |
50 |
||
51 |
Files can be added, but not modified once they are in. Typically
|
|
52 |
the hash is used as the name, or something else known to be unique,
|
|
53 |
such as a UUID.
|
|
54 |
||
55 |
>>> st = ImmutableScratchStore()
|
|
56 |
||
57 |
>>> st.add(StringIO('hello'), 'aa')
|
|
58 |
>>> 'aa' in st
|
|
59 |
True
|
|
60 |
>>> 'foo' in st
|
|
61 |
False
|
|
62 |
||
63 |
You are not allowed to add an id that is already present.
|
|
64 |
||
65 |
Entries can be retrieved as files, which may then be read.
|
|
66 |
||
67 |
>>> st.add(StringIO('goodbye'), '123123')
|
|
68 |
>>> st['123123'].read()
|
|
69 |
'goodbye'
|
|
70 |
||
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
71 |
TODO: Atomic add by writing to a temporary file and renaming.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
72 |
|
|
711
by Martin Pool
- store docs |
73 |
In bzr 0.0.5 and earlier, files within the store were marked
|
74 |
readonly on disk. This is no longer done but existing stores need
|
|
75 |
to be accomodated.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
76 |
"""
|
77 |
||
78 |
def __init__(self, basedir): |
|
79 |
self._basedir = basedir |
|
80 |
||
|
1185.1.1
by Martin Pool
- cleanup Store._path |
81 |
def _path(self, entry_id): |
82 |
if not isinstance(entry_id, basestring): |
|
83 |
raise TypeError(type(entry_id)) |
|
84 |
if '\\' in entry_id or '/' in entry_id: |
|
85 |
raise ValueError("invalid store id %r" % entry_id) |
|
86 |
return os.path.join(self._basedir, entry_id) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
87 |
|
88 |
def __repr__(self): |
|
89 |
return "%s(%r)" % (self.__class__.__name__, self._basedir) |
|
90 |
||
|
129
by mbp at sourcefrog
Store.add defaults to adding gzipped files |
91 |
def add(self, f, fileid, compressed=True): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
92 |
"""Add contents of a file into the store. |
93 |
||
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
94 |
f -- An open file, or file-like object."""
|
|
716
by Martin Pool
- write into store using AtomicFile |
95 |
# FIXME: Only works on files that will fit in memory
|
96 |
||
97 |
from bzrlib.atomicfile import AtomicFile |
|
98 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
99 |
mutter("add store entry %r" % (fileid)) |
100 |
if isinstance(f, types.StringTypes): |
|
101 |
content = f |
|
102 |
else: |
|
103 |
content = f.read() |
|
|
716
by Martin Pool
- write into store using AtomicFile |
104 |
|
|
129
by mbp at sourcefrog
Store.add defaults to adding gzipped files |
105 |
p = self._path(fileid) |
106 |
if os.access(p, os.F_OK) or os.access(p + '.gz', os.F_OK): |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
107 |
raise BzrError("store %r already contains id %r" % (self._basedir, fileid)) |
|
129
by mbp at sourcefrog
Store.add defaults to adding gzipped files |
108 |
|
|
716
by Martin Pool
- write into store using AtomicFile |
109 |
fn = p |
|
129
by mbp at sourcefrog
Store.add defaults to adding gzipped files |
110 |
if compressed: |
|
716
by Martin Pool
- write into store using AtomicFile |
111 |
fn = fn + '.gz' |
|
129
by mbp at sourcefrog
Store.add defaults to adding gzipped files |
112 |
|
|
716
by Martin Pool
- write into store using AtomicFile |
113 |
af = AtomicFile(fn, 'wb') |
114 |
try: |
|
115 |
if compressed: |
|
116 |
gf = gzip.GzipFile(mode='wb', fileobj=af) |
|
117 |
gf.write(content) |
|
118 |
gf.close() |
|
119 |
else: |
|
120 |
af.write(content) |
|
121 |
af.commit() |
|
122 |
finally: |
|
123 |
af.close() |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
124 |
|
|
670
by Martin Pool
- Show progress while branching |
125 |
|
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
126 |
def copy_multi(self, other, ids, permit_failure=False): |
|
626
by Martin Pool
- add Store.copy_multi for use in pulling changes into a branch |
127 |
"""Copy texts for ids from other into self. |
128 |
||
|
1116
by Martin Pool
- fix a few errors in new merge code |
129 |
If an id is present in self, it is skipped.
|
130 |
||
131 |
Returns (count_copied, failed), where failed is a collection of ids
|
|
132 |
that could not be copied.
|
|
|
626
by Martin Pool
- add Store.copy_multi for use in pulling changes into a branch |
133 |
"""
|
|
1104
by Martin Pool
- Add a simple UIFactory |
134 |
pb = bzrlib.ui.ui_factory.progress_bar() |
135 |
||
|
670
by Martin Pool
- Show progress while branching |
136 |
pb.update('preparing to copy') |
137 |
to_copy = [id for id in ids if id not in self] |
|
|
790
by Martin Pool
Merge from aaron: |
138 |
if isinstance(other, ImmutableStore): |
|
974.1.77
by Aaron Bentley
Fixed branch handling of missing revisions |
139 |
return self.copy_multi_immutable(other, to_copy, pb, |
140 |
permit_failure=permit_failure) |
|
|
626
by Martin Pool
- add Store.copy_multi for use in pulling changes into a branch |
141 |
count = 0 |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
142 |
failed = set() |
|
670
by Martin Pool
- Show progress while branching |
143 |
for id in to_copy: |
144 |
count += 1 |
|
145 |
pb.update('copy', count, len(to_copy)) |
|
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
146 |
if not permit_failure: |
147 |
self.add(other[id], id) |
|
148 |
else: |
|
149 |
try: |
|
150 |
entry = other[id] |
|
|
974.1.77
by Aaron Bentley
Fixed branch handling of missing revisions |
151 |
except KeyError: |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
152 |
failed.add(id) |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
153 |
continue
|
154 |
self.add(entry, id) |
|
155 |
||
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
156 |
if not permit_failure: |
157 |
assert count == len(to_copy) |
|
|
670
by Martin Pool
- Show progress while branching |
158 |
pb.clear() |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
159 |
return count, failed |
160 |
||
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
161 |
def copy_multi_immutable(self, other, to_copy, pb, permit_failure=False): |
|
790
by Martin Pool
Merge from aaron: |
162 |
count = 0 |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
163 |
failed = set() |
|
790
by Martin Pool
Merge from aaron: |
164 |
for id in to_copy: |
165 |
p = self._path(id) |
|
166 |
other_p = other._path(id) |
|
167 |
try: |
|
|
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
168 |
osutils.link_or_copy(other_p, p) |
169 |
except (IOError, OSError), e: |
|
|
790
by Martin Pool
Merge from aaron: |
170 |
if e.errno == errno.ENOENT: |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
171 |
if not permit_failure: |
|
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
172 |
osutils.link_or_copy(other_p+".gz", p+".gz") |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
173 |
else: |
174 |
try: |
|
|
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
175 |
osutils.link_or_copy(other_p+".gz", p+".gz") |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
176 |
except IOError, e: |
177 |
if e.errno == errno.ENOENT: |
|
178 |
failed.add(id) |
|
179 |
else: |
|
180 |
raise
|
|
|
790
by Martin Pool
Merge from aaron: |
181 |
else: |
182 |
raise
|
|
183 |
||
184 |
count += 1 |
|
185 |
pb.update('copy', count, len(to_copy)) |
|
186 |
assert count == len(to_copy) |
|
187 |
pb.clear() |
|
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
188 |
return count, failed |
|
670
by Martin Pool
- Show progress while branching |
189 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
190 |
|
191 |
def __contains__(self, fileid): |
|
192 |
"""""" |
|
|
128
by mbp at sourcefrog
More support for compressed files in stores |
193 |
p = self._path(fileid) |
194 |
return (os.access(p, os.R_OK) |
|
195 |
or os.access(p + '.gz', os.R_OK)) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
196 |
|
|
1298
by Martin Pool
- cosmetic |
197 |
# TODO: Guard against the same thing being stored twice,
|
198 |
# compressed and uncompressed
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
199 |
|
200 |
def __iter__(self): |
|
|
128
by mbp at sourcefrog
More support for compressed files in stores |
201 |
for f in os.listdir(self._basedir): |
202 |
if f[-3:] == '.gz': |
|
203 |
# TODO: case-insensitive?
|
|
204 |
yield f[:-3] |
|
205 |
else: |
|
206 |
yield f |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
207 |
|
|
80
by mbp at sourcefrog
show_info: Show number of entries in the branch stores |
208 |
def __len__(self): |
209 |
return len(os.listdir(self._basedir)) |
|
210 |
||
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
211 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
212 |
def __getitem__(self, fileid): |
213 |
"""Returns a file reading from a particular entry.""" |
|
|
127
by mbp at sourcefrog
- store support for retrieving compressed files |
214 |
p = self._path(fileid) |
215 |
try: |
|
216 |
return gzip.GzipFile(p + '.gz', 'rb') |
|
217 |
except IOError, e: |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
218 |
if e.errno != errno.ENOENT: |
219 |
raise
|
|
220 |
||
221 |
try: |
|
222 |
return file(p, 'rb') |
|
223 |
except IOError, e: |
|
224 |
if e.errno != errno.ENOENT: |
|
225 |
raise
|
|
226 |
||
|
974.1.77
by Aaron Bentley
Fixed branch handling of missing revisions |
227 |
raise KeyError(fileid) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
228 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
229 |
|
|
81
by mbp at sourcefrog
show space usage for various stores in the info command |
230 |
def total_size(self): |
|
127
by mbp at sourcefrog
- store support for retrieving compressed files |
231 |
"""Return (count, bytes) |
232 |
||
233 |
This is the (compressed) size stored on disk, not the size of
|
|
234 |
the content."""
|
|
|
81
by mbp at sourcefrog
show space usage for various stores in the info command |
235 |
total = 0 |
236 |
count = 0 |
|
237 |
for fid in self: |
|
238 |
count += 1 |
|
|
128
by mbp at sourcefrog
More support for compressed files in stores |
239 |
p = self._path(fid) |
240 |
try: |
|
241 |
total += os.stat(p)[ST_SIZE] |
|
242 |
except OSError: |
|
243 |
total += os.stat(p + '.gz')[ST_SIZE] |
|
244 |
||
|
81
by mbp at sourcefrog
show space usage for various stores in the info command |
245 |
return count, total |
246 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
247 |
|
248 |
||
249 |
||
250 |
class ImmutableScratchStore(ImmutableStore): |
|
251 |
"""Self-destructing test subclass of ImmutableStore. |
|
252 |
||
253 |
The Store only exists for the lifetime of the Python object.
|
|
|
711
by Martin Pool
- store docs |
254 |
Obviously you should not put anything precious in it.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
255 |
"""
|
256 |
def __init__(self): |
|
257 |
ImmutableStore.__init__(self, tempfile.mkdtemp()) |
|
258 |
||
259 |
def __del__(self): |
|
|
130
by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression, |
260 |
for f in os.listdir(self._basedir): |
|
163
by mbp at sourcefrog
merge win32 portability fixes |
261 |
fpath = os.path.join(self._basedir, f) |
262 |
# needed on windows, and maybe some other filesystems
|
|
263 |
os.chmod(fpath, 0600) |
|
264 |
os.remove(fpath) |
|
|
130
by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression, |
265 |
os.rmdir(self._basedir) |
266 |
mutter("%r destroyed" % self) |
|
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
267 |
|
268 |
def copy_all(store_from, store_to): |
|
269 |
"""Copy all ids from one store to another.""" |
|
270 |
if not hasattr(store_from, "__iter__"): |
|
271 |
raise UnlistableStore(store_from) |
|
272 |
ids = [f for f in store_from] |
|
273 |
store_to.copy_multi(store_from, ids) |