/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

Require dulwich 0.7.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
20
20
from bzrlib import (
21
21
    errors as bzr_errors,
22
22
    lockable_files,
 
23
    trace,
23
24
    urlutils,
24
25
    version_info as bzrlib_version,
25
26
    )
 
27
from bzrlib.bzrdir import CreateRepository
 
28
from bzrlib.transport import do_catching_redirections
26
29
 
27
30
LockWarner = getattr(lockable_files, "_LockWarner", None)
28
31
 
29
 
from bzrlib.plugins.git import (
30
 
    BareLocalGitControlDirFormat,
31
 
    LocalGitControlDirFormat,
 
32
from bzrlib.controldir import (
 
33
    ControlDir,
 
34
    ControlDirFormat,
 
35
    format_registry,
32
36
    )
33
 
try:
34
 
    from bzrlib.controldir import (
35
 
        ControlDir,
36
 
        format_registry,
37
 
        )
38
 
except ImportError:
39
 
    # bzr < 2.3
40
 
    from bzrlib.bzrdir import (
41
 
        BzrDir,
42
 
        format_registry,
43
 
        )
44
 
    ControlDir = BzrDir
45
37
 
46
38
 
47
39
class GitLock(object):
48
40
    """A lock that thunks through to Git."""
49
41
 
 
42
    def __init__(self):
 
43
        self.lock_name = "git lock"
 
44
 
50
45
    def lock_write(self, token=None):
51
46
        pass
52
47
 
90
85
        raise bzr_errors.BzrError("Cannot set configuration")
91
86
 
92
87
 
 
88
class GitControlDirFormat(ControlDirFormat):
 
89
 
 
90
    _lock_class = lockable_files.TransportLock
 
91
 
 
92
    colocated_branches = True
 
93
    fixed_components = True
 
94
 
 
95
    def __eq__(self, other):
 
96
        return type(self) == type(other)
 
97
 
 
98
    def is_supported(self):
 
99
        return True
 
100
 
 
101
    def network_name(self):
 
102
        return "git"
 
103
 
 
104
 
93
105
class GitDir(ControlDir):
94
106
    """An adapter to the '.git' dir used by git."""
95
107
 
108
120
    def _branch_name_to_ref(self, name):
109
121
        raise NotImplementedError(self._branch_name_to_ref)
110
122
 
111
 
    if bzrlib_version >= (2, 2):
112
 
        def open_branch(self, name=None, unsupported=False, 
113
 
            ignore_fallbacks=None):
114
 
            return self._open_branch(name=name,
115
 
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
116
 
    else:
117
 
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
118
 
            return self._open_branch(name=None,
119
 
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
120
 
 
121
123
    def get_config(self):
122
124
        return GitDirConfig()
123
125
 
 
126
    def sprout(self, url, revision_id=None, force_new_repo=False,
 
127
               recurse='down', possible_transports=None,
 
128
               accelerator_tree=None, hardlink=False, stacked=False,
 
129
               source_branch=None, create_tree_if_local=True):
 
130
        from bzrlib.repository import InterRepository
 
131
        from bzrlib.transport.local import LocalTransport
 
132
        from bzrlib.transport import get_transport
 
133
        target_transport = get_transport(url, possible_transports)
 
134
        target_transport.ensure_base()
 
135
        cloning_format = self.cloning_metadir()
 
136
        # Create/update the result branch
 
137
        result = cloning_format.initialize_on_transport(target_transport)
 
138
        source_branch = self.open_branch()
 
139
        source_repository = self.find_repository()
 
140
        try:
 
141
            result_repo = result.find_repository()
 
142
        except bzr_errors.NoRepositoryPresent:
 
143
            result_repo = result.create_repository()
 
144
            target_is_empty = True
 
145
        else:
 
146
            target_is_empty = None # Unknown
 
147
        if stacked:
 
148
            raise bzr_errors.IncompatibleRepositories(source_repository, result_repo)
 
149
        interrepo = InterRepository.get(source_repository, result_repo)
 
150
 
 
151
        if revision_id is not None:
 
152
            determine_wants = interrepo.get_determine_wants_revids(
 
153
                [revision_id], include_tags=True)
 
154
        else:
 
155
            determine_wants = interrepo.determine_wants_all
 
156
        interrepo.fetch_objects(determine_wants=determine_wants,
 
157
            mapping=source_branch.mapping)
 
158
        result_branch = source_branch.sprout(result,
 
159
            revision_id=revision_id, repository=result_repo)
 
160
        if (create_tree_if_local and isinstance(target_transport, LocalTransport)
 
161
            and (result_repo is None or result_repo.make_working_trees())):
 
162
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
 
163
                hardlink=hardlink, from_branch=result_branch)
 
164
            wt.lock_write()
 
165
            try:
 
166
                if wt.path2id('') is None:
 
167
                    try:
 
168
                        wt.set_root_id(self.open_workingtree.get_root_id())
 
169
                    except bzr_errors.NoWorkingTree:
 
170
                        pass
 
171
            finally:
 
172
                wt.unlock()
 
173
        return result
 
174
 
 
175
    def clone_on_transport(self, transport, revision_id=None,
 
176
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
 
177
        create_prefix=False, use_existing_dir=True, no_tree=False):
 
178
        from dulwich.protocol import ZERO_SHA
 
179
        """See ControlDir.clone_on_transport."""
 
180
        if no_tree:
 
181
            format = BareLocalGitControlDirFormat()
 
182
        else:
 
183
            format = LocalGitControlDirFormat()
 
184
        (target_repo, target_controldir, stacking, repo_policy) = format.initialize_on_transport_ex(transport, use_existing_dir=use_existing_dir, create_prefix=create_prefix, force_new_repo=force_new_repo)
 
185
        target_git_repo = target_repo._git
 
186
        source_repo = self.open_repository()
 
187
        source_git_repo = source_repo._git
 
188
        if revision_id is not None:
 
189
            determine_wants = source_repo.determine_wants_revid_and_tags(revision_id)
 
190
        else:
 
191
            determine_wants = target_git_repo.object_store.determine_wants_all
 
192
        refs = source_git_repo.fetch(target_git_repo, determine_wants)
 
193
        for name, val in refs.iteritems():
 
194
            target_git_repo.refs[name] = val
 
195
        lockfiles = GitLockableFiles(transport, GitLock())
 
196
        return self.__class__(transport, lockfiles, target_git_repo, format)
 
197
 
 
198
    def find_repository(self):
 
199
        """Find the repository that should be used.
 
200
 
 
201
        This does not require a branch as we use it to find the repo for
 
202
        new branches as well as to hook existing branches up to their
 
203
        repository.
 
204
        """
 
205
        return self.open_repository()
 
206
 
 
207
 
 
208
class LocalGitControlDirFormat(GitControlDirFormat):
 
209
    """The .git directory control format."""
 
210
 
 
211
    bare = False
 
212
 
 
213
    @classmethod
 
214
    def _known_formats(self):
 
215
        return set([LocalGitControlDirFormat()])
 
216
 
 
217
    @property
 
218
    def repository_format(self):
 
219
        from bzrlib.plugins.git.repository import GitRepositoryFormat
 
220
        return GitRepositoryFormat()
 
221
 
 
222
    def get_branch_format(self):
 
223
        from bzrlib.plugins.git.branch import GitBranchFormat
 
224
        return GitBranchFormat()
 
225
 
 
226
    def open(self, transport, _found=None):
 
227
        """Open this directory.
 
228
 
 
229
        """
 
230
        from bzrlib.plugins.git.transportgit import TransportRepo
 
231
        gitrepo = TransportRepo(transport)
 
232
        lockfiles = GitLockableFiles(transport, GitLock())
 
233
        return LocalGitDir(transport, lockfiles, gitrepo, self)
 
234
 
 
235
    def get_format_description(self):
 
236
        return "Local Git Repository"
 
237
 
 
238
    def initialize_on_transport(self, transport):
 
239
        from bzrlib.plugins.git.transportgit import TransportRepo
 
240
        TransportRepo.init(transport, bare=self.bare)
 
241
        return self.open(transport)
 
242
 
 
243
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
 
244
        create_prefix=False, force_new_repo=False, stacked_on=None,
 
245
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
 
246
        shared_repo=False, vfs_only=False):
 
247
        def make_directory(transport):
 
248
            transport.mkdir('.')
 
249
            return transport
 
250
        def redirected(transport, e, redirection_notice):
 
251
            trace.note(redirection_notice)
 
252
            return transport._redirected_to(e.source, e.target)
 
253
        try:
 
254
            transport = do_catching_redirections(make_directory, transport,
 
255
                redirected)
 
256
        except bzr_errors.FileExists:
 
257
            if not use_existing_dir:
 
258
                raise
 
259
        except bzr_errors.NoSuchFile:
 
260
            if not create_prefix:
 
261
                raise
 
262
            transport.create_prefix()
 
263
        controldir = self.initialize_on_transport(transport)
 
264
        repository = controldir.open_repository()
 
265
        repository.lock_write()
 
266
        return (repository, controldir, False, CreateRepository(controldir))
 
267
 
 
268
    def is_supported(self):
 
269
        return True
 
270
 
 
271
 
 
272
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
 
273
 
 
274
    bare = True
 
275
    supports_workingtrees = False
 
276
 
 
277
    def get_format_description(self):
 
278
        return "Local Git Repository (bare)"
 
279
 
124
280
 
125
281
class LocalGitDir(GitDir):
126
282
    """An adapter to the '.git' dir used by git."""
162
318
        return ref
163
319
 
164
320
    def is_control_filename(self, filename):
165
 
        return filename == '.git' or filename.startswith('.git/')
 
321
        return (filename == '.git' or filename.startswith('.git/'))
166
322
 
167
323
    def get_branch_transport(self, branch_format, name=None):
168
324
        if branch_format is None:
185
341
            return self.transport
186
342
        raise bzr_errors.IncompatibleFormat(format, self._format)
187
343
 
188
 
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
 
344
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None):
189
345
        """'create' a branch for this dir."""
