bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2
by Jelmer Vernooij
Refresh copyright headers, add my email. |
1 |
# Copyright (C) 2010-2018 Jelmer Vernooij <jelmer@jelmer.uk>
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
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
|
|
0.358.1
by Jelmer Vernooij
Fix FSF address. |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
16 |
|
17 |
"""A Git repository implementation that uses a Bazaar transport."""
|
|
18 |
||
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
19 |
from io import BytesIO |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
20 |
|
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
21 |
import os |
0.284.5
by Jelmer Vernooij
Implement TransportRepo._determine_file_mode. |
22 |
import sys |
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
23 |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
24 |
from dulwich.errors import ( |
0.246.7
by Jelmer Vernooij
more work. |
25 |
NoIndexPresent, |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
26 |
)
|
0.410.1
by Jelmer Vernooij
use standard git infrastructure for locking. |
27 |
from dulwich.file import ( |
28 |
GitFile, |
|
29 |
FileLocked, |
|
30 |
)
|
|
0.246.4
by Jelmer Vernooij
more work on transportgit. |
31 |
from dulwich.objects import ( |
32 |
ShaFile, |
|
33 |
)
|
|
34 |
from dulwich.object_store import ( |
|
35 |
PackBasedObjectStore, |
|
36 |
PACKDIR, |
|
7268.1.1
by Jelmer Vernooij
Fix compatibility with newer versions of Dulwich. |
37 |
read_packs_file, |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
38 |
)
|
39 |
from dulwich.pack import ( |
|
0.200.1003
by Jelmer Vernooij
Initial work on supporting move_in_thin_pack. |
40 |
MemoryPackIndex, |
0.246.7
by Jelmer Vernooij
more work. |
41 |
PackData, |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
42 |
Pack, |
0.200.936
by Jelmer Vernooij
Test transportgit. |
43 |
iter_sha1, |
0.246.7
by Jelmer Vernooij
more work. |
44 |
load_pack_index_file, |
0.399.1
by Jelmer Vernooij
Fix thin pack fetching. |
45 |
write_pack_objects, |
0.200.936
by Jelmer Vernooij
Test transportgit. |
46 |
write_pack_index_v2, |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
47 |
)
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
48 |
from dulwich.repo import ( |
49 |
BaseRepo, |
|
0.200.1775
by Jelmer Vernooij
Assume newer dulwich. |
50 |
InfoRefsContainer, |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
51 |
RefsContainer, |
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
52 |
BASE_DIRECTORIES, |
0.200.1776
by Jelmer Vernooij
Basic support for commondir. |
53 |
COMMONDIR, |
0.398.1
by Jelmer Vernooij
Support reading .git files. |
54 |
CONTROLDIR, |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
55 |
INDEX_FILENAME, |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
56 |
OBJECTDIR, |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
57 |
SYMREF, |
58 |
check_ref_format, |
|
59 |
read_packed_refs_with_peeled, |
|
60 |
read_packed_refs, |
|
61 |
write_packed_refs, |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
62 |
)
|
63 |
||
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
64 |
from .. import ( |
7018.3.1
by Jelmer Vernooij
Fix git cache handling. |
65 |
osutils, |
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
66 |
transport as _mod_transport, |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
67 |
urlutils, |
68 |
)
|
|
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
69 |
from ..errors import ( |
0.200.1718
by Jelmer Vernooij
Support AlreadyControlDirError. |
70 |
AlreadyControlDirError, |
0.200.933
by Jelmer Vernooij
Allow directories to already exist :-) |
71 |
FileExists, |
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
72 |
LockBroken, |
0.410.1
by Jelmer Vernooij
use standard git infrastructure for locking. |
73 |
LockContention, |
74 |
NotLocalUrl, |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
75 |
NoSuchFile, |
0.398.1
by Jelmer Vernooij
Support reading .git files. |
76 |
ReadError, |
0.200.946
by Jelmer Vernooij
Fix reading pack files over http. |
77 |
TransportNotPossible, |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
78 |
)
|
79 |
||
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
80 |
from ..lock import LogicalLockResult |
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
81 |
from ..trace import warning |
0.410.1
by Jelmer Vernooij
use standard git infrastructure for locking. |
82 |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
83 |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
84 |
class TransportRefsContainer(RefsContainer): |
85 |
"""Refs container that reads refs from a transport.""" |
|
86 |
||
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
87 |
def __init__(self, transport, worktree_transport=None): |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
88 |
self.transport = transport |
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
89 |
if worktree_transport is None: |
90 |
worktree_transport = transport |
|
91 |
self.worktree_transport = worktree_transport |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
92 |
self._packed_refs = None |
93 |
self._peeled_refs = None |
|
94 |
||
95 |
def __repr__(self): |
|
96 |
return "%s(%r)" % (self.__class__.__name__, self.transport) |
|
97 |
||
0.257.2
by Jelmer Vernooij
Fix transportgit. |
98 |
def _ensure_dir_exists(self, path): |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
99 |
for n in range(path.count("/")): |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
100 |
dirname = "/".join(path.split("/")[:n + 1]) |
0.257.2
by Jelmer Vernooij
Fix transportgit. |
101 |
try: |
102 |
self.transport.mkdir(dirname) |
|
103 |
except FileExists: |
|
104 |
pass
|
|
105 |
||
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
106 |
def subkeys(self, base): |
0.377.1
by Jelmer Vernooij
Fix some remote operations and add more tests. |
107 |
"""Refs present in this container under a base. |
108 |
||
109 |
:param base: The base to return refs under.
|
|
110 |
:return: A set of valid refs in this container under the base; the base
|
|
111 |
prefix is stripped from the ref names returned.
|
|
112 |
"""
|
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
113 |
keys = set() |
0.377.1
by Jelmer Vernooij
Fix some remote operations and add more tests. |
114 |
base_len = len(base) + 1 |
115 |
for refname in self.allkeys(): |
|
116 |
if refname.startswith(base): |
|
117 |
keys.add(refname[base_len:]) |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
118 |
return keys |
119 |
||
120 |
def allkeys(self): |
|
121 |
keys = set() |
|
0.200.1387
by Jelmer Vernooij
Avoid using HEAD. |
122 |
try: |
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
123 |
self.worktree_transport.get_bytes("HEAD") |
0.200.1387
by Jelmer Vernooij
Avoid using HEAD. |
124 |
except NoSuchFile: |
125 |
pass
|
|
126 |
else: |
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
127 |
keys.add(b"HEAD") |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
128 |
try: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
129 |
iter_files = list(self.transport.clone( |
130 |
"refs").iter_files_recursive()) |
|
0.257.2
by Jelmer Vernooij
Fix transportgit. |
131 |
for filename in iter_files: |
7045.4.1
by Jelmer Vernooij
Some brz-git fixes. |
132 |
unquoted_filename = urlutils.unquote_to_bytes(filename) |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
133 |
refname = osutils.pathjoin(b"refs", unquoted_filename) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
134 |
if check_ref_format(refname): |
135 |
keys.add(refname) |
|
0.257.2
by Jelmer Vernooij
Fix transportgit. |
136 |
except (TransportNotPossible, NoSuchFile): |
137 |
pass
|
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
138 |
keys.update(self.get_packed_refs()) |
139 |
return keys |
|
140 |
||
141 |
def get_packed_refs(self): |
|
142 |
"""Get contents of the packed-refs file. |
|
143 |
||
144 |
:return: Dictionary mapping ref names to SHA1s
|
|
145 |
||
146 |
:note: Will return an empty dictionary when no packed-refs file is
|
|
147 |
present.
|
|
148 |
"""
|
|
149 |
# TODO: invalidate the cache on repacking
|
|
150 |
if self._packed_refs is None: |
|
151 |
# set both to empty because we want _peeled_refs to be
|
|
152 |
# None if and only if _packed_refs is also None.
|
|
153 |
self._packed_refs = {} |
|
154 |
self._peeled_refs = {} |
|
155 |
try: |
|
156 |
f = self.transport.get("packed-refs") |
|
157 |
except NoSuchFile: |
|
158 |
return {} |
|
159 |
try: |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
160 |
first_line = next(iter(f)).rstrip() |
7129.1.1
by Jelmer Vernooij
Fix bytiness. |
161 |
if (first_line.startswith(b"# pack-refs") and b" peeled" in |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
162 |
first_line): |
163 |
for sha, name, peeled in read_packed_refs_with_peeled(f): |
|
164 |
self._packed_refs[name] = sha |
|
165 |
if peeled: |
|
166 |
self._peeled_refs[name] = peeled |
|
167 |
else: |
|
168 |
f.seek(0) |
|
169 |
for sha, name in read_packed_refs(f): |
|
170 |
self._packed_refs[name] = sha |
|
171 |
finally: |
|
172 |
f.close() |
|
173 |
return self._packed_refs |
|
174 |
||
175 |
def get_peeled(self, name): |
|
176 |
"""Return the cached peeled value of a ref, if available. |
|
177 |
||
178 |
:param name: Name of the ref to peel
|
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
179 |
:return: The peeled value of the ref. If the ref is known not point to
|
180 |
a tag, this will be the SHA the ref refers to. If the ref may point
|
|
181 |
to a tag, but no cached information is available, None is returned.
|
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
182 |
"""
|
183 |
self.get_packed_refs() |
|
184 |
if self._peeled_refs is None or name not in self._packed_refs: |
|
185 |
# No cache: no peeled refs were read, or this ref is loose
|
|
186 |
return None |
|
187 |
if name in self._peeled_refs: |
|
188 |
return self._peeled_refs[name] |
|
189 |
else: |
|
190 |
# Known not peelable
|
|
191 |
return self[name] |
|
192 |
||
193 |
def read_loose_ref(self, name): |
|
194 |
"""Read a reference file and return its contents. |
|
195 |
||
196 |
If the reference file a symbolic reference, only read the first line of
|
|
197 |
the file. Otherwise, only read the first 40 bytes.
|
|
198 |
||
199 |
:param name: the refname to read, relative to refpath
|
|
200 |
:return: The contents of the ref file, or None if the file does not
|
|
201 |
exist.
|
|
202 |
:raises IOError: if any other error occurs
|
|
203 |
"""
|
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
204 |
if name == b'HEAD': |
205 |
transport = self.worktree_transport |
|
206 |
else: |
|
207 |
transport = self.transport |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
208 |
try: |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
209 |
f = transport.get(urlutils.quote_from_bytes(name)) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
210 |
except NoSuchFile: |
211 |
return None |
|
7027.4.7
by Jelmer Vernooij
Fix some tests. |
212 |
with f: |
7290.44.1
by Jelmer Vernooij
Don't throw an error attempting to read the parent of a ref. |
213 |
try: |
214 |
header = f.read(len(SYMREF)) |
|
215 |
except ReadError: |
|
216 |
# probably a directory
|
|
217 |
return None |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
218 |
if header == SYMREF: |
219 |
# Read only the first line
|
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
220 |
return header + next(iter(f)).rstrip(b"\r\n") |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
221 |
else: |
222 |
# Read only the first 40 bytes
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
223 |
return header + f.read(40 - len(SYMREF)) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
224 |
|
225 |
def _remove_packed_ref(self, name): |
|
226 |
if self._packed_refs is None: |
|
227 |
return
|
|
228 |
# reread cached refs from disk, while holding the lock
|
|
229 |
||
230 |
self._packed_refs = None |
|
231 |
self.get_packed_refs() |
|
232 |
||
233 |
if name not in self._packed_refs: |
|
234 |
return
|
|
235 |
||
236 |
del self._packed_refs[name] |
|
237 |
if name in self._peeled_refs: |
|
238 |
del self._peeled_refs[name] |
|
7356.1.5
by Jelmer Vernooij
Use more ExitStacks. |
239 |
with self.transport.open_write_stream("packed-refs") as f: |
0.200.954
by Jelmer Vernooij
Avoid writing to memory first unless strictly necessary. |
240 |
write_packed_refs(f, self._packed_refs, self._peeled_refs) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
241 |
|
242 |
def set_symbolic_ref(self, name, other): |
|
243 |
"""Make a ref point at another ref. |
|
244 |
||
245 |
:param name: Name of the ref to set
|
|
246 |
:param other: Name of the ref to point at
|
|
247 |
"""
|
|
248 |
self._check_refname(name) |
|
249 |
self._check_refname(other) |
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
250 |
if name != b'HEAD': |
251 |
transport = self.transport |
|
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
252 |
self._ensure_dir_exists(urlutils.quote_from_bytes(name)) |
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
253 |
else: |
254 |
transport = self.worktree_transport |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
255 |
transport.put_bytes(urlutils.quote_from_bytes( |
256 |
name), SYMREF + other + b'\n') |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
257 |
|
258 |
def set_if_equals(self, name, old_ref, new_ref): |
|
259 |
"""Set a refname to new_ref only if it currently equals old_ref. |
|
260 |
||
261 |
This method follows all symbolic references, and can be used to perform
|
|
262 |
an atomic compare-and-swap operation.
|
|
263 |
||
264 |
:param name: The refname to set.
|
|
265 |
:param old_ref: The old sha the refname must refer to, or None to set
|
|
266 |
unconditionally.
|
|
267 |
:param new_ref: The new sha the refname will refer to.
|
|
268 |
:return: True if the set was successful, False otherwise.
|
|
269 |
"""
|
|
270 |
try: |
|
0.284.2
by Jelmer Vernooij
Use new RefsContainer.follow(). |
271 |
realnames, _ = self.follow(name) |
272 |
realname = realnames[-1] |
|
273 |
except (KeyError, IndexError): |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
274 |
realname = name |
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
275 |
if realname == b'HEAD': |
276 |
transport = self.worktree_transport |
|
277 |
else: |
|
278 |
transport = self.transport |
|
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
279 |
self._ensure_dir_exists(urlutils.quote_from_bytes(realname)) |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
280 |
transport.put_bytes(urlutils.quote_from_bytes( |
281 |
realname), new_ref + b"\n") |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
282 |
return True |
283 |
||
284 |
def add_if_new(self, name, ref): |
|
285 |
"""Add a new reference only if it does not already exist. |
|
286 |
||
287 |
This method follows symrefs, and only ensures that the last ref in the
|
|
288 |
chain does not exist.
|
|
289 |
||
290 |
:param name: The refname to set.
|
|
291 |
:param ref: The new sha the refname will refer to.
|
|
292 |
:return: True if the add was successful, False otherwise.
|
|
293 |
"""
|
|
294 |
try: |
|
0.284.2
by Jelmer Vernooij
Use new RefsContainer.follow(). |
295 |
realnames, contents = self.follow(name) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
296 |
if contents is not None: |
297 |
return False |
|
0.284.2
by Jelmer Vernooij
Use new RefsContainer.follow(). |
298 |
realname = realnames[-1] |
299 |
except (KeyError, IndexError): |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
300 |
realname = name |
301 |
self._check_refname(realname) |
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
302 |
if realname == b'HEAD': |
303 |
transport = self.worktree_transport |
|
304 |
else: |
|
305 |
transport = self.transport |
|
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
306 |
self._ensure_dir_exists(urlutils.quote_from_bytes(realname)) |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
307 |
transport.put_bytes(urlutils.quote_from_bytes(realname), ref + b"\n") |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
308 |
return True |
309 |
||
310 |
def remove_if_equals(self, name, old_ref): |
|
311 |
"""Remove a refname only if it currently equals old_ref. |
|
312 |
||
313 |
This method does not follow symbolic references. It can be used to
|
|
314 |
perform an atomic compare-and-delete operation.
|
|
315 |
||
316 |
:param name: The refname to delete.
|
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
317 |
:param old_ref: The old sha the refname must refer to, or None to
|
318 |
delete unconditionally.
|
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
319 |
:return: True if the delete was successful, False otherwise.
|
320 |
"""
|
|
321 |
self._check_refname(name) |
|
322 |
# may only be packed
|
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
323 |
if name == b'HEAD': |
324 |
transport = self.worktree_transport |
|
325 |
else: |
|
326 |
transport = self.transport |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
327 |
try: |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
328 |
transport.delete(urlutils.quote_from_bytes(name)) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
329 |
except NoSuchFile: |
330 |
pass
|
|
331 |
self._remove_packed_ref(name) |
|
332 |
return True |
|
333 |
||
0.200.1459
by Jelmer Vernooij
Implement TransportRefsContainer.get. |
334 |
def get(self, name, default=None): |
335 |
try: |
|
336 |
return self[name] |
|
337 |
except KeyError: |
|
338 |
return default |
|
339 |
||
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
340 |
def unlock_ref(self, name): |
341 |
if name == b"HEAD": |
|
342 |
transport = self.worktree_transport |
|
343 |
else: |
|
344 |
transport = self.transport |
|
6973.12.3
by Jelmer Vernooij
Fixes. |
345 |
lockname = name + b".lock" |
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
346 |
try: |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
347 |
transport.delete(urlutils.quote_from_bytes(lockname)) |
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
348 |
except NoSuchFile: |
349 |
pass
|
|
350 |
||
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
351 |
def lock_ref(self, name): |
352 |
if name == b"HEAD": |
|
353 |
transport = self.worktree_transport |
|
354 |
else: |
|
355 |
transport = self.transport |
|
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
356 |
self._ensure_dir_exists(urlutils.quote_from_bytes(name)) |
357 |
lockname = urlutils.quote_from_bytes(name + b".lock") |
|
0.383.2
by Jelmer Vernooij
Fall back to (shudder) racy locking. |
358 |
try: |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
359 |
local_path = transport.local_abspath( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
360 |
urlutils.quote_from_bytes(name)) |
0.410.1
by Jelmer Vernooij
use standard git infrastructure for locking. |
361 |
except NotLocalUrl: |
362 |
# This is racy, but what can we do?
|
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
363 |
if transport.has(lockname): |
0.410.1
by Jelmer Vernooij
use standard git infrastructure for locking. |
364 |
raise LockContention(name) |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
365 |
transport.put_bytes(lockname, b'Locked by brz-git') |
366 |
return LogicalLockResult(lambda: transport.delete(lockname)) |
|
0.410.1
by Jelmer Vernooij
use standard git infrastructure for locking. |
367 |
else: |
368 |
try: |
|
369 |
gf = GitFile(local_path, 'wb') |
|
370 |
except FileLocked as e: |
|
371 |
raise LockContention(name, e) |
|
372 |
else: |
|
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
373 |
def unlock(): |
374 |
try: |
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
375 |
transport.delete(lockname) |
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
376 |
except NoSuchFile: |
377 |
raise LockBroken(lockname) |
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
378 |
# GitFile.abort doesn't care if the lock has already
|
379 |
# disappeared
|
|
0.412.1
by Jelmer Vernooij
Implement Branch.break_lock. |
380 |
gf.abort() |
381 |
return LogicalLockResult(unlock) |
|
0.383.1
by Jelmer Vernooij
Fix a bunch of locking issues. |
382 |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
383 |
|
7045.4.2
by Jelmer Vernooij
Fix some more gitty tests. |
384 |
# TODO(jelmer): Use upstream read_gitfile; unfortunately that expects strings
|
385 |
# rather than bytes..
|
|
386 |
def read_gitfile(f): |
|
387 |
"""Read a ``.git`` file. |
|
388 |
||
389 |
The first line of the file should start with "gitdir: "
|
|
390 |
||
391 |
:param f: File-like object to read from
|
|
392 |
:return: A path
|
|
393 |
"""
|
|
394 |
cs = f.read() |
|
395 |
if not cs.startswith(b"gitdir: "): |
|
396 |
raise ValueError("Expected file to start with 'gitdir: '") |
|
397 |
return cs[len(b"gitdir: "):].rstrip(b"\n") |
|
398 |
||
399 |
||
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
400 |
class TransportRepo(BaseRepo): |
401 |
||
0.200.1485
by Jelmer Vernooij
Keep track of refs text when opening bare repository. |
402 |
def __init__(self, transport, bare, refs_text=None): |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
403 |
self.transport = transport |
0.200.1387
by Jelmer Vernooij
Avoid using HEAD. |
404 |
self.bare = bare |
0.398.1
by Jelmer Vernooij
Support reading .git files. |
405 |
try: |
406 |
with transport.get(CONTROLDIR) as f: |
|
407 |
path = read_gitfile(f) |
|
408 |
except (ReadError, NoSuchFile): |
|
409 |
if self.bare: |
|
410 |
self._controltransport = self.transport |
|
411 |
else: |
|
412 |
self._controltransport = self.transport.clone('.git') |
|
0.200.1387
by Jelmer Vernooij
Avoid using HEAD. |
413 |
else: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
414 |
self._controltransport = self.transport.clone( |
415 |
urlutils.quote_from_bytes(path)) |
|
0.200.1776
by Jelmer Vernooij
Basic support for commondir. |
416 |
commondir = self.get_named_file(COMMONDIR) |
417 |
if commondir is not None: |
|
418 |
with commondir: |
|
419 |
commondir = os.path.join( |
|
420 |
self.controldir(), |
|
421 |
commondir.read().rstrip(b"\r\n").decode( |
|
422 |
sys.getfilesystemencoding())) |
|
423 |
self._commontransport = \ |
|
424 |
_mod_transport.get_transport_from_path(commondir) |
|
425 |
else: |
|
426 |
self._commontransport = self._controltransport |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
427 |
object_store = TransportObjectStore( |
0.200.1776
by Jelmer Vernooij
Basic support for commondir. |
428 |
self._commontransport.clone(OBJECTDIR)) |
0.200.1485
by Jelmer Vernooij
Keep track of refs text when opening bare repository. |
429 |
if refs_text is not None: |
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
430 |
refs_container = InfoRefsContainer(BytesIO(refs_text)) |
0.200.1572
by Jelmer Vernooij
Fix compatibility for fetching over dumb transport. |
431 |
try: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
432 |
head = TransportRefsContainer( |
7371.4.4
by Jelmer Vernooij
Pull in more fixes from janitor. |
433 |
self._commontransport).read_loose_ref(b"HEAD") |
0.200.1572
by Jelmer Vernooij
Fix compatibility for fetching over dumb transport. |
434 |
except KeyError: |
435 |
pass
|
|
436 |
else: |
|
7371.4.4
by Jelmer Vernooij
Pull in more fixes from janitor. |
437 |
refs_container._refs[b"HEAD"] = head |
0.200.1485
by Jelmer Vernooij
Keep track of refs text when opening bare repository. |
438 |
else: |
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
439 |
refs_container = TransportRefsContainer( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
440 |
self._commontransport, self._controltransport) |
0.200.1636
by Jelmer Vernooij
Some formatting fixes. |
441 |
super(TransportRepo, self).__init__(object_store, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
442 |
refs_container) |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
443 |
|
0.200.1658
by Jelmer Vernooij
Fix handling of ignores - return patterns that matched. |
444 |
def controldir(self): |
445 |
return self._controltransport.local_abspath('.') |
|
446 |
||
0.404.1
by Jelmer Vernooij
Implement TransportRepo.commondir. |
447 |
def commondir(self): |
448 |
return self._commontransport.local_abspath('.') |
|
449 |
||
0.200.1658
by Jelmer Vernooij
Fix handling of ignores - return patterns that matched. |
450 |
@property
|
451 |
def path(self): |
|
452 |
return self.transport.local_abspath('.') |
|
453 |
||
0.284.5
by Jelmer Vernooij
Implement TransportRepo._determine_file_mode. |
454 |
def _determine_file_mode(self): |
455 |
# Be consistent with bzr
|
|
456 |
if sys.platform == 'win32': |
|
457 |
return False |
|
458 |
return True |
|
459 |
||
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
460 |
def get_named_file(self, path): |
461 |
"""Get a file from the control dir with a specific name. |
|
462 |
||
463 |
Although the filename should be interpreted as a filename relative to
|
|
464 |
the control dir in a disk-baked Repo, the object returned need not be
|
|
465 |
pointing to a file in that location.
|
|
466 |
||
467 |
:param path: The path to the file, relative to the control dir.
|
|
468 |
:return: An open file object, or None if the file does not exist.
|
|
469 |
"""
|
|
470 |
try: |
|
471 |
return self._controltransport.get(path.lstrip('/')) |
|
472 |
except NoSuchFile: |
|
473 |
return None |
|
474 |
||
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
475 |
def _put_named_file(self, relpath, contents): |
476 |
self._controltransport.put_bytes(relpath, contents) |
|
477 |
||
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
478 |
def index_path(self): |
479 |
"""Return the path to the index file.""" |
|
480 |
return self._controltransport.local_abspath(INDEX_FILENAME) |
|
481 |
||
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
482 |
def open_index(self): |
483 |
"""Open the index for this repository.""" |
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
484 |
from dulwich.index import Index |
485 |
if not self.has_index(): |
|
486 |
raise NoIndexPresent() |
|
487 |
return Index(self.index_path()) |
|
488 |
||
489 |
def has_index(self): |
|
0.257.2
by Jelmer Vernooij
Fix transportgit. |
490 |
"""Check if an index is present.""" |
491 |
# Bare repos must never have index files; non-bare repos may have a
|
|
492 |
# missing index file, which is treated as empty.
|
|
493 |
return not self.bare |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
494 |
|
0.200.1546
by Jelmer Vernooij
Provide get_config. |
495 |
def get_config(self): |
0.200.1547
by Jelmer Vernooij
Support setting branch nicks. |
496 |
from dulwich.config import ConfigFile |
497 |
try: |
|
7027.4.7
by Jelmer Vernooij
Fix some tests. |
498 |
with self._controltransport.get('config') as f: |
499 |
return ConfigFile.from_file(f) |
|
0.200.1547
by Jelmer Vernooij
Support setting branch nicks. |
500 |
except NoSuchFile: |
501 |
return ConfigFile() |
|
502 |
||
503 |
def get_config_stack(self): |
|
504 |
from dulwich.config import StackedConfig |
|
0.200.1546
by Jelmer Vernooij
Provide get_config. |
505 |
backends = [] |
0.200.1547
by Jelmer Vernooij
Support setting branch nicks. |
506 |
p = self.get_config() |
507 |
if p is not None: |
|
508 |
backends.append(p) |
|
509 |
writable = p |
|
510 |
else: |
|
511 |
writable = None |
|
0.200.1546
by Jelmer Vernooij
Provide get_config. |
512 |
backends.extend(StackedConfig.default_backends()) |
0.200.1547
by Jelmer Vernooij
Support setting branch nicks. |
513 |
return StackedConfig(backends, writable=writable) |
0.200.1546
by Jelmer Vernooij
Provide get_config. |
514 |
|
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
515 |
def __repr__(self): |
0.200.1031
by Jelmer Vernooij
Better __repr__. |
516 |
return "<%s for %r>" % (self.__class__.__name__, self.transport) |
0.246.1
by Jelmer Vernooij
Add TransportRepo class. |
517 |
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
518 |
@classmethod
|
519 |
def init(cls, transport, bare=False): |
|
520 |
if not bare: |
|
0.200.1718
by Jelmer Vernooij
Support AlreadyControlDirError. |
521 |
try: |
522 |
transport.mkdir(".git") |
|
523 |
except FileExists: |
|
524 |
raise AlreadyControlDirError(transport.base) |
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
525 |
control_transport = transport.clone(".git") |
526 |
else: |
|
527 |
control_transport = transport |
|
528 |
for d in BASE_DIRECTORIES: |
|
0.200.1718
by Jelmer Vernooij
Support AlreadyControlDirError. |
529 |
try: |
530 |
control_transport.mkdir("/".join(d)) |
|
531 |
except FileExists: |
|
532 |
pass
|
|
533 |
try: |
|
534 |
control_transport.mkdir(OBJECTDIR) |
|
535 |
except FileExists: |
|
536 |
raise AlreadyControlDirError(transport.base) |
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
537 |
TransportObjectStore.init(control_transport.clone(OBJECTDIR)) |
0.200.1387
by Jelmer Vernooij
Avoid using HEAD. |
538 |
ret = cls(transport, bare) |
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
539 |
ret.refs.set_symbolic_ref(b"HEAD", b"refs/heads/master") |
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
540 |
ret._init_files(bare) |
541 |
return ret |
|
542 |
||
0.246.4
by Jelmer Vernooij
more work on transportgit. |
543 |
|
544 |
class TransportObjectStore(PackBasedObjectStore): |
|
545 |
"""Git-style object store that exists on disk.""" |
|
546 |
||
547 |
def __init__(self, transport): |
|
548 |
"""Open an object store. |
|
549 |
||
550 |
:param transport: Transport to open data from
|
|
551 |
"""
|
|
552 |
super(TransportObjectStore, self).__init__() |
|
553 |
self.transport = transport |
|
554 |
self.pack_transport = self.transport.clone(PACKDIR) |
|
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
555 |
self._alternates = None |
0.200.1031
by Jelmer Vernooij
Better __repr__. |
556 |
|
0.317.1
by Jelmer Vernooij
Implement TransportObjectStore.__eq__. |
557 |
def __eq__(self, other): |
558 |
if not isinstance(other, TransportObjectStore): |
|
559 |
return False |
|
560 |
return self.transport == other.transport |
|
561 |
||
0.200.1031
by Jelmer Vernooij
Better __repr__. |
562 |
def __repr__(self): |
563 |
return "%s(%r)" % (self.__class__.__name__, self.transport) |
|
564 |
||
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
565 |
@property
|
566 |
def alternates(self): |
|
567 |
if self._alternates is not None: |
|
568 |
return self._alternates |
|
569 |
self._alternates = [] |
|
570 |
for path in self._read_alternate_paths(): |
|
571 |
# FIXME: Check path
|
|
0.200.1342
by Jelmer Vernooij
Add basic support for alternates. |
572 |
t = _mod_transport.get_transport_from_path(path) |
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
573 |
self._alternates.append(self.__class__(t)) |
574 |
return self._alternates |
|
575 |
||
576 |
def _read_alternate_paths(self): |
|
577 |
try: |
|
578 |
f = self.transport.get("info/alternates") |
|
579 |
except NoSuchFile: |
|
580 |
return [] |
|
581 |
ret = [] |
|
7027.4.7
by Jelmer Vernooij
Fix some tests. |
582 |
with f: |
0.200.1572
by Jelmer Vernooij
Fix compatibility for fetching over dumb transport. |
583 |
for l in f.read().splitlines(): |
7027.4.7
by Jelmer Vernooij
Fix some tests. |
584 |
if l[0] == b"#": |
0.200.1340
by Jelmer Vernooij
Add basic support for alternates. |
585 |
continue
|
586 |
if os.path.isabs(l): |
|
587 |
continue
|
|
588 |
ret.append(l) |
|
589 |
return ret |
|
590 |
||
0.281.2
by William Grant
Fix TransportObjectStore to actually have packs with the new cache dict. |
591 |
def _update_pack_cache(self): |
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
592 |
pack_files = set(self._pack_names()) |
7268.1.1
by Jelmer Vernooij
Fix compatibility with newer versions of Dulwich. |
593 |
new_packs = [] |
594 |
for basename in pack_files: |
|
595 |
pack_name = basename + ".pack" |
|
596 |
if basename not in self._pack_cache: |
|
597 |
try: |
|
598 |
size = self.pack_transport.stat(pack_name).st_size |
|
599 |
except TransportNotPossible: |
|
600 |
f = self.pack_transport.get(pack_name) |
|
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
601 |
# TODO(jelmer): Don't read entire file into memory?
|
602 |
f = BytesIO(f.read()) |
|
7268.1.1
by Jelmer Vernooij
Fix compatibility with newer versions of Dulwich. |
603 |
pd = PackData(pack_name, f) |
604 |
else: |
|
605 |
pd = PackData( |
|
606 |
pack_name, self.pack_transport.get(pack_name), |
|
607 |
size=size) |
|
608 |
idxname = basename + ".idx" |
|
609 |
idx = load_pack_index_file( |
|
610 |
idxname, self.pack_transport.get(idxname)) |
|
611 |
pack = Pack.from_objects(pd, idx) |
|
612 |
pack._basename = basename |
|
613 |
self._pack_cache[basename] = pack |
|
614 |
new_packs.append(pack) |
|
615 |
# Remove disappeared pack files
|
|
616 |
for f in set(self._pack_cache) - pack_files: |
|
617 |
self._pack_cache.pop(f).close() |
|
618 |
return new_packs |
|
0.281.2
by William Grant
Fix TransportObjectStore to actually have packs with the new cache dict. |
619 |
|
0.256.1
by Jelmer Vernooij
Allow using manual listing for pack contents. |
620 |
def _pack_names(self): |
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
621 |
pack_files = [] |
0.256.1
by Jelmer Vernooij
Allow using manual listing for pack contents. |
622 |
try: |
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
623 |
dir_contents = self.pack_transport.list_dir(".") |
624 |
for name in dir_contents: |
|
625 |
if name.startswith("pack-") and name.endswith(".pack"): |
|
626 |
# verify that idx exists first (otherwise the pack was not yet
|
|
627 |
# fully written)
|
|
628 |
idx_name = os.path.splitext(name)[0] + ".idx" |
|
629 |
if idx_name in dir_contents: |
|
630 |
pack_files.append(os.path.splitext(name)[0]) |
|
7131.2.1
by Jelmer Vernooij
Read packs file only if directory isn't listable. |
631 |
except TransportNotPossible: |
632 |
try: |
|
633 |
f = self.transport.get('info/packs') |
|
634 |
except NoSuchFile: |
|
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
635 |
warning('No info/packs on remote host;' |
636 |
'run \'git update-server-info\' on remote.') |
|
7131.2.1
by Jelmer Vernooij
Read packs file only if directory isn't listable. |
637 |
else: |
638 |
with f: |
|
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
639 |
pack_files = [ |
640 |
os.path.splitext(name)[0] |
|
641 |
for name in read_packs_file(f)] |
|
7131.2.1
by Jelmer Vernooij
Read packs file only if directory isn't listable. |
642 |
except NoSuchFile: |
7411.1.1
by Jelmer Vernooij
Fix support for reading from a dumb git server. |
643 |
pass
|
644 |
return pack_files |
|
0.256.1
by Jelmer Vernooij
Allow using manual listing for pack contents. |
645 |
|
0.200.1671
by Jelmer Vernooij
Fix pack tests. |
646 |
def _remove_pack(self, pack): |
647 |
self.pack_transport.delete(os.path.basename(pack.index.path)) |
|
648 |
self.pack_transport.delete(pack.data.filename) |
|
7268.1.1
by Jelmer Vernooij
Fix compatibility with newer versions of Dulwich. |
649 |
try: |
650 |
del self._pack_cache[os.path.basename(pack._basename)] |
|
651 |
except KeyError: |
|
652 |
pass
|
|
0.246.4
by Jelmer Vernooij
more work on transportgit. |
653 |
|
654 |
def _iter_loose_objects(self): |
|
655 |
for base in self.transport.list_dir('.'): |
|
656 |
if len(base) != 2: |
|
657 |
continue
|
|
658 |
for rest in self.transport.list_dir(base): |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
659 |
yield (base + rest).encode(sys.getfilesystemencoding()) |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
660 |
|
661 |
def _split_loose_object(self, sha): |
|
662 |
return (sha[:2], sha[2:]) |
|
663 |
||
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
664 |
def _remove_loose_object(self, sha): |
7018.3.1
by Jelmer Vernooij
Fix git cache handling. |
665 |
path = osutils.joinpath(self._split_loose_object(sha)) |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
666 |
self.transport.delete(urlutils.quote_from_bytes(path)) |
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
667 |
|
0.246.4
by Jelmer Vernooij
more work on transportgit. |
668 |
def _get_loose_object(self, sha): |
7018.3.1
by Jelmer Vernooij
Fix git cache handling. |
669 |
path = osutils.joinpath(self._split_loose_object(sha)) |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
670 |
try: |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
671 |
with self.transport.get(urlutils.quote_from_bytes(path)) as f: |
7027.4.7
by Jelmer Vernooij
Fix some tests. |
672 |
return ShaFile.from_file(f) |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
673 |
except NoSuchFile: |
674 |
return None |
|
675 |
||
676 |
def add_object(self, obj): |
|
677 |
"""Add a single object to this object store. |
|
678 |
||
679 |
:param obj: Object to add
|
|
680 |
"""
|
|
681 |
(dir, file) = self._split_loose_object(obj.id) |
|
0.200.933
by Jelmer Vernooij
Allow directories to already exist :-) |
682 |
try: |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
683 |
self.transport.mkdir(urlutils.quote_from_bytes(dir)) |
0.200.933
by Jelmer Vernooij
Allow directories to already exist :-) |
684 |
except FileExists: |
685 |
pass
|
|
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
686 |
path = urlutils.quote_from_bytes(osutils.pathjoin(dir, file)) |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
687 |
if self.transport.has(path): |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
688 |
return # Already there, no need to write again |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
689 |
self.transport.put_bytes(path, obj.as_legacy_object()) |
690 |
||
0.200.937
by Jelmer Vernooij
Avoid using os module in transportgit. |
691 |
def move_in_pack(self, f): |
0.200.936
by Jelmer Vernooij
Test transportgit. |
692 |
"""Move a specific file containing a pack into the pack directory. |
693 |
||
694 |
:note: The file should be on the same file system as the
|
|
695 |
packs directory.
|
|
696 |
||
697 |
:param path: Path to the pack file.
|
|
698 |
"""
|
|
0.200.937
by Jelmer Vernooij
Avoid using os module in transportgit. |
699 |
f.seek(0) |
0.200.1682
by Jelmer Vernooij
Fix compatibility with newer versions of dulwich. |
700 |
p = PackData("", f, len(f.getvalue())) |
0.200.936
by Jelmer Vernooij
Test transportgit. |
701 |
entries = p.sorted_entries() |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
702 |
basename = "pack-%s" % iter_sha1(entry[0] |
703 |
for entry in entries).decode('ascii') |
|
0.200.1671
by Jelmer Vernooij
Fix pack tests. |
704 |
p._filename = basename + ".pack" |
0.200.937
by Jelmer Vernooij
Avoid using os module in transportgit. |
705 |
f.seek(0) |
706 |
self.pack_transport.put_file(basename + ".pack", f) |
|
7356.1.5
by Jelmer Vernooij
Use more ExitStacks. |
707 |
with self.pack_transport.open_write_stream(basename + ".idx") as idxfile: |
0.200.954
by Jelmer Vernooij
Avoid writing to memory first unless strictly necessary. |
708 |
write_pack_index_v2(idxfile, entries, p.get_stored_checksum()) |
0.399.2
by Jelmer Vernooij
Fix tests. |
709 |
idxfile = self.pack_transport.get(basename + ".idx") |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
710 |
idx = load_pack_index_file(basename + ".idx", idxfile) |
0.399.2
by Jelmer Vernooij
Fix tests. |
711 |
final_pack = Pack.from_objects(p, idx) |
712 |
final_pack._basename = basename |
|
7268.1.1
by Jelmer Vernooij
Fix compatibility with newer versions of Dulwich. |
713 |
self._add_cached_pack(basename, final_pack) |
0.399.2
by Jelmer Vernooij
Fix tests. |
714 |
return final_pack |
0.200.1003
by Jelmer Vernooij
Initial work on supporting move_in_thin_pack. |
715 |
|
716 |
def move_in_thin_pack(self, f): |
|
717 |
"""Move a specific file containing a pack into the pack directory. |
|
718 |
||
719 |
:note: The file should be on the same file system as the
|
|
720 |
packs directory.
|
|
721 |
||
722 |
:param path: Path to the pack file.
|
|
723 |
"""
|
|
724 |
f.seek(0) |
|
0.399.1
by Jelmer Vernooij
Fix thin pack fetching. |
725 |
p = Pack('', resolve_ext_ref=self.get_raw) |
726 |
p._data = PackData.from_file(f, len(f.getvalue())) |
|
727 |
p._data.pack = p |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
728 |
p._idx_load = lambda: MemoryPackIndex( |
729 |
p.data.sorted_entries(), p.data.get_stored_checksum()) |
|
0.200.1003
by Jelmer Vernooij
Initial work on supporting move_in_thin_pack. |
730 |
|
0.399.1
by Jelmer Vernooij
Fix thin pack fetching. |
731 |
pack_sha = p.index.objects_sha1() |
0.200.1003
by Jelmer Vernooij
Initial work on supporting move_in_thin_pack. |
732 |
|
7356.1.5
by Jelmer Vernooij
Use more ExitStacks. |
733 |
with self.pack_transport.open_write_stream( |
734 |
"pack-%s.pack" % pack_sha.decode('ascii')) as datafile: |
|
0.399.1
by Jelmer Vernooij
Fix thin pack fetching. |
735 |
entries, data_sum = write_pack_objects(datafile, p.pack_tuples()) |
736 |
entries = sorted([(k, v[0], v[1]) for (k, v) in entries.items()]) |
|
7356.1.5
by Jelmer Vernooij
Use more ExitStacks. |
737 |
with self.pack_transport.open_write_stream( |
738 |
"pack-%s.idx" % pack_sha.decode('ascii')) as idxfile: |
|
0.399.1
by Jelmer Vernooij
Fix thin pack fetching. |
739 |
write_pack_index_v2(idxfile, entries, data_sum) |
0.200.1003
by Jelmer Vernooij
Initial work on supporting move_in_thin_pack. |
740 |
|
0.246.4
by Jelmer Vernooij
more work on transportgit. |
741 |
def add_pack(self): |
0.200.1636
by Jelmer Vernooij
Some formatting fixes. |
742 |
"""Add a new pack to this object store. |
0.246.4
by Jelmer Vernooij
more work on transportgit. |
743 |
|
0.200.1636
by Jelmer Vernooij
Some formatting fixes. |
744 |
:return: Fileobject to write to and a commit function to
|
0.246.4
by Jelmer Vernooij
more work on transportgit. |
745 |
call when the pack is finished.
|
746 |
"""
|
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
747 |
f = BytesIO() |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
748 |
|
0.200.936
by Jelmer Vernooij
Test transportgit. |
749 |
def commit(): |
0.200.937
by Jelmer Vernooij
Avoid using os module in transportgit. |
750 |
if len(f.getvalue()) > 0: |
751 |
return self.move_in_pack(f) |
|
0.200.936
by Jelmer Vernooij
Test transportgit. |
752 |
else: |
753 |
return None |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
754 |
|
0.200.1626
by Jelmer Vernooij
Fix compatibility with dulwich 0.9.1. |
755 |
def abort(): |
756 |
return None |
|
757 |
return f, commit, abort |
|
0.200.934
by Jelmer Vernooij
Add init function. |
758 |
|
759 |
@classmethod
|
|
760 |
def init(cls, transport): |
|
0.200.1718
by Jelmer Vernooij
Support AlreadyControlDirError. |
761 |
try: |
762 |
transport.mkdir('info') |
|
763 |
except FileExists: |
|
764 |
pass
|
|
765 |
try: |
|
766 |
transport.mkdir(PACKDIR) |
|
767 |
except FileExists: |
|
768 |
pass
|
|
0.200.934
by Jelmer Vernooij
Add init function. |
769 |
return cls(transport) |