/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

  • Committer: Jelmer Vernooij
  • Date: 2009-09-10 13:13:15 UTC
  • mto: (0.200.602 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090910131315-6890xg58pl2jseml
Allow serving remote URLs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2010 Jelmer Vernooij
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
19
18
 
20
19
from bzrlib import (
21
20
    bzrdir,
22
 
    errors as bzr_errors,
23
21
    lockable_files,
24
22
    urlutils,
25
 
    version_info as bzrlib_version,
26
23
    )
27
24
 
28
25
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
26
 
30
27
from bzrlib.plugins.git import (
31
28
    LocalGitBzrDirFormat,
 
29
    branch,
 
30
    errors,
 
31
    get_rich_root_format,
 
32
    repository,
 
33
    workingtree,
32
34
    )
33
35
 
34
36
 
50
52
    def validate_token(self, token):
51
53
        pass
52
54
 
53
 
    def break_lock(self):
54
 
        pass
55
 
 
56
55
 
57
56
class GitLockableFiles(lockable_files.LockableFiles):
58
57
    """Git specific lockable files abstraction."""
76
75
        return True
77
76
 
78
77
    def cloning_metadir(self, stacked=False):
79
 
        return bzrdir.format_registry.make_bzrdir("default")
80
 
 
81
 
    def _branch_name_to_ref(self, name):
82
 
        raise NotImplementedError(self._branch_name_to_ref)
83
 
 
84
 
    if bzrlib_version >= (2, 2):
85
 
        def open_branch(self, name=None, ignore_fallbacks=None,
86
 
            unsupported=False):
87
 
            return self._open_branch(name=name,
88
 
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
89
 
    else:
90
 
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
91
 
            return self._open_branch(name=None,
92
 
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
78
        return get_rich_root_format(stacked)
93
79
 
94
80
 
95
81
class LocalGitDir(GitDir):
96
82
    """An adapter to the '.git' dir used by git."""
97
83
 
98
 
    def _get_gitrepository_class(self):
99
 
        from bzrlib.plugins.git.repository import LocalGitRepository
100
 
        return LocalGitRepository
101
 
 
102
 
    _gitrepository_class = property(_get_gitrepository_class)
 
84
    _gitrepository_class = repository.LocalGitRepository
103
85
 
104
86
    def __init__(self, transport, lockfiles, gitrepo, format):
105
87
        self._format = format
112
94
        self._lockfiles = lockfiles
113
95
        self._mode_check_done = None
114
96
 
115
 
    def _branch_name_to_ref(self, name):
116
 
        from bzrlib.plugins.git.refs import branch_name_to_ref
117
 
        ref = branch_name_to_ref(name, None)
118
 
        if ref == "HEAD":
119
 
            from dulwich.repo import SYMREF
120
 
            refcontents = self._git.refs.read_ref(ref)
121
 
            if refcontents.startswith(SYMREF):
122
 
                ref = refcontents[len(SYMREF):]
123
 
        return ref
124
 
 
125
97
    def is_control_filename(self, filename):
126
98
        return filename == '.git' or filename.startswith('.git/')
127
99
 
128
 
    def get_branch_transport(self, branch_format, name):
 
100
    def get_branch_transport(self, branch_format):
129
101
        if branch_format is None:
130
102
            return self.transport
131
103
        if isinstance(branch_format, LocalGitBzrDirFormat):
132
104
            return self.transport
133
 
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
134
 
 
135
 
    def get_repository_transport(self, format):
136
 
        if format is None:
137
 
            return self.transport
138
 
        if isinstance(format, LocalGitBzrDirFormat):
139
 
            return self.transport
140
 
        raise bzr_errors.IncompatibleFormat(format, self._format)
141
 
 
142
 
    def get_workingtree_transport(self, format):
143
 
        if format is None:
144
 
            return self.transport
145
 
        if isinstance(format, LocalGitBzrDirFormat):
146
 
            return self.transport
147
 
        raise bzr_errors.IncompatibleFormat(format, self._format)
148
 
 
149
 
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
 
105
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
 
106
 
 
107
    get_repository_transport = get_branch_transport
 
108
    get_workingtree_transport = get_branch_transport
 
109
 
 
110
    def open_branch(self, ignore_fallbacks=None):
150
111
        """'create' a branch for this dir."""
151
112
        repo = self.open_repository()
152
 
        from bzrlib.plugins.git.branch import LocalGitBranch
153
 
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
154
 
            self._lockfiles)
155
 
 
156
 
    def destroy_branch(self, name=None):
157
 
        del self._git.refs[self._branch_name_to_ref(name)]
158
 
 
159
 
    def list_branches(self):
160
 
        ret = []
161
 
        for name in self._git.get_refs():
162
 
            if name.startswith("refs/heads/"):
163
 
                ret.append(self.open_branch(name=name))
164
 
        return ret
 
113
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
165
114
 
166
115
    def open_repository(self, shared=False):
167
116
        """'open' a repository for this dir."""
168
117
        return self._gitrepository_class(self, self._lockfiles)
169
118
 
170
119
    def open_workingtree(self, recommend_upgrade=True):
171
 
        if not self._git.bare:
172
 
            from dulwich.errors import NoIndexPresent
173
 
            repo = self.open_repository()
174
 
            try:
175
 
                index = repo._git.open_index()
176
 
            except NoIndexPresent:
177
 
                pass
178
 
            else:
179
 
                from bzrlib.plugins.git.workingtree import GitWorkingTree
180
 
                try:
181
 
                    branch = self.open_branch()
182
 
                except bzr_errors.NotBranchError:
183
 
                    pass
184
 
                else:
185
 
                    return GitWorkingTree(self, repo, branch, index)
 
120
        if not self._git.bare and self._git.has_index():
 
121
            return workingtree.GitWorkingTree(self, self.open_repository(), 
 
122
                                                  self.open_branch())
186
123
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
187
 
        raise bzr_errors.NoWorkingTree(loc)
 
124
        raise errors.bzr_errors.NoWorkingTree(loc)
188
125
 
189
126
    def create_repository(self, shared=False):
190
127
        return self.open_repository()
191
128
 
192
 
    def create_branch(self, name=None):
193
 
        refname = self._branch_name_to_ref(name)
194
 
        from dulwich.protocol import ZERO_SHA
195
 
        self._git.refs[refname or "HEAD"] = ZERO_SHA
196
 
        return self.open_branch(name)
 
129
    def create_branch(self):
 
130
        return self.open_branch()
197
131
 
198
132
    def backup_bzrdir(self):
199
133
        if self._git.bare:
201
135
            return (self.root_transport.abspath(".git"),
202
136
                    self.root_transport.abspath(".git.backup"))
203
137
        else:
204
 
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
138
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
205
139
 
206
140
    def create_workingtree(self, revision_id=None, from_branch=None,
207
141
        accelerator_tree=None, hardlink=False):
208
142
        if self._git.bare:
209
 
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
143
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
210
144
        from dulwich.index import write_index
211
 
        from dulwich.pack import SHA1Writer
212
 
        f = open(self.transport.local_abspath("index"), 'w+')
213
 
        try:
214
 
            f = SHA1Writer(f)
215
 
            write_index(f, [])
216
 
        finally:
217
 
            f.close()
 
145
        write_index(self.root_transport.abspath(".git/index"), [])
218
146
        return self.open_workingtree()