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

Fix the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""An adapter between a Git control dir and a Bazaar BzrDir."""
 
17
"""An adapter between a Git control dir and a Bazaar BzrDir"""
18
18
 
19
 
import os
 
19
import git, os
20
20
 
21
21
import bzrlib
 
22
from bzrlib.lazy_import import lazy_import
22
23
from bzrlib import (
23
24
    bzrdir,
24
25
    lockable_files,
25
26
    urlutils,
26
27
    )
27
28
 
28
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
 
 
 
29
lazy_import(globals(), """
 
30
from bzrlib.lockable_files import TransportLock
30
31
from bzrlib.plugins.git import (
31
 
    LocalGitBzrDirFormat,
 
32
    errors,
32
33
    branch,
33
 
    errors,
34
 
    get_rich_root_format,
35
34
    repository,
36
35
    workingtree,
37
36
    )
 
37
""")
38
38
 
39
39
 
40
40
class GitLock(object):
52
52
    def peek(self):
53
53
        pass
54
54
 
55
 
    def validate_token(self, token):
56
 
        pass
57
 
 
58
55
 
59
56
class GitLockableFiles(lockable_files.LockableFiles):
60
57
    """Git specific lockable files abstraction."""
61
58
 
62
 
    def __init__(self, transport, lock):
 
59
    def __init__(self, lock):
63
60
        self._lock = lock
64
61
        self._transaction = None
65
62
        self._lock_mode = None
66
 
        self._transport = transport
67
 
        if LockWarner is None:
68
 
            # Bzr 1.13
69
 
            self._lock_count = 0
70
 
        else:
71
 
            self._lock_warner = LockWarner(repr(self))
 
63
        self._lock_count = 0
72
64
 
73
65
 
74
66
class GitDir(bzrdir.BzrDir):
75
67
    """An adapter to the '.git' dir used by git."""
76
68
 
77
 
    def is_supported(self):
78
 
        return True
79
 
 
80
 
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format()
82
 
 
83
 
 
84
 
class LocalGitDir(GitDir):
85
 
    """An adapter to the '.git' dir used by git."""
86
 
 
87
 
    _gitrepository_class = repository.LocalGitRepository
 
69
    _gitrepository_class = repository.GitRepository
88
70
 
89
71
    def __init__(self, transport, lockfiles, gitrepo, format):
90
72
        self._format = format
99
81
    def get_branch_transport(self, branch_format):
100
82
        if branch_format is None:
101
83
            return self.transport
102
 
        if isinstance(branch_format, LocalGitBzrDirFormat):
 
84
        if isinstance(branch_format, GitBzrDirFormat):
103
85
            return self.transport
104
86
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
105
87
 
106
88
    get_repository_transport = get_branch_transport
107
89
    get_workingtree_transport = get_branch_transport
108
90
 
109
 
    def open_branch(self, ignore_fallbacks=None):
 
91
    def is_supported(self):
 
92
        return True
 
93
 
 
94
    def open_branch(self, ignored=None):
110
95
        """'create' a branch for this dir."""
111
96
        repo = self.open_repository()
112
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(),
113
 
            self._lockfiles)
 
97
        if repo._git.heads == []:
 
98
            head = None
 
99
        else:
 
100
            head = repo._git.heads[0].commit.id
 
101
        return branch.GitBranch(self, repo, head, 
 
102
                                    self.root_transport.base, self._lockfiles)
114
103
 
115
104
    def open_repository(self, shared=False):
116
105
        """'open' a repository for this dir."""
117
106
        return self._gitrepository_class(self, self._lockfiles)
118
107
 
119
108
    def open_workingtree(self, recommend_upgrade=True):
120
 
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
121
 
        raise errors.bzr_errors.NoWorkingTree(loc)
122
 
        if (not self._git.bare and 
123
 
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
 
109
        if self._git.bare:
 
110
            loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
111
            raise errors.bzr_errors.NoWorkingTree(loc)
 
112
        else:
124
113
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
114
                                                  self.open_branch())
126
115
 
 
116
    def cloning_metadir(self, stacked=False):
 
117
        if stacked:
 
118
            return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
 
119
        else:
 
120
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
 
121
 
127
122
    def create_repository(self, shared=False):
128
123
        return self.open_repository()
129
124
 
130
 
    def create_branch(self):
131
 
        return self.open_branch()
 
125
 
 
126
class GitBzrDirFormat(bzrdir.BzrDirFormat):
 
127
    """The .git directory control format."""
 
128
 
 
129
    _gitdir_class = GitDir
 
130
    _lock_class = TransportLock
 
131
 
 
132
    @classmethod
 
133
    def _known_formats(self):
 
134
        return set([GitBzrDirFormat()])
 
135
 
 
136
    def open(self, transport, _found=None):
 
137
        """Open this directory.
 
138
 
 
139
        """
 
140
        # we dont grok readonly - git isn't integrated with transport.
 
141
        url = transport.base
 
142
        if url.startswith('readonly+'):
 
143
            url = url[len('readonly+'):]
 
144
 
 
145
        try:
 
146
            gitrepo = git.repo.Repo(transport.local_abspath("."))
 
147
        except errors.bzr_errors.NotLocalUrl:
 
148
            raise errors.bzr_errors.NotBranchError(path=transport.base)
 
149
        lockfiles = GitLockableFiles(GitLock())
 
150
        return self._gitdir_class(transport, lockfiles, gitrepo, self)
 
151
 
 
152
    @classmethod
 
153
    def probe_transport(klass, transport):
 
154
        """Our format is present if the transport ends in '.not/'."""
 
155
        # little ugly, but works
 
156
        format = klass()
 
157
        # delegate to the main opening code. This pays a double rtt cost at the
 
158
        # moment, so perhaps we want probe_transport to return the opened thing
 
159
        # rather than an openener ? or we could return a curried thing with the
 
160
        # dir to open already instantiated ? Needs more thought.
 
161
        try:
 
162
            format.open(transport)
 
163
            return format
 
164
        except Exception, e:
 
165
            raise errors.bzr_errors.NotBranchError(path=transport.base)
 
166
        raise errors.bzr_errors.NotBranchError(path=transport.base)
 
167
 
 
168
    def get_format_description(self):
 
169
        return "Local Git Repository"
 
170
 
 
171
    def get_format_string(self):
 
172
        return "Local Git Repository"
 
173
 
 
174
    def initialize_on_transport(self, transport):
 
175
        from bzrlib.transport.local import LocalTransport
 
176
 
 
177
        if not isinstance(transport, LocalTransport):
 
178
            raise NotImplementedError(self.initialize, 
 
179
                "Can't create Git Repositories/branches on "
 
180
                "non-local transports")
 
181
 
 
182
        git.repo.Repo.create(transport.local_abspath(".")) 
 
183
        return self.open(transport)
 
184
 
 
185
 
 
186
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)