190
346
        repo = self.open_repository()
191
347
        from bzrlib.plugins.git.branch import LocalGitBranch
215
371
                ret.append(self.open_branch(name=name))
216
372
        return ret
217
373
 
218
 
    def open_repository(self, shared=False):
 
374
    def open_repository(self):
219
375
        """'open' a repository for this dir."""
220
376
        return self._gitrepository_class(self, self._lockfiles)
221
377
 
239
395
        raise bzr_errors.NoWorkingTree(loc)
240
396
 
241
397
    def create_repository(self, shared=False):
 
398
        from bzrlib.plugins.git.repository import GitRepositoryFormat
 
399
        if shared:
 
400
            raise bzr_errors.IncompatibleFormat(GitRepositoryFormat(), self._format)
242
401
        return self.open_repository()
243
402
 
244
 
    def create_branch(self, name=None):
 
403
    def create_branch(self, name=None, repository=None):
245
404
        refname = self._branch_name_to_ref(name)
246
405
        from dulwich.protocol import ZERO_SHA
247
406
        self._git.refs[refname or "HEAD"] = ZERO_SHA
258
417
    def create_workingtree(self, revision_id=None, from_branch=None,
259
418
        accelerator_tree=None, hardlink=False):
260
419
        if self._git.bare:
261
 
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
420
            raise bzr_errors.UnsupportedOperation(self.create_workingtree, self)
262
421
        from dulwich.index import write_index
263
422
        from dulwich.pack import SHA1Writer
264
423
        f = open(self.transport.local_abspath("index"), 'w+')
269
428
            f.close()
270
429
        return self.open_workingtree()
271
430
 
272
 
    def find_repository(self):
273
 
        """Find the repository that should be used.
274
 
 
275
 
        This does not require a branch as we use it to find the repo for
276
 
        new branches as well as to hook existing branches up to their
277
 
        repository.
278
 
        """
279
 
        return self.open_repository()
 
431
    def _find_or_create_repository(self, force_new_repo=None):
 
432
        return self.create_repository(shared=False)
280
433
 
281
434
    def _find_creation_modes(self):
282
435
        """Determine the appropriate modes for files and directories.
291
444
        self._mode_check_done = True
292
445
        try:
293
446
            st = self.transport.stat('.')
294
 
        except TransportNotPossible:
 
447
        except bzr_errors.TransportNotPossible:
295
448
            self._dir_mode = None
296
449
            self._file_mode = None
297
450
        else:
322
475
            self._find_creation_modes()
323
476
        return self._dir_mode
324
477
 
325