/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

Hackishly fix tree references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
17
17
 
18
18
"""An adapter between a Git control dir and a Bazaar ControlDir."""
19
19
 
 
20
import urllib
 
21
 
20
22
from bzrlib import (
21
23
    errors as bzr_errors,
22
 
    lockable_files,
 
24
    trace,
 
25
    osutils,
23
26
    urlutils,
24
 
    version_info as bzrlib_version,
25
 
    )
26
 
 
27
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
28
 
 
29
 
from bzrlib.plugins.git import (
30
 
    BareLocalGitControlDirFormat,
31
 
    LocalGitControlDirFormat,
32
 
    )
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
 
 
46
 
 
47
 
class GitLock(object):
48
 
    """A lock that thunks through to Git."""
49
 
 
50
 
    def lock_write(self, token=None):
51
 
        pass
52
 
 
53
 
    def lock_read(self):
54
 
        pass
55
 
 
56
 
    def unlock(self):
57
 
        pass
58
 
 
59
 
    def peek(self):
60
 
        pass
61
 
 
62
 
    def validate_token(self, token):
63
 
        pass
64
 
 
65
 
    def break_lock(self):
66
 
        pass
67
 
 
68
 
 
69
 
class GitLockableFiles(lockable_files.LockableFiles):
70
 
    """Git specific lockable files abstraction."""
71
 
 
72
 
    def __init__(self, transport, lock):
73
 
        self._lock = lock
74
 
        self._transaction = None
75
 
        self._lock_mode = None
76
 
        self._transport = transport
77
 
        if LockWarner is None:
78
 
            # Bzr 1.13
79
 
            self._lock_count = 0
80
 
        else:
81
 
            self._lock_warner = LockWarner(repr(self))
 
27
    )
 
28
from bzrlib.bzrdir import CreateRepository
 
29
from bzrlib.transport import do_catching_redirections
 
30
 
 
31
from bzrlib.controldir import (
 
32
    ControlDir,
 
33
    ControlDirFormat,
 
34
    format_registry,
 
35
    )
82
36
 
83
37
 
84
38
class GitDirConfig(object):
90
44
        raise bzr_errors.BzrError("Cannot set configuration")
91
45
 
92
46
 
 
47
class GitControlDirFormat(ControlDirFormat):
 
48
 
 
49
    colocated_branches = True
 
50
    fixed_components = True
 
51
 
 
52
    def __eq__(self, other):
 
53
        return type(self) == type(other)
 
54
 
 
55
    def is_supported(self):
 
56
        return True
 
57
 
 
58
    def network_name(self):
 
59
        return "git"
 
60
 
 
61
 
93
62
class GitDir(ControlDir):
94
63
    """An adapter to the '.git' dir used by git."""
95
64
 
105
74
    def cloning_metadir(self, stacked=False):
106
75
        return format_registry.make_bzrdir("default")
107
76
 
108
 
    def _branch_name_to_ref(self, name):
109
 
        raise NotImplementedError(self._branch_name_to_ref)
 
77
    def checkout_metadir(self, stacked=False):
 
78
        return format_registry.make_bzrdir("default")
110
79
 
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)
 
80
    def _get_selected_ref(self, branch, ref=None):
 
81
        if ref is not None and branch is not None:
 
82
            raise bzr_errors.BzrError("can't specify both ref and branch")
 
83
        if ref is not None:
 
84
            return ref
 
85
        if branch is None and getattr(self, "_get_selected_branch", False):
 
86
            branch = self._get_selected_branch()
 
87
        if branch is not None:
 
88
            from bzrlib.plugins.git.refs import branch_name_to_ref
 
89
            return branch_name_to_ref(branch, None)
 
90
        segment_parameters = getattr(
 
91
            self.user_transport, "get_segment_parameters", lambda: {})()
 
92
        ref = segment_parameters.get("ref")
 
93
        if ref is not None:
 
94
            ref = urlutils.unescape(ref)
 
95
        return ref
120
96
 
121
97
    def get_config(self):
122
98
        return GitDirConfig()
123
99
 
 
100
    def _available_backup_name(self, base):
 
101
        return osutils.available_backup_name(base, self.root_transport.has)
 
