/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

Cope with the fact that _type is gone in upstream dulwich.

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"""
18
 
 
19
 
import os
20
 
 
21
 
import bzrlib
22
 
from bzrlib.lazy_import import lazy_import
 
17
"""An adapter between a Git control dir and a Bazaar BzrDir."""
 
18
 
23
19
from bzrlib import (
24
20
    bzrdir,
 
21
    errors as bzr_errors,
25
22
    lockable_files,
26
23
    urlutils,
 
24
    version_info as bzrlib_version,
27
25
    )
28
26
 
29
 
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import TransportLock
 
27
LockWarner = getattr(lockable_files, "_LockWarner", None)
 
28
 
31
29
from bzrlib.plugins.git import (
32
 
    errors,
33
 
    branch,
34
 
    repository,
35
 
    workingtree,
 
30
    LocalGitBzrDirFormat,
 
31
    get_rich_root_format,
36
32
    )
37
 
""")
38
 
 
39
 
from bzrlib.plugins.git import LocalGitBzrDirFormat
40
 
 
41
33
 
42
34
 
43
35
class GitLock(object):
58
50
    def validate_token(self, token):
59
51
        pass
60
52
 
 
53
    def break_lock(self):
 
54
        pass
 
55
 
61
56
 
62
57
class GitLockableFiles(lockable_files.LockableFiles):
63
58
    """Git specific lockable files abstraction."""
66
61
        self._lock = lock
67
62
        self._transaction = None
68
63
        self._lock_mode = None
69
 
        self._lock_count = 0
70
64
        self._transport = transport
 
65
        if LockWarner is None:
 
66
            # Bzr 1.13
 
67
            self._lock_count = 0
 
68
        else:
 
69
            self._lock_warner = LockWarner(repr(self))
71
70
 
72
71
 
73
72
class GitDir(bzrdir.BzrDir):
77
76
        return True
78
77
 
79
78
    def cloning_metadir(self, stacked=False):
80
 
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
 
79
        return get_rich_root_format(stacked)
 
80
 
 
81
    def _branch_name_to_ref(self, name):
 
82
        from bzrlib.plugins.git.branch import branch_name_to_ref
 
83
        return branch_name_to_ref(name)
 
84
 
 
85
    if bzrlib_version >= (2, 2):
 
86
        def open_branch(self, name=None, ignore_fallbacks=None,
 
87
            unsupported=False):
 
88
            return self._open_branch(name=name,
 
89
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
90
    else:
 
91
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
92
            return self._open_branch(name=None,
 
93
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
81
94
 
82
95
 
83
96
class LocalGitDir(GitDir):
84
97
    """An adapter to the '.git' dir used by git."""
85
98
 
86
 
    _gitrepository_class = repository.LocalGitRepository
 
99
    def _get_gitrepository_class(self):
 
100
        from bzrlib.plugins.git.repository import LocalGitRepository
 
101
        return LocalGitRepository
 
102
 
 
103
    _gitrepository_class = property(_get_gitrepository_class)
87
104
 
88
105
    def __init__(self, transport, lockfiles, gitrepo, format):
89
106
        self._format = format
94
111
        else:
95
112
            self.transport = transport.clone('.git')
96
113
        self._lockfiles = lockfiles
 
114
        self._mode_check_done = None
 
115
 
 
116
    def is_control_filename(self, filename):
 
117
        return filename == '.git' or filename.startswith('.git/')
97
118
 
98
119
    def get_branch_transport(self, branch_format):
99
120
        if branch_format is None:
100
121
            return self.transport
101
122
        if isinstance(branch_format, LocalGitBzrDirFormat):
102
123
            return self.transport
103
 
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
 
124
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
104
125
 
105
126
    get_repository_transport = get_branch_transport
106
127
    get_workingtree_transport = get_branch_transport
107
128
 
108
 
    def open_branch(self, ignored=None):
 
129
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
109
130
        """'create' a branch for this dir."""
110
131
        repo = self.open_repository()
111
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
 
132
        from bzrlib.plugins.git.branch import LocalGitBranch
 
133
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
 
134
            self._lockfiles)
 
135
 
 
136
    def destroy_branch(self, name=None):
 
137
        del self._git.refs[self._branch_name_to_ref(name)]
 
138
 
 
139
    def list_branches(self):
 
140
        ret = []
 
141
        for name in self._git.get_refs():
 
142
            if name.startswith("refs/heads/") or name == "HEAD":
 
143
                ret.append(self.open_branch(name=name))
 
144
        return ret
112
145
 
113
146
    def open_repository(self, shared=False):
114
147
        """'open' a repository for this dir."""
115
148
        return self._gitrepository_class(self, self._lockfiles)
116
149
 
117
150
    def open_workingtree(self, recommend_upgrade=True):
118
 
        if (not self._git.bare and 
119
 
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
120
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
121
 
                                                  self.open_branch())
 
151
        if not self._git.bare:
 
152
            from dulwich.errors import NoIndexPresent
 
153
            repo = self.open_repository()
 
154
            try:
 
155
                index = repo._git.open_index()
 
156
            except NoIndexPresent:
 
157
                pass
 
158
            else:
 
159
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
160
                return GitWorkingTree(self, repo, self.open_branch(), index)
122
161
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
123
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
162
        raise bzr_errors.NoWorkingTree(loc)
124
163
 
125
164
    def create_repository(self, shared=False):
126
165
        return self.open_repository()
 
166
 
 
167
    def create_branch(self, name=None):
 
168
        refname = self._branch_name_to_ref(name)
 
169
        self._git.refs[refname] = "0" * 40
 
170
        return self.open_branch(name)
 
171
 
 
172
    def backup_bzrdir(self):
 
173
        if self._git.bare:
 
174
            self.root_transport.copy_tree(".git", ".git.backup")
 
175
            return (self.root_transport.abspath(".git"),
 
176
                    self.root_transport.abspath(".git.backup"))
 
177
        else:
 
178
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
179
 
 
180
    def create_workingtree(self, revision_id=None, from_branch=None,
 
181
        accelerator_tree=None, hardlink=False):
 
182
        if self._git.bare:
 
183
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
184
        from dulwich.index import write_index
 
185
        from dulwich.pack import SHA1Writer
 
186
        f = open(self.transport.local_abspath("index"), 'w+')
 
187
        try:
 
188
            f = SHA1Writer(f)
 
189
            write_index(f, [])
 
190
        finally:
 
191
            f.close()
 
192
        return self.open_workingtree()