/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 FOSDEM roundtripping notes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2010 Jelmer Vernooij
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
16
 
18
 
"""An adapter between a Git control dir and a Bazaar BzrDir."""
19
 
 
 
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
20
23
from bzrlib import (
21
24
    bzrdir,
22
 
    errors as bzr_errors,
23
25
    lockable_files,
24
26
    urlutils,
25
 
    version_info as bzrlib_version,
26
27
    )
27
28
 
28
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
 
 
 
29
lazy_import(globals(), """
 
30
from bzrlib.lockable_files import TransportLock
30
31
from bzrlib.plugins.git import (
31
 
    LocalGitBzrDirFormat,
 
32
    errors,
 
33
    branch,
 
34
    repository,
 
35
    workingtree,
32
36
    )
 
37
""")
 
38
 
 
39
from bzrlib.plugins.git import LocalGitBzrDirFormat
 
40
 
33
41
 
34
42
 
35
43
class GitLock(object):
50
58
    def validate_token(self, token):
51
59
        pass
52
60
 
53
 
    def break_lock(self):
54
 
        pass
55
 
 
56
61
 
57
62
class GitLockableFiles(lockable_files.LockableFiles):
58
63
    """Git specific lockable files abstraction."""
61
66
        self._lock = lock
62
67
        self._transaction = None
63
68
        self._lock_mode = None
 
69
        self._lock_count = 0
64
70
        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
 
71
72
 
72
73
class GitDir(bzrdir.BzrDir):
76
77
        return True
77
78
 
78
79
    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)
 
80
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
93
81
 
94
82
 
95
83
class LocalGitDir(GitDir):
96
84
    """An adapter to the '.git' dir used by git."""
97
85
 
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)
 
86
    _gitrepository_class = repository.LocalGitRepository
103
87
 
104
88
    def __init__(self, transport, lockfiles, gitrepo, format):
105
89
        self._format = format
110
94
        else:
111
95
            self.transport = transport.clone('.git')
112
96
        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):
 
97
 
 
98
    def get_branch_transport(self, branch_format):
129
99
        if branch_format is None:
130
100
            return self.transport
131
101
        if isinstance(branch_format, LocalGitBzrDirFormat):
132
102
            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):
 
103
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
 
104
 
 
105
    get_repository_transport = get_branch_transport
 
106
    get_workingtree_transport = get_branch_transport
 
107
 
 
108
    def open_branch(self, ignored=None):
150
109
        """'create' a branch for this dir."""
151
110
        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
 
111
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
165
112
 
166
113
    def open_repository(self, shared=False):
167
114
        """'open' a repository for this dir."""
168
115
        return self._gitrepository_class(self, self._lockfiles)
169
116
 
170
117
    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)
 
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())
186
122
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
187
 
        raise bzr_errors.NoWorkingTree(loc)
 
123
        raise errors.bzr_errors.NoWorkingTree(loc)
188
124
 
189
125
    def create_repository(self, shared=False):
190
126
        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()