102
 
 
103
    def sprout(self, url, revision_id=None, force_new_repo=False,
 
104
               recurse='down', possible_transports=None,
 
105
               accelerator_tree=None, hardlink=False, stacked=False,
 
106
               source_branch=None, create_tree_if_local=True):
 
107
        from bzrlib.repository import InterRepository
 
108
        from bzrlib.transport.local import LocalTransport
 
109
        from bzrlib.transport import get_transport
 
110
        target_transport = get_transport(url, possible_transports)
 
111
        target_transport.ensure_base()
 
112
        cloning_format = self.cloning_metadir()
 
113
        # Create/update the result branch
 
114
        result = cloning_format.initialize_on_transport(target_transport)
 
115
        source_branch = self.open_branch()
 
116
        source_repository = self.find_repository()
 
117
        try:
 
118
            result_repo = result.find_repository()
 
119
        except bzr_errors.NoRepositoryPresent:
 
120
            result_repo = result.create_repository()
 
121
            target_is_empty = True
 
122
        else:
 
123
            target_is_empty = None # Unknown
 
124
        if stacked:
 
125
            raise bzr_errors.IncompatibleRepositories(source_repository, result_repo)
 
126
        interrepo = InterRepository.get(source_repository, result_repo)
 
127
 
 
128
        if revision_id is not None:
 
129
            determine_wants = interrepo.get_determine_wants_revids(
 
130
                [revision_id], include_tags=False)
 
131
        else:
 
132
            determine_wants = interrepo.determine_wants_all
 
133
        interrepo.fetch_objects(determine_wants=determine_wants,
 
134
            mapping=source_branch.mapping)
 
135
        result_branch = source_branch.sprout(result,
 
136
            revision_id=revision_id, repository=result_repo)
 
137
        if (create_tree_if_local
 
138
            and isinstance(target_transport, LocalTransport)
 
139
            and (result_repo is None or result_repo.make_working_trees())):
 
140
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
 
141
                hardlink=hardlink, from_branch=result_branch)
 
142
            wt.lock_write()
 
143
            try:
 
144
                if wt.path2id('') is None:
 
145
                    try:
 
146
                        wt.set_root_id(self.open_workingtree.get_root_id())
 
147
                    except bzr_errors.NoWorkingTree:
 
148
                        pass
 
149
            finally:
 
150
                wt.unlock()
 
151
        return result
 
152
 
 
153
    def clone_on_transport(self, transport, revision_id=None,
 
154
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
 
155
        create_prefix=False, use_existing_dir=True, no_tree=False):
 
156
        """See ControlDir.clone_on_transport."""
 
157
        from bzrlib.repository import InterRepository
 
158
        from bzrlib.plugins.git.mapping import default_mapping
 
159
        if no_tree:
 
160
            format = BareLocalGitControlDirFormat()
 
161
        else:
 
162
            format = LocalGitControlDirFormat()
 
163
        (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)
 
164
        target_git_repo = target_repo._git
 
165
        source_repo = self.open_repository()
 
166
        source_git_repo = source_repo._git
 
167
        interrepo = InterRepository.get(source_repo, target_repo)
 
168
        if revision_id is not None:
 
169
            determine_wants = interrepo.get_determine_wants_revids([revision_id], include_tags=True)
 
170
        else:
 
171
            determine_wants = interrepo.determine_wants_all
 
172
        (pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
 
173
            mapping=default_mapping)
 
174
        for name, val in refs.iteritems():
 
175
            target_git_repo.refs[name] = val
 
176
        return self.__class__(transport, target_git_repo, format)
 
177
 
 
178
    def find_repository(self):
 
179
        """Find the repository that should be used.
 
180
 
 
181
        This does not require a branch as we use it to find the repo for
 
182
        new branches as well as to hook existing branches up to their
 
183
        repository.
 
184
        """
 
185
        return self.open_repository()
 
186
 
 
187
    def get_refs_container(self):
 
188
        """Retrieve the refs container.
 
189
        """
 
190
        raise NotImplementedError(self.get_refs_container)
 
191
 
 
192
 
 
193
class LocalGitControlDirFormat(GitControlDirFormat):
 
194
    """The .git directory control format."""
 
