/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-04-02 15:54:49 UTC
  • mto: (0.200.326 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090402155449-nuqhu1fsnqk6bt0g
Check that regenerated objects have the expected sha1.

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