/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

  • Committer: Jelmer Vernooij
  • Date: 2010-02-12 00:39:11 UTC
  • mto: (0.200.718 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100212003911-hz63ctlfgsvrzrjh
Cope with has_index not existing.

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."""
120
122
        return self._gitrepository_class(self, self._lockfiles)
121
123
 
122
124
    def open_workingtree(self, recommend_upgrade=True):
123
 
        if not self._git.bare and self._git.has_index():
124
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
 
                                                  self.open_branch())
 
125
        if not self._git.bare:
 
126
            from dulwich.errors import NoIndexPresent
 
127
            try:
 
128
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
129
                return GitWorkingTree(self, self.open_repository(),
 
130
                                                      self.open_branch())
 
131
            except NoIndexPresent:
 
132
                pass
126
133
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
134
        raise bzr_errors.NoWorkingTree(loc)
128
135
 
129
136
    def create_repository(self, shared=False):
130
137
        return self.open_repository()
138
145
            return (self.root_transport.abspath(".git"),
139
146
                    self.root_transport.abspath(".git.backup"))
140
147
        else:
141
 
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
 
148
            raise bzr_errors.BzrError("Unable to backup bare repositories")
142
149
 
143
150
    def create_workingtree(self, revision_id=None, from_branch=None,
144
151
        accelerator_tree=None, hardlink=False):
145
152
        if self._git.bare:
146
 
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
 
153
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
147
154
        from dulwich.index import write_index
148
 
        write_index(self.root_transport.abspath(".git/index"), [])
 
155
        from dulwich.pack import SHA1Writer
 
156
        f = open(self.transport.local_abspath("index"), 'w+')
 
157
        try:
 
158
            f = SHA1Writer(f)
 
159
            write_index(f, [])
 
160
        finally:
 
161
            f.close()
149
162
        return self.open_workingtree()