/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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""An adapter between a Git control dir and a Bazaar BzrDir."""
18
 
 
 
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
19
23
from bzrlib import (
20
24
    bzrdir,
21
 
    errors as bzr_errors,
22
25
    lockable_files,
23
26
    urlutils,
24
 
    version_info as bzrlib_version,
25
27
    )
26
28
 
27
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
28
 
 
 
29
lazy_import(globals(), """
 
30
from bzrlib.lockable_files import TransportLock
29
31
from bzrlib.plugins.git import (
30
 
    LocalGitBzrDirFormat,
31
 
    get_rich_root_format,
 
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 get_rich_root_format(stacked)
80
 
 
81
 
    def _branch_name_to_ref(self, name):
82
 
        from bzrlib.plugins.git.branch import branch_name_to_ref
83
 
        return branch_name_to_ref(name)
84
 
 
85
 
    if bzrlib_version >= (2, 2):
86
 
        def open_branch(self, name=None, ignore_fallbacks=None,
87
 
            unsupported=False):
88
 
            return self._open_branch(name=name,
89
 
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
90
 
    else:
91
 
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
92
 
            return self._open_branch(name=None,
93
 
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
80
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
94
81
 
95
82
 
96
83
class LocalGitDir(GitDir):
97
84
    """An adapter to the '.git' dir used by git."""
98
85
 
99
 
    def _get_gitrepository_class(self):
100
 
        from bzrlib.plugins.git.repository import LocalGitRepository
101
 
        return LocalGitRepository
102
 
 
103
 
    _gitrepository_class = property(_get_gitrepository_class)
 
86
    _gitrepository_class = repository.LocalGitRepository
104
87
 
105
88
    def __init__(self, transport, lockfiles, gitrepo, format):
106
89
        self._format = format
111
94
        else:
112
95
            self.transport = transport.clone('.git')
113
96
        self._lockfiles = lockfiles
114
 
        self._mode_check_done = None
115
 
 
116
 
    def is_control_filename(self, filename):
117
 
        return filename == '.git' or filename.startswith('.git/')
118
97
 
119
98
    def get_branch_transport(self, branch_format):
120
99
        if branch_format is None:
121
100
            return self.transport
122
101
        if isinstance(branch_format, LocalGitBzrDirFormat):
123
102
            return self.transport
124
 
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
103
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
125
104
 
126
105
    get_repository_transport = get_branch_transport
127
106
    get_workingtree_transport = get_branch_transport
128
107
 
129
 
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
 
108
    def open_branch(self, ignored=None):
130
109
        """'create' a branch for this dir."""
131
110
        repo = self.open_repository()
132
 
        from bzrlib.plugins.git.branch import LocalGitBranch
133
 
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
134
 
            self._lockfiles)
135
 
 
136
 
    def destroy_branch(self, name=None):
137
 
        del self._git.refs[self._branch_name_to_ref(name)]
138
 
 
139
 
    def list_branches(self):
140
 
        ret = []
141
 
        for name in self._git.get_refs():
142
 
            if name.startswith("refs/heads/") or name == "HEAD":
143
 
                ret.append(self.open_branch(name=name))
144
 
        return ret
 
111
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
145
112
 
146
113
    def open_repository(self, shared=False):
147
114
        """'open' a repository for this dir."""
148
115
        return self._gitrepository_class(self, self._lockfiles)
149
116
 
150
117
    def open_workingtree(self, recommend_upgrade=True):
151
 
        if not self._git.bare:
152
 
            from dulwich.errors import NoIndexPresent
153
 
            repo = self.open_repository()
154
 
            try:
155
 
                index = repo._git.open_index()
156
 
            except NoIndexPresent:
157
 
                pass
158
 
            else:
159
 
                from bzrlib.plugins.git.workingtree import GitWorkingTree
160
 
                return GitWorkingTree(self, repo, self.open_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())
161
122
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
162
 
        raise bzr_errors.NoWorkingTree(loc)
 
123
        raise errors.bzr_errors.NoWorkingTree(loc)
163
124
 
164
125
    def create_repository(self, shared=False):
165
126
        return self.open_repository()
166
 
 
167
 
    def create_branch(self, name=None):
168
 
        refname = self._branch_name_to_ref(name)
169
 
        self._git.refs[refname] = "0" * 40
170
 
        return self.open_branch(name)
171
 
 
172
 
    def backup_bzrdir(self):
173
 
        if self._git.bare:
174
 
            self.root_transport.copy_tree(".git", ".git.backup")
175
 
            return (self.root_transport.abspath(".git"),
176
 
                    self.root_transport.abspath(".git.backup"))
177
 
        else:
178
 
            raise bzr_errors.BzrError("Unable to backup bare repositories")
179
 
 
180
 
    def create_workingtree(self, revision_id=None, from_branch=None,
181
 
        accelerator_tree=None, hardlink=False):
182
 
        if self._git.bare:
183
 
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
184
 
        from dulwich.index import write_index
185
 
        from dulwich.pack import SHA1Writer
186
 
        f = open(self.transport.local_abspath("index"), 'w+')
187
 
        try:
188
 
            f = SHA1Writer(f)
189
 
            write_index(f, [])
190
 
        finally:
191
 
            f.close()
192
 
        return self.open_workingtree()