/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: 2010-06-28 23:48:36 UTC
  • mto: (0.200.953 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100628234836-96qxjh7g2xxedblp
Fix transportgit.

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
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
21
22
    errors as bzr_errors,
22
23
    lockable_files,
23
24
    urlutils,
 
25
    version_info as bzrlib_version,
24
26
    )
25
27
 
26
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
27
29
 
28
30
from bzrlib.plugins.git import (
29
31
    LocalGitBzrDirFormat,
30
 
    get_rich_root_format,
31
32
    )
32
33
 
33
34
 
75
76
        return True
76
77
 
77
78
    def cloning_metadir(self, stacked=False):
78
 
        return get_rich_root_format(stacked)
 
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)
79
93
 
80
94
 
81
95
class LocalGitDir(GitDir):
98
112
        self._lockfiles = lockfiles
99
113
        self._mode_check_done = None
100
114
 
 
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
 
101
125
    def is_control_filename(self, filename):
102
126
        return filename == '.git' or filename.startswith('.git/')
103
127
 
104
 
    def get_branch_transport(self, branch_format):
 
128
    def get_branch_transport(self, branch_format, name):
105
129
        if branch_format is None:
106
130
            return self.transport
107
131
        if isinstance(branch_format, LocalGitBzrDirFormat):
108
132
            return self.transport
109
133
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
110
134
 
111
 
    get_repository_transport = get_branch_transport
112
 
    get_workingtree_transport = get_branch_transport
113
 
 
114
 
    def open_branch(self, ignore_fallbacks=None):
 
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):
115
150
        """'create' a branch for this dir."""
116
151
        repo = self.open_repository()
117
152
        from bzrlib.plugins.git.branch import LocalGitBranch
118
 
        return LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
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
119
165
 
120
166
    def open_repository(self, shared=False):
121
167
        """'open' a repository for this dir."""
122
168
        return self._gitrepository_class(self, self._lockfiles)
123
169
 
124
170
    def open_workingtree(self, recommend_upgrade=True):
125
 
        if not self._git.bare and self._git.has_index():
126
 
            from bzrlib.plugins.git.workingtree import GitWorkingTree
127
 
            return GitWorkingTree(self, self.open_repository(),
128
 
                                                  self.open_branch())
 
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)
129
186
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
130
187
        raise bzr_errors.NoWorkingTree(loc)
131
188
 
132
189
    def create_repository(self, shared=False):
133
190
        return self.open_repository()
134
191
 
135
 
    def create_branch(self):
136
 
        return self.open_branch()
 
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)
137
197
 
138
198
    def backup_bzrdir(self):
139
199
        if self._git.bare: