/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 git_dir.py

Implement GitLock.peek().

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_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.lazy_import import lazy_import
23
20
from bzrlib import (
24
21
    bzrdir,
27
24
    )
28
25
 
29
26
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import TransportLock
31
27
from bzrlib.plugins.git import (
32
28
    errors,
33
 
    branch,
34
 
    repository,
35
 
    workingtree,
 
29
    git_branch,
 
30
    git_repository,
36
31
    )
37
32
""")
38
33
 
39
 
from bzrlib.plugins.git import LocalGitBzrDirFormat
40
 
 
41
 
 
42
34
 
43
35
class GitLock(object):
44
36
    """A lock that thunks through to Git."""
45
37
 
46
 
    def lock_write(self, token=None):
 
38
    def lock_write(self):
47
39
        pass
48
40
 
49
41
    def lock_read(self):
55
47
    def peek(self):
56
48
        pass
57
49
 
58
 
    def validate_token(self, token):
59
 
        pass
60
 
 
61
50
 
62
51
class GitLockableFiles(lockable_files.LockableFiles):
63
52
    """Git specific lockable files abstraction."""
64
53
 
65
 
    def __init__(self, transport, lock):
 
54
    def __init__(self, lock):
66
55
        self._lock = lock
67
56
        self._transaction = None
68
57
        self._lock_mode = None
69
58
        self._lock_count = 0
70
 
        self._transport = transport
71
59
 
72
60
 
73
61
class GitDir(bzrdir.BzrDir):
74
62
    """An adapter to the '.git' dir used by git."""
75
63
 
76
 
    def is_supported(self):
77
 
        return True
78
 
 
79
 
    def cloning_metadir(self, stacked=False):
80
 
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
81
 
 
82
 
 
83
 
class LocalGitDir(GitDir):
84
 
    """An adapter to the '.git' dir used by git."""
85
 
 
86
 
    _gitrepository_class = repository.LocalGitRepository
87
 
 
88
 
    def __init__(self, transport, lockfiles, gitrepo, format):
 
64
    _gitrepository_class = git_repository.GitRepository
 
65
 
 
66
    def __init__(self, transport, lockfiles, format):
89
67
        self._format = format
90
68
        self.root_transport = transport
91
 
        self._git = gitrepo
92
 
        if gitrepo.bare:
93
 
            self.transport = transport
94
 
        else:
95
 
            self.transport = transport.clone('.git')
 
69
        self.transport = transport.clone('.git')
96
70
        self._lockfiles = lockfiles
97
71
 
98
72
    def get_branch_transport(self, branch_format):
99
73
        if branch_format is None:
100
74
            return self.transport
101
 
        if isinstance(branch_format, LocalGitBzrDirFormat):
 
75
        if isinstance(branch_format, GitBzrDirFormat):
102
76
            return self.transport
103
77
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
104
78
 
105
79
    get_repository_transport = get_branch_transport
106
80
    get_workingtree_transport = get_branch_transport
107
81
 
 
82
    def is_supported(self):
 
83
        return True
 
84
 
108
85
    def open_branch(self, ignored=None):
109
86
        """'create' a branch for this dir."""
110
87
        repo = self.open_repository()
111
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
 
88
        if repo._git.heads == []:
 
89
            head = None
 
90
        else:
 
91
            head = repo._git.heads[0].commit.id
 
92
        return git_branch.GitBranch(self, repo, head, 
 
93
                                    self.root_transport.base, self._lockfiles)
112
94
 
113
95
    def open_repository(self, shared=False):
114
96
        """'open' a repository for this dir."""
115
97
        return self._gitrepository_class(self, self._lockfiles)
116
98
 
117
99
    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())
122
100
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
123
101
        raise errors.bzr_errors.NoWorkingTree(loc)
124
102
 
125
 
    def create_repository(self, shared=False):
126
 
        return self.open_repository()
 
103
    def cloning_metadir(self):
 
104
        return bzrdir.BzrDirFormat.get_default_format()
 
105
 
 
106
 
 
107
class GitBzrDirFormat(bzrdir.BzrDirFormat):
 
108
    """The .git directory control format."""
 
109
 
 
110
    _gitdir_class = GitDir
 
111
 
 
112
    @classmethod
 
113
    def _known_formats(self):
 
114
        return set([GitBzrDirFormat()])
 
115
 
 
116
    def open(self, transport, _create=False, _found=None):
 
117
        """Open this directory.
 
118
 
 
119
        :param _create: create the git dir on the fly. private to GitDirFormat.
 
120
        """
 
121
        # we dont grok readonly - git isn't integrated with transport.
 
122
        url = transport.base
 
123
        if url.startswith('readonly+'):
 
124
            url = url[len('readonly+'):]
 
125
        if not transport.has('.git'):
 
126
            raise errors.bzr_errors.NotBranchError(path=transport.base)
 
127
        lockfiles = GitLockableFiles(GitLock())
 
128
        return self._gitdir_class(transport, lockfiles, self)
 
129
 
 
130
    @classmethod
 
131
    def probe_transport(klass, transport):
 
132
        """Our format is present if the transport ends in '.not/'."""
 
133
        # little ugly, but works
 
134
        format = klass()
 
135
        # delegate to the main opening code. This pays a double rtt cost at the
 
136
        # moment, so perhaps we want probe_transport to return the opened thing
 
137
        # rather than an openener ? or we could return a curried thing with the
 
138
        # dir to open already instantiated ? Needs more thought.
 
139
        try:
 
140
            format.open(transport)
 
141
            return format
 
142
        except Exception, e:
 
143
            raise errors.bzr_errors.NotBranchError(path=transport.base)
 
144
        raise errors.bzr_errors.NotBranchError(path=transport.base)
 
145
 
 
146
    def get_format_description(self):
 
147
        return "Local Git Repository"
 
148
 
 
149
 
 
150
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)