bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
1 |
# Copyright (C) 2007 Canonical Ltd
|
0.358.2
by Jelmer Vernooij
Refresh copyright headers, add my email. |
2 |
# Copyright (C) 2010-2018 Jelmer Vernooij
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
3 |
#
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
0.358.1
by Jelmer Vernooij
Fix FSF address. |
16 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
17 |
|
0.200.1012
by Jelmer Vernooij
Rename BzrDir to ControlDir. |
18 |
"""An adapter between a Git control dir and a Bazaar ControlDir."""
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
19 |
|
0.200.1594
by Jelmer Vernooij
Use absolute_import everywhere. |
20 |
from __future__ import absolute_import |
21 |
||
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
22 |
from .. import ( |
0.200.1688
by Jelmer Vernooij
Fix stacking tests. |
23 |
branch as _mod_branch, |
7404.5.5
by Jelmer Vernooij
Fix tests. |
24 |
cleanup, |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
25 |
errors as brz_errors, |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
26 |
trace, |
0.200.1172
by Jelmer Vernooij
Provide GitDir._available_backup_name. |
27 |
osutils, |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
28 |
urlutils, |
29 |
)
|
|
6986.2.3
by Jelmer Vernooij
Merge trunk |
30 |
from ..sixish import ( |
7018.3.3
by Jelmer Vernooij
Fix url handling. |
31 |
PY3, |
32 |
viewitems, |
|
33 |
)
|
|
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
34 |
from ..transport import ( |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
35 |
do_catching_redirections, |
36 |
get_transport_from_path, |
|
37 |
)
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
38 |
|
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
39 |
from ..controldir import ( |
0.416.1
by Jelmer Vernooij
Raise BranchReferenceLoop. |
40 |
BranchReferenceLoop, |
0.200.1111
by Jelmer Vernooij
Drop support for Bazaar < 2.3. |
41 |
ControlDir, |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
42 |
ControlDirFormat, |
0.200.1111
by Jelmer Vernooij
Drop support for Bazaar < 2.3. |
43 |
format_registry, |
0.200.1702
by Jelmer Vernooij
Implement GitDir.acquire_repository. |
44 |
RepositoryAcquisitionPolicy, |
0.200.1111
by Jelmer Vernooij
Drop support for Bazaar < 2.3. |
45 |
)
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
46 |
|
0.419.1
by Jelmer Vernooij
Simplify pushing to Git directories. |
47 |
from .push import ( |
48 |
GitPushResult, |
|
49 |
)
|
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
50 |
from .transportgit import ( |
51 |
OBJECTDIR, |
|
52 |
TransportObjectStore, |
|
53 |
)
|
|
54 |
||
0.200.123
by Jelmer Vernooij
Use central git module. |
55 |
|
0.200.1026
by Jelmer Vernooij
Fix typo. |
56 |
class GitDirConfig(object): |
0.200.1025
by Jelmer Vernooij
Implement GitDir.get_config(). |
57 |
|
58 |
def get_default_stack_on(self): |
|
59 |
return None |
|
60 |
||
61 |
def set_default_stack_on(self, value): |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
62 |
raise brz_errors.BzrError("Cannot set configuration") |
0.200.1025
by Jelmer Vernooij
Implement GitDir.get_config(). |
63 |
|
64 |
||
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
65 |
class GitControlDirFormat(ControlDirFormat): |
66 |
||
67 |
colocated_branches = True |
|
68 |
fixed_components = True |
|
69 |
||
70 |
def __eq__(self, other): |
|
71 |
return type(self) == type(other) |
|
72 |
||
73 |
def is_supported(self): |
|
74 |
return True |
|
75 |
||
76 |
def network_name(self): |
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
77 |
return b"git" |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
78 |
|
79 |
||
0.200.1702
by Jelmer Vernooij
Implement GitDir.acquire_repository. |
80 |
class UseExistingRepository(RepositoryAcquisitionPolicy): |
81 |
"""A policy of reusing an existing repository""" |
|
82 |
||
83 |
def __init__(self, repository, stack_on=None, stack_on_pwd=None, |
|
84 |
require_stacking=False): |
|
85 |
"""Constructor. |
|
86 |
||
87 |
:param repository: The repository to use.
|
|
88 |
:param stack_on: A location to stack on
|
|
89 |
:param stack_on_pwd: If stack_on is relative, the location it is
|
|
90 |
relative to.
|
|
91 |
"""
|
|
92 |
super(UseExistingRepository, self).__init__( |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
93 |
stack_on, stack_on_pwd, require_stacking) |
0.200.1702
by Jelmer Vernooij
Implement GitDir.acquire_repository. |
94 |
self._repository = repository |
95 |
||
96 |
def acquire_repository(self, make_working_trees=None, shared=False, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
97 |
possible_transports=None): |
0.200.1702
by Jelmer Vernooij
Implement GitDir.acquire_repository. |
98 |
"""Implementation of RepositoryAcquisitionPolicy.acquire_repository |
99 |
||
100 |
Returns an existing repository to use.
|
|
101 |
"""
|
|
102 |
return self._repository, False |
|
103 |
||
104 |
||
0.200.1012
by Jelmer Vernooij
Rename BzrDir to ControlDir. |
105 |
class GitDir(ControlDir): |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
106 |
"""An adapter to the '.git' dir used by git.""" |
107 |
||
0.200.148
by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir. |
108 |
def is_supported(self): |
109 |
return True |
|
110 |
||
0.200.981
by Jelmer Vernooij
Mark git directories as not convertable (for now). |
111 |
def can_convert_format(self): |
112 |
return False |
|
113 |
||
0.200.1025
by Jelmer Vernooij
Implement GitDir.get_config(). |
114 |
def break_lock(self): |
0.314.1
by Jelmer Vernooij
Mark ControlDir.break_lock as not implemented. |
115 |
# There are no global locks, so nothing to break.
|
116 |
raise NotImplementedError(self.break_lock) |
|
0.200.1025
by Jelmer Vernooij
Implement GitDir.get_config(). |
117 |
|
0.200.155
by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories. |
118 |
def cloning_metadir(self, stacked=False): |
0.288.1
by Jelmer Vernooij
Use git format as default for clones. |
119 |
return format_registry.make_controldir("git") |
0.200.155
by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories. |
120 |
|
0.200.1165
by Jelmer Vernooij
Implement GitDir.checkout_metadir. |
121 |
def checkout_metadir(self, stacked=False): |
0.288.1
by Jelmer Vernooij
Use git format as default for clones. |
122 |
return format_registry.make_controldir("git") |
0.200.1165
by Jelmer Vernooij
Implement GitDir.checkout_metadir. |
123 |
|
0.269.8
by Jelmer Vernooij
Support push in git-remote-bzr. |
124 |
def _get_selected_ref(self, branch, ref=None): |
125 |
if ref is not None and branch is not None: |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
126 |
raise brz_errors.BzrError("can't specify both ref and branch") |
0.269.8
by Jelmer Vernooij
Support push in git-remote-bzr. |
127 |
if ref is not None: |
128 |
return ref |
|
0.303.2
by Jelmer Vernooij
Fix resolution order for segment parameters. |
129 |
if branch is not None: |
130 |
from .refs import branch_name_to_ref |
|
131 |
return branch_name_to_ref(branch) |
|
0.200.1559
by Jelmer Vernooij
Fix compatibility with bzr 2.5. |
132 |
segment_parameters = getattr( |
133 |
self.user_transport, "get_segment_parameters", lambda: {})() |
|
134 |
ref = segment_parameters.get("ref") |
|
135 |
if ref is not None: |
|
7045.4.2
by Jelmer Vernooij
Fix some more gitty tests. |
136 |
return urlutils.unquote_to_bytes(ref) |
0.200.1310
by Jelmer Vernooij
Add _get_selected_ref method. |
137 |
if branch is None and getattr(self, "_get_selected_branch", False): |
138 |
branch = self._get_selected_branch() |
|
0.303.2
by Jelmer Vernooij
Fix resolution order for segment parameters. |
139 |
if branch is not None: |
140 |
from .refs import branch_name_to_ref |
|
141 |
return branch_name_to_ref(branch) |
|
0.303.1
by Jelmer Vernooij
Remove _get_default_ref. |
142 |
return b"HEAD" |
0.200.1310
by Jelmer Vernooij
Add _get_selected_ref method. |
143 |
|
0.200.1025
by Jelmer Vernooij
Implement GitDir.get_config(). |
144 |
def get_config(self): |
145 |
return GitDirConfig() |
|
146 |
||
0.200.1172
by Jelmer Vernooij
Provide GitDir._available_backup_name. |
147 |
def _available_backup_name(self, base): |
148 |
return osutils.available_backup_name(base, self.root_transport.has) |
|
149 |
||
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
150 |
def sprout(self, url, revision_id=None, force_new_repo=False, |
151 |
recurse='down', possible_transports=None, |
|
152 |
accelerator_tree=None, hardlink=False, stacked=False, |
|
153 |
source_branch=None, create_tree_if_local=True): |
|
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
154 |
from ..repository import InterRepository |
155 |
from ..transport.local import LocalTransport |
|
156 |
from ..transport import get_transport |
|
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
157 |
target_transport = get_transport(url, possible_transports) |
158 |
target_transport.ensure_base() |
|
159 |
cloning_format = self.cloning_metadir() |
|
160 |
# Create/update the result branch
|
|
0.310.15
by Jelmer Vernooij
Handle destroy_workingtree. |
161 |
try: |
162 |
result = ControlDir.open_from_transport(target_transport) |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
163 |
except brz_errors.NotBranchError: |
0.310.15
by Jelmer Vernooij
Handle destroy_workingtree. |
164 |
result = cloning_format.initialize_on_transport(target_transport) |
0.200.1373
by Jelmer Vernooij
Prevent accidentally removing branch. |
165 |
source_branch = self.open_branch() |
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
166 |
source_repository = self.find_repository() |
167 |
try: |
|
168 |
result_repo = result.find_repository() |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
169 |
except brz_errors.NoRepositoryPresent: |
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
170 |
result_repo = result.create_repository() |
171 |
if stacked: |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
172 |
raise _mod_branch.UnstackableBranchFormat( |
173 |
self._format, self.user_url) |
|
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
174 |
interrepo = InterRepository.get(source_repository, result_repo) |
175 |
||
176 |
if revision_id is not None: |
|
0.259.4
by Jelmer Vernooij
Put determine_wants methods on InterRepo. |
177 |
determine_wants = interrepo.get_determine_wants_revids( |
0.200.1777
by Jelmer Vernooij
Copy tags. |
178 |
[revision_id], include_tags=True) |
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
179 |
else: |
0.259.4
by Jelmer Vernooij
Put determine_wants methods on InterRepo. |
180 |
determine_wants = interrepo.determine_wants_all |
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
181 |
interrepo.fetch_objects(determine_wants=determine_wants, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
182 |
mapping=source_branch.mapping) |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
183 |
result_branch = source_branch.sprout( |
184 |
result, revision_id=revision_id, repository=result_repo) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
185 |
if (create_tree_if_local and |
7290.26.1
by Jelmer Vernooij
Fix switching in git repositories. |
186 |
result.open_branch(name="").name == result_branch.name and |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
187 |
isinstance(target_transport, LocalTransport) and |
188 |
(result_repo is None or result_repo.make_working_trees())): |
|
7404.5.1
by Jelmer Vernooij
Support checking out nested trees, including for git repositories. |
189 |
wt = result.create_workingtree( |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
190 |
accelerator_tree=accelerator_tree, |
191 |
hardlink=hardlink, from_branch=result_branch) |
|
7404.5.1
by Jelmer Vernooij
Support checking out nested trees, including for git repositories. |
192 |
else: |
193 |
wt = None |
|
194 |
if recurse == 'down': |
|
7404.5.5
by Jelmer Vernooij
Fix tests. |
195 |
with cleanup.ExitStack() as stack: |
196 |
basis = None |
|
197 |
if wt is not None: |
|
198 |
basis = wt.basis_tree() |
|
199 |
elif result_branch is not None: |
|
200 |
basis = result_branch.basis_tree() |
|
201 |
elif source_branch is not None: |
|
202 |
basis = source_branch.basis_tree() |
|
203 |
if basis is not None: |
|
204 |
stack.enter_context(basis.lock_read()) |
|
205 |
subtrees = basis.iter_references() |
|
206 |
else: |
|
207 |
subtrees = [] |
|
208 |
for path in subtrees: |
|
209 |
target = urlutils.join(url, urlutils.escape(path)) |
|
7447.3.1
by Jelmer Vernooij
Move tree reference info functions to workingtree. |
210 |
sublocation = wt.reference_parent( |
7404.5.5
by Jelmer Vernooij
Fix tests. |
211 |
path, possible_transports=possible_transports) |
7447.3.1
by Jelmer Vernooij
Move tree reference info functions to workingtree. |
212 |
if sublocation is None: |
213 |
trace.warning( |
|
214 |
'Ignoring nested tree %s, parent location unknown.', |
|
215 |
path) |
|
216 |
continue
|
|
7404.5.5
by Jelmer Vernooij
Fix tests. |
217 |
sublocation.controldir.sprout( |
218 |
target, basis.get_reference_revision(path), |
|
219 |
force_new_repo=force_new_repo, recurse=recurse, |
|
220 |
stacked=stacked) |
|
0.259.1
by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility. |
221 |
return result |
222 |
||
0.200.1117
by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport. |
223 |
def clone_on_transport(self, transport, revision_id=None, |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
224 |
force_new_repo=False, preserve_stacking=False, |
225 |
stacked_on=None, create_prefix=False, |
|
7489.4.2
by Jelmer Vernooij
Plumb through tag_selector. |
226 |
use_existing_dir=True, no_tree=False, |
227 |
tag_selector=None): |
|
0.200.1117
by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport. |
228 |
"""See ControlDir.clone_on_transport.""" |
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
229 |
from ..repository import InterRepository |
0.200.1644
by Jelmer Vernooij
More relative imports. |
230 |
from .mapping import default_mapping |
7490.13.4
by Jelmer Vernooij
Fix git clone. |
231 |
from ..transport.local import LocalTransport |
0.285.3
by Jelmer Vernooij
Fix handling of stacking requests. |
232 |
if stacked_on is not None: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
233 |
raise _mod_branch.UnstackableBranchFormat( |
234 |
self._format, self.user_url) |
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
235 |
if no_tree: |
236 |
format = BareLocalGitControlDirFormat() |
|
237 |
else: |
|
238 |
format = LocalGitControlDirFormat() |
|
0.200.1778
by Jelmer Vernooij
Fix cloning to non-last revision. |
239 |
(target_repo, target_controldir, stacking, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
240 |
repo_policy) = format.initialize_on_transport_ex( |
241 |
transport, use_existing_dir=use_existing_dir, |
|
242 |
create_prefix=create_prefix, |
|
243 |
force_new_repo=force_new_repo) |
|
0.330.1
by Jelmer Vernooij
Fix initialize_on_transport_ex without repo_format specified. |
244 |
target_repo = target_controldir.find_repository() |
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
245 |
target_git_repo = target_repo._git |
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
246 |
source_repo = self.find_repository() |
0.200.1171
by Jelmer Vernooij
Fix some more tests. |
247 |
interrepo = InterRepository.get(source_repo, target_repo) |
0.200.1117
by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport. |
248 |
if revision_id is not None: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
249 |
determine_wants = interrepo.get_determine_wants_revids( |
7489.4.2
by Jelmer Vernooij
Plumb through tag_selector. |
250 |
[revision_id], include_tags=True, tag_selector=tag_selector) |
0.200.1117
by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport. |
251 |
else: |
0.200.1171
by Jelmer Vernooij
Fix some more tests. |
252 |
determine_wants = interrepo.determine_wants_all |
253 |
(pack_hint, _, refs) = interrepo.fetch_objects(determine_wants, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
254 |
mapping=default_mapping) |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
255 |
for name, val in viewitems(refs): |
0.200.1117
by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport. |
256 |
target_git_repo.refs[name] = val |
7490.13.3
by Jelmer Vernooij
Fix git branch cloning. |
257 |
result_dir = LocalGitDir(transport, target_git_repo, format) |
0.336.7
by Jelmer Vernooij
Fix remaining tests. |
258 |
if revision_id is not None: |
259 |
result_dir.open_branch().set_last_revision(revision_id) |
|
7490.13.4
by Jelmer Vernooij
Fix git clone. |
260 |
if not no_tree and isinstance(result_dir.root_transport, LocalTransport): |
0.428.1
by Jelmer Vernooij
Fix clone_preserves_content test. |
261 |
if result_dir.open_repository().make_working_trees(): |
7490.13.6
by Jelmer Vernooij
Fix tests. |
262 |
try: |
263 |
local_wt = self.open_workingtree() |
|
264 |
except brz_errors.NotLocalUrl: |
|
265 |
result_dir.create_workingtree(revision_id=revision_id) |
|
266 |
else: |
|
267 |
local_wt.clone(result_dir, revision_id=revision_id) |
|
0.428.1
by Jelmer Vernooij
Fix clone_preserves_content test. |
268 |
|
0.336.7
by Jelmer Vernooij
Fix remaining tests. |
269 |
return result_dir |
0.200.1117
by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport. |
270 |
|
0.259.2
by Jelmer Vernooij
Make sure RemoteGitDir.find_repository works. |
271 |
def find_repository(self): |
272 |
"""Find the repository that should be used. |
|
273 |
||
274 |
This does not require a branch as we use it to find the repo for
|
|
275 |
new branches as well as to hook existing branches up to their
|
|
276 |
repository.
|
|
277 |
"""
|
|
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
278 |
return self._gitrepository_class(self._find_commondir()) |
0.259.2
by Jelmer Vernooij
Make sure RemoteGitDir.find_repository works. |
279 |
|
0.200.1487
by Jelmer Vernooij
Use peeling. |
280 |
def get_refs_container(self): |
281 |
"""Retrieve the refs container. |
|
0.200.1434
by Jelmer Vernooij
Move refs access to control dir. |
282 |
"""
|
0.200.1487
by Jelmer Vernooij
Use peeling. |
283 |
raise NotImplementedError(self.get_refs_container) |
0.200.1434
by Jelmer Vernooij
Move refs access to control dir. |
284 |
|
0.200.1701
by Jelmer Vernooij
Fix a few tests. |
285 |
def determine_repository_policy(self, force_new_repo=False, stack_on=None, |
286 |
stack_on_pwd=None, require_stacking=False): |
|
287 |
"""Return an object representing a policy to use. |
|
288 |
||
289 |
This controls whether a new repository is created, and the format of
|
|
290 |
that repository, or some existing shared repository used instead.
|
|
291 |
||
292 |
If stack_on is supplied, will not seek a containing shared repo.
|
|
293 |
||
294 |
:param force_new_repo: If True, require a new repository to be created.
|
|
295 |
:param stack_on: If supplied, the location to stack on. If not
|
|
296 |
supplied, a default_stack_on location may be used.
|
|
297 |
:param stack_on_pwd: If stack_on is relative, the location it is
|
|
298 |
relative to.
|
|
299 |
"""
|
|
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
300 |
return UseExistingRepository(self.find_repository()) |
0.200.1701
by Jelmer Vernooij
Fix a few tests. |
301 |
|
7490.13.2
by Jelmer Vernooij
Fix reference handling. |
302 |
def branch_names(self): |
303 |
from .refs import ref_to_branch_name |
|
304 |
ret = [] |
|
305 |
for ref in self.get_refs_container().keys(): |
|
306 |
try: |
|
307 |
branch_name = ref_to_branch_name(ref) |
|
308 |
except UnicodeDecodeError: |
|
309 |
trace.warning("Ignoring branch %r with unicode error ref", ref) |
|
310 |
continue
|
|
311 |
except ValueError: |
|
312 |
continue
|
|
313 |
ret.append(branch_name) |
|
314 |
return ret |
|
315 |
||
0.377.1
by Jelmer Vernooij
Fix some remote operations and add more tests. |
316 |
def get_branches(self): |
317 |
from .refs import ref_to_branch_name |
|
318 |
ret = {} |
|
319 |
for ref in self.get_refs_container().keys(): |
|
320 |
try: |
|
321 |
branch_name = ref_to_branch_name(ref) |
|
322 |
except UnicodeDecodeError: |
|
323 |
trace.warning("Ignoring branch %r with unicode error ref", ref) |
|
324 |
continue
|
|
7295.2.1
by Jelmer Vernooij
Fix some issues reported by lgtm.com. |
325 |
except ValueError: |
326 |
continue
|
|
0.377.1
by Jelmer Vernooij
Fix some remote operations and add more tests. |
327 |
ret[branch_name] = self.open_branch(ref=ref) |
328 |
return ret |
|
329 |
||
330 |
def list_branches(self): |
|
7045.4.1
by Jelmer Vernooij
Some brz-git fixes. |
331 |
return list(self.get_branches().values()) |
0.377.1
by Jelmer Vernooij
Fix some remote operations and add more tests. |
332 |
|
0.419.1
by Jelmer Vernooij
Simplify pushing to Git directories. |
333 |
def push_branch(self, source, revision_id=None, overwrite=False, |
334 |
remember=False, create_prefix=False, lossy=False, |
|
7489.4.4
by Jelmer Vernooij
Add more tests. |
335 |
name=None, tag_selector=None): |
0.419.1
by Jelmer Vernooij
Simplify pushing to Git directories. |
336 |
"""Push the source branch into this ControlDir.""" |
337 |
push_result = GitPushResult() |
|
338 |
push_result.workingtree_updated = None |
|
339 |
push_result.master_branch = None |
|
340 |
push_result.source_branch = source |
|
341 |
push_result.stacked_on = None |
|
342 |
from .branch import GitBranch |
|
343 |
if isinstance(source, GitBranch) and lossy: |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
344 |
raise brz_errors.LossyPushToSameVCS(source.controldir, self) |
0.419.1
by Jelmer Vernooij
Simplify pushing to Git directories. |
345 |
target = self.open_branch(name, nascent_ok=True) |
346 |
push_result.branch_push_result = source.push( |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
347 |
target, overwrite=overwrite, stop_revision=revision_id, |
7489.4.4
by Jelmer Vernooij
Add more tests. |
348 |
lossy=lossy, tag_selector=tag_selector) |
0.419.1
by Jelmer Vernooij
Simplify pushing to Git directories. |
349 |
push_result.new_revid = push_result.branch_push_result.new_revid |
350 |
push_result.old_revid = push_result.branch_push_result.old_revid |
|
7290.26.1
by Jelmer Vernooij
Fix switching in git repositories. |
351 |
try: |
352 |
wt = self.open_workingtree() |
|
353 |
except brz_errors.NoWorkingTree: |
|
354 |
push_result.workingtree_updated = None |
|
355 |
else: |
|
356 |
if self.open_branch(name="").name == target.name: |
|
357 |
wt._update_git_tree( |
|
358 |
old_revision=push_result.old_revid, |
|
359 |
new_revision=push_result.new_revid) |
|
360 |
push_result.workingtree_updated = True |
|
361 |
else: |
|
362 |
push_result.workingtree_updated = False |
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
363 |
push_result.target_branch = target |
0.419.1
by Jelmer Vernooij
Simplify pushing to Git directories. |
364 |
if source.get_push_location() is None or remember: |
365 |
source.set_push_location(push_result.target_branch.base) |
|
366 |
return push_result |
|
367 |
||
0.200.148
by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir. |
368 |
|
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
369 |
class LocalGitControlDirFormat(GitControlDirFormat): |
370 |
"""The .git directory control format.""" |
|
371 |
||
372 |
bare = False |
|
373 |
||
374 |
@classmethod
|
|
375 |
def _known_formats(self): |
|
376 |
return set([LocalGitControlDirFormat()]) |
|
377 |
||
378 |
@property
|
|
379 |
def repository_format(self): |
|
0.200.1644
by Jelmer Vernooij
More relative imports. |
380 |
from .repository import GitRepositoryFormat |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
381 |
return GitRepositoryFormat() |
382 |
||
0.290.3
by Jelmer Vernooij
Set workingtree_format on LocalGitDirFormat. |
383 |
@property
|
384 |
def workingtree_format(self): |
|
385 |
from .workingtree import GitWorkingTreeFormat |
|
386 |
return GitWorkingTreeFormat() |
|
387 |
||
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
388 |
def get_branch_format(self): |
0.295.1
by Jelmer Vernooij
Split up branch formats. |
389 |
from .branch import LocalGitBranchFormat |
390 |
return LocalGitBranchFormat() |
|
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
391 |
|
392 |
def open(self, transport, _found=None): |
|
393 |
"""Open this directory. |
|
394 |
||
395 |
"""
|
|
0.200.1644
by Jelmer Vernooij
More relative imports. |
396 |
from .transportgit import TransportRepo |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
397 |
|
7096.1.2
by Jelmer Vernooij
Fix redirection handling for git. |
398 |
def _open(transport): |
7380.1.1
by Jelmer Vernooij
Several more fixes for git merge proposals. |
399 |
try: |
400 |
return TransportRepo(transport, self.bare, |
|
401 |
refs_text=getattr(self, "_refs_text", None)) |
|
402 |
except ValueError as e: |
|
403 |
if e.args == ('Expected file to start with \'gitdir: \'', ): |
|
404 |
raise brz_errors.NotBranchError(path=transport.base) |
|
405 |
raise
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
406 |
|
7096.1.2
by Jelmer Vernooij
Fix redirection handling for git. |
407 |
def redirected(transport, e, redirection_notice): |
408 |
trace.note(redirection_notice) |
|
409 |
return transport._redirected_to(e.source, e.target) |
|
410 |
gitrepo = do_catching_redirections(_open, transport, redirected) |
|
7413.4.3
by Jelmer Vernooij
Don't re-probe when opening control directory. |
411 |
if not _found and not gitrepo._controltransport.has('objects'): |
7411.1.3
by Jelmer Vernooij
Fix tests. |
412 |
raise brz_errors.NotBranchError(path=transport.base) |
0.200.1411
by Jelmer Vernooij
Fix control files. |
413 |
return LocalGitDir(transport, gitrepo, self) |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
414 |
|
415 |
def get_format_description(self): |
|
416 |
return "Local Git Repository" |
|
417 |
||
418 |
def initialize_on_transport(self, transport): |
|
0.200.1644
by Jelmer Vernooij
More relative imports. |
419 |
from .transportgit import TransportRepo |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
420 |
git_repo = TransportRepo.init(transport, bare=self.bare) |
421 |
return LocalGitDir(transport, git_repo, self) |
|
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
422 |
|
423 |
def initialize_on_transport_ex(self, transport, use_existing_dir=False, |
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
424 |
create_prefix=False, force_new_repo=False, |
425 |
stacked_on=None, |
|
426 |
stack_on_pwd=None, repo_format_name=None, |
|
427 |
make_working_trees=None, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
428 |
shared_repo=False, vfs_only=False): |
7385.2.2
by Jelmer Vernooij
Raise exception when requesting shared repository be created. |
429 |
if shared_repo: |
430 |
raise brz_errors.SharedRepositoriesUnsupported(self) |
|
431 |
||
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
432 |
def make_directory(transport): |
433 |
transport.mkdir('.') |
|
434 |
return transport |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
435 |
|
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
436 |
def redirected(transport, e, redirection_notice): |
437 |
trace.note(redirection_notice) |
|
438 |
return transport._redirected_to(e.source, e.target) |
|
439 |
try: |
|
7143.15.6
by Jelmer Vernooij
Merge trunk. |
440 |
transport = do_catching_redirections( |
441 |
make_directory, transport, redirected) |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
442 |
except brz_errors.FileExists: |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
443 |
if not use_existing_dir: |
444 |
raise
|
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
445 |
except brz_errors.NoSuchFile: |
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
446 |
if not create_prefix: |
447 |
raise
|
|
448 |
transport.create_prefix() |
|
449 |
controldir = self.initialize_on_transport(transport) |
|
0.330.1
by Jelmer Vernooij
Fix initialize_on_transport_ex without repo_format specified. |
450 |
if repo_format_name: |
451 |
result_repo = controldir.find_repository() |
|
452 |
repository_policy = UseExistingRepository(result_repo) |
|
453 |
result_repo.lock_write() |
|
454 |
else: |
|
455 |
result_repo = None |
|
456 |
repository_policy = None |
|
457 |
return (result_repo, controldir, False, |
|
458 |
repository_policy) |
|
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
459 |
|
460 |
def is_supported(self): |
|
461 |
return True |
|
462 |
||
0.200.1412
by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport. |
463 |
def supports_transport(self, transport): |
464 |
try: |
|
465 |
external_url = transport.external_url() |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
466 |
except brz_errors.InProcessTransport: |
467 |
raise brz_errors.NotBranchError(path=transport.base) |
|
0.332.1
by Jelmer Vernooij
Mark LocalGitControlDir as not supporting http. |
468 |
return external_url.startswith("file:") |
0.200.1412
by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport. |
469 |
|
7311.2.3
by Jelmer Vernooij
Drop find_trees. |
470 |
def is_control_filename(self, filename): |
471 |
return (filename == '.git' |
|
472 |
or filename.startswith('.git/') |
|
473 |
or filename.startswith('.git\\')) |
|
474 |
||
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
475 |
|
476 |
class BareLocalGitControlDirFormat(LocalGitControlDirFormat): |
|
477 |
||
478 |
bare = True |
|
479 |
supports_workingtrees = False |
|
480 |
||
481 |
def get_format_description(self): |
|
482 |
return "Local Git Repository (bare)" |
|
483 |
||
7311.2.3
by Jelmer Vernooij
Drop find_trees. |
484 |
def is_control_filename(self, filename): |
485 |
return False |
|
486 |
||
0.200.1137
by Jelmer Vernooij
Support BzrProber.known_formats(). |
487 |
|
0.200.148
by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir. |
488 |
class LocalGitDir(GitDir): |
489 |
"""An adapter to the '.git' dir used by git.""" |
|
490 |
||
0.239.13
by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed. |
491 |
def _get_gitrepository_class(self): |
0.200.1644
by Jelmer Vernooij
More relative imports. |
492 |
from .repository import LocalGitRepository |
0.239.13
by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed. |
493 |
return LocalGitRepository |
494 |
||
0.200.1313
by Jelmer Vernooij
Add __repr__ |
495 |
def __repr__(self): |
496 |
return "<%s at %r>" % ( |
|
497 |
self.__class__.__name__, self.root_transport.base) |
|
498 |
||
0.239.13
by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed. |
499 |
_gitrepository_class = property(_get_gitrepository_class) |
0.202.2
by David Allouche
GitRepository.get_inventory and .revision_tree work for the null revision. Support for testing GitRepository without disk data. |
500 |
|
0.200.1014
by Jelmer Vernooij
Fix tests. |
501 |
@property
|
502 |
def user_transport(self): |
|
503 |
return self.root_transport |
|
504 |
||
505 |
@property
|
|
506 |
def control_transport(self): |
|
0.398.1
by Jelmer Vernooij
Support reading .git files. |
507 |
return self._git._controltransport |
0.200.1014
by Jelmer Vernooij
Fix tests. |
508 |
|
0.200.1411
by Jelmer Vernooij
Fix control files. |
509 |
def __init__(self, transport, gitrepo, format): |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
510 |
self._format = format |
511 |
self.root_transport = transport |
|
0.200.1018
by Jelmer Vernooij
Fix use with new control dir API. |
512 |
self._mode_check_done = False |
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
513 |
self._git = gitrepo |
514 |
if gitrepo.bare: |
|
515 |
self.transport = transport |
|
516 |
else: |
|
517 |
self.transport = transport.clone('.git') |
|
0.200.381
by Jelmer Vernooij
Support working trees properly, status and ls. |
518 |
self._mode_check_done = None |
519 |
||
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
520 |
def _get_symref(self, ref): |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
521 |
ref_chain, unused_sha = self._git.refs.follow(ref) |
522 |
if len(ref_chain) == 1: |
|
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
523 |
return None |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
524 |
return ref_chain[1] |
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
525 |
|
0.200.1773
by Jelmer Vernooij
Fix argument name. |
526 |
def set_branch_reference(self, target_branch, name=None): |
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
527 |
ref = self._get_selected_ref(name) |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
528 |
target_transport = target_branch.controldir.control_transport |
529 |
if self.control_transport.base == target_transport.base: |
|
0.416.1
by Jelmer Vernooij
Raise BranchReferenceLoop. |
530 |
if ref == target_branch.ref: |
531 |
raise BranchReferenceLoop(target_branch) |
|
0.311.1
by Jelmer Vernooij
Support git lightweight checkouts. |
532 |
self._git.refs.set_symbolic_ref(ref, target_branch.ref) |
533 |
else: |
|
534 |
try: |
|
7143.15.6
by Jelmer Vernooij
Merge trunk. |
535 |
target_path = ( |
536 |
target_branch.controldir.control_transport.local_abspath( |
|
537 |
'.')) |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
538 |
except brz_errors.NotLocalUrl: |
7143.15.6
by Jelmer Vernooij
Merge trunk. |
539 |
raise brz_errors.IncompatibleFormat( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
540 |
target_branch._format, self._format) |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
541 |
# TODO(jelmer): Do some consistency checking across branches..
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
542 |
self.control_transport.put_bytes( |
543 |
'commondir', target_path.encode('utf-8')) |
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
544 |
# TODO(jelmer): Urgh, avoid mucking about with internals.
|
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
545 |
self._git._commontransport = ( |
546 |
target_branch.repository._git._commontransport.clone()) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
547 |
self._git.object_store = TransportObjectStore( |
548 |
self._git._commontransport.clone(OBJECTDIR)) |
|
0.311.3
by Jelmer Vernooij
Fix handling of lightweight checkouts. |
549 |
self._git.refs.transport = self._git._commontransport |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
550 |
target_ref_chain, unused_sha = ( |
551 |
target_branch.controldir._git.refs.follow(target_branch.ref)) |
|
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
552 |
for target_ref in target_ref_chain: |
553 |
if target_ref == b'HEAD': |
|
554 |
continue
|
|
555 |
break
|
|
556 |
else: |
|
557 |
# Can't create a reference to something that is not a in a repository.
|
|
7143.15.6
by Jelmer Vernooij
Merge trunk. |
558 |
raise brz_errors.IncompatibleFormat( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
559 |
self.set_branch_reference, self) |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
560 |
self._git.refs.set_symbolic_ref(ref, target_ref) |
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
561 |
|
562 |
def get_branch_reference(self, name=None): |
|
563 |
ref = self._get_selected_ref(name) |
|
564 |
target_ref = self._get_symref(ref) |
|
565 |
if target_ref is not None: |
|
0.303.3
by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs. |
566 |
from .refs import ref_to_branch_name |
567 |
try: |
|
568 |
branch_name = ref_to_branch_name(target_ref) |
|
569 |
except ValueError: |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
570 |
params = {'ref': urlutils.quote( |
571 |
target_ref.decode('utf-8'), '')} |
|
0.303.3
by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs. |
572 |
else: |
7018.3.3
by Jelmer Vernooij
Fix url handling. |
573 |
if branch_name != '': |
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
574 |
params = {'branch': urlutils.quote(branch_name, '')} |
0.303.3
by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs. |
575 |
else: |
576 |
params = {} |
|
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
577 |
try: |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
578 |
commondir = self.control_transport.get_bytes('commondir') |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
579 |
except brz_errors.NoSuchFile: |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
580 |
base_url = self.user_url.rstrip('/') |
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
581 |
else: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
582 |
base_url = urlutils.local_path_to_url( |
583 |
commondir.decode(osutils._fs_enc)).rstrip('/.git/') + '/' |
|
7018.3.3
by Jelmer Vernooij
Fix url handling. |
584 |
if not PY3: |
585 |
params = {k: v.encode('utf-8') for (k, v) in viewitems(params)} |
|
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
586 |
return urlutils.join_segment_parameters(base_url, params) |
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
587 |
return None |
588 |
||
589 |
def find_branch_format(self, name=None): |
|
0.200.1644
by Jelmer Vernooij
More relative imports. |
590 |
from .branch import ( |
0.295.1
by Jelmer Vernooij
Split up branch formats. |
591 |
LocalGitBranchFormat, |
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
592 |
)
|
0.321.1
by Jelmer Vernooij
Remove unused GitSymrefBranchFormat. |
593 |
return LocalGitBranchFormat() |
0.200.1311
by Jelmer Vernooij
More work on colocated branch support. |
594 |
|
0.200.978
by Jelmer Vernooij
Allow name argument to get_branch_transport to be missing. |
595 |
def get_branch_transport(self, branch_format, name=None): |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
596 |
if branch_format is None: |
597 |
return self.transport |
|
0.200.1012
by Jelmer Vernooij
Rename BzrDir to ControlDir. |
598 |
if isinstance(branch_format, LocalGitControlDirFormat): |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
599 |
return self.transport |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
600 |
raise brz_errors.IncompatibleFormat(branch_format, self._format) |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
601 |
|
0.200.887
by Jelmer Vernooij
get_branch_transport takes a name argument. |
602 |
def get_repository_transport(self, format): |
603 |
if format is None: |
|
604 |
return self.transport |
|
0.200.1012
by Jelmer Vernooij
Rename BzrDir to ControlDir. |
605 |
if isinstance(format, LocalGitControlDirFormat): |
0.200.887
by Jelmer Vernooij
get_branch_transport takes a name argument. |
606 |
return self.transport |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
607 |
raise brz_errors.IncompatibleFormat(format, self._format) |
0.200.887
by Jelmer Vernooij
get_branch_transport takes a name argument. |
608 |
|
609 |
def get_workingtree_transport(self, format): |
|
610 |
if format is None: |
|
611 |
return self.transport |
|
0.200.1012
by Jelmer Vernooij
Rename BzrDir to ControlDir. |
612 |
if isinstance(format, LocalGitControlDirFormat): |
0.200.887
by Jelmer Vernooij
get_branch_transport takes a name argument. |
613 |
return self.transport |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
614 |
raise brz_errors.IncompatibleFormat(format, self._format) |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
615 |
|
0.269.8
by Jelmer Vernooij
Support push in git-remote-bzr. |
616 |
def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
617 |
ref=None, possible_transports=None, nascent_ok=False): |
0.200.57
by Jelmer Vernooij
Fix more tests. |
618 |
"""'create' a branch for this dir.""" |
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
619 |
repo = self.find_repository() |
0.200.1644
by Jelmer Vernooij
More relative imports. |
620 |
from .branch import LocalGitBranch |
0.269.8
by Jelmer Vernooij
Support push in git-remote-bzr. |
621 |
ref = self._get_selected_ref(name, ref) |
0.310.9
by Jelmer Vernooij
Some controldir fixes. |
622 |
if not nascent_ok and ref not in self._git.refs: |
7143.15.6
by Jelmer Vernooij
Merge trunk. |
623 |
raise brz_errors.NotBranchError( |
624 |
self.root_transport.base, controldir=self) |
|
0.310.9
by Jelmer Vernooij
Some controldir fixes. |
625 |
ref_chain, unused_sha = self._git.refs.follow(ref) |
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
626 |
if ref_chain[-1] == b'HEAD': |
627 |
controldir = self |
|
628 |
else: |
|
629 |
controldir = self._find_commondir() |
|
630 |
return LocalGitBranch(controldir, repo, ref_chain[-1]) |
|
0.200.722
by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch. |
631 |
|
0.200.724
by Jelmer Vernooij
support destroy_branch |
632 |
def destroy_branch(self, name=None): |
0.200.1310
by Jelmer Vernooij
Add _get_selected_ref method. |
633 |
refname = self._get_selected_ref(name) |
0.310.2
by Jelmer Vernooij
Don't allow removing HEAD. |
634 |
if refname == b'HEAD': |
635 |
# HEAD can't be removed
|
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
636 |
raise brz_errors.UnsupportedOperation( |
0.310.2
by Jelmer Vernooij
Don't allow removing HEAD. |
637 |
self.destroy_branch, self) |
0.200.1364
by Jelmer Vernooij
Fix .destroy_branch. |
638 |
try: |
639 |
del self._git.refs[refname] |
|
640 |
except KeyError: |
|
7143.15.6
by Jelmer Vernooij
Merge trunk. |
641 |
raise brz_errors.NotBranchError( |
642 |
self.root_transport.base, controldir=self) |
|
0.200.724
by Jelmer Vernooij
support destroy_branch |
643 |
|
0.200.980
by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository(). |
644 |
def destroy_repository(self): |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
645 |
raise brz_errors.UnsupportedOperation(self.destroy_repository, self) |
0.200.980
by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository(). |
646 |
|
0.200.986
by Jelmer Vernooij
Implement GitDir.destroy_workingtree. |
647 |
def destroy_workingtree(self): |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
648 |
raise brz_errors.UnsupportedOperation(self.destroy_workingtree, self) |
0.200.1566
by Jelmer Vernooij
Basic implementation of LocalGitDir.destroy_workingtree. |
649 |
|
650 |
def destroy_workingtree_metadata(self): |
|
7143.15.6
by Jelmer Vernooij
Merge trunk. |
651 |
raise brz_errors.UnsupportedOperation( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
652 |
self.destroy_workingtree_metadata, self) |
0.200.986
by Jelmer Vernooij
Implement GitDir.destroy_workingtree. |
653 |
|
0.200.997
by Jelmer Vernooij
Implement BzrDir.needs_format_conversion. |
654 |
def needs_format_conversion(self, format=None): |
655 |
return not isinstance(self._format, format.__class__) |
|
656 |
||
0.200.1114
by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True |
657 |
def open_repository(self): |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
658 |
"""'open' a repository for this dir.""" |
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
659 |
if self.control_transport.has('commondir'): |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
660 |
raise brz_errors.NoRepositoryPresent(self) |
0.200.1411
by Jelmer Vernooij
Fix control files. |
661 |
return self._gitrepository_class(self) |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
662 |
|
0.310.3
by Jelmer Vernooij
Implement ControlDir.has_workingtree. |
663 |
def has_workingtree(self): |
664 |
return not self._git.bare |
|
665 |
||
0.200.1537
by Jelmer Vernooij
Support unsupported= argument. |
666 |
def open_workingtree(self, recommend_upgrade=True, unsupported=False): |
0.246.5
by Jelmer Vernooij
Cope with has_index not existing. |
667 |
if not self._git.bare: |
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
668 |
repo = self.find_repository() |
0.415.3
by Jelmer Vernooij
Open index on demand. |
669 |
from .workingtree import GitWorkingTree |
670 |
branch = self.open_branch(ref=b'HEAD', nascent_ok=True) |
|
671 |
return GitWorkingTree(self, repo, branch) |
|
0.200.392
by Jelmer Vernooij
Fix some tests now that working trees are supported. |
672 |
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii') |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
673 |
raise brz_errors.NoWorkingTree(loc) |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
674 |
|
0.200.108
by Jelmer Vernooij
Support bzr init --git. |
675 |
def create_repository(self, shared=False): |
0.200.1644
by Jelmer Vernooij
More relative imports. |
676 |
from .repository import GitRepositoryFormat |
0.200.1114
by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True |
677 |
if shared: |
7143.15.6
by Jelmer Vernooij
Merge trunk. |
678 |
raise brz_errors.IncompatibleFormat( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
679 |
GitRepositoryFormat(), self._format) |
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
680 |
return self.find_repository() |
0.200.288
by Jelmer Vernooij
Add test for init-repo. |
681 |
|
0.200.1377
by Jelmer Vernooij
Fix get_branch_reference. |
682 |
def create_branch(self, name=None, repository=None, |
0.269.8
by Jelmer Vernooij
Support push in git-remote-bzr. |
683 |
append_revisions_only=None, ref=None): |
684 |
refname = self._get_selected_ref(name, ref) |
|
0.310.1
by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD. |
685 |
if refname != b'HEAD' and refname in self._git.refs: |
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
686 |
raise brz_errors.AlreadyBranchError(self.user_url) |
0.310.9
by Jelmer Vernooij
Some controldir fixes. |
687 |
repo = self.open_repository() |
688 |
if refname in self._git.refs: |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
689 |
ref_chain, unused_sha = self._git.refs.follow( |
690 |
self._get_selected_ref(None)) |
|
0.310.14
by Jelmer Vernooij
merge lightweight checkout-in-git support. |
691 |
if ref_chain[0] == b'HEAD': |
692 |
refname = ref_chain[1] |
|
693 |
from .branch import LocalGitBranch |
|
694 |
branch = LocalGitBranch(self, repo, refname) |
|
0.200.1378
by Jelmer Vernooij
Fix branch. |
695 |
if append_revisions_only: |
0.200.1377
by Jelmer Vernooij
Fix get_branch_reference. |
696 |
branch.set_append_revisions_only(append_revisions_only) |
697 |
return branch |
|
0.200.535
by Jelmer Vernooij
use standard version to check for index. |
698 |
|
699 |
def backup_bzrdir(self): |
|
0.200.1549
by Jelmer Vernooij
Support backing up bare repositories. |
700 |
if not self._git.bare: |
0.200.535
by Jelmer Vernooij
use standard version to check for index. |
701 |
self.root_transport.copy_tree(".git", ".git.backup") |
702 |
return (self.root_transport.abspath(".git"), |
|
703 |
self.root_transport.abspath(".git.backup")) |
|
704 |
else: |
|
0.200.1549
by Jelmer Vernooij
Support backing up bare repositories. |
705 |
basename = urlutils.basename(self.root_transport.base) |
706 |
parent = self.root_transport.clone('..') |
|
707 |
parent.copy_tree(basename, basename + ".backup") |
|
0.200.535
by Jelmer Vernooij
use standard version to check for index. |
708 |
|
709 |
def create_workingtree(self, revision_id=None, from_branch=None, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
710 |
accelerator_tree=None, hardlink=False): |
0.200.535
by Jelmer Vernooij
use standard version to check for index. |
711 |
if self._git.bare: |
7143.15.6
by Jelmer Vernooij
Merge trunk. |
712 |
raise brz_errors.UnsupportedOperation( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
713 |
self.create_workingtree, self) |
0.310.1
by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD. |
714 |
if from_branch is None: |
0.310.9
by Jelmer Vernooij
Some controldir fixes. |
715 |
from_branch = self.open_branch(nascent_ok=True) |
0.288.5
by Jelmer Vernooij
Fix working tree contruction. |
716 |
if revision_id is None: |
0.310.1
by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD. |
717 |
revision_id = from_branch.last_revision() |
0.302.1
by Jelmer Vernooij
Implement .find_repository. |
718 |
repo = self.find_repository() |
0.302.2
by Jelmer Vernooij
Use from_branch. |
719 |
from .workingtree import GitWorkingTree |
0.415.3
by Jelmer Vernooij
Open index on demand. |
720 |
wt = GitWorkingTree(self, repo, from_branch) |
0.373.1
by Jelmer Vernooij
Fix WorkingTree.reset_state(). |
721 |
wt.set_last_revision(revision_id) |
722 |
wt._build_checkout_with_index() |
|
0.200.1721
by Jelmer Vernooij
Support passing in last revision. |
723 |
return wt |
0.200.1015
by Jelmer Vernooij
Fix GitControlDir.find_repository(). |
724 |
|
0.200.1114
by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True |
725 |
def _find_or_create_repository(self, force_new_repo=None): |
726 |
return self.create_repository(shared=False) |
|
727 |
||
0.200.1018
by Jelmer Vernooij
Fix use with new control dir API. |
728 |
def _find_creation_modes(self): |
729 |
"""Determine the appropriate modes for files and directories. |
|
730 |
||
731 |
They're always set to be consistent with the base directory,
|
|
732 |
assuming that this transport allows setting modes.
|
|
733 |
"""
|
|
734 |
# TODO: Do we need or want an option (maybe a config setting) to turn
|
|
735 |
# this off or override it for particular locations? -- mbp 20080512
|
|
736 |
if self._mode_check_done: |
|
737 |
return
|
|
738 |
self._mode_check_done = True |
|
739 |
try: |
|
740 |
st = self.transport.stat('.') |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
741 |
except brz_errors.TransportNotPossible: |
0.200.1018
by Jelmer Vernooij
Fix use with new control dir API. |
742 |
self._dir_mode = None |
743 |
self._file_mode = None |
|
744 |
else: |
|
745 |
# Check the directory mode, but also make sure the created
|
|
746 |
# directories and files are read-write for this user. This is
|
|
747 |
# mostly a workaround for filesystems which lie about being able to
|
|
748 |
# write to a directory (cygwin & win32)
|
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
749 |
if (st.st_mode & 0o7777 == 0o0000): |
0.200.1018
by Jelmer Vernooij
Fix use with new control dir API. |
750 |
# FTP allows stat but does not return dir/file modes
|
751 |
self._dir_mode = None |
|
752 |
self._file_mode = None |
|
753 |
else: |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
754 |
self._dir_mode = (st.st_mode & 0o7777) | 0o0700 |
0.200.1018
by Jelmer Vernooij
Fix use with new control dir API. |
755 |
# Remove the sticky and execute bits for files
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
756 |
self._file_mode = self._dir_mode & ~0o7111 |
0.200.1018
by Jelmer Vernooij
Fix use with new control dir API. |
757 |
|
758 |
def _get_file_mode(self): |
|
759 |
"""Return Unix mode for newly created files, or None. |
|
760 |
"""
|
|
761 |
if not self._mode_check_done: |
|
762 |
self._find_creation_modes() |
|
763 |
return self._file_mode |
|
764 |
||
765 |
def _get_dir_mode(self): |
|
766 |
"""Return Unix mode for newly created directories, or None. |
|
767 |
"""
|
|
768 |
if not self._mode_check_done: |
|
769 |
self._find_creation_modes() |
|
770 |
return self._dir_mode |
|
771 |
||
0.200.1487
by Jelmer Vernooij
Use peeling. |
772 |
def get_refs_container(self): |
773 |
return self._git.refs |
|
0.200.1489
by Jelmer Vernooij
More fixes to peel handling. |
774 |
|
775 |
def get_peeled(self, ref): |
|
776 |
return self._git.get_peeled(ref) |
|
0.409.1
by Jelmer Vernooij
Don't probe for commondir over remote transport. |
777 |
|
778 |
def _find_commondir(self): |
|
779 |
try: |
|
780 |
commondir = self.control_transport.get_bytes('commondir') |
|
7143.7.1
by Jelmer Vernooij
Simplify brz-git, drop imports. |
781 |
except brz_errors.NoSuchFile: |
0.409.1
by Jelmer Vernooij
Don't probe for commondir over remote transport. |
782 |
return self |
783 |
else: |
|
7045.3.1
by Jelmer Vernooij
Fix another ~500 tests. |
784 |
commondir = commondir.rstrip(b'/.git/').decode(osutils._fs_enc) |
7143.15.3
by Jelmer Vernooij
Fix pep8 issues in breezy.git. |
785 |
return ControlDir.open_from_transport( |
786 |
get_transport_from_path(commondir)) |