/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

properly commit write group

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 import (
23
20
    bzrdir,
 
21
    errors as bzr_errors,
24
22
    lockable_files,
25
23
    urlutils,
26
24
    )
29
27
 
30
28
from bzrlib.plugins.git import (
31
29
    LocalGitBzrDirFormat,
32
 
    branch,
33
 
    errors,
34
30
    get_rich_root_format,
35
 
    repository,
36
 
    workingtree,
37
31
    )
38
32
 
39
33
 
55
49
    def validate_token(self, token):
56
50
        pass
57
51
 
 
52
    def break_lock(self):
 
53
        pass
 
54
 
58
55
 
59
56
class GitLockableFiles(lockable_files.LockableFiles):
60
57
    """Git specific lockable files abstraction."""
84
81
class LocalGitDir(GitDir):
85
82
    """An adapter to the '.git' dir used by git."""
86
83
 
87
 
    _gitrepository_class = repository.LocalGitRepository
 
84
    def _get_gitrepository_class(self):
 
85
        from bzrlib.plugins.git.repository import LocalGitRepository
 
86
        return LocalGitRepository
 
87
 
 
88
    _gitrepository_class = property(_get_gitrepository_class)
88
89
 
89
90
    def __init__(self, transport, lockfiles, gitrepo, format):
90
91
        self._format = format
105
106
            return self.transport
106
107
        if isinstance(branch_format, LocalGitBzrDirFormat):
107
108
            return self.transport
108
 
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
 
109
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
109
110
 
110
111
    get_repository_transport = get_branch_transport
111
112
    get_workingtree_transport = get_branch_transport
113
114
    def open_branch(self, ignore_fallbacks=None):
114
115
        """'create' a branch for this dir."""
115
116
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
117
        from bzrlib.plugins.git.branch import LocalGitBranch
 
118
        return LocalGitBranch(self, repo, "HEAD", self._lockfiles)
117
119
 
118
120
    def open_repository(self, shared=False):
119
121
        """'open' a repository for this dir."""
121
123
 
122
124
    def open_workingtree(self, recommend_upgrade=True):
123
125
        if not self._git.bare and self._git.has_index():
124
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
 
126
            from bzrlib.plugins.git.workingtree import GitWorkingTree
 
127
            return GitWorkingTree(self, self.open_repository(),
125
128
                                                  self.open_branch())
126
129
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
130
        raise bzr_errors.NoWorkingTree(loc)
128
131
 
129
132
    def create_repository(self, shared=False):
130
133
        return self.open_repository()
138
141
            return (self.root_transport.abspath(".git"),
139
142
                    self.root_transport.abspath(".git.backup"))
140
143
        else:
141
 
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
 
144
            raise bzr_errors.BzrError("Unable to backup bare repositories")
142
145
 
143
146
    def create_workingtree(self, revision_id=None, from_branch=None,
144
147
        accelerator_tree=None, hardlink=False):
145
148
        if self._git.bare:
146
 
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
 
149
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
147
150
        from dulwich.index import write_index
148
 
        write_index(self.root_transport.abspath(".git/index"), [])
 
151
        from dulwich.pack import SHA1Writer
 
152
        f = open(self.transport.local_abspath("index"), 'w+')
 
153
        try:
 
154
            f = SHA1Writer(f)
 
155
            write_index(f, [])
 
156
        finally:
 
157
            f.close()
149
158
        return self.open_workingtree()