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
- browse files at revision 0.200.737
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.737
- Committer: Jelmer Vernooij
- Date: 2010-03-11 14:08:23 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20100311140823-z6lry1r1vprqagil
Add helper function, always set encoding to utf-8.
- files removed:
- help.py
- files renamed:
- cache.py => shamap.py
- tests/test_cache.py => tests/test_shamap.py
- files modified:
- Makefile
added
removed
dir.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2010 Jelmer Vernooij
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
16
18
"""An adapter between a Git control dir and a Bazaar ControlDir."""
17
"""An adapter between a Git control dir and a Bazaar BzrDir."""
19
18
20
19
from bzrlib import (
20
bzrdir,
21
21
errors as bzr_errors,
22
22
lockable_files,
23
23
urlutils,
24
version_info as bzrlib_version,
25
24
)
26
25
27
26
LockWarner = getattr(lockable_files, "_LockWarner", None)
28
27
29
28
from bzrlib.plugins.git import (
30
BareLocalGitControlDirFormat,
31
LocalGitControlDirFormat,
29
LocalGitBzrDirFormat,
30
get_rich_root_format,
32
31
)
33
try:
34
from bzrlib.controldir import (
35
ControlDir,
36
format_registry,
37
)
38
except ImportError:
39
# bzr < 2.3
40
from bzrlib.bzrdir import (
41
BzrDir,
42
format_registry,
43
)
44
ControlDir = BzrDir
45
32
46
33
47
34
class GitLock(object):
81
68
self._lock_warner = LockWarner(repr(self))
82
69
83
70
84
class GitDirConfig(object):
85
86
def get_default_stack_on(self):
87
return None
88
89
def set_default_stack_on(self, value):
90
raise bzr_errors.BzrError("Cannot set configuration")
91
92
93
class GitDir(ControlDir):
71
class GitDir(bzrdir.BzrDir):
94
72
"""An adapter to the '.git' dir used by git."""
95
73
96
74
def is_supported(self):
97
75
return True
98
76
99
def can_convert_format(self):
100
return False
101
102
def break_lock(self):
103
pass
104
105
77
def cloning_metadir(self, stacked=False):
106
return format_registry.make_bzrdir("default")
78
return get_rich_root_format(stacked)
107
79
108
80
def _branch_name_to_ref(self, name):
109
raise NotImplementedError(self._branch_name_to_ref)
110
111
if bzrlib_version >= (2, 2):
112
def open_branch(self, name=None, unsupported=False,
113
ignore_fallbacks=None):
114
return self._open_branch(name=name,
115
ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
116
else:
117
def open_branch(self, ignore_fallbacks=None, unsupported=False):
118
return self._open_branch(name=None,
119
ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
120
121
def get_config(self):
122
return GitDirConfig()
81
if name is None and name != "HEAD":
82
return "HEAD"
83
if not "/" in name:
84
return "refs/heads/%s" % name
85
else:
86
return name
123
87
124
88
125
89
class LocalGitDir(GitDir):
131
95
132
96
_gitrepository_class = property(_get_gitrepository_class)
133
97
134
@property
135
def user_transport(self):
136
return self.root_transport
137
138
@property
139
def control_transport(self):
140
return self.transport
141
142
98
def __init__(self, transport, lockfiles, gitrepo, format):
143
99
self._format = format
144
100
self.root_transport = transport
145
self._mode_check_done = False
146
101
self._git = gitrepo
147
102
if gitrepo.bare:
148
103
self.transport = transport
151
106
self._lockfiles = lockfiles
152
107
self._mode_check_done = None
153
108
154
def _branch_name_to_ref(self, name):
155
from bzrlib.plugins.git.refs import branch_name_to_ref
156
ref = branch_name_to_ref(name, None)
157
if ref == "HEAD":
158
from dulwich.repo import SYMREF
159
refcontents = self._git.refs.read_ref(ref)
160
if refcontents.startswith(SYMREF):
161
ref = refcontents[len(SYMREF):]
162
return ref
163
164
109
def is_control_filename(self, filename):
165
110
return filename == '.git' or filename.startswith('.git/')
166
111
167
def get_branch_transport(self, branch_format, name=None):
112
def get_branch_transport(self, branch_format):
168
113
if branch_format is None:
169
114
return self.transport
170
if isinstance(branch_format, LocalGitControlDirFormat):
115
if isinstance(branch_format, LocalGitBzrDirFormat):
171
116
return self.transport
172
117
raise bzr_errors.IncompatibleFormat(branch_format, self._format)
173
118
174
def get_repository_transport(self, format):
175
if format is None:
176
return self.transport
177
if isinstance(format, LocalGitControlDirFormat):
178
return self.transport
179
raise bzr_errors.IncompatibleFormat(format, self._format)
180
181
def get_workingtree_transport(self, format):
182
if format is None:
183
return self.transport
184
if isinstance(format, LocalGitControlDirFormat):
185
return self.transport
186
raise bzr_errors.IncompatibleFormat(format, self._format)
187
188
def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
119
get_repository_transport = get_branch_transport
120
get_workingtree_transport = get_branch_transport
121
122
123
def open_branch(self, ignore_fallbacks=None, name=None, unsupported=False):
189
124
"""'create' a branch for this dir."""
190
125
repo = self.open_repository()
191
126
from bzrlib.plugins.git.branch import LocalGitBranch
193
128
self._lockfiles)
194
129
195
130
def destroy_branch(self, name=None):
196
refname = self._branch_name_to_ref(name)
197
if not refname in self._git.refs:
198
raise bzr_errors.NotBranchError(self.root_transport.base,
199
bzrdir=self)
200
del self._git.refs[refname]
201
202
def destroy_repository(self):
203
raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
204
205
def destroy_workingtree(self):
206
raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
207
208
def needs_format_conversion(self, format=None):
209
return not isinstance(self._format, format.__class__)
131
del self._git.refs[self._branch_name_to_ref(name)]
210
132
211
133
def list_branches(self):
212
134
ret = []
213
135
for name in self._git.get_refs():
214
if name.startswith("refs/heads/"):
215
ret.append(self.open_branch(name=name))
136
ret.append(self.open_branch(name=name))
216
137
return ret
217
138
218
139
def open_repository(self, shared=False):
222
143
def open_workingtree(self, recommend_upgrade=True):
223
144
if not self._git.bare:
224
145
from dulwich.errors import NoIndexPresent
225
repo = self.open_repository()
226
146
try:
227
index = repo._git.open_index()
147
from bzrlib.plugins.git.workingtree import GitWorkingTree
148
return GitWorkingTree(self, self.open_repository(),
149
self.open_branch())
228
150
except NoIndexPresent:
229
151
pass
230
else:
231
from bzrlib.plugins.git.workingtree import GitWorkingTree
232
try:
233
branch = self.open_branch()
234
except bzr_errors.NotBranchError:
235
pass
236
else:
237
return GitWorkingTree(self, repo, branch, index)
238
152
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
239
153
raise bzr_errors.NoWorkingTree(loc)
240
154
243
157
244
158
def create_branch(self, name=None):
245
159
refname = self._branch_name_to_ref(name)
246
from dulwich.protocol import ZERO_SHA
247
self._git.refs[refname or "HEAD"] = ZERO_SHA
160
self._git.refs[refname] = "0" * 40
248
161
return self.open_branch(name)
249
162
250
163
def backup_bzrdir(self):
268
181
finally:
269
182
f.close()
270
183
return self.open_workingtree()
271
272
def find_repository(self):
273
"""Find the repository that should be used.
274
275
This does not require a branch as we use it to find the repo for
276
new branches as well as to hook existing branches up to their
277
repository.
278
"""
279
return self.open_repository()
280
281
def _find_creation_modes(self):
282
"""Determine the appropriate modes for files and directories.
283
284
They're always set to be consistent with the base directory,
285
assuming that this transport allows setting modes.
286
"""
287
# TODO: Do we need or want an option (maybe a config setting) to turn
288
# this off or override it for particular locations? -- mbp 20080512
289
if self._mode_check_done:
290
return
291
self._mode_check_done = True
292
try:
293
st = self.transport.stat('.')
294
except TransportNotPossible:
295
self._dir_mode = None
296
self._file_mode = None
297
else:
298
# Check the directory mode, but also make sure the created
299
# directories and files are read-write for this user. This is
300
# mostly a workaround for filesystems which lie about being able to
301
# write to a directory (cygwin & win32)
302
if (st.st_mode & 07777 == 00000):
303
# FTP allows stat but does not return dir/file modes
304
self._dir_mode = None
305
self._file_mode = None
306
else:
307
self._dir_mode = (st.st_mode & 07777) | 00700
308
# Remove the sticky and execute bits for files
309
self._file_mode = self._dir_mode & ~07111
310
311
def _get_file_mode(self):
312
"""Return Unix mode for newly created files, or None.
313
"""
314
if not self._mode_check_done:
315
self._find_creation_modes()
316
return self._file_mode
317
318
def _get_dir_mode(self):
319
"""Return Unix mode for newly created directories, or None.
320
"""
321
if not self._mode_check_done:
322
self._find_creation_modes()
323
return self._dir_mode
324
325
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0