/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

Extract unusual file modes from revision when reconstructing Trees.

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
 
import git, os
 
19
import os
20
20
 
21
21
import bzrlib
22
 
from bzrlib.lazy_import import lazy_import
23
22
from bzrlib import (
24
23
    bzrdir,
25
24
    lockable_files,
26
25
    urlutils,
27
26
    )
28
27
 
29
 
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import TransportLock
 
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
 
29
 
31
30
from bzrlib.plugins.git import (
 
31
    LocalGitBzrDirFormat,
 
32
    branch,
32
33
    errors,
33
 
    branch,
 
34
    get_rich_root_format,
34
35
    repository,
35
36
    workingtree,
36
37
    )
37
 
""")
38
38
 
39
39
 
40
40
class GitLock(object):
52
52
    def peek(self):
53
53
        pass
54
54
 
 
55
    def validate_token(self, token):
 
56
        pass
 
57
 
55
58
 
56
59
class GitLockableFiles(lockable_files.LockableFiles):
57
60
    """Git specific lockable files abstraction."""
58
61
 
59
 
    def __init__(self, lock):
 
62
    def __init__(self, transport, lock):
60
63
        self._lock = lock
61
64
        self._transaction = None
62
65
        self._lock_mode = None
63
 
        self._lock_count = 0
 
66
        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))
64
72
 
65
73
 
66
74
class GitDir(bzrdir.BzrDir):
67
75
    """An adapter to the '.git' dir used by git."""
68
76
 
69
 
    _gitrepository_class = repository.GitRepository
 
77
    def is_supported(self):
 
78
        return True
 
79
 
 
80
    def cloning_metadir(self, stacked=False):
 
81
        return get_rich_root_format(stacked)
 
82
 
 
83
 
 
84
class LocalGitDir(GitDir):
 
85
    """An adapter to the '.git' dir used by git."""
 
86
 
 
87
    _gitrepository_class = repository.LocalGitRepository
70
88
 
71
89
    def __init__(self, transport, lockfiles, gitrepo, format):
72
90
        self._format = format
77
95
        else:
78
96
            self.transport = transport.clone('.git')
79
97
        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/')
80
102
 
81
103
    def get_branch_transport(self, branch_format):
82
104
        if branch_format is None:
83
105
            return self.transport
84
 
        if isinstance(branch_format, GitBzrDirFormat):
 
106
        if isinstance(branch_format, LocalGitBzrDirFormat):
85
107
            return self.transport
86
108
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
87
109
 
88
110
    get_repository_transport = get_branch_transport
89
111
    get_workingtree_transport = get_branch_transport
90
112
 
91
 
    def is_supported(self):
92
 
        return True
93
 
 
94
 
    def open_branch(self, ignored=None):
 
113
    def open_branch(self, ignore_fallbacks=None):
95
114
        """'create' a branch for this dir."""
96
115
        repo = self.open_repository()
97
 
        if repo._git.heads == []:
98
 
            head = None
99
 
        else:
100
 
            head = filter(lambda h: h.name == repo._git.active_branch, repo._git.heads)[0].commit.id
101
 
        return branch.GitBranch(self, repo, head, 
102
 
                                    self.root_transport.base, self._lockfiles)
 
116
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
103
117
 
104
118
    def open_repository(self, shared=False):
105
119
        """'open' a repository for this dir."""
106
120
        return self._gitrepository_class(self, self._lockfiles)
107
121
 
108
122
    def open_workingtree(self, recommend_upgrade=True):
109
 
        if self._git.bare:
110
 
            loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
111
 
            raise errors.bzr_errors.NoWorkingTree(loc)
112
 
        else:
 
123
        if not self._git.bare and self._git.has_index():
113
124
            return workingtree.GitWorkingTree(self, self.open_repository(), 
114
125
                                                  self.open_branch())
115
 
 
116
 
    def cloning_metadir(self, stacked=False):
117
 
        if stacked:
118
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
119
 
        else:
120
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
 
126
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
127
        raise errors.bzr_errors.NoWorkingTree(loc)
121
128
 
122
129
    def create_repository(self, shared=False):
123
130
        return self.open_repository()
124
131
 
125
 
 
126
 
class GitBzrDirFormat(bzrdir.BzrDirFormat):
127
 
    """The .git directory control format."""
128
 
 
129
 
    _gitdir_class = GitDir
130
 
    _lock_class = TransportLock
131
 
 
132
 
    @classmethod
133
 
    def _known_formats(self):
134
 
        return set([GitBzrDirFormat()])
135
 
 
136
 
    def open(self, transport, _found=None):
137
 
        """Open this directory.
138
 
 
139
 
        """
140
 
        # we dont grok readonly - git isn't integrated with transport.
141
 
        url = transport.base
142
 
        if url.startswith('readonly+'):
143
 
            url = url[len('readonly+'):]
144
 
 
145
 
        try:
146
 
            gitrepo = git.repo.Repo(transport.local_abspath("."))
147
 
        except errors.bzr_errors.NotLocalUrl:
148
 
            raise errors.bzr_errors.NotBranchError(path=transport.base)
149
 
        lockfiles = GitLockableFiles(GitLock())
150
 
        return self._gitdir_class(transport, lockfiles, gitrepo, self)
151
 
 
152
 
    @classmethod
153
 
    def probe_transport(klass, transport):
154
 
        """Our format is present if the transport ends in '.not/'."""
155
 
        # little ugly, but works
156
 
        format = klass()
157
 
        # delegate to the main opening code. This pays a double rtt cost at the
158
 
        # moment, so perhaps we want probe_transport to return the opened thing
159
 
        # rather than an openener ? or we could return a curried thing with the
160
 
        # dir to open already instantiated ? Needs more thought.
161
 
        try:
162
 
            format.open(transport)
163
 
            return format
164
 
        except Exception, e:
165
 
            raise errors.bzr_errors.NotBranchError(path=transport.base)
166
 
        raise errors.bzr_errors.NotBranchError(path=transport.base)
167
 
 
168
 
    def get_format_description(self):
169
 
        return "Local Git Repository"
170
 
 
171
 
    def get_format_string(self):
172
 
        return "Local Git Repository"
173
 
 
174
 
    def initialize_on_transport(self, transport):
175
 
        from bzrlib.transport.local import LocalTransport
176
 
 
177
 
        if not isinstance(transport, LocalTransport):
178
 
            raise NotImplementedError(self.initialize, 
179
 
                "Can't create Git Repositories/branches on "
180
 
                "non-local transports")
181
 
 
182
 
        git.repo.Repo.create(transport.local_abspath(".")) 
183
 
        return self.open(transport)
184
 
 
185
 
 
186
 
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
 
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()