bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.200.235
by Jelmer Vernooij
Depend on newer dulwich. |
1 |
# Copyright (C) 2006-2009 Canonical Ltd
|
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
2 |
|
|
0.200.1
by Robert Collins
Commit initial content. |
3 |
# Authors: Robert Collins <robert.collins@canonical.com>
|
|
0.200.184
by Jelmer Vernooij
Update authors: line. |
4 |
# Jelmer Vernooij <jelmer@samba.org>
|
5 |
# John Carr <john.carr@unrouted.co.uk>
|
|
|
0.200.1
by Robert Collins
Commit initial content. |
6 |
#
|
7 |
# This program is free software; you can redistribute it and/or modify
|
|
8 |
# it under the terms of the GNU General Public License as published by
|
|
9 |
# the Free Software Foundation; either version 2 of the License, or
|
|
10 |
# (at your option) any later version.
|
|
11 |
#
|
|
12 |
# This program is distributed in the hope that it will be useful,
|
|
13 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
14 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
15 |
# GNU General Public License for more details.
|
|
16 |
#
|
|
17 |
# You should have received a copy of the GNU General Public License
|
|
18 |
# along with this program; if not, write to the Free Software
|
|
19 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
20 |
||
21 |
||
22 |
"""A GIT branch and repository format implementation for bzr."""
|
|
23 |
||
|
0.224.1
by Alexander Belchenko
bzr.exe support: allow import of dulwich from _lib subdirectory |
24 |
import os |
25 |
import sys |
|
26 |
||
|
0.200.199
by Jelmer Vernooij
Check for bzrlib API version. |
27 |
import bzrlib |
28 |
import bzrlib.api |
|
|
0.200.519
by Jelmer Vernooij
Move imports down, might not be available in older bzr-git versions. |
29 |
|
|
0.200.587
by Jelmer Vernooij
Put plugin info in separate file. |
30 |
from info import ( |
|
0.200.583
by Jelmer Vernooij
Add plugin api info. |
31 |
bzr_compatible_versions, |
32 |
bzr_plugin_version as version_info, |
|
33 |
dulwich_minimum_version, |
|
34 |
)
|
|
|
0.200.519
by Jelmer Vernooij
Move imports down, might not be available in older bzr-git versions. |
35 |
|
36 |
if version_info[3] == 'final': |
|
37 |
version_string = '%d.%d.%d' % version_info[:3] |
|
38 |
else: |
|
39 |
version_string = '%d.%d.%d%s%d' % version_info |
|
40 |
__version__ = version_string |
|
41 |
||
|
0.200.583
by Jelmer Vernooij
Add plugin api info. |
42 |
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions) |
|
0.200.519
by Jelmer Vernooij
Move imports down, might not be available in older bzr-git versions. |
43 |
|
44 |
||
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
45 |
from bzrlib import ( |
46 |
bzrdir, |
|
47 |
errors as bzr_errors, |
|
|
0.200.370
by Jelmer Vernooij
Specify plain string path to Dulwich. |
48 |
osutils, |
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
49 |
)
|
50 |
from bzrlib.foreign import ( |
|
51 |
foreign_vcs_registry, |
|
52 |
)
|
|
53 |
from bzrlib.lockable_files import ( |
|
54 |
TransportLock, |
|
55 |
)
|
|
56 |
from bzrlib.transport import ( |
|
57 |
register_lazy_transport, |
|
|
0.200.308
by Jelmer Vernooij
Register git protocols. |
58 |
register_transport_proto, |
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
59 |
)
|
60 |
from bzrlib.commands import ( |
|
61 |
plugin_cmds, |
|
62 |
)
|
|
|
0.200.341
by Jelmer Vernooij
Add stanza with git commit info in 'bzr version-info' |
63 |
from bzrlib.version_info_formats.format_rio import ( |
64 |
RioVersionInfoBuilder, |
|
65 |
)
|
|
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
66 |
from bzrlib.send import ( |
67 |
format_registry as send_format_registry, |
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
68 |
)
|
|
0.200.341
by Jelmer Vernooij
Add stanza with git commit info in 'bzr version-info' |
69 |
|
|
0.200.192
by Jelmer Vernooij
use system-provided dulwich, remove own copy. |
70 |
|
|
0.224.1
by Alexander Belchenko
bzr.exe support: allow import of dulwich from _lib subdirectory |
71 |
if getattr(sys, "frozen", None): |
72 |
# allow import additional libs from ./_lib for bzr.exe only
|
|
73 |
sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib'))) |
|
74 |
||
|
0.200.200
by Jelmer Vernooij
Register lazily where possible. |
75 |
_versions_checked = False |
76 |
def lazy_check_versions(): |
|
77 |
global _versions_checked |
|
78 |
if _versions_checked: |
|
79 |
return
|
|
80 |
_versions_checked = True |
|
81 |
try: |
|
82 |
from dulwich import __version__ as dulwich_version |
|
83 |
except ImportError: |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
84 |
raise bzr_errors.DependencyNotPresent("dulwich", |
85 |
"bzr-git: Please install dulwich, https://launchpad.net/dulwich") |
|
|
0.200.200
by Jelmer Vernooij
Register lazily where possible. |
86 |
else: |
|
0.200.583
by Jelmer Vernooij
Add plugin api info. |
87 |
if dulwich_version < dulwich_minimum_version: |
|
0.239.7
by Jelmer Vernooij
Better error message when dulwich is missing. |
88 |
raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Dulwich is too old; at least %d.%d.%d is required" % dulwich_minimum_version) |
|
0.200.199
by Jelmer Vernooij
Check for bzrlib API version. |
89 |
|
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
90 |
bzrdir.format_registry.register_lazy('git', |
|
0.200.200
by Jelmer Vernooij
Register lazily where possible. |
91 |
"bzrlib.plugins.git.dir", "LocalGitBzrDirFormat", |
92 |
help='GIT repository.', native=False, experimental=True, |
|
93 |
)
|
|
|
0.200.204
by Jelmer Vernooij
Support bzr 1.11. |
94 |
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
95 |
from bzrlib.revisionspec import revspec_registry |
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
96 |
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", |
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
97 |
"RevisionSpec_git") |
|
0.200.200
by Jelmer Vernooij
Register lazily where possible. |
98 |
|
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
99 |
try: |
100 |
from bzrlib.revisionspec import dwim_revspecs |
|
101 |
except ImportError: |
|
102 |
pass
|
|
103 |
else: |
|
104 |
from bzrlib.plugins.git.revspec import RevisionSpec_git |
|
105 |
dwim_revspecs.append(RevisionSpec_git) |
|
106 |
||
|
0.200.328
by Jelmer Vernooij
Support stacking, depend on bzr 1.15. |
107 |
|
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
108 |
class GitBzrDirFormat(bzrdir.BzrDirFormat): |
|
0.200.623
by Jelmer Vernooij
Use more dulwich functions for writing patches. |
109 |
|
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
110 |
_lock_class = TransportLock |
111 |
||
112 |
def is_supported(self): |
|
113 |
return True |
|
114 |
||
|
0.200.536
by Jelmer Vernooij
Implement network name. |
115 |
def network_name(self): |
116 |
return "git" |
|
117 |
||
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
118 |
|
119 |
class LocalGitBzrDirFormat(GitBzrDirFormat): |
|
120 |
"""The .git directory control format.""" |
|
121 |
||
122 |
@classmethod
|
|
123 |
def _known_formats(self): |
|
124 |
return set([LocalGitBzrDirFormat()]) |
|
125 |
||
126 |
def open(self, transport, _found=None): |
|
127 |
"""Open this directory. |
|
128 |
||
129 |
"""
|
|
|
0.239.13
by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed. |
130 |
lazy_check_versions() |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
131 |
# we dont grok readonly - git isn't integrated with transport.
|
|
0.246.10
by Jelmer Vernooij
Use local repo if possible. |
132 |
from bzrlib.transport.local import LocalTransport |
133 |
if isinstance(transport, LocalTransport): |
|
134 |
import dulwich |
|
135 |
gitrepo = dulwich.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc)) |
|
136 |
else: |
|
137 |
from bzrlib.plugins.git.transportgit import TransportRepo |
|
|
0.246.6
by Jelmer Vernooij
Use TransportGit by default. |
138 |
gitrepo = TransportRepo(transport) |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
139 |
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock |
140 |
lockfiles = GitLockableFiles(transport, GitLock()) |
|
141 |
return LocalGitDir(transport, lockfiles, gitrepo, self) |
|
142 |
||
143 |
@classmethod
|
|
144 |
def probe_transport(klass, transport): |
|
|
0.200.720
by Jelmer Vernooij
Avoid loading bzr-git/dulwich when not necessary. |
145 |
try: |
|
0.200.805
by Jelmer Vernooij
Fix formatting. |
146 |
if not (transport.has('info/refs') or |
147 |
transport.has('.git/branches') or |
|
|
0.200.720
by Jelmer Vernooij
Avoid loading bzr-git/dulwich when not necessary. |
148 |
transport.has('branches')): |
149 |
raise bzr_errors.NotBranchError(path=transport.base) |
|
150 |
except bzr_errors.NoSuchFile: |
|
151 |
raise bzr_errors.NotBranchError(path=transport.base) |
|
|
0.200.730
by Jelmer Vernooij
Don't claim control directories can be accessed directly, always open the |
152 |
from bzrlib import urlutils |
153 |
if urlutils.split(transport.base)[1] == ".git": |
|
154 |
raise bzr_errors.NotBranchError(path=transport.base) |
|
|
0.239.13
by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed. |
155 |
lazy_check_versions() |
|
0.200.580
by Jelmer Vernooij
Remove 'as git' imports. |
156 |
import dulwich |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
157 |
format = klass() |
158 |
try: |
|
159 |
format.open(transport) |
|
160 |
return format |
|
|
0.200.580
by Jelmer Vernooij
Remove 'as git' imports. |
161 |
except dulwich.errors.NotGitRepository, e: |
|
0.200.203
by Jelmer Vernooij
Fix imports. |
162 |
raise bzr_errors.NotBranchError(path=transport.base) |
163 |
raise bzr_errors.NotBranchError(path=transport.base) |
|
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
164 |
|
165 |
def get_format_description(self): |
|
166 |
return "Local Git Repository" |
|
167 |
||
168 |
def get_format_string(self): |
|
169 |
return "Local Git Repository" |
|
170 |
||
171 |
def initialize_on_transport(self, transport): |
|
172 |
from bzrlib.transport.local import LocalTransport |
|
173 |
||
174 |
if not isinstance(transport, LocalTransport): |
|
|
0.200.668
by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions. |
175 |
raise NotImplementedError(self.initialize, |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
176 |
"Can't create Git Repositories/branches on "
|
177 |
"non-local transports") |
|
|
0.239.13
by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed. |
178 |
lazy_check_versions() |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
179 |
from dulwich.repo import Repo |
|
0.200.803
by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory. |
180 |
Repo.init(transport.local_abspath(".").encode(osutils._fs_enc)) |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
181 |
return self.open(transport) |
182 |
||
183 |
def is_supported(self): |
|
184 |
return True |
|
185 |
||
186 |
||
187 |
class RemoteGitBzrDirFormat(GitBzrDirFormat): |
|
188 |
"""The .git directory control format.""" |
|
189 |
||
190 |
@classmethod
|
|
191 |
def _known_formats(self): |
|
192 |
return set([RemoteGitBzrDirFormat()]) |
|
193 |
||
194 |
def open(self, transport, _found=None): |
|
195 |
"""Open this directory. |
|
196 |
||
197 |
"""
|
|
|
0.200.321
by Jelmer Vernooij
Make remote repository access a bit lazier. |
198 |
# we dont grok readonly - git isn't integrated with transport.
|
199 |
url = transport.base |
|
200 |
if url.startswith('readonly+'): |
|
201 |
url = url[len('readonly+'):] |
|
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
202 |
if (not url.startswith("git://") and not url.startswith("git+")): |
|
0.200.321
by Jelmer Vernooij
Make remote repository access a bit lazier. |
203 |
raise bzr_errors.NotBranchError(transport.base) |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
204 |
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport |
205 |
if not isinstance(transport, GitSmartTransport): |
|
|
0.200.203
by Jelmer Vernooij
Fix imports. |
206 |
raise bzr_errors.NotBranchError(transport.base) |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
207 |
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock |
208 |
lockfiles = GitLockableFiles(transport, GitLock()) |
|
209 |
return RemoteGitDir(transport, lockfiles, self) |
|
210 |
||
211 |
@classmethod
|
|
212 |
def probe_transport(klass, transport): |
|
213 |
"""Our format is present if the transport ends in '.not/'.""" |
|
|
0.200.321
by Jelmer Vernooij
Make remote repository access a bit lazier. |
214 |
url = transport.base |
215 |
if url.startswith('readonly+'): |
|
216 |
url = url[len('readonly+'):] |
|
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
217 |
if (not url.startswith("git://") and not url.startswith("git+")): |
|
0.200.321
by Jelmer Vernooij
Make remote repository access a bit lazier. |
218 |
raise bzr_errors.NotBranchError(transport.base) |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
219 |
# little ugly, but works
|
220 |
format = klass() |
|
221 |
from bzrlib.plugins.git.remote import GitSmartTransport |
|
222 |
if not isinstance(transport, GitSmartTransport): |
|
|
0.200.203
by Jelmer Vernooij
Fix imports. |
223 |
raise bzr_errors.NotBranchError(transport.base) |
|
0.200.461
by Jelmer Vernooij
Reduce number of round trips when fetching from Git. |
224 |
return format |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
225 |
|
226 |
def get_format_description(self): |
|
227 |
return "Remote Git Repository" |
|
228 |
||
229 |
def get_format_string(self): |
|
230 |
return "Remote Git Repository" |
|
231 |
||
232 |
def initialize_on_transport(self, transport): |
|
|
0.200.203
by Jelmer Vernooij
Fix imports. |
233 |
raise bzr_errors.UninitializableFormat(self) |
|
0.200.201
by Jelmer Vernooij
Try to import nothing other than __init__ when not opening git repositories. |
234 |
|
235 |
||
236 |
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat) |
|
237 |
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat) |
|
|
0.200.138
by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories. |
238 |
|
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
239 |
register_transport_proto('git://', |
|
0.200.308
by Jelmer Vernooij
Register git protocols. |
240 |
help="Access using the Git smart server protocol.") |
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
241 |
register_transport_proto('git+ssh://', |
|
0.200.308
by Jelmer Vernooij
Register git protocols. |
242 |
help="Access using the Git smart server protocol over SSH.") |
243 |
||
|
0.200.138
by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories. |
244 |
register_lazy_transport("git://", 'bzrlib.plugins.git.remote', |
|
0.200.307
by Jelmer Vernooij
Support git+ssh. |
245 |
'TCPGitSmartTransport') |
246 |
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote', |
|
247 |
'SSHGitSmartTransport') |
|
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
248 |
|
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
249 |
foreign_vcs_registry.register_lazy("git", |
|
0.200.328
by Jelmer Vernooij
Support stacking, depend on bzr 1.15. |
250 |
"bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker") |
|
0.208.5
by Jelmer Vernooij
Add log show function for git. |
251 |
|
|
0.200.206
by Jelmer Vernooij
Move commands to a separate python module and register them lazily. |
252 |
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands") |
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
253 |
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], |
|
0.200.422
by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects. |
254 |
"bzrlib.plugins.git.commands") |
|
0.200.177
by Jelmer Vernooij
Add git-import command. |
255 |
|
|
0.200.341
by Jelmer Vernooij
Add stanza with git commit info in 'bzr version-info' |
256 |
def update_stanza(rev, stanza): |
257 |
mapping = getattr(rev, "mapping", None) |
|
258 |
if mapping is not None and mapping.revid_prefix.startswith("git-"): |
|
259 |
stanza.add("git-commit", rev.foreign_revid) |
|
260 |
||
261 |
||
|
0.200.388
by Jelmer Vernooij
Support bzr 1.14 as well. |
262 |
rio_hooks = getattr(RioVersionInfoBuilder, "hooks", None) |
263 |
if rio_hooks is not None: |
|
264 |
rio_hooks.install_named_hook('revision', update_stanza, None) |
|
|
0.200.341
by Jelmer Vernooij
Add stanza with git commit info in 'bzr version-info' |
265 |
|
|
0.200.531
by Jelmer Vernooij
Support 'bzr serve --git'. |
266 |
|
|
0.239.6
by Jelmer Vernooij
Remove pre-1.15 incompatible code. |
267 |
from bzrlib.transport import transport_server_registry |
268 |
transport_server_registry.register_lazy('git', |
|
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
269 |
'bzrlib.plugins.git.server', |
|
0.239.6
by Jelmer Vernooij
Remove pre-1.15 incompatible code. |
270 |
'serve_git', |
271 |
'Git Smart server protocol over TCP. (default port: 9418)') |
|
|
0.200.531
by Jelmer Vernooij
Support 'bzr serve --git'. |
272 |
|
273 |
||
|
0.200.536
by Jelmer Vernooij
Implement network name. |
274 |
from bzrlib.repository import network_format_registry as repository_network_format_registry |
|
0.200.674
by Jelmer Vernooij
Fix formatting. |
275 |
repository_network_format_registry.register_lazy('git', |
|
0.200.536
by Jelmer Vernooij
Implement network name. |
276 |
'bzrlib.plugins.git.repository', 'GitRepositoryFormat') |
277 |
||
278 |
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry |
|
279 |
bzrdir_network_format_registry.register('git', GitBzrDirFormat) |
|
280 |
||
281 |
||
|
0.200.328
by Jelmer Vernooij
Support stacking, depend on bzr 1.15. |
282 |
def get_rich_root_format(stacked=False): |
283 |
if stacked: |
|
284 |
return bzrdir.format_registry.make_bzrdir("1.9-rich-root") |
|
285 |
else: |
|
|
0.200.266
by Jelmer Vernooij
Use default-rich-root if possible. |
286 |
return bzrdir.format_registry.make_bzrdir("default-rich-root") |
|
0.228.1
by Jelmer Vernooij
Add basic tests for local fetch. |
287 |
|
|
0.238.1
by Lukas Lalinsky, Jelmer Vernooij
Import initial work on 'bzr send --format=git' based on luks' patch for bzr-svn. |
288 |
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send', |
289 |
'send_git', 'Git am-style diff format') |
|
290 |
||
|
0.201.1
by Jelmer Vernooij
Add very small initial testsuite. |
291 |
def test_suite(): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
292 |
from bzrlib.plugins.git import tests |
293 |
return tests.test_suite() |