195
 
 
196
    bare = False
 
197
 
 
198
    @classmethod
 
199
    def _known_formats(self):
 
200
        return set([LocalGitControlDirFormat()])
 
201
 
 
202
    @property
 
203
    def repository_format(self):
 
204
        from bzrlib.plugins.git.repository import GitRepositoryFormat
 
205
        return GitRepositoryFormat()
 
206
 
 
207
    def get_branch_format(self):
 
208
        from bzrlib.plugins.git.branch import GitBranchFormat
 
209
        return GitBranchFormat()
 
210
 
 
211
    def open(self, transport, _found=None):
 
212
        """Open this directory.
 
213
 
 
214
        """
 
215
        from bzrlib.plugins.git.transportgit import TransportRepo
 
216
        gitrepo = TransportRepo(transport, self.bare,
 
217
                refs_text=getattr(self, "_refs_text", None))
 
218
        return LocalGitDir(transport, gitrepo, self)
 
219
 
 
220
    def get_format_description(self):
 
221
        return "Local Git Repository"
 
222
 
 
223
    def initialize_on_transport(self, transport):
 
224
        from bzrlib.plugins.git.transportgit import TransportRepo
 
225
        TransportRepo.init(transport, bare=self.bare)
 
226
        return self.open(transport)
 
227
 
 
228
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
 
229
        create_prefix=False, force_new_repo=False, stacked_on=None,
 
230
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
 
231
        shared_repo=False, vfs_only=False):
 
232
        def make_directory(transport):
 
233
            transport.mkdir('.')
 
234
            return transport
 
235
        def redirected(transport, e, redirection_notice):
 
236
            trace.note(redirection_notice)
 
237
            return transport._redirected_to(e.source, e.target)
 
238
        try:
 
239
            transport = do_catching_redirections(make_directory, transport,
 
240
                redirected)
 
241
        except bzr_errors.FileExists:
 
242
            if not use_existing_dir:
 
243
                raise
 
244
        except bzr_errors.NoSuchFile:
 
245
            if not create_prefix:
 
246
                raise
 
247
            transport.create_prefix()
 
248
        controldir = self.initialize_on_transport(transport)
 
249
        repository = controldir.open_repository()
 
250
        repository.lock_write()
 
251
        return (repository, controldir, False, CreateRepository(controldir))
 
252
 
 
253
    def is_supported(self):
 
254
        return True
 
255
 
 
256
    def supports_transport(self, transport):
 
257
        try:
 
258
            external_url = transport.external_url()
 
259
        except bzr_errors.InProcessTransport:
 
260
            raise bzr_errors.NotBranchError(path=transport.base)
 
261
        return (external_url.startswith("http:") or
 
262
                external_url.startswith("https:") or
 
263
                external_url.startswith("file:"))
 
264
 
 
265
 
 
266
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
 
267
 
 
268
    bare = True
 
269
    supports_workingtrees = False
 
270
 
 
271
    def get_format_description(self):
 
272
        return "Local Git Repository (bare)"
 
273
 
124
274
 
125
275
class LocalGitDir(GitDir):
126
276
    """An adapter to the '.git' dir used by git."""
129
279
        from bzrlib.plugins.git.repository import LocalGitRepository
130
280
        return LocalGitRepository
131
281
 
 
282
    def __repr__(self):
 
283
        return "<%s at %r>" % (
 
284
            self.__class__.__name__, self.root_transport.base)
 
285
 
132
286
    _gitrepository_class = property(_get_gitrepository_class)
133
287
 
134
288
    @property
139
293
    def control_transport(self):
140
294
        return self.transport
141
295
 
142
 
    def __init__(self, transport, lockfiles, gitrepo, format):
 
296
    def __init__(self, transport, gitrepo, format):
143
297
        self._format = format
144
298
        self.root_transport = transport
145
299
        self._mode_check_done = False
148
302
            self.transport = transport
149
303
        else:
150
304
            self.transport = transport.clone('.git')
151
 
        self._lockfiles = lockfiles
152
305
        self._mode_check_done = None
153
306
 
154
 
    def _branch_name_to_ref(self, name):
155
 
        from bzrlib.plugins.git.refs import branch_name_to_ref
