/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
  • Author(s): Chadrik
  • Date: 2010-07-26 14:02:05 UTC
  • mto: (0.312.1 master) (6883.23.1 bundle-git)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100726140205-m45dyrhi1ifg0fck
Fix 'bzr status' after 'bzr add' in native git working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2010 Jelmer Vernooij
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
"""An adapter between a Git control dir and a Bazaar BzrDir."""
 
19
 
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    errors as bzr_errors,
 
23
    lockable_files,
 
24
    urlutils,
 
25
    version_info as bzrlib_version,
 
26
    )
 
27
 
 
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
 
29
 
 
30
from bzrlib.plugins.git import (
 
31
    LocalGitBzrDirFormat,
 
32
    )
 
33
 
 
34
 
 
35
class GitLock(object):
 
36
    """A lock that thunks through to Git."""
 
37
 
 
38
    def lock_write(self, token=None):
 
39
        pass
 
40
 
 
41
    def lock_read(self):
 
42
        pass
 
43
 
 
44
    def unlock(self):
 
45
        pass
 
46
 
 
47
    def peek(self):
 
48
        pass
 
49
 
 
50
    def validate_token(self, token):
 
51
        pass
 
52
 
 
53
    def break_lock(self):
 
54
        pass
 
55
 
 
56
 
 
57
class GitLockableFiles(lockable_files.LockableFiles):
 
58
    """Git specific lockable files abstraction."""
 
59
 
 
60
    def __init__(self, transport, lock):
 
61
        self._lock = lock
 
62
        self._transaction = None
 
63
        self._lock_mode = None
 
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))
 
70
 
 
71
 
 
72
class GitDir(bzrdir.BzrDir):
 
73
    """An adapter to the '.git' dir used by git."""
 
74
 
 
75
    def is_supported(self):
 
76
        return True
 
77
 
 
78
    def cloning_metadir(self, stacked=False):
 
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)
 
93
 
 
94
 
 
95
class LocalGitDir(GitDir):
 
96
    """An adapter to the '.git' dir used by git."""
 
97
 
 
98
    def _get_gitrepository_class(self):
 
99
        from bzrlib.plugins.git.repository import LocalGitRepository
 
100
        return LocalGitRepository
 
101
 
 
102
    _gitrepository_class = property(_get_gitrepository_class)
 
103
 
 
104
    def __init__(self, transport, lockfiles, gitrepo, format):
 
105
        self._format = format
 
106
        self.root_transport = transport
 
107
        self._git = gitrepo
 
108
        if gitrepo.bare:
 
109
            self.transport = transport
 
110
        else:
 
111
            self.transport = transport.clone('.git')
 
112
        self._lockfiles = lockfiles
 
113
        self._mode_check_done = None
 
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
 
 
125
    def is_control_filename(self, filename):
 
126
        return filename == '.git' or filename.startswith('.git/')
 
127
 
 
128
    def get_branch_transport(self, branch_format, name):
 
129
        if branch_format is None:
 
130
            return self.transport
 
131
        if isinstance(branch_format, LocalGitBzrDirFormat):
 
132
            return self.transport
 
133
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
134
 
 
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):
 
150
        """'create' a branch for this dir."""
 
151
        repo = self.open_repository()
 
152
        from bzrlib.plugins.git.branch import LocalGitBranch
 
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
 
165
 
 
166
    def open_repository(self, shared=False):
 
167
        """'open' a repository for this dir."""
 
168
        return self._gitrepository_class(self, self._lockfiles)
 
169
 
 
170
    def open_workingtree(self, recommend_upgrade=True):
 
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)
 
186
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
187
        raise bzr_errors.NoWorkingTree(loc)
 
188
 
 
189
    def create_repository(self, shared=False):
 
190
        return self.open_repository()
 
191
 
 
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)
 
197
 
 
198
    def backup_bzrdir(self):
 
199
        if self._git.bare:
 
200
            self.root_transport.copy_tree(".git", ".git.backup")
 
201
            return (self.root_transport.abspath(".git"),
 
202
                    self.root_transport.abspath(".git.backup"))
 
203
        else:
 
204
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
205
 
 
206
    def create_workingtree(self, revision_id=None, from_branch=None,
 
207
        accelerator_tree=None, hardlink=False):
 
208
        if self._git.bare:
 
209
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
210
        from dulwich.index import write_index
 
211
        from dulwich.pack import SHA1Writer
 
212
        f = open(self.transport.local_abspath("index"), 'w+')
 
213
        try:
 
214
            f = SHA1Writer(f)
 
215
            write_index(f, [])
 
216
        finally:
 
217
            f.close()
 
218
        return self.open_workingtree()