/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

Fix tests.

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."""
 
17
"""An adapter between a Git control dir and a Bazaar BzrDir"""
18
18
 
19
19
import os
20
20
 
21
21
import bzrlib
 
22
from bzrlib.lazy_import import lazy_import
22
23
from bzrlib import (
23
24
    bzrdir,
24
25
    lockable_files,
25
26
    urlutils,
26
27
    )
27
28
 
28
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
 
 
 
29
lazy_import(globals(), """
 
30
from bzrlib.lockable_files import (
 
31
    TransportLock,
 
32
    )
30
33
from bzrlib.plugins.git import (
31
 
    LocalGitBzrDirFormat,
 
34
    errors,
32
35
    branch,
33
 
    errors,
34
 
    get_rich_root_format,
35
36
    repository,
36
37
    workingtree,
37
38
    )
 
39
""")
 
40
 
 
41
from bzrlib.plugins.git import LocalGitBzrDirFormat
 
42
 
38
43
 
39
44
 
40
45
class GitLock(object):
64
69
        self._transaction = None
65
70
        self._lock_mode = None
66
71
        self._transport = transport
67
 
        if LockWarner is None:
68
 
            # Bzr 1.13
69
 
            self._lock_count = 0
70
 
        else:
71
 
            self._lock_warner = LockWarner(repr(self))
 
72
        self._lock_count = 0
72
73
 
73
74
 
74
75
class GitDir(bzrdir.BzrDir):
78
79
        return True
79
80
 
80
81
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format(stacked)
 
82
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
82
83
 
83
84
 
84
85
class LocalGitDir(GitDir):
95
96
        else:
96
97
            self.transport = transport.clone('.git')
97
98
        self._lockfiles = lockfiles
98
 
        self._mode_check_done = None
99
 
 
100
 
    def is_control_filename(self, filename):
101
 
        return filename == '.git' or filename.startswith('.git/')
102
99
 
103
100
    def get_branch_transport(self, branch_format):
104
101
        if branch_format is None:
110
107
    get_repository_transport = get_branch_transport
111
108
    get_workingtree_transport = get_branch_transport
112
109
 
113
 
    def open_branch(self, ignore_fallbacks=None):
 
110
    def open_branch(self, ignored=None):
114
111
        """'create' a branch for this dir."""
115
112
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
113
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
117
114
 
118
115
    def open_repository(self, shared=False):
119
116
        """'open' a repository for this dir."""
120
117
        return self._gitrepository_class(self, self._lockfiles)
121
118
 
122
119
    def open_workingtree(self, recommend_upgrade=True):
123
 
        if not self._git.bare and self._git.has_index():
 
120
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
121
        raise errors.bzr_errors.NoWorkingTree(loc)
 
122
        if (not self._git.bare and 
 
123
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
124
124
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
125
                                                  self.open_branch())
126
 
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
 
        raise errors.bzr_errors.NoWorkingTree(loc)
128
126
 
129
127
    def create_repository(self, shared=False):
130
128
        return self.open_repository()
131
 
 
132
 
    def create_branch(self):
133
 
        return self.open_branch()
134
 
 
135
 
    def backup_bzrdir(self):
136
 
        if self._git.bare:
137
 
            self.root_transport.copy_tree(".git", ".git.backup")
138
 
            return (self.root_transport.abspath(".git"),
139
 
                    self.root_transport.abspath(".git.backup"))
140
 
        else:
141
 
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
142
 
 
143
 
    def create_workingtree(self, revision_id=None, from_branch=None,
144
 
        accelerator_tree=None, hardlink=False):
145
 
        if self._git.bare:
146
 
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
147
 
        from dulwich.index import write_index
148
 
        write_index(self.root_transport.abspath(".git/index"), [])
149
 
        return self.open_workingtree()