/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to transportgit.py

https://launchpad.net/bugs/887785
Warn about ignoring path segment parameters when using bzr 2.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
transportgit.py
18
18
 
19
19
from cStringIO import StringIO
20
20
 
 
21
import os
 
22
 
21
23
from dulwich.errors import (
22
24
    NotGitRepository,
23
25
    NoIndexPresent,
33
35
    MemoryPackIndex,
34
36
    PackData,
35
37
    Pack,
36
 
    ThinPackData,
37
38
    iter_sha1,
38
39
    load_pack_index_file,
39
40
    write_pack_data,
42
43
from dulwich.repo import (
43
44
    BaseRepo,
44
45
    RefsContainer,
 
46
    BASE_DIRECTORIES,
45
47
    INDEX_FILENAME,
46
48
    OBJECTDIR,
47
49
    REFSDIR,
52
54
    write_packed_refs,
53
55
    )
54
56
 
 
57
from bzrlib import (
 
58
    transport as _mod_transport,
 
59
    )
55
60
from bzrlib.errors import (
56
61
    FileExists,
57
62
    NoSuchFile,
93
98
 
94
99
    def allkeys(self):
95
100
        keys = set()
96
 
        if self.transport.has("HEAD"):
 
101
        try:
 
102
            self.transport.get_bytes("HEAD")
 
103
        except NoSuchFile:
 
104
            pass
 
105
        else:
97
106
            keys.add("HEAD")
98
107
        try:
99
108
            iter_files = list(self.transport.clone("refs").iter_files_recursive())
276
285
        self._remove_packed_ref(name)
277
286
        return True
278
287
 
 
288
    def get(self, name, default=None):
 
289
        try:
 
290
            return self[name]
 
291
        except KeyError:
 
292
            return default
 
293
 
279
294
 
280
295
class TransportRepo(BaseRepo):
281
296
 
282
 
    def __init__(self, transport):
 
297
    def __init__(self, transport, bare):
283
298
        self.transport = transport
284
 
        try:
285
 
            if self.transport.has(".git/%s" % OBJECTDIR):
286
 
                self.bare = False
287
 
                self._controltransport = self.transport.clone('.git')
288
 
            elif self.transport.has_any(["info/refs", OBJECTDIR, REFSDIR]):
289
 
                self.bare = True
290
 
                self._controltransport = self.transport
291
 
            else:
292
 
                raise NotGitRepository(self.transport)
293
 
        except NoSuchFile:
294
 
            raise NotGitRepository(self.transport)
 
299
        self.bare = bare
 
300
        if self.bare:
 
301
            self._controltransport = self.transport
 
302
        else:
 
303
            self._controltransport = self.transport.clone('.git')
295
304
        object_store = TransportObjectStore(
296
305
            self._controltransport.clone(OBJECTDIR))
297
306
        super(TransportRepo, self).__init__(object_store, 
312
321
        except NoSuchFile:
313
322
            return None
314
323
 
 
324
    def _put_named_file(self, relpath, contents):
 
325
        self._controltransport.put_bytes(relpath, contents)
 
326
 
315
327
    def index_path(self):
316
328
        """Return the path to the index file."""
317
329
        return self._controltransport.local_abspath(INDEX_FILENAME)
332
344
    def __repr__(self):
333
345
        return "<%s for %r>" % (self.__class__.__name__, self.transport)
334
346
 
 
347
    @classmethod
 
348
    def init(cls, transport, bare=False):
 
349
        if not bare:
 
350
            transport.mkdir(".git")
 
351
            control_transport = transport.clone(".git")
 
352
        else:
 
353
            control_transport = transport
 
354
        for d in BASE_DIRECTORIES:
 
355
            control_transport.mkdir("/".join(d))
 
356
        control_transport.mkdir(OBJECTDIR)
 
357
        TransportObjectStore.init(control_transport.clone(OBJECTDIR))
 
358
        ret = cls(transport, bare)
 
359
        ret.refs.set_symbolic_ref("HEAD", "refs/heads/master")
 
360
        ret._init_files(bare)
 
361
        return ret
 
362
 
335
363
 
336
364
class TransportObjectStore(PackBasedObjectStore):
337
365
    """Git-style object store that exists on disk."""
344
372
        super(TransportObjectStore, self).__init__()
345
373
        self.transport = transport
346
374
        self.pack_transport = self.transport.clone(PACKDIR)
 
375
        self._alternates = None
347
376
 
348
377
    def __repr__(self):
349
378
        return "%s(%r)" % (self.__class__.__name__, self.transport)
351
380
    def _pack_cache_stale(self):
352
381
        return False # FIXME
353
382
 
 
383
    @property
 
384
    def alternates(self):
 
385
        if self._alternates is not None:
 
386
            return self._alternates
 
387
        self._alternates = []
 
388
        for path in self._read_alternate_paths():
 
389
            # FIXME: Check path
 
390
            t = _mod_transport.get_transport_from_path(path)
 
391
            self._alternates.append(self.__class__(t))
 
392
        return self._alternates
 
393
 
 
394
    def _read_alternate_paths(self):
 
395
        try:
 
396
            f = self.transport.get("info/alternates")
 
397
        except NoSuchFile:
 
398
            return []
 
399
        ret = []
 
400
        try:
 
401
            for l in f.readlines():
 
402
                l = l.rstrip("\n")
 
403
                if l[0] == "#":
 
404
                    continue
 
405
                if os.path.isabs(l):
 
406
                    continue
 
407
                ret.append(l)
 
408
            return ret
 
409
        finally:
 
410
            f.close()
 
411
 
354
412
    def _pack_names(self):
355
413
        try:
356
414
            f = self.transport.get('info/packs')
473
531
        :param path: Path to the pack file.
474
532
        """
475
533
        f.seek(0)
476
 
        data = ThinPackData.from_file(self.get_raw, f, len(f.getvalue()))
 
534
        data = PackData.from_file(self.get_raw, f, len(f.getvalue()))
477
535
        idx = MemoryPackIndex(data.sorted_entries(), data.get_stored_checksum())
478
536
        p = Pack.from_objects(data, idx)
479
537
 
480
538
        pack_sha = idx.objects_sha1()
481
539
 
482
 
        datafile = self.pack_transport.open_write_stream("pack-%s.pack" % pack_sha)
 
540
        datafile = self.pack_transport.open_write_stream(
 
541
                "pack-%s.pack" % pack_sha)
483
542
        try:
484
 
            entries, data_sum = write_pack_data(datafile, ((o, None) for o in p.iterobjects()), len(p))
 
543
            entries, data_sum = write_pack_data(datafile, p.pack_tuples())
485
544
        finally:
486
545
            datafile.close()
487
546
        entries.sort()
488
 
        idxfile = self.pack_transport.open_write_stream("pack-%s.idx" % pack_sha)
 
547
        idxfile = self.pack_transport.open_write_stream(
 
548
            "pack-%s.idx" % pack_sha)
489
549
        try:
490
550
            write_pack_index_v2(idxfile, data.sorted_entries(), data_sum)
491
551
        finally:
494
554
        self._add_known_pack(final_pack)
495
555
        return final_pack
496
556
 
497
 
 
498
 
 
499
557
    def add_pack(self):
500
558
        """Add a new pack to this object store. 
501
559