156
 
        ref = branch_name_to_ref(name, None)
157
 
        if ref == "HEAD":
158
 
            from dulwich.repo import SYMREF
159
 
            refcontents = self._git.refs.read_ref(ref)
160
 
            if refcontents.startswith(SYMREF):
161
 
                ref = refcontents[len(SYMREF):]
162
 
        return ref
163
 
 
164
307
    def is_control_filename(self, filename):
165
 
        return filename == '.git' or filename.startswith('.git/')
 
308
        return (filename == '.git' or filename.startswith('.git/'))
 
309
 
 
310
    def _get_symref(self, ref):
 
311
        from dulwich.repo import SYMREF
 
312
        refcontents = self._git.refs.read_ref(ref)
 
313
        if refcontents is None: # no such ref
 
314
            return None
 
315
        if refcontents.startswith(SYMREF):
 
316
            return refcontents[len(SYMREF):].rstrip("\n")
 
317
        return None
 
318
 
 
319
    def set_branch_reference(self, name, target):
 
320
        ref = self._get_selected_ref(name)
 
321
        if ref is None:
 
322
            ref = "HEAD"
 
323
        if not getattr(target, "ref", None):
 
324
            raise bzr_errors.BzrError("Can only set symrefs to Git refs")
 
325
        self._git.refs.set_symbolic_ref(ref, target.ref)
 
326
 
 
327
    def get_branch_reference(self, name=None):
 
328
        ref = self._get_selected_ref(name)
 
329
        if ref is None:
 
330
            ref = "HEAD"
 
331
        target_ref = self._get_symref(ref)
 
332
        if target_ref is not None:
 
333
            return urlutils.join_segment_parameters(
 
334
                self.user_url.rstrip("/"), {"ref": urllib.quote(target_ref, '')})
 
335
        return None
 
336
 
 
337
    def find_branch_format(self, name=None):
 
338
        from bzrlib.plugins.git.branch import (
 
339
            GitBranchFormat,
 
340
            GitSymrefBranchFormat,
 
341
            )
 
342
        ref = self._get_selected_ref(name)
 
343
        if ref is None:
 
344
            ref = "HEAD"
 
345
        if self._get_symref(ref) is not None:
 
346
            return GitSymrefBranchFormat()
 
347
        else:
 
348
            return GitBranchFormat()
166
349
 
167
350
    def get_branch_transport(self, branch_format, name=None):
168
351
        if branch_format is None:
185
368
            return self.transport
186
369
        raise bzr_errors.IncompatibleFormat(format, self._format)
187
370
 
188
 
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
 
371
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None,
 
372
            ref=None, possible_transports=None):
189
373
        """'create' a branch for this dir."""
190
374
        repo = self.open_repository()
191
375
        from bzrlib.plugins.git.branch import LocalGitBranch
192
 
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
193
 
            self._lockfiles)
 
376
        ref = self._get_selected_ref(name, ref)
 
377
        if ref is None:
 
378
            ref = "HEAD"
 
379
        ref, sha = self._git.refs._follow(ref)
 
380
        if not ref in self._git.refs:
 
381
            raise bzr_errors.NotBranchError(self.root_transport.base,
 
382
                    bzrdir=self)
 
383
        return LocalGitBranch(self, repo, ref)
194
384
 
195
385
    def destroy_branch(self, name=None):
196
 
        refname = self._branch_name_to_ref(name)
197
 
        if not refname in self._git.refs:
 
386
        refname = self._get_selected_ref(name)
 
387
        if refname is None:
 
388
            refname = "refs/heads/master"
 
389
        try:
 
390
            del self._git.refs[refname]
 
391
        except KeyError:
198
392
            raise bzr_errors.NotBranchError(self.root_transport.base,
199
393
                    bzrdir=self)
200
 
        del self._git.refs[refname]
201
394
 
202
395
    def destroy_repository(self):
203
396
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
209
402
        return not isinstance(self._format, format.__class__)
210
403
 
211
404
    def list_branches(self):
212
 
        ret = []
213
 
        for name in self._git.get_refs():
214
 
            if name.startswith("refs/heads/"):
215
 
                ret.append(self.open_branch(name=name))
 
405
        return self.get_branches().values()
 
