/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

Add tests for revspec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 import (
23
20
    bzrdir,
 
21
    errors as bzr_errors,
24
22
    lockable_files,
25
23
    urlutils,
 
24
    version_info as bzrlib_version,
26
25
    )
27
26
 
28
27
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
28
 
30
29
from bzrlib.plugins.git import (
31
30
    LocalGitBzrDirFormat,
32
 
    branch,
33
 
    errors,
34
31
    get_rich_root_format,
35
 
    repository,
36
 
    workingtree,
37
32
    )
38
33
 
39
34
 
55
50
    def validate_token(self, token):
56
51
        pass
57
52
 
 
53
    def break_lock(self):
 
54
        pass
 
55
 
58
56
 
59
57
class GitLockableFiles(lockable_files.LockableFiles):
60
58
    """Git specific lockable files abstraction."""
80
78
    def cloning_metadir(self, stacked=False):
81
79
        return get_rich_root_format(stacked)
82
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)
 
94
 
83
95
 
84
96
class LocalGitDir(GitDir):
85
97
    """An adapter to the '.git' dir used by git."""
86
98
 
87
 
    _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)
88
104
 
89
105
    def __init__(self, transport, lockfiles, gitrepo, format):
90
106
        self._format = format
105
121
            return self.transport
106
122
        if isinstance(branch_format, LocalGitBzrDirFormat):
107
123
            return self.transport
108
 
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
 
124
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
109
125
 
110
126
    get_repository_transport = get_branch_transport
111
127
    get_workingtree_transport = get_branch_transport
112
128
 
113
 
    def open_branch(self, ignore_fallbacks=None):
 
129
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
114
130
        """'create' a branch for this dir."""
115
131
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "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
117
145
 
118
146
    def open_repository(self, shared=False):
119
147
        """'open' a repository for this dir."""
120
148
        return self._gitrepository_class(self, self._lockfiles)
121
149
 
122
150
    def open_workingtree(self, recommend_upgrade=True):
123
 
        if not self._git.bare and self._git.has_index():
124
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
 
                                                  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)
126
161
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
162
        raise bzr_errors.NoWorkingTree(loc)
128
163
 
129
164
    def create_repository(self, shared=False):
130
165
        return self.open_repository()
131
166
 
132
 
    def create_branch(self):
133
 
        return self.open_branch()
 
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)
134
171
 
135
172
    def backup_bzrdir(self):
136
173
        if self._git.bare:
138
175
            return (self.root_transport.abspath(".git"),
139
176
                    self.root_transport.abspath(".git.backup"))
140
177
        else:
141
 
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
 
178
            raise bzr_errors.BzrError("Unable to backup bare repositories")
142
179
 
143
180
    def create_workingtree(self, revision_id=None, from_branch=None,
144
181
        accelerator_tree=None, hardlink=False):
145
182
        if self._git.bare:
146
 
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
 
183
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
147
184
        from dulwich.index import write_index
148
 
        write_index(self.root_transport.abspath(".git/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()
149
192
        return self.open_workingtree()