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