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