/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 git_dir.py

Implement GitLock.peek().

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_dir.py
16
16
 
17
17
"""An adapter between a Git control dir and a Bazaar BzrDir"""
18
18
 
19
 
import os
20
 
 
21
 
import bzrlib
22
19
from bzrlib.lazy_import import lazy_import
23
20
from bzrlib import (
24
21
    bzrdir,
27
24
    )
28
25
 
29
26
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import TransportLock
31
27
from bzrlib.plugins.git import (
32
28
    errors,
33
 
    branch,
34
 
    repository,
35
 
    workingtree,
 
29
    git_branch,
 
30
    git_repository,
36
31
    )
37
32
""")
38
33
 
39
34
 
40
 
 
41
35
class GitLock(object):
42
36
    """A lock that thunks through to Git."""
43
37
 
44
 
    def lock_write(self, token=None):
 
38
    def lock_write(self):
45
39
        pass
46
40
 
47
41
    def lock_read(self):
67
61
class GitDir(bzrdir.BzrDir):
68
62
    """An adapter to the '.git' dir used by git."""
69
63
 
70
 
    _gitrepository_class = repository.GitRepository
 
64
    _gitrepository_class = git_repository.GitRepository
71
65
 
72
 
    def __init__(self, transport, lockfiles, gitrepo, format):
 
66
    def __init__(self, transport, lockfiles, format):
73
67
        self._format = format
74
68
        self.root_transport = transport
75
 
        self._git = gitrepo
76
 
        if gitrepo.bare:
77
 
            self.transport = transport
78
 
        else:
79
 
            self.transport = transport.clone('.git')
 
69
        self.transport = transport.clone('.git')
80
70
        self._lockfiles = lockfiles
81
71
 
82
72
    def get_branch_transport(self, branch_format):
98
88
        if repo._git.heads == []:
99
89
            head = None
100
90
        else:
101
 
            head = repo._git.head()
102
 
        return branch.GitBranch(self, repo, head, 
 
91
            head = repo._git.heads[0].commit.id
 
92
        return git_branch.GitBranch(self, repo, head, 
103
93
                                    self.root_transport.base, self._lockfiles)
104
94
 
105
95
    def open_repository(self, shared=False):
107
97
        return self._gitrepository_class(self, self._lockfiles)
108
98
 
109
99
    def open_workingtree(self, recommend_upgrade=True):
110
 
        if self._git.bare:
111
 
            loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
112
 
            raise errors.bzr_errors.NoWorkingTree(loc)
113
 
        else:
114
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
115
 
                                                  self.open_branch())
116
 
 
117
 
    def cloning_metadir(self, stacked=False):
118
 
        if stacked:
119
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
120
 
        else:
121
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
122
 
 
123
 
    def create_repository(self, shared=False):
124
 
        return self.open_repository()
 
100
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
101
        raise errors.bzr_errors.NoWorkingTree(loc)
 
102
 
 
103
    def cloning_metadir(self):
 
104
        return bzrdir.BzrDirFormat.get_default_format()
125
105
 
126
106
 
127
107
class GitBzrDirFormat(bzrdir.BzrDirFormat):
128
108
    """The .git directory control format."""
129
109
 
130
110
    _gitdir_class = GitDir
131
 
    _lock_class = TransportLock
132
111
 
133
112
    @classmethod
134
113
    def _known_formats(self):
135
114
        return set([GitBzrDirFormat()])
136
115
 
137
 
    def open(self, transport, _found=None):
 
116
    def open(self, transport, _create=False, _found=None):
138
117
        """Open this directory.
139
118
 
 
119
        :param _create: create the git dir on the fly. private to GitDirFormat.
140
120
        """
141
 
        from bzrlib.plugins.git import git
142
121
        # we dont grok readonly - git isn't integrated with transport.
143
122
        url = transport.base
144
123
        if url.startswith('readonly+'):
145
124
            url = url[len('readonly+'):]
146
 
 
147
 
        try:
148
 
            gitrepo = git.repo.Repo(transport.local_abspath("."))
149
 
        except errors.bzr_errors.NotLocalUrl:
 
125
        if not transport.has('.git'):
150
126
            raise errors.bzr_errors.NotBranchError(path=transport.base)
151
127
        lockfiles = GitLockableFiles(GitLock())
152
 
        return self._gitdir_class(transport, lockfiles, gitrepo, self)
 
128
        return self._gitdir_class(transport, lockfiles, self)
153
129
 
154
130
    @classmethod
155
131
    def probe_transport(klass, transport):
170
146
    def get_format_description(self):
171
147
        return "Local Git Repository"
172
148
 
173
 
    def get_format_string(self):
174
 
        return "Local Git Repository"
175
 
 
176
 
    def initialize_on_transport(self, transport):
177
 
        from bzrlib.transport.local import LocalTransport
178
 
        from bzrlib.plugins.git import git
179
 
 
180
 
        if not isinstance(transport, LocalTransport):
181
 
            raise NotImplementedError(self.initialize, 
182
 
                "Can't create Git Repositories/branches on "
183
 
                "non-local transports")
184
 
 
185
 
        git.repo.Repo.create(transport.local_abspath(".")) 
186
 
        return self.open(transport)
187
 
 
188
149
 
189
150
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)