406
 
 
407
    def get_branches(self):
 
408
        from bzrlib.plugins.git.refs import ref_to_branch_name
 
409
        ret = {}
 
410
        for ref in self._git.refs.keys():
 
411
            try:
 
412
                branch_name = ref_to_branch_name(ref)
 
413
            except ValueError:
 
414
                continue
 
415
            except UnicodeDecodeError:
 
416
                trace.warning("Ignoring branch %r with unicode error ref", ref)
 
417
                continue
 
418
            ret[branch_name] = self.open_branch(ref=ref)
216
419
        return ret
217
420
 
218
 
    def open_repository(self, shared=False):
 
421
    def open_repository(self):
219
422
        """'open' a repository for this dir."""
220
 
        return self._gitrepository_class(self, self._lockfiles)
 
423
        return self._gitrepository_class(self)
221
424
 
222
 
    def open_workingtree(self, recommend_upgrade=True):
 
425
    def open_workingtree(self, recommend_upgrade=True, unsupported=False):
223
426
        if not self._git.bare:
224
427
            from dulwich.errors import NoIndexPresent
225
428
            repo = self.open_repository()
239
442
        raise bzr_errors.NoWorkingTree(loc)
240
443
 
241
444
    def create_repository(self, shared=False):
 
445
        from bzrlib.plugins.git.repository import GitRepositoryFormat
 
446
        if shared:
 
447
            raise bzr_errors.IncompatibleFormat(GitRepositoryFormat(), self._format)
242
448
        return self.open_repository()
243
449
 
244
 
    def create_branch(self, name=None):
245
 
        refname = self._branch_name_to_ref(name)
 
450
    def create_branch(self, name=None, repository=None,
 
451
                      append_revisions_only=None, ref=None):
 
452
        refname = self._get_selected_ref(name, ref)
246
453
        from dulwich.protocol import ZERO_SHA
247
 
        self._git.refs[refname or "HEAD"] = ZERO_SHA
248
 
        return self.open_branch(name)
 
454
        # FIXME: This is a bit awkward. Perhaps we should have a
 
455
        # a separate method for changing the default branch?
 
456
        if refname is None:
 
457
            refname = "refs/heads/master"
 
458
            set_head = True
 
459
        else:
 
460
            set_head = False
 
461
 
 
462
        if refname in self._git.refs:
 
463
            raise bzr_errors.AlreadyBranchError(self.base)
 
464
        self._git.refs[refname] = ZERO_SHA
 
465
        if set_head:
 
466
            self._git.refs.set_symbolic_ref("HEAD", refname)
 
467
        branch = self.open_branch(name)
 
468
        if append_revisions_only:
 
469
            branch.set_append_revisions_only(append_revisions_only)
 
470
        return branch
249
471
 
250
472
    def backup_bzrdir(self):
251
473
        if self._git.bare:
258
480
    def create_workingtree(self, revision_id=None, from_branch=None,
259
481
        accelerator_tree=None, hardlink=False):
260
482
        if self._git.bare:
261
 
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
483
            raise bzr_errors.UnsupportedOperation(self.create_workingtree, self)
262
484
        from dulwich.index import write_index
263
485
        from dulwich.pack import SHA1Writer
264
486
        f = open(self.transport.local_abspath("index"), 'w+')
269
491
            f.close()
270
492
        return self.open_workingtree()
271
493
 
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()
 
494
    def _find_or_create_repository(self, force_new_repo=None):
 
495
        return self.create_repository(shared=False)
280
496
 
281
497
    def _find_creation_modes(self):
282
498
        """Determine the appropriate modes for files and directories.
291
507
        self._mode_check_done = True
292
508
        try:
293
509
            st = self.transport.stat('.')
294
 
        except TransportNotPossible:
 
510
        except bzr_errors.TransportNotPossible:
295
511
            self._dir_mode = None
296
512
            self._file_mode = None
297
513
        else:
322
538
            self._find_creation_modes()
323
539
        return self._dir_mode
324
540
 
 
541
    def get_refs_container(self):
 
542
        return self._git.refs
325
543
 
 
544
    def get_peeled(self, ref):
 
545
        return self._git.get_peeled(ref)