bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
6404.6.1
by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. |
1 |
# Copyright (C) 2005-2012 Canonical Ltd
|
|
1553.5.70
by Martin Pool
doc |
2 |
#
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
|
1553.5.70
by Martin Pool
doc |
7 |
#
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
|
1553.5.70
by Martin Pool
doc |
12 |
#
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
16 |
|
|
6379.6.1
by Jelmer Vernooij
Import absolute_import in a few places. |
17 |
from __future__ import absolute_import |
18 |
||
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
19 |
from . import errors |
|
1
by mbp at sourcefrog
import from baz patch-364 |
20 |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
21 |
from .lazy_import import lazy_import |
|
1996.3.3
by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir |
22 |
lazy_import(globals(), """ |
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
23 |
import itertools
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
24 |
from breezy import (
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
25 |
cleanup,
|
26 |
config as _mod_config,
|
|
27 |
debug,
|
|
28 |
fetch,
|
|
29 |
repository,
|
|
30 |
revision as _mod_revision,
|
|
31 |
tag as _mod_tag,
|
|
32 |
transport,
|
|
33 |
ui,
|
|
34 |
urlutils,
|
|
|
6670.4.3
by Jelmer Vernooij
Fix more imports. |
35 |
)
|
36 |
from breezy.bzr import (
|
|
|
6670.4.15
by Jelmer Vernooij
Fix per workingtree tests. |
37 |
remote,
|
|
6341.1.4
by Jelmer Vernooij
Move more functionality to vf_search. |
38 |
vf_search,
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
39 |
)
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
40 |
from breezy.i18n import gettext, ngettext
|
|
1996.3.3
by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir |
41 |
""") |
42 |
||
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
43 |
from . import ( |
|
5697.2.1
by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave. |
44 |
controldir, |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
45 |
registry, |
|
5697.2.1
by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave. |
46 |
)
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
47 |
from .decorators import ( |
|
5697.2.1
by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave. |
48 |
needs_read_lock, |
49 |
needs_write_lock, |
|
50 |
only_raises, |
|
51 |
)
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
52 |
from .hooks import Hooks |
53 |
from .inter import InterObject |
|
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
54 |
from .lock import LogicalLockResult |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
55 |
from .sixish import ( |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
56 |
BytesIO, |
|
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
57 |
viewitems, |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
58 |
)
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
59 |
from .trace import mutter, mutter_callsite, note, is_quiet |
|
1104
by Martin Pool
- Add a simple UIFactory |
60 |
|
|
1094
by Martin Pool
- merge aaron's merge improvements 999..1008 |
61 |
|
|
5363.2.10
by Jelmer Vernooij
base ControlDir on ControlComponent. |
62 |
class Branch(controldir.ControlComponent): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
63 |
"""Branch holding a history of revisions. |
64 |
||
|
5158.6.2
by Martin Pool
Branch provides user_url etc |
65 |
:ivar base:
|
66 |
Base directory/url of the branch; using control_url and
|
|
67 |
control_transport is more standardized.
|
|
|
5609.25.6
by Andrew Bennetts
Docstring tweaks. |
68 |
:ivar hooks: An instance of BranchHooks.
|
69 |
:ivar _master_branch_cache: cached result of get_master_branch, see
|
|
70 |
_clear_cached_state.
|
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
71 |
"""
|
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
72 |
# this is really an instance variable - FIXME move it there
|
73 |
# - RBC 20060112
|
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
74 |
base = None |
75 |
||
|
5158.6.2
by Martin Pool
Branch provides user_url etc |
76 |
@property
|
77 |
def control_transport(self): |
|
78 |
return self._transport |
|
79 |
||
80 |
@property
|
|
81 |
def user_transport(self): |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
82 |
return self.controldir.user_transport |
|
5158.6.2
by Martin Pool
Branch provides user_url etc |
83 |
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
84 |
def __init__(self, possible_transports=None): |
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
85 |
self.tags = self._format.make_tags(self) |
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
86 |
self._revision_history_cache = None |
|
2418.5.6
by John Arbash Meinel
Cache the revision_id => revno map as appropriate. |
87 |
self._revision_id_to_revno_cache = None |
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
88 |
self._partial_revision_id_to_revno_cache = {} |
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
89 |
self._partial_revision_history_cache = [] |
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
90 |
self._tags_bytes = None |
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
91 |
self._last_revision_info_cache = None |
|
5609.25.3
by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock. |
92 |
self._master_branch_cache = None |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
93 |
self._merge_sorted_revisions_cache = None |
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
94 |
self._open_hook(possible_transports) |
|
3681.1.1
by Robert Collins
Create a new hook Branch.open. (Robert Collins) |
95 |
hooks = Branch.hooks['open'] |
96 |
for hook in hooks: |
|
97 |
hook(self) |
|
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
98 |
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
99 |
def _open_hook(self, possible_transports): |
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
100 |
"""Called by init to allow simpler extension of the base class.""" |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
101 |
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
102 |
def _activate_fallback_location(self, url, possible_transports): |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
103 |
"""Activate the branch/repository from url as a fallback repository.""" |
|
5536.1.1
by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing. |
104 |
for existing_fallback_repo in self.repository._fallback_repositories: |
105 |
if existing_fallback_repo.user_url == url: |
|
106 |
# This fallback is already configured. This probably only
|
|
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
107 |
# happens because ControlDir.sprout is a horrible mess. To
|
108 |
# avoid confusing _unstack we don't add this a second time.
|
|
|
5536.1.9
by Andrew Bennetts
Do as the XXX and John's review suggest: log a warning about duplicate fallback activation. |
109 |
mutter('duplicate activation of fallback %r on %r', url, self) |
|
5536.1.1
by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing. |
110 |
return
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
111 |
repo = self._get_fallback_repository(url, possible_transports) |
|
4462.3.2
by Robert Collins
Do not stack on the same branch/repository anymore. This was never supported and would generally result in infinite recursion. Fixes bug 376243. |
112 |
if repo.has_same_location(self.repository): |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
113 |
raise errors.UnstackableLocationError(self.user_url, url) |
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
114 |
self.repository.add_fallback_repository(repo) |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
115 |
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
116 |
def break_lock(self): |
117 |
"""Break a lock if one is present from another instance. |
|
118 |
||
119 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
120 |
an active process.
|
|
121 |
||
122 |
This will probe the repository for its lock as well.
|
|
123 |
"""
|
|
124 |
self.control_files.break_lock() |
|
125 |
self.repository.break_lock() |
|
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
126 |
master = self.get_master_branch() |
127 |
if master is not None: |
|
128 |
master.break_lock() |
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
129 |
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
130 |
def _check_stackable_repo(self): |
131 |
if not self.repository._format.supports_external_lookups: |
|
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
132 |
raise errors.UnstackableRepositoryFormat( |
133 |
self.repository._format, self.repository.base) |
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
134 |
|
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
135 |
def _extend_partial_history(self, stop_index=None, stop_revision=None): |
136 |
"""Extend the partial history to include a given index |
|
137 |
||
138 |
If a stop_index is supplied, stop when that index has been reached.
|
|
139 |
If a stop_revision is supplied, stop when that revision is
|
|
140 |
encountered. Otherwise, stop when the beginning of history is
|
|
141 |
reached.
|
|
142 |
||
143 |
:param stop_index: The index which should be present. When it is
|
|
144 |
present, history extension will stop.
|
|
|
4419.2.3
by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch. |
145 |
:param stop_revision: The revision id which should be present. When
|
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
146 |
it is encountered, history extension will stop.
|
147 |
"""
|
|
148 |
if len(self._partial_revision_history_cache) == 0: |
|
|
4419.2.3
by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch. |
149 |
self._partial_revision_history_cache = [self.last_revision()] |
150 |
repository._iter_for_revno( |
|
151 |
self.repository, self._partial_revision_history_cache, |
|
152 |
stop_index=stop_index, stop_revision=stop_revision) |
|
153 |
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION: |
|
154 |
self._partial_revision_history_cache.pop() |
|
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
155 |
|
|
4332.3.5
by Robert Collins
Add Branch._get_check_refs. |
156 |
def _get_check_refs(self): |
157 |
"""Get the references needed for check(). |
|
158 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
159 |
See breezy.check.
|
|
4332.3.5
by Robert Collins
Add Branch._get_check_refs. |
160 |
"""
|
161 |
revid = self.last_revision() |
|
162 |
return [('revision-existence', revid), ('lefthand-distance', revid)] |
|
163 |
||
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
164 |
@staticmethod
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
165 |
def open(base, _unsupported=False, possible_transports=None): |
|
1815.1.1
by Jelmer Vernooij
Fix copy-pasted comment. |
166 |
"""Open the branch rooted at base. |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
167 |
|
|
1815.1.1
by Jelmer Vernooij
Fix copy-pasted comment. |
168 |
For instance, if the branch is at URL/.bzr/branch,
|
169 |
Branch.open(URL) -> a Branch instance.
|
|
|
1534.4.7
by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same. |
170 |
"""
|
|
6402.3.3
by Jelmer Vernooij
Simplify safe open a bit more. |
171 |
control = controldir.ControlDir.open(base, |
172 |
possible_transports=possible_transports, _unsupported=_unsupported) |
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
173 |
return control.open_branch(unsupported=_unsupported, |
174 |
possible_transports=possible_transports) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
175 |
|
176 |
@staticmethod
|
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
177 |
def open_from_transport(transport, name=None, _unsupported=False, |
178 |
possible_transports=None): |
|
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
179 |
"""Open the branch rooted at transport""" |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
180 |
control = controldir.ControlDir.open_from_transport(transport, _unsupported) |
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
181 |
return control.open_branch(name=name, unsupported=_unsupported, |
182 |
possible_transports=possible_transports) |
|
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
183 |
|
184 |
@staticmethod
|
|
|
2485.8.37
by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp |
185 |
def open_containing(url, possible_transports=None): |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
186 |
"""Open an existing branch which contains url. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
187 |
|
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
188 |
This probes for a branch at url, and searches upwards from there.
|
|
1185.17.2
by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable |
189 |
|
190 |
Basically we keep looking up until we find the control directory or
|
|
191 |
run into the root. If there isn't one, raises NotBranchError.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
192 |
If there is one and it is either an unrecognised format or an unsupported
|
|
1534.4.22
by Robert Collins
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch. |
193 |
format, UnknownFormatError or UnsupportedFormatError are raised.
|
|
1442.1.64
by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path). |
194 |
If there is one, it is returned, along with the unused portion of url.
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
195 |
"""
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
196 |
control, relpath = controldir.ControlDir.open_containing(url, |
|
2485.8.37
by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp |
197 |
possible_transports) |
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
198 |
branch = control.open_branch(possible_transports=possible_transports) |
199 |
return (branch, relpath) |
|
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
200 |
|
|
4032.3.5
by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch. |
201 |
def _push_should_merge_tags(self): |
202 |
"""Should _basic_push merge this branch's tags into the target? |
|
203 |
||
204 |
The default implementation returns False if this branch has no tags,
|
|
205 |
and True the rest of the time. Subclasses may override this.
|
|
206 |
"""
|
|
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
207 |
return self.supports_tags() and self.tags.get_tag_dict() |
|
4032.3.5
by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch. |
208 |
|
|
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
209 |
def get_config(self): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
210 |
"""Get a breezy.config.BranchConfig for this Branch. |
|
5284.3.1
by Robert Collins
Document bzrlib.branch.Branch.get_config. |
211 |
|
212 |
This can then be used to get and set configuration options for the
|
|
213 |
branch.
|
|
214 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
215 |
:return: A breezy.config.BranchConfig.
|
|
5284.3.1
by Robert Collins
Document bzrlib.branch.Branch.get_config. |
216 |
"""
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
217 |
return _mod_config.BranchConfig(self) |
|
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
218 |
|
|
6155.2.1
by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches. |
219 |
def get_config_stack(self): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
220 |
"""Get a breezy.config.BranchStack for this Branch. |
|
6155.2.1
by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches. |
221 |
|
222 |
This can then be used to get and set configuration options for the
|
|
223 |
branch.
|
|
224 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
225 |
:return: A breezy.config.BranchStack.
|
|
6155.2.1
by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches. |
226 |
"""
|
227 |
return _mod_config.BranchStack(self) |
|
228 |
||
|
4226.1.5
by Robert Collins
Reinstate the use of the Branch.get_config_file verb. |
229 |
def _get_config(self): |
230 |
"""Get the concrete config for just the config in this branch. |
|
231 |
||
232 |
This is not intended for client use; see Branch.get_config for the
|
|
233 |
public API.
|
|
234 |
||
235 |
Added in 1.14.
|
|
236 |
||
237 |
:return: An object supporting get_option and set_option.
|
|
238 |
"""
|
|
239 |
raise NotImplementedError(self._get_config) |
|
240 |
||
|
6538.1.29
by Aaron Bentley
Remove unused 'message' |
241 |
def store_uncommitted(self, creator): |
|
6538.1.20
by Aaron Bentley
Cleanup |
242 |
"""Store uncommitted changes from a ShelfCreator. |
243 |
||
|
6538.1.21
by Aaron Bentley
Ensure shelves are deleted when restored. |
244 |
:param creator: The ShelfCreator containing uncommitted changes, or
|
245 |
None to delete any stored changes.
|
|
|
6538.1.20
by Aaron Bentley
Cleanup |
246 |
:raises: ChangesAlreadyStored if the branch already has changes.
|
247 |
"""
|
|
|
6538.1.23
by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch. |
248 |
raise NotImplementedError(self.store_uncommitted) |
|
6538.1.4
by Aaron Bentley
Implement store_uncommitted. |
249 |
|
|
6538.1.12
by Aaron Bentley
Move unshelver construction to Branch. |
250 |
def get_unshelver(self, tree): |
|
6538.1.20
by Aaron Bentley
Cleanup |
251 |
"""Return a shelf.Unshelver for this branch and tree. |
252 |
||
253 |
:param tree: The tree to use to construct the Unshelver.
|
|
254 |
:return: an Unshelver or None if no changes are stored.
|
|
255 |
"""
|
|
|
6538.1.23
by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch. |
256 |
raise NotImplementedError(self.get_unshelver) |
|
6538.1.8
by Aaron Bentley
Implement branch.get_uncommitted_data. |
257 |
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
258 |
def _get_fallback_repository(self, url, possible_transports): |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
259 |
"""Get the repository we fallback to at url.""" |
260 |
url = urlutils.join(self.base, url) |
|
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
261 |
a_branch = Branch.open(url, possible_transports=possible_transports) |
|
5051.3.14
by Jelmer Vernooij
Remove use of BzrDir.open_branch() without arguments. |
262 |
return a_branch.repository |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
263 |
|
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
264 |
@needs_read_lock
|
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
265 |
def _get_tags_bytes(self): |
266 |
"""Get the bytes of a serialised tags dict. |
|
267 |
||
268 |
Note that not all branches support tags, nor do all use the same tags
|
|
269 |
logic: this method is specific to BasicTags. Other tag implementations
|
|
270 |
may use the same method name and behave differently, safely, because
|
|
271 |
of the double-dispatch via
|
|
272 |
format.make_tags->tags_instance->get_tags_dict.
|
|
273 |
||
274 |
:return: The bytes of the tags file.
|
|
275 |
:seealso: Branch._set_tags_bytes.
|
|
276 |
"""
|
|
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
277 |
if self._tags_bytes is None: |
278 |
self._tags_bytes = self._transport.get_bytes('tags') |
|
279 |
return self._tags_bytes |
|
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
280 |
|
|
3815.3.4
by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch. |
281 |
def _get_nick(self, local=False, possible_transports=None): |
|
3565.6.7
by Marius Kruger
* checkouts now use master nick when no explicit nick is set. |
282 |
config = self.get_config() |
|
3815.3.4
by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch. |
283 |
# explicit overrides master, but don't look for master if local is True
|
284 |
if not local and not config.has_explicit_nickname(): |
|
|
3565.6.10
by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable |
285 |
try: |
286 |
master = self.get_master_branch(possible_transports) |
|
|
5050.7.4
by Parth Malwankar
fixed recursion detection to handle shared repos |
287 |
if master and self.user_url == master.user_url: |
|
5050.7.5
by Parth Malwankar
better error message for RecursiveBind |
288 |
raise errors.RecursiveBind(self.user_url) |
|
3565.6.10
by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable |
289 |
if master is not None: |
290 |
# return the master branch value
|
|
|
3815.3.3
by Marius Kruger
apply Martin's fix for #293440 |
291 |
return master.nick |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
292 |
except errors.RecursiveBind as e: |
|
5050.7.2
by Parth Malwankar
recursive binding now shows a clear error |
293 |
raise e |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
294 |
except errors.BzrError as e: |
|
3565.6.10
by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable |
295 |
# Silently fall back to local implicit nick if the master is
|
296 |
# unavailable
|
|
297 |
mutter("Could not connect to bound branch, " |
|
298 |
"falling back to local nick.\n " + str(e)) |
|
|
3565.6.7
by Marius Kruger
* checkouts now use master nick when no explicit nick is set. |
299 |
return config.get_nickname() |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
300 |
|
301 |
def _set_nick(self, nick): |
|
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
302 |
self.get_config().set_user_option('nickname', nick, warn_masked=True) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
303 |
|
304 |
nick = property(_get_nick, _set_nick) |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
305 |
|
306 |
def is_locked(self): |
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
307 |
raise NotImplementedError(self.is_locked) |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
308 |
|
|
4005.2.1
by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test. |
309 |
def _lefthand_history(self, revision_id, last_rev=None, |
310 |
other_branch=None): |
|
311 |
if 'evil' in debug.debug_flags: |
|
312 |
mutter_callsite(4, "_lefthand_history scales with history.") |
|
313 |
# stop_revision must be a descendant of last_revision
|
|
314 |
graph = self.repository.get_graph() |
|
315 |
if last_rev is not None: |
|
316 |
if not graph.is_ancestor(last_rev, revision_id): |
|
317 |
# our previous tip is not merged into stop_revision
|
|
318 |
raise errors.DivergedBranches(self, other_branch) |
|
319 |
# make a new revision history from the graph
|
|
320 |
parents_map = graph.get_parent_map([revision_id]) |
|
321 |
if revision_id not in parents_map: |
|
322 |
raise errors.NoSuchRevision(self, revision_id) |
|
323 |
current_rev_id = revision_id |
|
324 |
new_history = [] |
|
325 |
check_not_reserved_id = _mod_revision.check_not_reserved_id |
|
326 |
# Do not include ghosts or graph origin in revision_history
|
|
327 |
while (current_rev_id in parents_map and |
|
328 |
len(parents_map[current_rev_id]) > 0): |
|
329 |
check_not_reserved_id(current_rev_id) |
|
330 |
new_history.append(current_rev_id) |
|
331 |
current_rev_id = parents_map[current_rev_id][0] |
|
332 |
parents_map = graph.get_parent_map([current_rev_id]) |
|
333 |
new_history.reverse() |
|
334 |
return new_history |
|
335 |
||
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
336 |
def lock_write(self, token=None): |
337 |
"""Lock the branch for write operations. |
|
338 |
||
339 |
:param token: A token to permit reacquiring a previously held and
|
|
340 |
preserved lock.
|
|
341 |
:return: A BranchWriteLockResult.
|
|
342 |
"""
|
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
343 |
raise NotImplementedError(self.lock_write) |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
344 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
345 |
def lock_read(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
346 |
"""Lock the branch for read operations. |
347 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
348 |
:return: A breezy.lock.LogicalLockResult.
|
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
349 |
"""
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
350 |
raise NotImplementedError(self.lock_read) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
351 |
|
352 |
def unlock(self): |
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
353 |
raise NotImplementedError(self.unlock) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
354 |
|
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
355 |
def peek_lock_mode(self): |
356 |
"""Return lock mode for the Branch: 'r', 'w' or None""" |
|
|
1185.70.6
by Martin Pool
review fixups from John |
357 |
raise NotImplementedError(self.peek_lock_mode) |
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
358 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
359 |
def get_physical_lock_status(self): |
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
360 |
raise NotImplementedError(self.get_physical_lock_status) |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
361 |
|
|
2418.5.12
by John Arbash Meinel
Move functions from BzrBranch to base Branch object. |
362 |
@needs_read_lock
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
363 |
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False): |
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
364 |
"""Return the revision_id for a dotted revno. |
365 |
||
366 |
:param revno: a tuple like (1,) or (1,1,2)
|
|
|
3949.2.4
by Ian Clatworthy
add top level revno cache |
367 |
:param _cache_reverse: a private parameter enabling storage
|
368 |
of the reverse mapping in a top level cache. (This should
|
|
369 |
only be done in selective circumstances as we want to
|
|
370 |
avoid having the mapping cached multiple times.)
|
|
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
371 |
:return: the revision_id
|
372 |
:raises errors.NoSuchRevision: if the revno doesn't exist
|
|
373 |
"""
|
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
374 |
rev_id = self._do_dotted_revno_to_revision_id(revno) |
375 |
if _cache_reverse: |
|
376 |
self._partial_revision_id_to_revno_cache[rev_id] = revno |
|
|
3949.2.4
by Ian Clatworthy
add top level revno cache |
377 |
return rev_id |
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
378 |
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
379 |
def _do_dotted_revno_to_revision_id(self, revno): |
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
380 |
"""Worker function for dotted_revno_to_revision_id. |
381 |
||
382 |
Subclasses should override this if they wish to
|
|
383 |
provide a more efficient implementation.
|
|
384 |
"""
|
|
385 |
if len(revno) == 1: |
|
386 |
return self.get_rev_id(revno[0]) |
|
387 |
revision_id_to_revno = self.get_revision_id_to_revno_map() |
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
388 |
revision_ids = [revision_id for revision_id, this_revno |
|
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
389 |
in viewitems(revision_id_to_revno) |
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
390 |
if revno == this_revno] |
391 |
if len(revision_ids) == 1: |
|
392 |
return revision_ids[0] |
|
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
393 |
else: |
394 |
revno_str = '.'.join(map(str, revno)) |
|
395 |
raise errors.NoSuchRevision(self, revno_str) |
|
396 |
||
397 |
@needs_read_lock
|
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
398 |
def revision_id_to_dotted_revno(self, revision_id): |
399 |
"""Given a revision id, return its dotted revno. |
|
|
4032.1.1
by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts. |
400 |
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
401 |
:return: a tuple like (1,) or (400,1,3).
|
402 |
"""
|
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
403 |
return self._do_revision_id_to_dotted_revno(revision_id) |
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
404 |
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
405 |
def _do_revision_id_to_dotted_revno(self, revision_id): |
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
406 |
"""Worker function for revision_id_to_revno.""" |
|
3949.2.4
by Ian Clatworthy
add top level revno cache |
407 |
# Try the caches if they are loaded
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
408 |
result = self._partial_revision_id_to_revno_cache.get(revision_id) |
409 |
if result is not None: |
|
410 |
return result |
|
411 |
if self._revision_id_to_revno_cache: |
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
412 |
result = self._revision_id_to_revno_cache.get(revision_id) |
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
413 |
if result is None: |
414 |
raise errors.NoSuchRevision(self, revision_id) |
|
415 |
# Try the mainline as it's optimised
|
|
416 |
try: |
|
417 |
revno = self.revision_id_to_revno(revision_id) |
|
418 |
return (revno,) |
|
419 |
except errors.NoSuchRevision: |
|
420 |
# We need to load and use the full revno map after all
|
|
421 |
result = self.get_revision_id_to_revno_map().get(revision_id) |
|
422 |
if result is None: |
|
423 |
raise errors.NoSuchRevision(self, revision_id) |
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
424 |
return result |
425 |
||
|
3949.2.7
by Ian Clatworthy
fix accidental needs_read_lock removal |
426 |
@needs_read_lock
|
|
2418.5.12
by John Arbash Meinel
Move functions from BzrBranch to base Branch object. |
427 |
def get_revision_id_to_revno_map(self): |
428 |
"""Return the revision_id => dotted revno map. |
|
429 |
||
430 |
This will be regenerated on demand, but will be cached.
|
|
431 |
||
432 |
:return: A dictionary mapping revision_id => dotted revno.
|
|
433 |
This dictionary should not be modified by the caller.
|
|
434 |
"""
|
|
435 |
if self._revision_id_to_revno_cache is not None: |
|
436 |
mapping = self._revision_id_to_revno_cache |
|
437 |
else: |
|
438 |
mapping = self._gen_revno_map() |
|
439 |
self._cache_revision_id_to_revno(mapping) |
|
440 |
# TODO: jam 20070417 Since this is being cached, should we be returning
|
|
441 |
# a copy?
|
|
442 |
# I would rather not, and instead just declare that users should not
|
|
443 |
# modify the return value.
|
|
444 |
return mapping |
|
445 |
||
446 |
def _gen_revno_map(self): |
|
447 |
"""Create a new mapping from revision ids to dotted revnos. |
|
448 |
||
449 |
Dotted revnos are generated based on the current tip in the revision
|
|
450 |
history.
|
|
451 |
This is the worker function for get_revision_id_to_revno_map, which
|
|
452 |
just caches the return value.
|
|
453 |
||
454 |
:return: A dictionary mapping revision_id => dotted revno.
|
|
455 |
"""
|
|
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
456 |
revision_id_to_revno = dict((rev_id, revno) |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
457 |
for rev_id, depth, revno, end_of_merge |
458 |
in self.iter_merge_sorted_revisions()) |
|
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
459 |
return revision_id_to_revno |
460 |
||
461 |
@needs_read_lock
|
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
462 |
def iter_merge_sorted_revisions(self, start_revision_id=None, |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
463 |
stop_revision_id=None, stop_rule='exclude', direction='reverse'): |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
464 |
"""Walk the revisions for a branch in merge sorted order. |
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
465 |
|
|
3949.3.8
by Ian Clatworthy
feedback from poolie |
466 |
Merge sorted order is the output from a merge-aware,
|
467 |
topological sort, i.e. all parents come before their
|
|
468 |
children going forward; the opposite for reverse.
|
|
469 |
||
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
470 |
:param start_revision_id: the revision_id to begin walking from.
|
471 |
If None, the branch tip is used.
|
|
472 |
:param stop_revision_id: the revision_id to terminate the walk
|
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
473 |
after. If None, the rest of history is included.
|
474 |
:param stop_rule: if stop_revision_id is not None, the precise rule
|
|
475 |
to use for termination:
|
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
476 |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
477 |
* 'exclude' - leave the stop revision out of the result (default)
|
478 |
* 'include' - the stop revision is the last item in the result
|
|
479 |
* 'with-merges' - include the stop revision and all of its
|
|
480 |
merged revisions in the result
|
|
|
5155.1.5
by Vincent Ladeuil
Fixed as per Andrew's review. |
481 |
* 'with-merges-without-common-ancestry' - filter out revisions
|
482 |
that are in both ancestries
|
|
|
3949.3.3
by Ian Clatworthy
simplify the meaning of forward to be appropriate to this layer |
483 |
:param direction: either 'reverse' or 'forward':
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
484 |
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
485 |
* reverse means return the start_revision_id first, i.e.
|
486 |
start at the most recent revision and go backwards in history
|
|
|
3949.3.3
by Ian Clatworthy
simplify the meaning of forward to be appropriate to this layer |
487 |
* forward returns tuples in the opposite order to reverse.
|
488 |
Note in particular that forward does *not* do any intelligent
|
|
489 |
ordering w.r.t. depth as some clients of this API may like.
|
|
|
3949.3.8
by Ian Clatworthy
feedback from poolie |
490 |
(If required, that ought to be done at higher layers.)
|
491 |
||
492 |
:return: an iterator over (revision_id, depth, revno, end_of_merge)
|
|
493 |
tuples where:
|
|
494 |
||
495 |
* revision_id: the unique id of the revision
|
|
496 |
* depth: How many levels of merging deep this node has been
|
|
497 |
found.
|
|
498 |
* revno_sequence: This field provides a sequence of
|
|
499 |
revision numbers for all revisions. The format is:
|
|
500 |
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
|
|
501 |
branch that the revno is on. From left to right the REVNO numbers
|
|
502 |
are the sequence numbers within that branch of the revision.
|
|
503 |
* end_of_merge: When True the next node (earlier in history) is
|
|
504 |
part of a different merge.
|
|
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
505 |
"""
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
506 |
# Note: depth and revno values are in the context of the branch so
|
507 |
# we need the full graph to get stable numbers, regardless of the
|
|
508 |
# start_revision_id.
|
|
509 |
if self._merge_sorted_revisions_cache is None: |
|
510 |
last_revision = self.last_revision() |
|
|
4913.4.2
by Jelmer Vernooij
Add Repository.get_known_graph_ancestry. |
511 |
known_graph = self.repository.get_known_graph_ancestry( |
512 |
[last_revision]) |
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
513 |
self._merge_sorted_revisions_cache = known_graph.merge_sort( |
|
4913.4.2
by Jelmer Vernooij
Add Repository.get_known_graph_ancestry. |
514 |
last_revision) |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
515 |
filtered = self._filter_merge_sorted_revisions( |
516 |
self._merge_sorted_revisions_cache, start_revision_id, |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
517 |
stop_revision_id, stop_rule) |
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
518 |
# Make sure we don't return revisions that are not part of the
|
519 |
# start_revision_id ancestry.
|
|
|
5097.1.12
by Vincent Ladeuil
Implement the --exclude-common-ancestry log option. |
520 |
filtered = self._filter_start_non_ancestors(filtered) |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
521 |
if direction == 'reverse': |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
522 |
return filtered |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
523 |
if direction == 'forward': |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
524 |
return reversed(list(filtered)) |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
525 |
else: |
526 |
raise ValueError('invalid direction %r' % direction) |
|
|
2418.5.12
by John Arbash Meinel
Move functions from BzrBranch to base Branch object. |
527 |
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
528 |
def _filter_merge_sorted_revisions(self, merge_sorted_revisions, |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
529 |
start_revision_id, stop_revision_id, stop_rule): |
|
3949.3.7
by Ian Clatworthy
drop seqnum from in-memory cache |
530 |
"""Iterate over an inclusive range of sorted revisions.""" |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
531 |
rev_iter = iter(merge_sorted_revisions) |
532 |
if start_revision_id is not None: |
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
533 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
534 |
rev_id = node.key |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
535 |
if rev_id != start_revision_id: |
536 |
continue
|
|
537 |
else: |
|
|
3936.3.30
by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature |
538 |
# The decision to include the start or not
|
539 |
# depends on the stop_rule if a stop is provided
|
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
540 |
# so pop this node back into the iterator
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
541 |
rev_iter = itertools.chain(iter([node]), rev_iter) |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
542 |
break
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
543 |
if stop_revision_id is None: |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
544 |
# Yield everything
|
545 |
for node in rev_iter: |
|
|
5988.1.2
by Jelmer Vernooij
Fix log. |
546 |
rev_id = node.key |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
547 |
yield (rev_id, node.merge_depth, node.revno, |
548 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
549 |
elif stop_rule == 'exclude': |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
550 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
551 |
rev_id = node.key |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
552 |
if rev_id == stop_revision_id: |
553 |
return
|
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
554 |
yield (rev_id, node.merge_depth, node.revno, |
555 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
556 |
elif stop_rule == 'include': |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
557 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
558 |
rev_id = node.key |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
559 |
yield (rev_id, node.merge_depth, node.revno, |
560 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
561 |
if rev_id == stop_revision_id: |
562 |
return
|
|
|
5097.1.11
by Vincent Ladeuil
Fix bug #320119 in a crude way. |
563 |
elif stop_rule == 'with-merges-without-common-ancestry': |
564 |
# We want to exclude all revisions that are already part of the
|
|
565 |
# stop_revision_id ancestry.
|
|
566 |
graph = self.repository.get_graph() |
|
|
5155.1.3
by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once. |
567 |
ancestors = graph.find_unique_ancestors(start_revision_id, |
568 |
[stop_revision_id]) |
|
|
5097.1.11
by Vincent Ladeuil
Fix bug #320119 in a crude way. |
569 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
570 |
rev_id = node.key |
|
5155.1.3
by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once. |
571 |
if rev_id not in ancestors: |
|
5097.1.11
by Vincent Ladeuil
Fix bug #320119 in a crude way. |
572 |
continue
|
573 |
yield (rev_id, node.merge_depth, node.revno, |
|
574 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
575 |
elif stop_rule == 'with-merges': |
|
3960.3.4
by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth |
576 |
stop_rev = self.repository.get_revision(stop_revision_id) |
577 |
if stop_rev.parent_ids: |
|
|
4511.3.15
by Marius Kruger
mainline_stop_rev -> left_parent |
578 |
left_parent = stop_rev.parent_ids[0] |
|
3960.3.4
by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth |
579 |
else: |
|
4511.3.15
by Marius Kruger
mainline_stop_rev -> left_parent |
580 |
left_parent = _mod_revision.NULL_REVISION |
581 |
# left_parent is the actual revision we want to stop logging at,
|
|
582 |
# since we want to show the merged revisions after the stop_rev too
|
|
|
4511.3.10
by Marius Kruger
log -n0 should log up until the stop_revision with its meges and no further. |
583 |
reached_stop_revision_id = False |
|
4511.3.12
by Marius Kruger
ununinvert logic and improve some variable names. |
584 |
revision_id_whitelist = [] |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
585 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
586 |
rev_id = node.key |
|
4511.3.15
by Marius Kruger
mainline_stop_rev -> left_parent |
587 |
if rev_id == left_parent: |
588 |
# reached the left parent after the stop_revision
|
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
589 |
return
|
|
4511.3.12
by Marius Kruger
ununinvert logic and improve some variable names. |
590 |
if (not reached_stop_revision_id or |
591 |
rev_id in revision_id_whitelist): |
|
|
4511.3.10
by Marius Kruger
log -n0 should log up until the stop_revision with its meges and no further. |
592 |
yield (rev_id, node.merge_depth, node.revno, |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
593 |
node.end_of_merge) |
|
4511.3.10
by Marius Kruger
log -n0 should log up until the stop_revision with its meges and no further. |
594 |
if reached_stop_revision_id or rev_id == stop_revision_id: |
595 |
# only do the merged revs of rev_id from now on
|
|
596 |
rev = self.repository.get_revision(rev_id) |
|
597 |
if rev.parent_ids: |
|
598 |
reached_stop_revision_id = True |
|
|
4511.3.12
by Marius Kruger
ununinvert logic and improve some variable names. |
599 |
revision_id_whitelist.extend(rev.parent_ids) |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
600 |
else: |
601 |
raise ValueError('invalid stop_rule %r' % stop_rule) |
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
602 |
|
|
5097.1.12
by Vincent Ladeuil
Implement the --exclude-common-ancestry log option. |
603 |
def _filter_start_non_ancestors(self, rev_iter): |
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
604 |
# If we started from a dotted revno, we want to consider it as a tip
|
605 |
# and don't want to yield revisions that are not part of its
|
|
606 |
# ancestry. Given the order guaranteed by the merge sort, we will see
|
|
607 |
# uninteresting descendants of the first parent of our tip before the
|
|
608 |
# tip itself.
|
|
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
609 |
first = next(rev_iter) |
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
610 |
(rev_id, merge_depth, revno, end_of_merge) = first |
611 |
yield first |
|
612 |
if not merge_depth: |
|
613 |
# We start at a mainline revision so by definition, all others
|
|
614 |
# revisions in rev_iter are ancestors
|
|
615 |
for node in rev_iter: |
|
616 |
yield node |
|
617 |
||
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
618 |
clean = False |
|
5097.2.1
by Vincent Ladeuil
Fix bug #474807 but performance suffers. |
619 |
whitelist = set() |
|
5097.2.3
by Vincent Ladeuil
Better performance than before the fix. |
620 |
pmap = self.repository.get_parent_map([rev_id]) |
621 |
parents = pmap.get(rev_id, []) |
|
622 |
if parents: |
|
623 |
whitelist.update(parents) |
|
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
624 |
else: |
|
5097.1.8
by Vincent Ladeuil
Remove the comment about the missing test (it's not worth it at the |
625 |
# If there is no parents, there is nothing of interest left
|
626 |
||
627 |
# FIXME: It's hard to test this scenario here as this code is never
|
|
628 |
# called in that case. -- vila 20100322
|
|
629 |
return
|
|
630 |
||
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
631 |
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter: |
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
632 |
if not clean: |
633 |
if rev_id in whitelist: |
|
|
5097.2.3
by Vincent Ladeuil
Better performance than before the fix. |
634 |
pmap = self.repository.get_parent_map([rev_id]) |
635 |
parents = pmap.get(rev_id, []) |
|
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
636 |
whitelist.remove(rev_id) |
|
5097.2.3
by Vincent Ladeuil
Better performance than before the fix. |
637 |
whitelist.update(parents) |
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
638 |
if merge_depth == 0: |
639 |
# We've reached the mainline, there is nothing left to
|
|
640 |
# filter
|
|
641 |
clean = True |
|
642 |
else: |
|
643 |
# A revision that is not part of the ancestry of our
|
|
644 |
# starting revision.
|
|
645 |
continue
|
|
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
646 |
yield (rev_id, merge_depth, revno, end_of_merge) |
647 |
||
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
648 |
def leave_lock_in_place(self): |
649 |
"""Tell this branch object not to release the physical lock when this |
|
650 |
object is unlocked.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
651 |
|
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
652 |
If lock_write doesn't return a token, then this method is not supported.
|
653 |
"""
|
|
654 |
self.control_files.leave_in_place() |
|
655 |
||
656 |
def dont_leave_lock_in_place(self): |
|
657 |
"""Tell this branch object to release the physical lock when this |
|
658 |
object is unlocked, even if it didn't originally acquire it.
|
|
659 |
||
660 |
If lock_write doesn't return a token, then this method is not supported.
|
|
661 |
"""
|
|
662 |
self.control_files.dont_leave_in_place() |
|
663 |
||
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
664 |
def bind(self, other): |
665 |
"""Bind the local branch the other branch. |
|
666 |
||
667 |
:param other: The branch to bind to
|
|
668 |
:type other: Branch
|
|
669 |
"""
|
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
670 |
raise errors.UpgradeRequired(self.user_url) |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
671 |
|
|
6123.9.11
by Jelmer Vernooij
Make get_append_revisions_only public. |
672 |
def get_append_revisions_only(self): |
673 |
"""Whether it is only possible to append revisions to the history. |
|
674 |
"""
|
|
|
6123.9.14
by Jelmer Vernooij
Fix RemoteBranch.get_append_revisions_only(). |
675 |
if not self._format.supports_set_append_revisions_only(): |
676 |
return False |
|
|
6372.4.1
by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks. |
677 |
return self.get_config_stack().get('append_revisions_only') |
|
6123.9.11
by Jelmer Vernooij
Make get_append_revisions_only public. |
678 |
|
|
4301.3.3
by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert. |
679 |
def set_append_revisions_only(self, enabled): |
680 |
if not self._format.supports_set_append_revisions_only(): |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
681 |
raise errors.UpgradeRequired(self.user_url) |
|
6372.4.1
by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks. |
682 |
self.get_config_stack().set('append_revisions_only', enabled) |
|
4301.3.3
by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert. |
683 |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
684 |
def set_reference_info(self, file_id, tree_path, branch_location): |
685 |
"""Set the branch location to use for a tree reference.""" |
|
686 |
raise errors.UnsupportedOperation(self.set_reference_info, self) |
|
687 |
||
688 |
def get_reference_info(self, file_id): |
|
689 |
"""Get the tree_path and branch_location for a tree reference.""" |
|
690 |
raise errors.UnsupportedOperation(self.get_reference_info, self) |
|
691 |
||
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
692 |
@needs_write_lock
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
693 |
def fetch(self, from_branch, last_revision=None, limit=None): |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
694 |
"""Copy revisions from from_branch into this branch. |
695 |
||
696 |
:param from_branch: Where to copy from.
|
|
697 |
:param last_revision: What revision to stop at (None for at the end
|
|
698 |
of the branch.
|
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
699 |
:param limit: Optional rough limit of revisions to fetch
|
|
4065.1.1
by Robert Collins
Change the return value of fetch() to None. |
700 |
:return: None
|
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
701 |
"""
|
|
5852.1.4
by Jelmer Vernooij
Pass along limit=. |
702 |
return InterBranch.get(from_branch, self).fetch(last_revision, limit=limit) |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
703 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
704 |
def get_bound_location(self): |
|
1558.7.6
by Aaron Bentley
Fixed typo (Olaf Conradi) |
705 |
"""Return the URL of the branch we are bound to. |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
706 |
|
707 |
Older format branches cannot bind, please be sure to use a metadir
|
|
708 |
branch.
|
|
709 |
"""
|
|
710 |
return None |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
711 |
|
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
712 |
def get_old_bound_location(self): |
713 |
"""Return the URL of the branch we used to be bound to |
|
714 |
"""
|
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
715 |
raise errors.UpgradeRequired(self.user_url) |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
716 |
|
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
717 |
def get_commit_builder(self, parents, config_stack=None, timestamp=None, |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
718 |
timezone=None, committer=None, revprops=None, |
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
719 |
revision_id=None, lossy=False): |
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
720 |
"""Obtain a CommitBuilder for this branch. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
721 |
|
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
722 |
:param parents: Revision ids of the parents of the new revision.
|
723 |
:param config: Optional configuration to use.
|
|
724 |
:param timestamp: Optional timestamp recorded for commit.
|
|
725 |
:param timezone: Optional timezone for timestamp.
|
|
726 |
:param committer: Optional committer to set for commit.
|
|
727 |
:param revprops: Optional dictionary of revision properties.
|
|
728 |
:param revision_id: Optional revision id.
|
|
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
729 |
:param lossy: Whether to discard data that can not be natively
|
730 |
represented, when pushing to a foreign VCS
|
|
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
731 |
"""
|
732 |
||
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
733 |
if config_stack is None: |
734 |
config_stack = self.get_config_stack() |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
735 |
|
|
6351.3.2
by Jelmer Vernooij
Convert some gpg options to config stacks. |
736 |
return self.repository.get_commit_builder(self, parents, config_stack, |
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
737 |
timestamp, timezone, committer, revprops, revision_id, |
738 |
lossy) |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
739 |
|
|
2810.2.1
by Martin Pool
merge vincent and cleanup |
740 |
def get_master_branch(self, possible_transports=None): |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
741 |
"""Return the branch we are bound to. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
742 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
743 |
:return: Either a Branch, or None
|
744 |
"""
|
|
745 |
return None |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
746 |
|
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
747 |
def get_stacked_on_url(self): |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
748 |
"""Get the URL this branch is stacked against. |
749 |
||
750 |
:raises NotStacked: If the branch is not stacked.
|
|
751 |
:raises UnstackableBranchFormat: If the branch does not support
|
|
752 |
stacking.
|
|
753 |
"""
|
|
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
754 |
raise NotImplementedError(self.get_stacked_on_url) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
755 |
|
|
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
756 |
def print_file(self, file, revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
757 |
"""Print `file` to stdout.""" |
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
758 |
raise NotImplementedError(self.print_file) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
759 |
|
|
5718.8.18
by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls. |
760 |
@needs_write_lock
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
761 |
def set_last_revision_info(self, revno, revision_id): |
|
5718.8.3
by Jelmer Vernooij
More branch restructuring. |
762 |
"""Set the last revision of this branch. |
763 |
||
764 |
The caller is responsible for checking that the revno is correct
|
|
765 |
for this revision id.
|
|
766 |
||
767 |
It may be possible to set the branch last revision to an id not
|
|
768 |
present in the repository. However, branches can also be
|
|
769 |
configured to check constraints on history, in which case this may not
|
|
770 |
be permitted.
|
|
771 |
"""
|
|
|
5883.1.1
by Jelmer Vernooij
Fix NotImplementedError contents. |
772 |
raise NotImplementedError(self.set_last_revision_info) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
773 |
|
|
4288.1.4
by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch. |
774 |
@needs_write_lock
|
|
5718.8.6
by Jelmer Vernooij
Move generate_revision_history. |
775 |
def generate_revision_history(self, revision_id, last_rev=None, |
776 |
other_branch=None): |
|
|
5718.8.18
by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls. |
777 |
"""See Branch.generate_revision_history""" |
|
5718.8.24
by Jelmer Vernooij
Implement generate_revision_history using graph. |
778 |
graph = self.repository.get_graph() |
|
6015.18.1
by Jelmer Vernooij
Fix entry in known_revnos for generate_revision_history. |
779 |
(last_revno, last_revid) = self.last_revision_info() |
|
5718.8.24
by Jelmer Vernooij
Implement generate_revision_history using graph. |
780 |
known_revision_ids = [ |
|
6015.18.1
by Jelmer Vernooij
Fix entry in known_revnos for generate_revision_history. |
781 |
(last_revid, last_revno), |
|
5718.8.24
by Jelmer Vernooij
Implement generate_revision_history using graph. |
782 |
(_mod_revision.NULL_REVISION, 0), |
783 |
]
|
|
784 |
if last_rev is not None: |
|
785 |
if not graph.is_ancestor(last_rev, revision_id): |
|
786 |
# our previous tip is not merged into stop_revision
|
|
787 |
raise errors.DivergedBranches(self, other_branch) |
|
788 |
revno = graph.find_distance_to_null(revision_id, known_revision_ids) |
|
|
5718.8.6
by Jelmer Vernooij
Move generate_revision_history. |
789 |
self.set_last_revision_info(revno, revision_id) |
790 |
||
791 |
@needs_write_lock
|
|
|
4288.1.4
by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch. |
792 |
def set_parent(self, url): |
793 |
"""See Branch.set_parent.""" |
|
794 |
# TODO: Maybe delete old location files?
|
|
795 |
# URLs should never be unicode, even on the local fs,
|
|
796 |
# FIXUP this and get_parent in a future branch format bump:
|
|
797 |
# read and rewrite the file. RBC 20060125
|
|
798 |
if url is not None: |
|
799 |
if isinstance(url, unicode): |
|
800 |
try: |
|
801 |
url = url.encode('ascii') |
|
802 |
except UnicodeEncodeError: |
|
803 |
raise errors.InvalidURL(url, |
|
804 |
"Urls must be 7-bit ascii, "
|
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
805 |
"use breezy.urlutils.escape") |
|
4288.1.4
by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch. |
806 |
url = urlutils.relative_url(self.base, url) |
807 |
self._set_parent_location(url) |
|
808 |
||
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
809 |
@needs_write_lock
|
|
3537.3.3
by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url |
810 |
def set_stacked_on_url(self, url): |
|
3221.18.1
by Ian Clatworthy
tweaks by ianc during review |
811 |
"""Set the URL this branch is stacked against. |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
812 |
|
813 |
:raises UnstackableBranchFormat: If the branch does not support
|
|
814 |
stacking.
|
|
815 |
:raises UnstackableRepositoryFormat: If the repository does not support
|
|
816 |
stacking.
|
|
817 |
"""
|
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
818 |
if not self._format.supports_stacking(): |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
819 |
raise errors.UnstackableBranchFormat(self._format, self.user_url) |
|
4509.3.30
by Martin Pool
doc |
820 |
# XXX: Changing from one fallback repository to another does not check
|
821 |
# that all the data you need is present in the new fallback.
|
|
822 |
# Possibly it should.
|
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
823 |
self._check_stackable_repo() |
824 |
if not url: |
|
825 |
try: |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
826 |
old_url = self.get_stacked_on_url() |
827 |
except (errors.NotStacked, errors.UnstackableBranchFormat, |
|
828 |
errors.UnstackableRepositoryFormat): |
|
829 |
return
|
|
830 |
self._unstack() |
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
831 |
else: |
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
832 |
self._activate_fallback_location(url, |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
833 |
possible_transports=[self.controldir.root_transport]) |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
834 |
# write this out after the repository is stacked to avoid setting a
|
835 |
# stacked config that doesn't work.
|
|
836 |
self._set_config_location('stacked_on_location', url) |
|
837 |
||
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
838 |
def _unstack(self): |
839 |
"""Change a branch to be unstacked, copying data as needed. |
|
|
5697.2.1
by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave. |
840 |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
841 |
Don't call this directly, use set_stacked_on_url(None).
|
842 |
"""
|
|
843 |
pb = ui.ui_factory.nested_progress_bar() |
|
844 |
try: |
|
|
6138.4.1
by Jonathan Riddell
add gettext to progress bar strings |
845 |
pb.update(gettext("Unstacking")) |
|
4509.3.16
by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback. |
846 |
# The basic approach here is to fetch the tip of the branch,
|
847 |
# including all available ghosts, from the existing stacked
|
|
848 |
# repository into a new repository object without the fallbacks.
|
|
849 |
#
|
|
850 |
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
|
|
851 |
# correct for CHKMap repostiories
|
|
852 |
old_repository = self.repository |
|
853 |
if len(old_repository._fallback_repositories) != 1: |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
854 |
raise AssertionError("can't cope with fallback repositories " |
|
5536.1.1
by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing. |
855 |
"of %r (fallbacks: %r)" % (old_repository, |
856 |
old_repository._fallback_repositories)) |
|
|
5325.1.3
by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches. |
857 |
# Open the new repository object.
|
858 |
# Repositories don't offer an interface to remove fallback
|
|
859 |
# repositories today; take the conceptually simpler option and just
|
|
860 |
# reopen it. We reopen it starting from the URL so that we
|
|
861 |
# get a separate connection for RemoteRepositories and can
|
|
862 |
# stream from one of them to the other. This does mean doing
|
|
863 |
# separate SSH connection setup, but unstacking is not a
|
|
864 |
# common operation so it's tolerable.
|
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
865 |
new_bzrdir = controldir.ControlDir.open( |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
866 |
self.controldir.root_transport.base) |
|
5325.1.3
by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches. |
867 |
new_repository = new_bzrdir.find_repository() |
868 |
if new_repository._fallback_repositories: |
|
869 |
raise AssertionError("didn't expect %r to have " |
|
870 |
"fallback_repositories"
|
|
871 |
% (self.repository,)) |
|
|
5325.1.4
by Andrew Bennetts
Improve comments. |
872 |
# Replace self.repository with the new repository.
|
873 |
# Do our best to transfer the lock state (i.e. lock-tokens and
|
|
|
5325.1.3
by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches. |
874 |
# lock count) of self.repository to the new repository.
|
875 |
lock_token = old_repository.lock_write().repository_token |
|
876 |
self.repository = new_repository |
|
877 |
if isinstance(self, remote.RemoteBranch): |
|
|
5325.1.4
by Andrew Bennetts
Improve comments. |
878 |
# Remote branches can have a second reference to the old
|
879 |
# repository that need to be replaced.
|
|
|
5325.1.3
by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches. |
880 |
if self._real_branch is not None: |
881 |
self._real_branch.repository = new_repository |
|
882 |
self.repository.lock_write(token=lock_token) |
|
883 |
if lock_token is not None: |
|
884 |
old_repository.leave_lock_in_place() |
|
|
4509.3.16
by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback. |
885 |
old_repository.unlock() |
|
5325.1.3
by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches. |
886 |
if lock_token is not None: |
887 |
# XXX: self.repository.leave_lock_in_place() before this
|
|
888 |
# function will not be preserved. Fortunately that doesn't
|
|
|
5325.1.4
by Andrew Bennetts
Improve comments. |
889 |
# affect the current default format (2a), and would be a
|
890 |
# corner-case anyway.
|
|
|
5325.1.3
by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches. |
891 |
# - Andrew Bennetts, 2010/06/30
|
892 |
self.repository.dont_leave_lock_in_place() |
|
893 |
old_lock_count = 0 |
|
894 |
while True: |
|
895 |
try: |
|
896 |
old_repository.unlock() |
|
897 |
except errors.LockNotHeld: |
|
898 |
break
|
|
899 |
old_lock_count += 1 |
|
900 |
if old_lock_count == 0: |
|
901 |
raise AssertionError( |
|
902 |
'old_repository should have been locked at least once.') |
|
903 |
for i in range(old_lock_count-1): |
|
904 |
self.repository.lock_write() |
|
905 |
# Fetch from the old repository into the new.
|
|
|
4509.3.16
by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback. |
906 |
old_repository.lock_read() |
907 |
try: |
|
908 |
# XXX: If you unstack a branch while it has a working tree
|
|
909 |
# with a pending merge, the pending-merged revisions will no
|
|
910 |
# longer be present. You can (probably) revert and remerge.
|
|
|
5651.5.1
by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646) |
911 |
try: |
912 |
tags_to_fetch = set(self.tags.get_reverse_tag_dict()) |
|
913 |
except errors.TagsNotSupported: |
|
914 |
tags_to_fetch = set() |
|
|
6341.1.4
by Jelmer Vernooij
Move more functionality to vf_search. |
915 |
fetch_spec = vf_search.NotInOtherForRevs(self.repository, |
|
5651.5.1
by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646) |
916 |
old_repository, required_ids=[self.last_revision()], |
917 |
if_present_ids=tags_to_fetch, find_ghosts=True).execute() |
|
918 |
self.repository.fetch(old_repository, fetch_spec=fetch_spec) |
|
|
4509.3.16
by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback. |
919 |
finally: |
920 |
old_repository.unlock() |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
921 |
finally: |
922 |
pb.finished() |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
923 |
|
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
924 |
def _set_tags_bytes(self, bytes): |
925 |
"""Mirror method for _get_tags_bytes. |
|
926 |
||
927 |
:seealso: Branch._get_tags_bytes.
|
|
928 |
"""
|
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
929 |
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked) |
930 |
op.add_cleanup(self.lock_write().unlock) |
|
931 |
return op.run_simple(bytes) |
|
|
5535.2.3
by Andrew Bennetts
Reset cached tags when mutating tags. |
932 |
|
933 |
def _set_tags_bytes_locked(self, bytes): |
|
934 |
self._tags_bytes = bytes |
|
935 |
return self._transport.put_bytes('tags', bytes) |
|
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
936 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
937 |
def _cache_revision_history(self, rev_history): |
938 |
"""Set the cached revision history to rev_history. |
|
939 |
||
940 |
The revision_history method will use this cache to avoid regenerating
|
|
941 |
the revision history.
|
|
942 |
||
943 |
This API is semi-public; it only for use by subclasses, all other code
|
|
944 |
should consider it to be private.
|
|
945 |
"""
|
|
946 |
self._revision_history_cache = rev_history |
|
947 |
||
|
2418.5.6
by John Arbash Meinel
Cache the revision_id => revno map as appropriate. |
948 |
def _cache_revision_id_to_revno(self, revision_id_to_revno): |
949 |
"""Set the cached revision_id => revno map to revision_id_to_revno. |
|
950 |
||
951 |
This API is semi-public; it only for use by subclasses, all other code
|
|
952 |
should consider it to be private.
|
|
953 |
"""
|
|
954 |
self._revision_id_to_revno_cache = revision_id_to_revno |
|
955 |
||
|
2375.1.6
by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state. |
956 |
def _clear_cached_state(self): |
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
957 |
"""Clear any cached data on this branch, e.g. cached revision history. |
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
958 |
|
959 |
This means the next call to revision_history will need to call
|
|
960 |
_gen_revision_history.
|
|
961 |
||
|
6499.2.1
by Vincent Ladeuil
Save branch config options only during the final unlock |
962 |
This API is semi-public; it is only for use by subclasses, all other
|
963 |
code should consider it to be private.
|
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
964 |
"""
|
965 |
self._revision_history_cache = None |
|
|
2418.5.6
by John Arbash Meinel
Cache the revision_id => revno map as appropriate. |
966 |
self._revision_id_to_revno_cache = None |
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
967 |
self._last_revision_info_cache = None |
|
5609.25.3
by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock. |
968 |
self._master_branch_cache = None |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
969 |
self._merge_sorted_revisions_cache = None |
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
970 |
self._partial_revision_history_cache = [] |
971 |
self._partial_revision_id_to_revno_cache = {} |
|
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
972 |
self._tags_bytes = None |
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
973 |
|
974 |
def _gen_revision_history(self): |
|
975 |
"""Return sequence of revision hashes on to this branch. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
976 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
977 |
Unlike revision_history, this method always regenerates or rereads the
|
978 |
revision history, i.e. it does not cache the result, so repeated calls
|
|
979 |
may be expensive.
|
|
980 |
||
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
981 |
Concrete subclasses should override this instead of revision_history so
|
982 |
that subclasses do not need to deal with caching logic.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
983 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
984 |
This API is semi-public; it only for use by subclasses, all other code
|
985 |
should consider it to be private.
|
|
986 |
"""
|
|
987 |
raise NotImplementedError(self._gen_revision_history) |
|
988 |
||
|
6165.4.2
by Jelmer Vernooij
Deprecate revision_history. |
989 |
def _revision_history(self): |
|
2592.3.113
by Robert Collins
Various -Devil checks in branch.py. |
990 |
if 'evil' in debug.debug_flags: |
991 |
mutter_callsite(3, "revision_history scales with history.") |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
992 |
if self._revision_history_cache is not None: |
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
993 |
history = self._revision_history_cache |
994 |
else: |
|
995 |
history = self._gen_revision_history() |
|
996 |
self._cache_revision_history(history) |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
997 |
return list(history) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
998 |
|
999 |
def revno(self): |
|
1000 |
"""Return current revision number for this branch. |
|
1001 |
||
1002 |
That is equivalent to the number of revisions committed to
|
|
1003 |
this branch.
|
|
1004 |
"""
|
|
|
3066.1.1
by John Arbash Meinel
Make the default Branch.revno() implementation just be a thunk to last_revision_info. |
1005 |
return self.last_revision_info()[0] |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1006 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1007 |
def unbind(self): |
1008 |
"""Older format branches cannot bind or unbind.""" |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
1009 |
raise errors.UpgradeRequired(self.user_url) |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1010 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1011 |
def last_revision(self): |
|
3211.2.1
by Robert Collins
* Creating a new branch no longer tries to read the entire revision-history |
1012 |
"""Return last revision id, or NULL_REVISION.""" |
1013 |
return self.last_revision_info()[1] |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1014 |
|
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
1015 |
@needs_read_lock
|
|
2249.4.1
by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow |
1016 |
def last_revision_info(self): |
1017 |
"""Return information about the last revision. |
|
1018 |
||
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
1019 |
:return: A tuple (revno, revision_id).
|
|
2249.4.1
by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow |
1020 |
"""
|
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
1021 |
if self._last_revision_info_cache is None: |
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
1022 |
self._last_revision_info_cache = self._read_last_revision_info() |
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
1023 |
return self._last_revision_info_cache |
1024 |
||
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
1025 |
def _read_last_revision_info(self): |
|
5718.8.3
by Jelmer Vernooij
More branch restructuring. |
1026 |
raise NotImplementedError(self._read_last_revision_info) |
|
2249.4.1
by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow |
1027 |
|
|
5777.7.1
by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags. |
1028 |
def import_last_revision_info_and_tags(self, source, revno, revid, |
1029 |
lossy=False): |
|
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1030 |
"""Set the last revision info, importing from another repo if necessary. |
1031 |
||
1032 |
This is used by the bound branch code to upload a revision to
|
|
1033 |
the master branch first before updating the tip of the local branch.
|
|
1034 |
Revisions referenced by source's tags are also transferred.
|
|
1035 |
||
|
5535.3.35
by Andrew Bennetts
Fix deprecation warning from some tests, correct some docstrings. |
1036 |
:param source: Source branch to optionally fetch from
|
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1037 |
:param revno: Revision number of the new tip
|
1038 |
:param revid: Revision id of the new tip
|
|
|
5777.7.1
by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags. |
1039 |
:param lossy: Whether to discard metadata that can not be
|
1040 |
natively represented
|
|
1041 |
:return: Tuple with the new revision number and revision id
|
|
1042 |
(should only be different from the arguments when lossy=True)
|
|
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1043 |
"""
|
1044 |
if not self.repository.has_same_location(source.repository): |
|
|
5741.1.8
by Jelmer Vernooij
Remove fetch_tags argument. |
1045 |
self.fetch(source, revid) |
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1046 |
self.set_last_revision_info(revno, revid) |
|
5777.7.1
by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags. |
1047 |
return (revno, revid) |
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1048 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1049 |
def revision_id_to_revno(self, revision_id): |
1050 |
"""Given a revision id, return its revno""" |
|
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
1051 |
if _mod_revision.is_null(revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1052 |
return 0 |
|
6165.4.2
by Jelmer Vernooij
Deprecate revision_history. |
1053 |
history = self._revision_history() |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1054 |
try: |
1055 |
return history.index(revision_id) + 1 |
|
1056 |
except ValueError: |
|
|
2418.5.5
by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno |
1057 |
raise errors.NoSuchRevision(self, revision_id) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1058 |
|
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
1059 |
@needs_read_lock
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1060 |
def get_rev_id(self, revno, history=None): |
1061 |
"""Find the revision id of the specified revno.""" |
|
1062 |
if revno == 0: |
|
|
2598.5.10
by Aaron Bentley
Return NULL_REVISION instead of None for the null revision |
1063 |
return _mod_revision.NULL_REVISION |
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
1064 |
last_revno, last_revid = self.last_revision_info() |
1065 |
if revno == last_revno: |
|
1066 |
return last_revid |
|
1067 |
if revno <= 0 or revno > last_revno: |
|
|
2418.5.5
by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno |
1068 |
raise errors.NoSuchRevision(self, revno) |
|
4419.2.1
by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history(). |
1069 |
distance_from_last = last_revno - revno |
1070 |
if len(self._partial_revision_history_cache) <= distance_from_last: |
|
|
4419.2.17
by Andrew Bennetts
Fix test failures in test_lookup_revision_id_by_dotted. |
1071 |
self._extend_partial_history(distance_from_last) |
1072 |
return self._partial_revision_history_cache[distance_from_last] |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1073 |
|
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
1074 |
def pull(self, source, overwrite=False, stop_revision=None, |
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
1075 |
possible_transports=None, *args, **kwargs): |
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1076 |
"""Mirror source into this branch. |
1077 |
||
1078 |
This branch is considered to be 'local', having low latency.
|
|
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
1079 |
|
1080 |
:returns: PullResult instance
|
|
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1081 |
"""
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
1082 |
return InterBranch.get(source, self).pull(overwrite=overwrite, |
1083 |
stop_revision=stop_revision, |
|
1084 |
possible_transports=possible_transports, *args, **kwargs) |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1085 |
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
1086 |
def push(self, target, overwrite=False, stop_revision=None, lossy=False, |
1087 |
*args, **kwargs): |
|
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1088 |
"""Mirror this branch into target. |
1089 |
||
1090 |
This branch is considered to be 'local', having low latency.
|
|
1091 |
"""
|
|
|
4211.1.3
by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push(). |
1092 |
return InterBranch.get(self, target).push(overwrite, stop_revision, |
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
1093 |
lossy, *args, **kwargs) |
|
4347.2.1
by Jelmer Vernooij
Move dpush onto an InterBranch object. |
1094 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1095 |
def basis_tree(self): |
|
1852.5.1
by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree. |
1096 |
"""Return `Tree` object for last revision.""" |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1097 |
return self.repository.revision_tree(self.last_revision()) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1098 |
|
1099 |
def get_parent(self): |
|
1100 |
"""Return the parent location of the branch. |
|
1101 |
||
|
4031.1.1
by Alexander Belchenko
Parent location is not used as default for push. |
1102 |
This is the default location for pull/missing. The usual
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1103 |
pattern is that the user can override it by specifying a
|
1104 |
location.
|
|
1105 |
"""
|
|
|
4078.2.1
by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch. |
1106 |
parent = self._get_parent_location() |
1107 |
if parent is None: |
|
1108 |
return parent |
|
1109 |
# This is an old-format absolute path to a local branch
|
|
1110 |
# turn it into a url
|
|
1111 |
if parent.startswith('/'): |
|
1112 |
parent = urlutils.local_path_to_url(parent.decode('utf8')) |
|
1113 |
try: |
|
1114 |
return urlutils.join(self.base[:-1], parent) |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
1115 |
except errors.InvalidURLJoin as e: |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
1116 |
raise errors.InaccessibleParent(parent, self.user_url) |
|
4078.2.1
by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch. |
1117 |
|
1118 |
def _get_parent_location(self): |
|
1119 |
raise NotImplementedError(self._get_parent_location) |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1120 |
|
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1121 |
def _set_config_location(self, name, url, config=None, |
1122 |
make_relative=False): |
|
1123 |
if config is None: |
|
|
6379.11.1
by Vincent Ladeuil
Migrate location options to config stacks. |
1124 |
config = self.get_config_stack() |
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1125 |
if url is None: |
1126 |
url = '' |
|
1127 |
elif make_relative: |
|
1128 |
url = urlutils.relative_url(self.base, url) |
|
|
6379.11.1
by Vincent Ladeuil
Migrate location options to config stacks. |
1129 |
config.set(name, url) |
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1130 |
|
1131 |
def _get_config_location(self, name, config=None): |
|
1132 |
if config is None: |
|
|
6379.11.1
by Vincent Ladeuil
Migrate location options to config stacks. |
1133 |
config = self.get_config_stack() |
1134 |
location = config.get(name) |
|
|
6385.1.6
by Vincent Ladeuil
Remove the now useless hack |
1135 |
if location == '': |
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1136 |
location = None |
1137 |
return location |
|
1138 |
||
|
4382.3.1
by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations |
1139 |
def get_child_submit_format(self): |
1140 |
"""Return the preferred format of submissions to this branch.""" |
|
|
6421.3.1
by Vincent Ladeuil
Migrate more branch options to config stacks. |
1141 |
return self.get_config_stack().get('child_submit_format') |
|
4382.3.1
by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations |
1142 |
|
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
1143 |
def get_submit_branch(self): |
1144 |
"""Return the submit location of the branch. |
|
1145 |
||
1146 |
This is the default location for bundle. The usual
|
|
1147 |
pattern is that the user can override it by specifying a
|
|
1148 |
location.
|
|
1149 |
"""
|
|
|
6421.3.1
by Vincent Ladeuil
Migrate more branch options to config stacks. |
1150 |
return self.get_config_stack().get('submit_branch') |
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
1151 |
|
1152 |
def set_submit_branch(self, location): |
|
1153 |
"""Return the submit location of the branch. |
|
1154 |
||
1155 |
This is the default location for bundle. The usual
|
|
1156 |
pattern is that the user can override it by specifying a
|
|
1157 |
location.
|
|
1158 |
"""
|
|
|
6421.3.1
by Vincent Ladeuil
Migrate more branch options to config stacks. |
1159 |
self.get_config_stack().set('submit_branch', location) |
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
1160 |
|
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1161 |
def get_public_branch(self): |
1162 |
"""Return the public location of the branch. |
|
1163 |
||
|
4031.3.1
by Frank Aspell
Fixing various typos |
1164 |
This is used by merge directives.
|
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1165 |
"""
|
1166 |
return self._get_config_location('public_branch') |
|
1167 |
||
1168 |
def set_public_branch(self, location): |
|
1169 |
"""Return the submit location of the branch. |
|
1170 |
||
1171 |
This is the default location for bundle. The usual
|
|
1172 |
pattern is that the user can override it by specifying a
|
|
1173 |
location.
|
|
1174 |
"""
|
|
1175 |
self._set_config_location('public_branch', location) |
|
1176 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1177 |
def get_push_location(self): |
|
6421.3.1
by Vincent Ladeuil
Migrate more branch options to config stacks. |
1178 |
"""Return None or the location to push this branch to.""" |
1179 |
return self.get_config_stack().get('push_location') |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1180 |
|
1181 |
def set_push_location(self, location): |
|
1182 |
"""Set a new push location for this branch.""" |
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
1183 |
raise NotImplementedError(self.set_push_location) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1184 |
|
|
4005.2.1
by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test. |
1185 |
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid): |
1186 |
"""Run the post_change_branch_tip hooks.""" |
|
1187 |
hooks = Branch.hooks['post_change_branch_tip'] |
|
1188 |
if not hooks: |
|
1189 |
return
|
|
1190 |
new_revno, new_revid = self.last_revision_info() |
|
1191 |
params = ChangeBranchTipParams( |
|
1192 |
self, old_revno, new_revno, old_revid, new_revid) |
|
1193 |
for hook in hooks: |
|
1194 |
hook(params) |
|
1195 |
||
1196 |
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid): |
|
1197 |
"""Run the pre_change_branch_tip hooks.""" |
|
1198 |
hooks = Branch.hooks['pre_change_branch_tip'] |
|
1199 |
if not hooks: |
|
1200 |
return
|
|
1201 |
old_revno, old_revid = self.last_revision_info() |
|
1202 |
params = ChangeBranchTipParams( |
|
1203 |
self, old_revno, new_revno, old_revid, new_revid) |
|
1204 |
for hook in hooks: |
|
|
4943.1.1
by Robert Collins
Do not fiddle with exceptions in the pre_change_branch_tip hook running code. |
1205 |
hook(params) |
|
4005.2.1
by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test. |
1206 |
|
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
1207 |
@needs_write_lock
|
1208 |
def update(self): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1209 |
"""Synchronise this branch with the master branch if any. |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
1210 |
|
1211 |
:return: None or the last_revision pivoted out during the update.
|
|
1212 |
"""
|
|
1213 |
return None |
|
1214 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1215 |
def check_revno(self, revno): |
1216 |
"""\ |
|
1217 |
Check whether a revno corresponds to any revision.
|
|
1218 |
Zero (the NULL revision) is considered valid.
|
|
1219 |
"""
|
|
1220 |
if revno != 0: |
|
1221 |
self.check_real_revno(revno) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1222 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1223 |
def check_real_revno(self, revno): |
1224 |
"""\ |
|
1225 |
Check whether a revno corresponds to a real revision.
|
|
1226 |
Zero (the NULL revision) is considered invalid
|
|
1227 |
"""
|
|
1228 |
if revno < 1 or revno > self.revno(): |
|
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
1229 |
raise errors.InvalidRevisionNumber(revno) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1230 |
|
1231 |
@needs_read_lock
|
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1232 |
def clone(self, to_controldir, revision_id=None, repository_policy=None): |
1233 |
"""Clone this branch into to_controldir preserving all semantic values. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1234 |
|
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1235 |
Most API users will want 'create_clone_on_transport', which creates a
|
1236 |
new bzrdir and branch on the fly.
|
|
1237 |
||
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1238 |
revision_id: if not None, the revision history in the new branch will
|
1239 |
be truncated to end with revision_id.
|
|
1240 |
"""
|
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1241 |
result = to_controldir.create_branch() |
|
4288.1.8
by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn. |
1242 |
result.lock_write() |
1243 |
try: |
|
1244 |
if repository_policy is not None: |
|
1245 |
repository_policy.configure_branch(result) |
|
1246 |
self.copy_content_into(result, revision_id=revision_id) |
|
1247 |
finally: |
|
1248 |
result.unlock() |
|
1249 |
return result |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1250 |
|
1251 |
@needs_read_lock
|
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1252 |
def sprout(self, to_controldir, revision_id=None, repository_policy=None, |
|
5536.1.1
by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing. |
1253 |
repository=None): |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1254 |
"""Create a new line of development from the branch, into to_controldir. |
|
3650.2.1
by Aaron Bentley
Fix sprout to honour cloning format |
1255 |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1256 |
to_controldir controls the branch format.
|
|
3650.2.1
by Aaron Bentley
Fix sprout to honour cloning format |
1257 |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1258 |
revision_id: if not None, the revision history in the new branch will
|
1259 |
be truncated to end with revision_id.
|
|
1260 |
"""
|
|
|
4617.3.1
by Robert Collins
Fix test_stacking tests for 2a as a default format. The change to 2a exposed some actual bugs, both in tests and bzrdir/branch code. |
1261 |
if (repository_policy is not None and |
1262 |
repository_policy.requires_stacking()): |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1263 |
to_controldir._format.require_stacking(_skip_repo=True) |
1264 |
result = to_controldir.create_branch(repository=repository) |
|
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
1265 |
result.lock_write() |
|
4288.1.8
by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn. |
1266 |
try: |
1267 |
if repository_policy is not None: |
|
1268 |
repository_policy.configure_branch(result) |
|
1269 |
self.copy_content_into(result, revision_id=revision_id) |
|
|
6015.7.1
by John Arbash Meinel
No need to open the master branch just to get its URL. |
1270 |
master_url = self.get_bound_location() |
1271 |
if master_url is None: |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1272 |
result.set_parent(self.controldir.root_transport.base) |
|
5816.6.13
by A. S. Budden
Set the parent location to the branch to which we were bound if this is a bound branch. |
1273 |
else: |
|
6015.7.1
by John Arbash Meinel
No need to open the master branch just to get its URL. |
1274 |
result.set_parent(master_url) |
|
4288.1.8
by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn. |
1275 |
finally: |
1276 |
result.unlock() |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1277 |
return result |
1278 |
||
|
2230.3.18
by Aaron Bentley
Handle history sync as a special operation |
1279 |
def _synchronize_history(self, destination, revision_id): |
|
2230.3.35
by Aaron Bentley
Add documentation for synchonize_history |
1280 |
"""Synchronize last revision and revision history between branches. |
1281 |
||
1282 |
This version is most efficient when the destination is also a
|
|
|
3834.3.1
by Andrew Bennetts
Get rid of revision_history() call during copy_content_into. |
1283 |
BzrBranch6, but works for BzrBranch5, as long as the destination's
|
1284 |
repository contains all the lefthand ancestors of the intended
|
|
1285 |
last_revision. If not, set_last_revision_info will fail.
|
|
|
2230.3.35
by Aaron Bentley
Add documentation for synchonize_history |
1286 |
|
1287 |
:param destination: The branch to copy the history into
|
|
1288 |
:param revision_id: The revision-id to truncate history at. May
|
|
1289 |
be None to copy complete history.
|
|
1290 |
"""
|
|
|
3834.3.1
by Andrew Bennetts
Get rid of revision_history() call during copy_content_into. |
1291 |
source_revno, source_revision_id = self.last_revision_info() |
1292 |
if revision_id is None: |
|
1293 |
revno, revision_id = source_revno, source_revision_id |
|
|
3650.3.3
by Aaron Bentley
fix sprout |
1294 |
else: |
|
4266.3.8
by Jelmer Vernooij
Consistently use find_distance_to_null. |
1295 |
graph = self.repository.get_graph() |
|
4266.3.1
by Jelmer Vernooij
Support cloning of branches with ghosts in the left hand side history. |
1296 |
try: |
|
4266.3.8
by Jelmer Vernooij
Consistently use find_distance_to_null. |
1297 |
revno = graph.find_distance_to_null(revision_id, |
1298 |
[(source_revision_id, source_revno)]) |
|
1299 |
except errors.GhostRevisionsHaveNoRevno: |
|
1300 |
# Default to 1, if we can't find anything else
|
|
1301 |
revno = 1 |
|
|
3834.3.1
by Andrew Bennetts
Get rid of revision_history() call during copy_content_into. |
1302 |
destination.set_last_revision_info(revno, revision_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1303 |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1304 |
def copy_content_into(self, destination, revision_id=None): |
1305 |
"""Copy the content of self into destination. |
|
1306 |
||
1307 |
revision_id: if not None, the revision history in the new branch will
|
|
1308 |
be truncated to end with revision_id.
|
|
1309 |
"""
|
|
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
1310 |
return InterBranch.get(self, destination).copy_content_into( |
1311 |
revision_id=revision_id) |
|
|
4273.1.6
by Aaron Bentley
Ensure references are rebased. |
1312 |
|
1313 |
def update_references(self, target): |
|
|
4273.1.8
by Aaron Bentley
Handle references in push, pull, merge. |
1314 |
if not getattr(self._format, 'supports_reference_locations', False): |
1315 |
return
|
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
1316 |
reference_dict = self._get_all_reference_info() |
|
4273.1.9
by Aaron Bentley
Cleanup |
1317 |
if len(reference_dict) == 0: |
1318 |
return
|
|
|
4273.1.6
by Aaron Bentley
Ensure references are rebased. |
1319 |
old_base = self.base |
1320 |
new_base = target.base |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
1321 |
target_reference_dict = target._get_all_reference_info() |
|
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
1322 |
for file_id, (tree_path, branch_location) in viewitems(reference_dict): |
|
4273.1.6
by Aaron Bentley
Ensure references are rebased. |
1323 |
branch_location = urlutils.rebase_url(branch_location, |
1324 |
old_base, new_base) |
|
|
4273.1.7
by Aaron Bentley
Make update_references do a merge. |
1325 |
target_reference_dict.setdefault( |
1326 |
file_id, (tree_path, branch_location)) |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
1327 |
target._set_all_reference_info(target_reference_dict) |
|
1185.66.1
by Aaron Bentley
Merged from mainline |
1328 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1329 |
@needs_read_lock
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1330 |
def check(self, refs): |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1331 |
"""Check consistency of the branch. |
1332 |
||
1333 |
In particular this checks that revisions given in the revision-history
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1334 |
do actually match up in the revision graph, and that they're all
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1335 |
present in the repository.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1336 |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1337 |
Callers will typically also want to check the repository.
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1338 |
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1339 |
:param refs: Calculated refs for this branch as specified by
|
1340 |
branch._get_check_refs()
|
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1341 |
:return: A BranchCheckResult.
|
1342 |
"""
|
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
1343 |
result = BranchCheckResult(self) |
|
3389.2.1
by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent. |
1344 |
last_revno, last_revision_id = self.last_revision_info() |
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1345 |
actual_revno = refs[('lefthand-distance', last_revision_id)] |
1346 |
if actual_revno != last_revno: |
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
1347 |
result.errors.append(errors.BzrCheckError( |
1348 |
'revno does not match len(mainline) %s != %s' % ( |
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1349 |
last_revno, actual_revno))) |
1350 |
# TODO: We should probably also check that self.revision_history
|
|
1351 |
# matches the repository for older branch formats.
|
|
1352 |
# If looking for the code that cross-checks repository parents against
|
|
|
6165.4.19
by Jelmer Vernooij
Avoid all iter_reverse_revision_history calls. |
1353 |
# the Graph.iter_lefthand_ancestry output, that is now a repository
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1354 |
# specific check.
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
1355 |
return result |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1356 |
|
|
6127.1.9
by Jelmer Vernooij
Add lightweight option to _get_checkout_format(). |
1357 |
def _get_checkout_format(self, lightweight=False): |
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1358 |
"""Return the most suitable metadir for a checkout of this branch. |
|
2018.5.87
by Andrew Bennetts
Make make_branch_and_tree fall back to creating a local checkout if the transport doesn't support working trees, allowing several more Remote tests to pass. |
1359 |
Weaves are used if this branch's repository uses weaves.
|
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1360 |
"""
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1361 |
format = self.repository.controldir.checkout_metadir() |
|
5582.10.3
by Jelmer Vernooij
Remove custom code for presplitout. |
1362 |
format.set_branch_format(self._format) |
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1363 |
return format |
1364 |
||
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1365 |
def create_clone_on_transport(self, to_transport, revision_id=None, |
|
5448.6.1
by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text. |
1366 |
stacked_on=None, create_prefix=False, use_existing_dir=False, |
1367 |
no_tree=None): |
|
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1368 |
"""Create a clone of this branch and its bzrdir. |
1369 |
||
1370 |
:param to_transport: The transport to clone onto.
|
|
1371 |
:param revision_id: The revision id to use as tip in the new branch.
|
|
1372 |
If None the tip is obtained from this branch.
|
|
1373 |
:param stacked_on: An optional URL to stack the clone on.
|
|
|
4294.2.1
by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport. |
1374 |
:param create_prefix: Create any missing directories leading up to
|
1375 |
to_transport.
|
|
1376 |
:param use_existing_dir: Use an existing directory if one exists.
|
|
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1377 |
"""
|
|
4044.1.2
by Robert Collins
Reinstate the TODO comment about bzrdir.clone_on_transport. |
1378 |
# XXX: Fix the bzrdir API to allow getting the branch back from the
|
1379 |
# clone call. Or something. 20090224 RBC/spiv.
|
|
|
5147.4.1
by Jelmer Vernooij
Pass branch names in more places. |
1380 |
# XXX: Should this perhaps clone colocated branches as well,
|
1381 |
# rather than just the default branch? 20100319 JRV
|
|
|
4294.2.1
by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport. |
1382 |
if revision_id is None: |
1383 |
revision_id = self.last_revision() |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1384 |
dir_to = self.controldir.clone_on_transport(to_transport, |
|
4634.105.1
by Andrew Bennetts
Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory. |
1385 |
revision_id=revision_id, stacked_on=stacked_on, |
|
5448.6.1
by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text. |
1386 |
create_prefix=create_prefix, use_existing_dir=use_existing_dir, |
|
5448.6.2
by Matthew Gordon
Tested push --no-tree ang gor it working right. |
1387 |
no_tree=no_tree) |
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1388 |
return dir_to.open_branch() |
1389 |
||
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1390 |
def create_checkout(self, to_location, revision_id=None, |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1391 |
lightweight=False, accelerator_tree=None, |
1392 |
hardlink=False): |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1393 |
"""Create a checkout of a branch. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1394 |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1395 |
:param to_location: The url to produce the checkout at
|
1396 |
:param revision_id: The revision to check out
|
|
|
1551.8.5
by Aaron Bentley
Change name to create_checkout |
1397 |
:param lightweight: If True, produce a lightweight checkout, otherwise,
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1398 |
produce a bound branch (heavyweight checkout)
|
|
3123.5.17
by Aaron Bentley
Update docs |
1399 |
:param accelerator_tree: A tree which can be used for retrieving file
|
1400 |
contents more quickly than the revision tree, i.e. a workingtree.
|
|
1401 |
The revision tree will be used for cases where accelerator_tree's
|
|
1402 |
content is different.
|
|
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1403 |
:param hardlink: If true, hard-link files from accelerator_tree,
|
1404 |
where possible.
|
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1405 |
:return: The tree of the created checkout
|
1406 |
"""
|
|
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1407 |
t = transport.get_transport(to_location) |
|
2475.3.3
by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base() |
1408 |
t.ensure_base() |
|
6127.1.9
by Jelmer Vernooij
Add lightweight option to _get_checkout_format(). |
1409 |
format = self._get_checkout_format(lightweight=lightweight) |
|
6437.10.3
by Jelmer Vernooij
Allow checkouts into empty target directories. |
1410 |
try: |
1411 |
checkout = format.initialize_on_transport(t) |
|
1412 |
except errors.AlreadyControlDirError: |
|
1413 |
# It's fine if the control directory already exists,
|
|
1414 |
# as long as there is no existing branch and working tree.
|
|
1415 |
checkout = controldir.ControlDir.open_from_transport(t) |
|
1416 |
try: |
|
1417 |
checkout.open_branch() |
|
1418 |
except errors.NotBranchError: |
|
1419 |
pass
|
|
1420 |
else: |
|
1421 |
raise errors.AlreadyControlDirError(t.base) |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1422 |
if checkout.control_transport.base == self.controldir.control_transport.base: |
|
6437.17.1
by Jelmer Vernooij
Checkouts of colocated branches are always lightweight. |
1423 |
# When checking out to the same control directory,
|
1424 |
# always create a lightweight checkout
|
|
1425 |
lightweight = True |
|
|
6437.10.3
by Jelmer Vernooij
Allow checkouts into empty target directories. |
1426 |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1427 |
if lightweight: |
|
6437.7.3
by Jelmer Vernooij
Use ControlDir.set_branch_reference. |
1428 |
from_branch = checkout.set_branch_reference(target_branch=self) |
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1429 |
else: |
|
6437.10.1
by Jelmer Vernooij
Simplify handling of checkouts in bzrlib.branch.Branch.create_checkout. |
1430 |
policy = checkout.determine_repository_policy() |
1431 |
repo = policy.acquire_repository()[0] |
|
1432 |
checkout_branch = checkout.create_branch() |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1433 |
checkout_branch.bind(self) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1434 |
# pull up to the specified revision_id to set the initial
|
|
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
1435 |
# branch tip correctly, and seed it with history.
|
1436 |
checkout_branch.pull(self, stop_revision=revision_id) |
|
|
6437.10.1
by Jelmer Vernooij
Simplify handling of checkouts in bzrlib.branch.Branch.create_checkout. |
1437 |
from_branch = None |
|
2955.5.3
by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout. |
1438 |
tree = checkout.create_workingtree(revision_id, |
|
3123.5.2
by Aaron Bentley
Allow checkout --files_from |
1439 |
from_branch=from_branch, |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1440 |
accelerator_tree=accelerator_tree, |
1441 |
hardlink=hardlink) |
|
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
1442 |
basis_tree = tree.basis_tree() |
1443 |
basis_tree.lock_read() |
|
1444 |
try: |
|
1445 |
for path, file_id in basis_tree.iter_references(): |
|
1446 |
reference_parent = self.reference_parent(file_id, path) |
|
1447 |
reference_parent.create_checkout(tree.abspath(path), |
|
1448 |
basis_tree.get_reference_revision(file_id, path), |
|
1449 |
lightweight) |
|
1450 |
finally: |
|
1451 |
basis_tree.unlock() |
|
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
1452 |
return tree |
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1453 |
|
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
1454 |
@needs_write_lock
|
1455 |
def reconcile(self, thorough=True): |
|
1456 |
"""Make sure the data stored in this branch is consistent.""" |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1457 |
from breezy.reconcile import BranchReconciler |
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
1458 |
reconciler = BranchReconciler(self, thorough=thorough) |
1459 |
reconciler.reconcile() |
|
1460 |
return reconciler |
|
1461 |
||
|
4273.1.4
by Aaron Bentley
Relative reference locations are branch-relative. |
1462 |
def reference_parent(self, file_id, path, possible_transports=None): |
|
2100.3.29
by Aaron Bentley
Get merge working initially |
1463 |
"""Return the parent branch for a tree-reference file_id |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1464 |
|
|
2100.3.29
by Aaron Bentley
Get merge working initially |
1465 |
:param file_id: The file_id of the tree reference
|
1466 |
:param path: The path of the file_id in the tree
|
|
1467 |
:return: A branch associated with the file_id
|
|
1468 |
"""
|
|
1469 |
# FIXME should provide multiple branches, based on config
|
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1470 |
return Branch.open(self.controldir.root_transport.clone(path).base, |
|
5158.6.8
by Martin Pool
Go back to opening branch using url, so it can use all possible transports |
1471 |
possible_transports=possible_transports) |
|
2100.3.23
by Aaron Bentley
Nested checkouts kinda work |
1472 |
|
|
2220.2.30
by Martin Pool
split out tag-merging code and add some tests |
1473 |
def supports_tags(self): |
1474 |
return self._format.supports_tags() |
|
1475 |
||
|
5086.4.7
by Jelmer Vernooij
Put automatic_tag_name on Branch. |
1476 |
def automatic_tag_name(self, revision_id): |
1477 |
"""Try to automatically find the tag name for a revision. |
|
1478 |
||
1479 |
:param revision_id: Revision id of the revision.
|
|
|
5086.4.8
by Jelmer Vernooij
Review comments from Ian. |
1480 |
:return: A tag name or None if no tag name could be determined.
|
|
5086.4.7
by Jelmer Vernooij
Put automatic_tag_name on Branch. |
1481 |
"""
|
1482 |
for hook in Branch.hooks['automatic_tag_name']: |
|
1483 |
ret = hook(self, revision_id) |
|
1484 |
if ret is not None: |
|
1485 |
return ret |
|
1486 |
return None |
|
1487 |
||
|
3441.5.27
by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators. |
1488 |
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph, |
1489 |
other_branch): |
|
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1490 |
"""Ensure that revision_b is a descendant of revision_a. |
1491 |
||
1492 |
This is a helper function for update_revisions.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1493 |
|
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1494 |
:raises: DivergedBranches if revision_b has diverged from revision_a.
|
1495 |
:returns: True if revision_b is a descendant of revision_a.
|
|
1496 |
"""
|
|
1497 |
relation = self._revision_relations(revision_a, revision_b, graph) |
|
1498 |
if relation == 'b_descends_from_a': |
|
1499 |
return True |
|
1500 |
elif relation == 'diverged': |
|
1501 |
raise errors.DivergedBranches(self, other_branch) |
|
1502 |
elif relation == 'a_descends_from_b': |
|
1503 |
return False |
|
1504 |
else: |
|
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
1505 |
raise AssertionError("invalid relation: %r" % (relation,)) |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1506 |
|
1507 |
def _revision_relations(self, revision_a, revision_b, graph): |
|
1508 |
"""Determine the relationship between two revisions. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1509 |
|
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1510 |
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
|
1511 |
"""
|
|
1512 |
heads = graph.heads([revision_a, revision_b]) |
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1513 |
if heads == {revision_b}: |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1514 |
return 'b_descends_from_a' |
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1515 |
elif heads == {revision_a, revision_b}: |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1516 |
# These branches have diverged
|
1517 |
return 'diverged' |
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1518 |
elif heads == {revision_a}: |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1519 |
return 'a_descends_from_b' |
1520 |
else: |
|
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
1521 |
raise AssertionError("invalid heads: %r" % (heads,)) |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1522 |
|
|
5741.1.11
by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision. |
1523 |
def heads_to_fetch(self): |
|
5672.1.1
by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it. |
1524 |
"""Return the heads that must and that should be fetched to copy this |
1525 |
branch into another repo.
|
|
1526 |
||
1527 |
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
|
|
1528 |
set of heads that must be fetched. if_present_fetch is a set of
|
|
1529 |
heads that must be fetched if present, but no error is necessary if
|
|
1530 |
they are not present.
|
|
1531 |
"""
|
|
|
6404.1.1
by Vincent Ladeuil
Migrate branch.fetch_tags |
1532 |
# For bzr native formats must_fetch is just the tip, and
|
1533 |
# if_present_fetch are the tags.
|
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1534 |
must_fetch = {self.last_revision()} |
|
6015.15.1
by John Arbash Meinel
Start working on a config entry for testing whether we should fetch tags or not. |
1535 |
if_present_fetch = set() |
|
6404.1.1
by Vincent Ladeuil
Migrate branch.fetch_tags |
1536 |
if self.get_config_stack().get('branch.fetch_tags'): |
|
6015.15.1
by John Arbash Meinel
Start working on a config entry for testing whether we should fetch tags or not. |
1537 |
try: |
1538 |
if_present_fetch = set(self.tags.get_reverse_tag_dict()) |
|
1539 |
except errors.TagsNotSupported: |
|
1540 |
pass
|
|
|
5672.1.1
by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it. |
1541 |
must_fetch.discard(_mod_revision.NULL_REVISION) |
1542 |
if_present_fetch.discard(_mod_revision.NULL_REVISION) |
|
1543 |
return must_fetch, if_present_fetch |
|
1544 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1545 |
|
|
5669.3.10
by Jelmer Vernooij
Use ControlComponentFormat. |
1546 |
class BranchFormat(controldir.ControlComponentFormat): |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1547 |
"""An encapsulation of the initialization and open routines for a format. |
1548 |
||
1549 |
Formats provide three things:
|
|
1550 |
* An initialization routine,
|
|
|
6213.1.32
by Jelmer Vernooij
Fix check support status. |
1551 |
* a format description
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1552 |
* an open routine.
|
1553 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1554 |
Formats are placed in an dict by their format string for reference
|
|
5448.2.1
by Martin
Fix some "its" vs. "it's" spelling confusion in bzrlib code... also, ahem, a name in the NEWS file |
1555 |
during branch opening. It's not required that these be instances, they
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1556 |
can be classes themselves with class methods - it simply depends on
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1557 |
whether state is needed for a given format or not.
|
1558 |
||
1559 |
Once a format is deprecated, just deprecate the initialize and open
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1560 |
methods on the format class. Do not deprecate the object, as the
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1561 |
object will be created every time regardless.
|
1562 |
"""
|
|
1563 |
||
|
2363.5.5
by Aaron Bentley
add info.describe_format |
1564 |
def __eq__(self, other): |
1565 |
return self.__class__ is other.__class__ |
|
1566 |
||
1567 |
def __ne__(self, other): |
|
1568 |
return not (self == other) |
|
1569 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1570 |
def get_reference(self, controldir, name=None): |
1571 |
"""Get the target reference of the branch in controldir. |
|
|
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
1572 |
|
1573 |
format probing must have been completed before calling
|
|
1574 |
this method - it is assumed that the format of the branch
|
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1575 |
in controldir is correct.
|
|
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
1576 |
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1577 |
:param controldir: The controldir to get the branch data from.
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
1578 |
:param name: Name of the colocated branch to fetch
|
|
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
1579 |
:return: None if the branch is not a reference branch.
|
1580 |
"""
|
|
1581 |
return None |
|
1582 |
||
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1583 |
@classmethod
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1584 |
def set_reference(self, controldir, name, to_branch): |
1585 |
"""Set the target reference of the branch in controldir. |
|
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1586 |
|
1587 |
format probing must have been completed before calling
|
|
1588 |
this method - it is assumed that the format of the branch
|
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1589 |
in controldir is correct.
|
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1590 |
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1591 |
:param controldir: The controldir to set the branch reference for.
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
1592 |
:param name: Name of colocated branch to set, None for default
|
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1593 |
:param to_branch: branch that the checkout is to reference
|
1594 |
"""
|
|
1595 |
raise NotImplementedError(self.set_reference) |
|
1596 |
||
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
1597 |
def get_format_description(self): |
1598 |
"""Return the short format description for this format.""" |
|
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
1599 |
raise NotImplementedError(self.get_format_description) |
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
1600 |
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1601 |
def _run_post_branch_init_hooks(self, controldir, name, branch): |
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1602 |
hooks = Branch.hooks['post_branch_init'] |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1603 |
if not hooks: |
1604 |
return
|
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1605 |
params = BranchInitHookParams(self, controldir, name, branch) |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1606 |
for hook in hooks: |
1607 |
hook(params) |
|
1608 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1609 |
def initialize(self, controldir, name=None, repository=None, |
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
1610 |
append_revisions_only=None): |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1611 |
"""Create a branch of this format in controldir. |
1612 |
||
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1613 |
:param name: Name of the colocated branch to create.
|
1614 |
"""
|
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1615 |
raise NotImplementedError(self.initialize) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1616 |
|
|
1534.4.7
by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same. |
1617 |
def is_supported(self): |
1618 |
"""Is this format supported? |
|
1619 |
||
1620 |
Supported formats can be initialized and opened.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1621 |
Unsupported formats may not support initialization or committing or
|
|
1534.4.7
by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same. |
1622 |
some other features depending on the reason for not being supported.
|
1623 |
"""
|
|
1624 |
return True |
|
1625 |
||
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
1626 |
def make_tags(self, branch): |
1627 |
"""Create a tags object for branch. |
|
1628 |
||
1629 |
This method is on BranchFormat, because BranchFormats are reflected
|
|
1630 |
over the wire via network_name(), whereas full Branch instances require
|
|
1631 |
multiple VFS method calls to operate at all.
|
|
1632 |
||
1633 |
The default implementation returns a disabled-tags instance.
|
|
1634 |
||
1635 |
Note that it is normal for branch to be a RemoteBranch when using tags
|
|
1636 |
on a RemoteBranch.
|
|
1637 |
"""
|
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
1638 |
return _mod_tag.DisabledTags(branch) |
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
1639 |
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1640 |
def network_name(self): |
1641 |
"""A simple byte string uniquely identifying this format for RPC calls. |
|
1642 |
||
1643 |
MetaDir branch formats use their disk format string to identify the
|
|
1644 |
repository over the wire. All in one formats such as bzr < 0.8, and
|
|
1645 |
foreign formats like svn/git and hg should use some marker which is
|
|
1646 |
unique and immutable.
|
|
1647 |
"""
|
|
1648 |
raise NotImplementedError(self.network_name) |
|
1649 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1650 |
def open(self, controldir, name=None, _found=False, ignore_fallbacks=False, |
|
6305.3.2
by Jelmer Vernooij
Only make a single connection. |
1651 |
found_repository=None, possible_transports=None): |
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1652 |
"""Return the branch object for controldir. |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1653 |
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1654 |
:param controldir: A ControlDir that contains a branch.
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1655 |
:param name: Name of colocated branch to open
|
|
4160.2.12
by Andrew Bennetts
Improve docstrings and remove a line of cruft. |
1656 |
:param _found: a private parameter, do not use it. It is used to
|
1657 |
indicate if format probing has already be done.
|
|
1658 |
:param ignore_fallbacks: when set, no fallback branches will be opened
|
|
1659 |
(if there are any). Default is to open fallbacks.
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1660 |
"""
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1661 |
raise NotImplementedError(self.open) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1662 |
|
|
4301.3.3
by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert. |
1663 |
def supports_set_append_revisions_only(self): |
1664 |
"""True if this format supports set_append_revisions_only.""" |
|
1665 |
return False |
|
1666 |
||
|
3575.2.2
by Martin Pool
branch --stacked should force a stacked format |
1667 |
def supports_stacking(self): |
1668 |
"""True if this format records a stacked-on branch.""" |
|
1669 |
return False |
|
1670 |
||
|
5674.1.1
by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat. |
1671 |
def supports_leaving_lock(self): |
1672 |
"""True if this format supports leaving locks in place.""" |
|
1673 |
return False # by default |
|
1674 |
||
|
1553.4.8
by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the |
1675 |
def __str__(self): |
|
4032.3.2
by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls. |
1676 |
return self.get_format_description().rstrip() |
|
1553.4.8
by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the |
1677 |
|
|
2220.2.10
by Martin Pool
(broken) start moving things to branches |
1678 |
def supports_tags(self): |
1679 |
"""True if this format supports tags stored in the branch""" |
|
1680 |
return False # by default |
|
1681 |
||
|
6123.4.6
by Jelmer Vernooij
Move flags to BranchFormat. |
1682 |
def tags_are_versioned(self): |
1683 |
"""Whether the tag container for this branch versions tags.""" |
|
1684 |
return False |
|
1685 |
||
1686 |
def supports_tags_referencing_ghosts(self): |
|
1687 |
"""True if tags can reference ghost revisions.""" |
|
1688 |
return True |
|
1689 |
||
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1690 |
|
|
2370.4.1
by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented |
1691 |
class BranchHooks(Hooks): |
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1692 |
"""A dictionary mapping hook name to a list of callables for branch hooks. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1693 |
|
|
6498.3.4
by Jelmer Vernooij
Remove more .set_revision_history / .revision_history references. |
1694 |
e.g. ['post_push'] Is the list of items to be called when the
|
1695 |
push function is invoked.
|
|
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1696 |
"""
|
1697 |
||
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1698 |
def __init__(self): |
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1699 |
"""Create the default hooks. |
1700 |
||
1701 |
These are all empty initially, because by default nothing should get
|
|
1702 |
notified.
|
|
1703 |
"""
|
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1704 |
Hooks.__init__(self, "breezy.branch", "Branch.hooks") |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1705 |
self.add_hook('open', |
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1706 |
"Called with the Branch object that has been opened after a "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1707 |
"branch is opened.", (1, 8)) |
1708 |
self.add_hook('post_push', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1709 |
"Called after a push operation completes. post_push is called "
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1710 |
"with a breezy.branch.BranchPushResult object and only runs in the "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1711 |
"bzr client.", (0, 15)) |
1712 |
self.add_hook('post_pull', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1713 |
"Called after a pull operation completes. post_pull is called "
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1714 |
"with a breezy.branch.PullResult object and only runs in the "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1715 |
"bzr client.", (0, 15)) |
1716 |
self.add_hook('pre_commit', |
|
|
5430.4.2
by Vincent Ladeuil
Fix typo in Branch.pre_commit HookPoint docstring. |
1717 |
"Called after a commit is calculated but before it is "
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1718 |
"completed. pre_commit is called with (local, master, old_revno, "
|
1719 |
"old_revid, future_revno, future_revid, tree_delta, future_tree"
|
|
1720 |
"). old_revid is NULL_REVISION for the first commit to a branch, "
|
|
1721 |
"tree_delta is a TreeDelta object describing changes from the "
|
|
1722 |
"basis revision. hooks MUST NOT modify this delta. "
|
|
1723 |
" future_tree is an in-memory tree obtained from "
|
|
1724 |
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1725 |
"tree.", (0,91)) |
1726 |
self.add_hook('post_commit', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1727 |
"Called in the bzr client after a commit has completed. "
|
1728 |
"post_commit is called with (local, master, old_revno, old_revid, "
|
|
1729 |
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1730 |
"commit to a branch.", (0, 15)) |
1731 |
self.add_hook('post_uncommit', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1732 |
"Called in the bzr client after an uncommit completes. "
|
1733 |
"post_uncommit is called with (local, master, old_revno, "
|
|
1734 |
"old_revid, new_revno, new_revid) where local is the local branch "
|
|
1735 |
"or None, master is the target branch, and an empty branch "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1736 |
"receives new_revno of 0, new_revid of None.", (0, 15)) |
1737 |
self.add_hook('pre_change_branch_tip', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1738 |
"Called in bzr client and server before a change to the tip of a "
|
1739 |
"branch is made. pre_change_branch_tip is called with a "
|
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1740 |
"breezy.branch.ChangeBranchTipParams. Note that push, pull, "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1741 |
"commit, uncommit will all trigger this hook.", (1, 6)) |
1742 |
self.add_hook('post_change_branch_tip', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1743 |
"Called in bzr client and server after a change to the tip of a "
|
1744 |
"branch is made. post_change_branch_tip is called with a "
|
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1745 |
"breezy.branch.ChangeBranchTipParams. Note that push, pull, "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1746 |
"commit, uncommit will all trigger this hook.", (1, 4)) |
1747 |
self.add_hook('transform_fallback_location', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1748 |
"Called when a stacked branch is activating its fallback "
|
1749 |
"locations. transform_fallback_location is called with (branch, "
|
|
1750 |
"url), and should return a new url. Returning the same url "
|
|
1751 |
"allows it to be used as-is, returning a different one can be "
|
|
1752 |
"used to cause the branch to stack on a closer copy of that "
|
|
1753 |
"fallback_location. Note that the branch cannot have history "
|
|
1754 |
"accessing methods called on it during this hook because the "
|
|
1755 |
"fallback locations have not been activated. When there are "
|
|
1756 |
"multiple hooks installed for transform_fallback_location, "
|
|
1757 |
"all are called with the url returned from the previous hook."
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1758 |
"The order is however undefined.", (1, 9)) |
1759 |
self.add_hook('automatic_tag_name', |
|
|
5050.20.1
by Alexander Belchenko
trivial doc change to provide better docs in html format (space between two sentences needed) |
1760 |
"Called to determine an automatic tag name for a revision. "
|
|
5086.4.5
by Jelmer Vernooij
Make automatic_tag_name a hook on Branch. |
1761 |
"automatic_tag_name is called with (branch, revision_id) and "
|
1762 |
"should return a tag name or None if no tag name could be "
|
|
|
5086.4.9
by Jelmer Vernooij
Update documentation. |
1763 |
"determined. The first non-None tag name returned will be used.", |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1764 |
(2, 2)) |
1765 |
self.add_hook('post_branch_init', |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1766 |
"Called after new branch initialization completes. "
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1767 |
"post_branch_init is called with a "
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1768 |
"breezy.branch.BranchInitHookParams. "
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1769 |
"Note that init, branch and checkout (both heavyweight and "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1770 |
"lightweight) will all trigger this hook.", (2, 2)) |
1771 |
self.add_hook('post_switch', |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1772 |
"Called after a checkout switches branch. "
|
1773 |
"post_switch is called with a "
|
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1774 |
"breezy.branch.SwitchHookParams.", (2, 2)) |
|
5086.4.5
by Jelmer Vernooij
Make automatic_tag_name a hook on Branch. |
1775 |
|
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1776 |
|
1777 |
||
1778 |
# install the default hooks into the Branch class.
|
|
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1779 |
Branch.hooks = BranchHooks() |
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1780 |
|
1781 |
||
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1782 |
class ChangeBranchTipParams(object): |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1783 |
"""Object holding parameters passed to `*_change_branch_tip` hooks. |
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1784 |
|
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1785 |
There are 5 fields that hooks may wish to access:
|
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1786 |
|
|
3331.1.13
by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID. |
1787 |
:ivar branch: the branch being changed
|
1788 |
:ivar old_revno: revision number before the change
|
|
1789 |
:ivar new_revno: revision number after the change
|
|
1790 |
:ivar old_revid: revision id before the change
|
|
1791 |
:ivar new_revid: revision id after the change
|
|
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1792 |
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1793 |
The revid fields are strings. The revno fields are integers.
|
1794 |
"""
|
|
1795 |
||
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1796 |
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid): |
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1797 |
"""Create a group of ChangeBranchTip parameters. |
1798 |
||
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1799 |
:param branch: The branch being changed.
|
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1800 |
:param old_revno: Revision number before the change.
|
1801 |
:param new_revno: Revision number after the change.
|
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1802 |
:param old_revid: Tip revision id before the change.
|
1803 |
:param new_revid: Tip revision id after the change.
|
|
1804 |
"""
|
|
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1805 |
self.branch = branch |
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1806 |
self.old_revno = old_revno |
1807 |
self.new_revno = new_revno |
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1808 |
self.old_revid = old_revid |
1809 |
self.new_revid = new_revid |
|
1810 |
||
|
3517.2.3
by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks. |
1811 |
def __eq__(self, other): |
1812 |
return self.__dict__ == other.__dict__ |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1813 |
|
|
3517.2.3
by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks. |
1814 |
def __repr__(self): |
1815 |
return "<%s of %s from (%s, %s) to (%s, %s)>" % ( |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1816 |
self.__class__.__name__, self.branch, |
|
3517.2.3
by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks. |
1817 |
self.old_revno, self.old_revid, self.new_revno, self.new_revid) |
1818 |
||
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1819 |
|
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1820 |
class BranchInitHookParams(object): |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1821 |
"""Object holding parameters passed to `*_branch_init` hooks. |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1822 |
|
1823 |
There are 4 fields that hooks may wish to access:
|
|
1824 |
||
1825 |
:ivar format: the branch format
|
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1826 |
:ivar bzrdir: the ControlDir where the branch will be/has been initialized
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1827 |
:ivar name: name of colocated branch, if any (or None)
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1828 |
:ivar branch: the branch created
|
1829 |
||
1830 |
Note that for lightweight checkouts, the bzrdir and format fields refer to
|
|
1831 |
the checkout, hence they are different from the corresponding fields in
|
|
1832 |
branch, which refer to the original branch.
|
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1833 |
"""
|
1834 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1835 |
def __init__(self, format, controldir, name, branch): |
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1836 |
"""Create a group of BranchInitHook parameters. |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1837 |
|
1838 |
:param format: the branch format
|
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1839 |
:param controldir: the ControlDir where the branch will be/has been
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1840 |
initialized
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1841 |
:param name: name of colocated branch, if any (or None)
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1842 |
:param branch: the branch created
|
1843 |
||
1844 |
Note that for lightweight checkouts, the bzrdir and format fields refer
|
|
1845 |
to the checkout, hence they are different from the corresponding fields
|
|
1846 |
in branch, which refer to the original branch.
|
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1847 |
"""
|
1848 |
self.format = format |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
1849 |
self.controldir = controldir |
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1850 |
self.name = name |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1851 |
self.branch = branch |
1852 |
||
1853 |
def __eq__(self, other): |
|
1854 |
return self.__dict__ == other.__dict__ |
|
1855 |
||
1856 |
def __repr__(self): |
|
|
5050.21.1
by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__. |
1857 |
return "<%s of %s>" % (self.__class__.__name__, self.branch) |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1858 |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1859 |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1860 |
class SwitchHookParams(object): |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1861 |
"""Object holding parameters passed to `*_switch` hooks. |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1862 |
|
1863 |
There are 4 fields that hooks may wish to access:
|
|
1864 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1865 |
:ivar control_dir: ControlDir of the checkout to change
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1866 |
:ivar to_branch: branch that the checkout is to reference
|
1867 |
:ivar force: skip the check for local commits in a heavy checkout
|
|
1868 |
:ivar revision_id: revision ID to switch to (or None)
|
|
1869 |
"""
|
|
1870 |
||
1871 |
def __init__(self, control_dir, to_branch, force, revision_id): |
|
1872 |
"""Create a group of SwitchHook parameters. |
|
1873 |
||
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1874 |
:param control_dir: ControlDir of the checkout to change
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1875 |
:param to_branch: branch that the checkout is to reference
|
1876 |
:param force: skip the check for local commits in a heavy checkout
|
|
1877 |
:param revision_id: revision ID to switch to (or None)
|
|
1878 |
"""
|
|
1879 |
self.control_dir = control_dir |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1880 |
self.to_branch = to_branch |
1881 |
self.force = force |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1882 |
self.revision_id = revision_id |
1883 |
||
1884 |
def __eq__(self, other): |
|
1885 |
return self.__dict__ == other.__dict__ |
|
1886 |
||
1887 |
def __repr__(self): |
|
1888 |
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__, |
|
1889 |
self.control_dir, self.to_branch, |
|
1890 |
self.revision_id) |
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1891 |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1892 |
|
|
5669.3.9
by Jelmer Vernooij
Consistent naming. |
1893 |
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry): |
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
1894 |
"""Branch format registry.""" |
1895 |
||
1896 |
def __init__(self, other_registry=None): |
|
1897 |
super(BranchFormatRegistry, self).__init__(other_registry) |
|
|
6653.1.9
by Jelmer Vernooij
Fix set_default. |
1898 |
self._default_format = None |
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1899 |
self._default_format_key = None |
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1900 |
|
1901 |
def get_default(self): |
|
|
6653.1.9
by Jelmer Vernooij
Fix set_default. |
1902 |
"""Return the current default format.""" |
1903 |
if (self._default_format_key is not None and |
|
1904 |
self._default_format is None): |
|
1905 |
self._default_format = self.get(self._default_format_key) |
|
1906 |
return self._default_format |
|
1907 |
||
1908 |
def set_default(self, format): |
|
1909 |
"""Set the default format.""" |
|
1910 |
self._default_format = format |
|
1911 |
self._default_format_key = None |
|
1912 |
||
1913 |
def set_default_key(self, format_string): |
|
1914 |
"""Set the default format by its format string.""" |
|
1915 |
self._default_format_key = format_string |
|
1916 |
self._default_format = None |
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1917 |
|
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
1918 |
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1919 |
network_format_registry = registry.FormatRegistry() |
1920 |
"""Registry of formats indexed by their network name.
|
|
1921 |
||
|
4070.2.1
by Robert Collins
Add a BzrDirFormat.network_name. |
1922 |
The network name for a branch format is an identifier that can be used when
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1923 |
referring to formats with smart server operations. See
|
1924 |
BranchFormat.network_name() for more detail.
|
|
1925 |
"""
|
|
1926 |
||
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
1927 |
format_registry = BranchFormatRegistry(network_format_registry) |
1928 |
||
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1929 |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1930 |
# formats which have no format string are not discoverable
|
1931 |
# and not independently creatable, so are not registered.
|
|
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1932 |
format_registry.register_lazy( |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1933 |
"Bazaar-NG branch format 5\n", "breezy.bzr.fullhistory", |
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1934 |
"BzrBranchFormat5") |
1935 |
format_registry.register_lazy( |
|
1936 |
"Bazaar Branch Format 6 (bzr 0.15)\n", |
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1937 |
"breezy.bzr.branch", "BzrBranchFormat6") |
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1938 |
format_registry.register_lazy( |
1939 |
"Bazaar Branch Format 7 (needs bzr 1.6)\n", |
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1940 |
"breezy.bzr.branch", "BzrBranchFormat7") |
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1941 |
format_registry.register_lazy( |
1942 |
"Bazaar Branch Format 8 (needs bzr 1.15)\n", |
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1943 |
"breezy.bzr.branch", "BzrBranchFormat8") |
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1944 |
format_registry.register_lazy( |
1945 |
"Bazaar-NG Branch Reference Format 1\n", |
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
1946 |
"breezy.bzr.branch", "BranchReferenceFormat") |
|
6653.1.1
by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch. |
1947 |
|
1948 |
format_registry.set_default_key("Bazaar Branch Format 7 (needs bzr 1.6)\n") |
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1949 |
|
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
1950 |
|
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
1951 |
class BranchWriteLockResult(LogicalLockResult): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1952 |
"""The result of write locking a branch. |
1953 |
||
1954 |
:ivar branch_token: The token obtained from the underlying branch lock, or
|
|
1955 |
None.
|
|
1956 |
:ivar unlock: A callable which will unlock the lock.
|
|
1957 |
"""
|
|
1958 |
||
1959 |
def __init__(self, unlock, branch_token): |
|
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
1960 |
LogicalLockResult.__init__(self, unlock) |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1961 |
self.branch_token = branch_token |
1962 |
||
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
1963 |
def __repr__(self): |
|
5200.3.5
by Robert Collins
Add __str__ to the new helper classes. |
1964 |
return "BranchWriteLockResult(%s, %s)" % (self.branch_token, |
1965 |
self.unlock) |
|
1966 |
||
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1967 |
|
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
1968 |
######################################################################
|
1969 |
# results of operations
|
|
1970 |
||
|
2220.2.37
by Martin Pool
Report conflicting tags from push. |
1971 |
|
1972 |
class _Result(object): |
|
1973 |
||
1974 |
def _show_tag_conficts(self, to_file): |
|
1975 |
if not getattr(self, 'tag_conflicts', None): |
|
1976 |
return
|
|
1977 |
to_file.write('Conflicting tags:\n') |
|
1978 |
for name, value1, value2 in self.tag_conflicts: |
|
1979 |
to_file.write(' %s\n' % (name, )) |
|
1980 |
||
1981 |
||
1982 |
class PullResult(_Result): |
|
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
1983 |
"""Result of a Branch.pull operation. |
1984 |
||
1985 |
:ivar old_revno: Revision number before pull.
|
|
1986 |
:ivar new_revno: Revision number after pull.
|
|
1987 |
:ivar old_revid: Tip revision id before pull.
|
|
1988 |
:ivar new_revid: Tip revision id after pull.
|
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1989 |
:ivar source_branch: Source (local) branch object. (read locked)
|
|
3482.1.1
by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result. |
1990 |
:ivar master_branch: Master branch of the target, or the target if no
|
1991 |
Master
|
|
1992 |
:ivar local_branch: target branch if there is a Master, else None
|
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1993 |
:ivar target_branch: Target/destination branch object. (write locked)
|
|
3482.1.1
by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result. |
1994 |
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
|
|
6112.4.1
by Jelmer Vernooij
Show how many tags have been updated in bzr pull. |
1995 |
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
|
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
1996 |
"""
|
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
1997 |
|
|
2220.2.39
by Martin Pool
Pull also merges tags and warns if they conflict |
1998 |
def report(self, to_file): |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
1999 |
tag_conflicts = getattr(self, "tag_conflicts", None) |
2000 |
tag_updates = getattr(self, "tag_updates", None) |
|
|
3200.1.1
by James Westby
Make pull --quiet more quiet. Fixes #185907. |
2001 |
if not is_quiet(): |
|
6112.4.1
by Jelmer Vernooij
Show how many tags have been updated in bzr pull. |
2002 |
if self.old_revid != self.new_revid: |
|
3200.1.1
by James Westby
Make pull --quiet more quiet. Fixes #185907. |
2003 |
to_file.write('Now on revision %d.\n' % self.new_revno) |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
2004 |
if tag_updates: |
2005 |
to_file.write('%d tag(s) updated.\n' % len(tag_updates)) |
|
2006 |
if self.old_revid == self.new_revid and not tag_updates: |
|
2007 |
if not tag_conflicts: |
|
|
6112.4.1
by Jelmer Vernooij
Show how many tags have been updated in bzr pull. |
2008 |
to_file.write('No revisions or tags to pull.\n') |
2009 |
else: |
|
2010 |
to_file.write('No revisions to pull.\n') |
|
|
2220.2.39
by Martin Pool
Pull also merges tags and warns if they conflict |
2011 |
self._show_tag_conficts(to_file) |
2012 |
||
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
2013 |
|
|
4053.3.1
by Jelmer Vernooij
Rename PushResult to BranchPushResult. |
2014 |
class BranchPushResult(_Result): |
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
2015 |
"""Result of a Branch.push operation. |
2016 |
||
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
2017 |
:ivar old_revno: Revision number (eg 10) of the target before push.
|
2018 |
:ivar new_revno: Revision number (eg 12) of the target after push.
|
|
2019 |
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
|
|
2020 |
before the push.
|
|
2021 |
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
|
|
2022 |
after the push.
|
|
2023 |
:ivar source_branch: Source branch object that the push was from. This is
|
|
2024 |
read locked, and generally is a local (and thus low latency) branch.
|
|
2025 |
:ivar master_branch: If target is a bound branch, the master branch of
|
|
2026 |
target, or target itself. Always write locked.
|
|
2027 |
:ivar target_branch: The direct Branch where data is being sent (write
|
|
2028 |
locked).
|
|
2029 |
:ivar local_branch: If the target is a bound branch this will be the
|
|
2030 |
target, otherwise it will be None.
|
|
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
2031 |
"""
|
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
2032 |
|
|
2220.2.37
by Martin Pool
Report conflicting tags from push. |
2033 |
def report(self, to_file): |
|
6112.4.5
by Jelmer Vernooij
Add note about bzr pull / bzr push output inconsistency. |
2034 |
# TODO: This function gets passed a to_file, but then
|
2035 |
# ignores it and calls note() instead. This is also
|
|
2036 |
# inconsistent with PullResult(), which writes to stdout.
|
|
2037 |
# -- JRV20110901, bug #838853
|
|
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
2038 |
tag_conflicts = getattr(self, "tag_conflicts", None) |
2039 |
tag_updates = getattr(self, "tag_updates", None) |
|
|
6112.4.2
by Jelmer Vernooij
Fix tag tests. |
2040 |
if not is_quiet(): |
2041 |
if self.old_revid != self.new_revid: |
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
2042 |
note(gettext('Pushed up to revision %d.') % self.new_revno) |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
2043 |
if tag_updates: |
|
6143.1.1
by Jonathan Riddell
use ngettext for plurals |
2044 |
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates)) |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
2045 |
if self.old_revid == self.new_revid and not tag_updates: |
2046 |
if not tag_conflicts: |
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
2047 |
note(gettext('No new revisions or tags to push.')) |
|
6112.4.2
by Jelmer Vernooij
Fix tag tests. |
2048 |
else: |
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
2049 |
note(gettext('No new revisions to push.')) |
|
2220.2.37
by Martin Pool
Report conflicting tags from push. |
2050 |
self._show_tag_conficts(to_file) |
2051 |
||
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
2052 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
2053 |
class BranchCheckResult(object): |
2054 |
"""Results of checking branch consistency. |
|
2055 |
||
2056 |
:see: Branch.check
|
|
2057 |
"""
|
|
2058 |
||
2059 |
def __init__(self, branch): |
|
2060 |
self.branch = branch |
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
2061 |
self.errors = [] |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
2062 |
|
2063 |
def report_results(self, verbose): |
|
2064 |
"""Report the check results via trace.note. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2065 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
2066 |
:param verbose: Requests more detailed display of what was checked,
|
2067 |
if any.
|
|
2068 |
"""
|
|
|
6147.1.1
by Jonathan Riddell
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations |
2069 |
note(gettext('checked branch {0} format {1}').format( |
2070 |
self.branch.user_url, self.branch._format)) |
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
2071 |
for error in self.errors: |
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
2072 |
note(gettext('found error:%s'), error) |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
2073 |
|
2074 |
||
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
2075 |
class InterBranch(InterObject): |
2076 |
"""This class represents operations taking place between two branches. |
|
2077 |
||
2078 |
Its instances have methods like pull() and push() and contain
|
|
2079 |
references to the source and target repositories these operations
|
|
2080 |
can be carried out on.
|
|
2081 |
"""
|
|
2082 |
||
2083 |
_optimisers = [] |
|
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
2084 |
"""The available optimised InterBranch types.""" |
2085 |
||
|
5297.2.1
by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns |
2086 |
@classmethod
|
2087 |
def _get_branch_formats_to_test(klass): |
|
2088 |
"""Return an iterable of format tuples for testing. |
|
2089 |
|
|
2090 |
:return: An iterable of (from_format, to_format) to use when testing
|
|
2091 |
this InterBranch class. Each InterBranch class should define this
|
|
2092 |
method itself.
|
|
2093 |
"""
|
|
2094 |
raise NotImplementedError(klass._get_branch_formats_to_test) |
|
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
2095 |
|
|
5297.2.2
by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one. |
2096 |
@needs_write_lock
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2097 |
def pull(self, overwrite=False, stop_revision=None, |
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
2098 |
possible_transports=None, local=False): |
|
4000.5.10
by Jelmer Vernooij
Fix comment for InterBranch.pull. |
2099 |
"""Mirror source into target branch. |
2100 |
||
2101 |
The target branch is considered to be 'local', having low latency.
|
|
2102 |
||
2103 |
:returns: PullResult instance
|
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2104 |
"""
|
2105 |
raise NotImplementedError(self.pull) |
|
2106 |
||
|
5297.2.2
by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one. |
2107 |
@needs_write_lock
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
2108 |
def push(self, overwrite=False, stop_revision=None, lossy=False, |
|
4211.1.3
by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push(). |
2109 |
_override_hook_source_branch=None): |
2110 |
"""Mirror the source branch into the target branch. |
|
2111 |
||
2112 |
The source branch is considered to be 'local', having low latency.
|
|
2113 |
"""
|
|
2114 |
raise NotImplementedError(self.push) |
|
2115 |
||
|
5358.1.1
by Jelmer Vernooij
Add stub for InterBranch.copy_content_into. |
2116 |
@needs_write_lock
|
2117 |
def copy_content_into(self, revision_id=None): |
|
2118 |
"""Copy the content of source into target |
|
2119 |
||
2120 |
revision_id: if not None, the revision history in the new branch will
|
|
2121 |
be truncated to end with revision_id.
|
|
2122 |
"""
|
|
2123 |
raise NotImplementedError(self.copy_content_into) |
|
2124 |
||
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
2125 |
@needs_write_lock
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
2126 |
def fetch(self, stop_revision=None, limit=None): |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
2127 |
"""Fetch revisions. |
2128 |
||
2129 |
:param stop_revision: Last revision to fetch
|
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
2130 |
:param limit: Optional rough limit of revisions to fetch
|
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
2131 |
"""
|
2132 |
raise NotImplementedError(self.fetch) |
|
2133 |
||
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
2134 |
|
|
6159.2.4
by Jelmer Vernooij
Add --overwrite-tags flag. |
2135 |
def _fix_overwrite_type(overwrite): |
2136 |
if isinstance(overwrite, bool): |
|
2137 |
if overwrite: |
|
2138 |
return ["history", "tags"] |
|
2139 |
else: |
|
2140 |
return [] |
|
2141 |
return overwrite |
|
2142 |
||
2143 |
||
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
2144 |
class GenericInterBranch(InterBranch): |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2145 |
"""InterBranch implementation that uses public Branch functions.""" |
2146 |
||
2147 |
@classmethod
|
|
2148 |
def is_compatible(klass, source, target): |
|
2149 |
# GenericBranch uses the public API, so always compatible
|
|
2150 |
return True |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
2151 |
|
|
5297.2.1
by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns |
2152 |
@classmethod
|
2153 |
def _get_branch_formats_to_test(klass): |
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
2154 |
return [(format_registry.get_default(), format_registry.get_default())] |
|
4000.5.3
by Jelmer Vernooij
Add tests for InterBranch. |
2155 |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2156 |
@classmethod
|
2157 |
def unwrap_format(klass, format): |
|
2158 |
if isinstance(format, remote.RemoteBranchFormat): |
|
2159 |
format._ensure_real() |
|
2160 |
return format._custom_format |
|
|
5050.53.4
by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge. |
2161 |
return format |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2162 |
|
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
2163 |
@needs_write_lock
|
2164 |
def copy_content_into(self, revision_id=None): |
|
2165 |
"""Copy the content of source into target |
|
2166 |
||
2167 |
revision_id: if not None, the revision history in the new branch will
|
|
2168 |
be truncated to end with revision_id.
|
|
2169 |
"""
|
|
2170 |
self.source.update_references(self.target) |
|
2171 |
self.source._synchronize_history(self.target, revision_id) |
|
2172 |
try: |
|
2173 |
parent = self.source.get_parent() |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
2174 |
except errors.InaccessibleParent as e: |
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
2175 |
mutter('parent was not accessible to copy: %s', e) |
2176 |
else: |
|
2177 |
if parent: |
|
2178 |
self.target.set_parent(parent) |
|
2179 |
if self.source._push_should_merge_tags(): |
|
|
5284.4.3
by Robert Collins
Fix missed self.source change in copy_content_into. |
2180 |
self.source.tags.merge_to(self.target.tags) |
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
2181 |
|
2182 |
@needs_write_lock
|
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
2183 |
def fetch(self, stop_revision=None, limit=None): |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
2184 |
if self.target.base == self.source.base: |
2185 |
return (0, []) |
|
2186 |
self.source.lock_read() |
|
2187 |
try: |
|
|
5741.1.6
by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch. |
2188 |
fetch_spec_factory = fetch.FetchSpecFactory() |
2189 |
fetch_spec_factory.source_branch = self.source |
|
2190 |
fetch_spec_factory.source_branch_stop_revision_id = stop_revision |
|
2191 |
fetch_spec_factory.source_repo = self.source.repository |
|
2192 |
fetch_spec_factory.target_repo = self.target.repository |
|
2193 |
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING |
|
|
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
2194 |
fetch_spec_factory.limit = limit |
|
5741.1.6
by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch. |
2195 |
fetch_spec = fetch_spec_factory.make_fetch_spec() |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
2196 |
return self.target.repository.fetch(self.source.repository, |
|
5741.1.4
by Jelmer Vernooij
Change Branch.fetch to take fetch_tags argument rather than fetch_spec. |
2197 |
fetch_spec=fetch_spec) |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
2198 |
finally: |
2199 |
self.source.unlock() |
|
2200 |
||
|
5809.2.1
by Jelmer Vernooij
Deprecate Branch.update_revisions. |
2201 |
@needs_write_lock
|
2202 |
def _update_revisions(self, stop_revision=None, overwrite=False, |
|
|
5809.2.4
by Jelmer Vernooij
remove unused argument. |
2203 |
graph=None): |
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
2204 |
other_revno, other_last_revision = self.source.last_revision_info() |
2205 |
stop_revno = None # unknown |
|
2206 |
if stop_revision is None: |
|
2207 |
stop_revision = other_last_revision |
|
2208 |
if _mod_revision.is_null(stop_revision): |
|
2209 |
# if there are no commits, we're done.
|
|
2210 |
return
|
|
2211 |
stop_revno = other_revno |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
2212 |
|
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
2213 |
# what's the current last revision, before we fetch [and change it
|
2214 |
# possibly]
|
|
2215 |
last_rev = _mod_revision.ensure_null(self.target.last_revision()) |
|
2216 |
# we fetch here so that we don't process data twice in the common
|
|
2217 |
# case of having something to pull, and so that the check for
|
|
2218 |
# already merged can operate on the just fetched graph, which will
|
|
2219 |
# be cached in memory.
|
|
|
5741.1.8
by Jelmer Vernooij
Remove fetch_tags argument. |
2220 |
self.fetch(stop_revision=stop_revision) |
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
2221 |
# Check to see if one is an ancestor of the other
|
2222 |
if not overwrite: |
|
2223 |
if graph is None: |
|
2224 |
graph = self.target.repository.get_graph() |
|
2225 |
if self.target._check_if_descendant_or_diverged( |
|
2226 |
stop_revision, last_rev, graph, self.source): |
|
2227 |
# stop_revision is a descendant of last_rev, but we aren't
|
|
2228 |
# overwriting, so we're done.
|
|
2229 |
return
|
|
2230 |
if stop_revno is None: |
|
2231 |
if graph is None: |
|
2232 |
graph = self.target.repository.get_graph() |
|
2233 |
this_revno, this_last_revision = \ |
|
2234 |
self.target.last_revision_info() |
|
2235 |
stop_revno = graph.find_distance_to_null(stop_revision, |
|
2236 |
[(other_last_revision, other_revno), |
|
2237 |
(this_last_revision, this_revno)]) |
|
2238 |
self.target.set_last_revision_info(stop_revno, stop_revision) |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
2239 |
|
|
5297.2.2
by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one. |
2240 |
@needs_write_lock
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2241 |
def pull(self, overwrite=False, stop_revision=None, |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2242 |
possible_transports=None, run_hooks=True, |
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
2243 |
_override_hook_target=None, local=False): |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2244 |
"""Pull from source into self, updating my master if any. |
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2245 |
|
2246 |
:param run_hooks: Private parameter - if false, this branch
|
|
2247 |
is being called because it's the master of the primary branch,
|
|
2248 |
so it should not run its hooks.
|
|
2249 |
"""
|
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2250 |
bound_location = self.target.get_bound_location() |
2251 |
if local and not bound_location: |
|
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
2252 |
raise errors.LocalRequiresBoundBranch() |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2253 |
master_branch = None |
|
5609.50.1
by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files |
2254 |
source_is_master = False |
2255 |
if bound_location: |
|
|
5609.50.2
by Vincent Ladeuil
Fix typos caught by Jonathan. |
2256 |
# bound_location comes from a config file, some care has to be
|
2257 |
# taken to relate it to source.user_url
|
|
|
5609.50.1
by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files |
2258 |
normalized = urlutils.normalize_url(bound_location) |
2259 |
try: |
|
2260 |
relpath = self.source.user_transport.relpath(normalized) |
|
2261 |
source_is_master = (relpath == '') |
|
2262 |
except (errors.PathNotChild, errors.InvalidURL): |
|
2263 |
source_is_master = False |
|
|
5582.5.1
by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update. |
2264 |
if not local and bound_location and not source_is_master: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2265 |
# not pulling from master, so we need to update master.
|
2266 |
master_branch = self.target.get_master_branch(possible_transports) |
|
2267 |
master_branch.lock_write() |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2268 |
try: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2269 |
if master_branch: |
2270 |
# pull from source into master.
|
|
2271 |
master_branch.pull(self.source, overwrite, stop_revision, |
|
2272 |
run_hooks=False) |
|
2273 |
return self._pull(overwrite, |
|
2274 |
stop_revision, _hook_master=master_branch, |
|
2275 |
run_hooks=run_hooks, |
|
|
5582.5.1
by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update. |
2276 |
_override_hook_target=_override_hook_target, |
2277 |
merge_tags_to_master=not source_is_master) |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2278 |
finally: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2279 |
if master_branch: |
2280 |
master_branch.unlock() |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2281 |
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
2282 |
def push(self, overwrite=False, stop_revision=None, lossy=False, |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2283 |
_override_hook_source_branch=None): |
2284 |
"""See InterBranch.push. |
|
2285 |
||
2286 |
This is the basic concrete implementation of push()
|
|
2287 |
||
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
2288 |
:param _override_hook_source_branch: If specified, run the hooks
|
2289 |
passing this Branch as the source, rather than self. This is for
|
|
2290 |
use of RemoteBranch, where push is delegated to the underlying
|
|
2291 |
vfs-based Branch.
|
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2292 |
"""
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
2293 |
if lossy: |
2294 |
raise errors.LossyPushToSameVCS(self.source, self.target) |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2295 |
# TODO: Public option to disable running hooks - should be trivial but
|
2296 |
# needs tests.
|
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
2297 |
|
2298 |
op = cleanup.OperationWithCleanups(self._push_with_bound_branches) |
|
2299 |
op.add_cleanup(self.source.lock_read().unlock) |
|
2300 |
op.add_cleanup(self.target.lock_write().unlock) |
|
2301 |
return op.run(overwrite, stop_revision, |
|
2302 |
_override_hook_source_branch=_override_hook_source_branch) |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2303 |
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
2304 |
def _basic_push(self, overwrite, stop_revision): |
2305 |
"""Basic implementation of push without bound branches or hooks. |
|
2306 |
||
2307 |
Must be called with source read locked and target write locked.
|
|
2308 |
"""
|
|
2309 |
result = BranchPushResult() |
|
2310 |
result.source_branch = self.source |
|
2311 |
result.target_branch = self.target |
|
2312 |
result.old_revno, result.old_revid = self.target.last_revision_info() |
|
2313 |
self.source.update_references(self.target) |
|
|
6159.2.4
by Jelmer Vernooij
Add --overwrite-tags flag. |
2314 |
overwrite = _fix_overwrite_type(overwrite) |
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
2315 |
if result.old_revid != stop_revision: |
2316 |
# We assume that during 'push' this repository is closer than
|
|
2317 |
# the target.
|
|
2318 |
graph = self.source.repository.get_graph(self.target.repository) |
|
|
6159.2.4
by Jelmer Vernooij
Add --overwrite-tags flag. |
2319 |
self._update_revisions(stop_revision, |
2320 |
overwrite=("history" in overwrite), |
|
2321 |
graph=graph) |
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
2322 |
if self.source._push_should_merge_tags(): |
|
6112.4.4
by Jelmer Vernooij
Fix long lines. |
2323 |
result.tag_updates, result.tag_conflicts = ( |
|
6159.2.4
by Jelmer Vernooij
Add --overwrite-tags flag. |
2324 |
self.source.tags.merge_to( |
2325 |
self.target.tags, "tags" in overwrite)) |
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
2326 |
result.new_revno, result.new_revid = self.target.last_revision_info() |
2327 |
return result |
|
2328 |
||
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
2329 |
def _push_with_bound_branches(self, operation, overwrite, stop_revision, |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2330 |
_override_hook_source_branch=None): |
2331 |
"""Push from source into target, and into target's master if any. |
|
2332 |
"""
|
|
2333 |
def _run_hooks(): |
|
2334 |
if _override_hook_source_branch: |
|
2335 |
result.source_branch = _override_hook_source_branch |
|
2336 |
for hook in Branch.hooks['post_push']: |
|
2337 |
hook(result) |
|
2338 |
||
2339 |
bound_location = self.target.get_bound_location() |
|
2340 |
if bound_location and self.target.base != bound_location: |
|
2341 |
# there is a master branch.
|
|
2342 |
#
|
|
2343 |
# XXX: Why the second check? Is it even supported for a branch to
|
|
2344 |
# be bound to itself? -- mbp 20070507
|
|
2345 |
master_branch = self.target.get_master_branch() |
|
2346 |
master_branch.lock_write() |
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
2347 |
operation.add_cleanup(master_branch.unlock) |
2348 |
# push into the master from the source branch.
|
|
2349 |
master_inter = InterBranch.get(self.source, master_branch) |
|
2350 |
master_inter._basic_push(overwrite, stop_revision) |
|
2351 |
# and push into the target branch from the source. Note that
|
|
2352 |
# we push from the source branch again, because it's considered
|
|
2353 |
# the highest bandwidth repository.
|
|
2354 |
result = self._basic_push(overwrite, stop_revision) |
|
2355 |
result.master_branch = master_branch |
|
2356 |
result.local_branch = self.target |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2357 |
else: |
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
2358 |
master_branch = None |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2359 |
# no master branch
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
2360 |
result = self._basic_push(overwrite, stop_revision) |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2361 |
# TODO: Why set master_branch and local_branch if there's no
|
2362 |
# binding? Maybe cleaner to just leave them unset? -- mbp
|
|
2363 |
# 20070504
|
|
2364 |
result.master_branch = self.target |
|
2365 |
result.local_branch = None |
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
2366 |
_run_hooks() |
2367 |
return result |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
2368 |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2369 |
def _pull(self, overwrite=False, stop_revision=None, |
2370 |
possible_transports=None, _hook_master=None, run_hooks=True, |
|
|
5582.5.1
by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update. |
2371 |
_override_hook_target=None, local=False, |
2372 |
merge_tags_to_master=True): |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2373 |
"""See Branch.pull. |
2374 |
||
2375 |
This function is the core worker, used by GenericInterBranch.pull to
|
|
2376 |
avoid duplication when pulling source->master and source->local.
|
|
2377 |
||
2378 |
:param _hook_master: Private parameter - set the branch to
|
|
2379 |
be supplied as the master to pull hooks.
|
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2380 |
:param run_hooks: Private parameter - if false, this branch
|
2381 |
is being called because it's the master of the primary branch,
|
|
2382 |
so it should not run its hooks.
|
|
|
5662.2.6
by Jelmer Vernooij
add more tests. |
2383 |
is being called because it's the master of the primary branch,
|
2384 |
so it should not run its hooks.
|
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2385 |
:param _override_hook_target: Private parameter - set the branch to be
|
2386 |
supplied as the target_branch to pull hooks.
|
|
2387 |
:param local: Only update the local branch, and not the bound branch.
|
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2388 |
"""
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2389 |
# This type of branch can't be bound.
|
2390 |
if local: |
|
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
2391 |
raise errors.LocalRequiresBoundBranch() |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2392 |
result = PullResult() |
2393 |
result.source_branch = self.source |
|
2394 |
if _override_hook_target is None: |
|
2395 |
result.target_branch = self.target |
|
2396 |
else: |
|
2397 |
result.target_branch = _override_hook_target |
|
2398 |
self.source.lock_read() |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2399 |
try: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2400 |
# We assume that during 'pull' the target repository is closer than
|
2401 |
# the source one.
|
|
2402 |
self.source.update_references(self.target) |
|
2403 |
graph = self.target.repository.get_graph(self.source.repository) |
|
2404 |
# TODO: Branch formats should have a flag that indicates
|
|
2405 |
# that revno's are expensive, and pull() should honor that flag.
|
|
2406 |
# -- JRV20090506
|
|
2407 |
result.old_revno, result.old_revid = \ |
|
2408 |
self.target.last_revision_info() |
|
|
6159.2.4
by Jelmer Vernooij
Add --overwrite-tags flag. |
2409 |
overwrite = _fix_overwrite_type(overwrite) |
2410 |
self._update_revisions(stop_revision, |
|
2411 |
overwrite=("history" in overwrite), |
|
|
5809.2.1
by Jelmer Vernooij
Deprecate Branch.update_revisions. |
2412 |
graph=graph) |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2413 |
# TODO: The old revid should be specified when merging tags,
|
2414 |
# so a tags implementation that versions tags can only
|
|
2415 |
# pull in the most recent changes. -- JRV20090506
|
|
|
6112.4.4
by Jelmer Vernooij
Fix long lines. |
2416 |
result.tag_updates, result.tag_conflicts = ( |
|
6159.2.4
by Jelmer Vernooij
Add --overwrite-tags flag. |
2417 |
self.source.tags.merge_to(self.target.tags, |
2418 |
"tags" in overwrite, |
|
|
6112.4.4
by Jelmer Vernooij
Fix long lines. |
2419 |
ignore_master=not merge_tags_to_master)) |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2420 |
result.new_revno, result.new_revid = self.target.last_revision_info() |
2421 |
if _hook_master: |
|
2422 |
result.master_branch = _hook_master |
|
2423 |
result.local_branch = result.target_branch |
|
2424 |
else: |
|
2425 |
result.master_branch = result.target_branch |
|
2426 |
result.local_branch = None |
|
2427 |
if run_hooks: |
|
2428 |
for hook in Branch.hooks['post_pull']: |
|
2429 |
hook(result) |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2430 |
finally: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
2431 |
self.source.unlock() |
2432 |
return result |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
2433 |
|
2434 |
||
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
2435 |
InterBranch.register_optimiser(GenericInterBranch) |