bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
5582.5.1
by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update. |
1 |
# Copyright (C) 2005-2011 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 |
|
17 |
||
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
18 |
from cStringIO import StringIO |
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
19 |
|
|
1996.3.3
by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir |
20 |
from bzrlib.lazy_import import lazy_import |
21 |
lazy_import(globals(), """ |
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
22 |
import itertools
|
|
1551.8.4
by Aaron Bentley
Tweak import style |
23 |
from bzrlib import (
|
|
1911.2.7
by John Arbash Meinel
[merge] bzr.dev 1924 |
24 |
bzrdir,
|
25 |
cache_utf8,
|
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
26 |
cleanup,
|
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
27 |
config as _mod_config,
|
|
2592.3.113
by Robert Collins
Various -Devil checks in branch.py. |
28 |
debug,
|
|
1911.2.7
by John Arbash Meinel
[merge] bzr.dev 1924 |
29 |
errors,
|
|
5535.3.45
by Andrew Bennetts
Merge fetch-all-tags-309682. |
30 |
fetch,
|
|
5535.3.28
by Andrew Bennetts
Implement fetching tags during branch pull. Needs more tests. |
31 |
graph as _mod_graph,
|
|
1911.2.7
by John Arbash Meinel
[merge] bzr.dev 1924 |
32 |
lockdir,
|
|
1996.3.3
by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir |
33 |
lockable_files,
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
34 |
remote,
|
|
3287.6.8
by Robert Collins
Reduce code duplication as per review. |
35 |
repository,
|
|
1996.3.12
by John Arbash Meinel
Change how 'revision' is imported to avoid problems later |
36 |
revision as _mod_revision,
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
37 |
rio,
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
38 |
tag as _mod_tag,
|
|
1911.2.9
by John Arbash Meinel
Fix accidental import removal |
39 |
transport,
|
|
4509.3.6
by Martin Pool
Show progress bar while unstacking |
40 |
ui,
|
|
1911.2.7
by John Arbash Meinel
[merge] bzr.dev 1924 |
41 |
urlutils,
|
|
1551.8.4
by Aaron Bentley
Tweak import style |
42 |
)
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
43 |
from bzrlib.i18n import gettext
|
|
1996.3.3
by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir |
44 |
""") |
45 |
||
|
5697.2.1
by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave. |
46 |
from bzrlib import ( |
47 |
controldir, |
|
48 |
)
|
|
49 |
from bzrlib.decorators import ( |
|
50 |
needs_read_lock, |
|
51 |
needs_write_lock, |
|
52 |
only_raises, |
|
53 |
)
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
54 |
from bzrlib.hooks import Hooks |
|
3978.3.2
by Jelmer Vernooij
Move most of push to IterGenericBranchBzrDir. |
55 |
from bzrlib.inter import InterObject |
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
56 |
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult |
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
57 |
from bzrlib import registry |
|
3407.2.11
by Martin Pool
Deprecate Branch.abspath |
58 |
from bzrlib.symbol_versioning import ( |
59 |
deprecated_in, |
|
60 |
deprecated_method, |
|
61 |
)
|
|
|
3200.1.1
by James Westby
Make pull --quiet more quiet. Fixes #185907. |
62 |
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet |
|
1104
by Martin Pool
- Add a simple UIFactory |
63 |
|
|
1094
by Martin Pool
- merge aaron's merge improvements 999..1008 |
64 |
|
|
5363.2.10
by Jelmer Vernooij
base ControlDir on ControlComponent. |
65 |
class Branch(controldir.ControlComponent): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
66 |
"""Branch holding a history of revisions. |
67 |
||
|
5158.6.2
by Martin Pool
Branch provides user_url etc |
68 |
:ivar base:
|
69 |
Base directory/url of the branch; using control_url and
|
|
70 |
control_transport is more standardized.
|
|
|
5609.25.6
by Andrew Bennetts
Docstring tweaks. |
71 |
:ivar hooks: An instance of BranchHooks.
|
72 |
:ivar _master_branch_cache: cached result of get_master_branch, see
|
|
73 |
_clear_cached_state.
|
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
74 |
"""
|
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
75 |
# this is really an instance variable - FIXME move it there
|
76 |
# - RBC 20060112
|
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
77 |
base = None |
78 |
||
|
5158.6.2
by Martin Pool
Branch provides user_url etc |
79 |
@property
|
80 |
def control_transport(self): |
|
81 |
return self._transport |
|
82 |
||
83 |
@property
|
|
84 |
def user_transport(self): |
|
85 |
return self.bzrdir.user_transport |
|
86 |
||
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
87 |
def __init__(self, *ignored, **ignored_too): |
|
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. |
88 |
self.tags = self._format.make_tags(self) |
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
89 |
self._revision_history_cache = None |
|
2418.5.6
by John Arbash Meinel
Cache the revision_id => revno map as appropriate. |
90 |
self._revision_id_to_revno_cache = None |
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
91 |
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(). |
92 |
self._partial_revision_history_cache = [] |
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
93 |
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. |
94 |
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. |
95 |
self._master_branch_cache = None |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
96 |
self._merge_sorted_revisions_cache = None |
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
97 |
self._open_hook() |
|
3681.1.1
by Robert Collins
Create a new hook Branch.open. (Robert Collins) |
98 |
hooks = Branch.hooks['open'] |
99 |
for hook in hooks: |
|
100 |
hook(self) |
|
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
101 |
|
102 |
def _open_hook(self): |
|
103 |
"""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. |
104 |
|
|
4379.2.2
by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly. |
105 |
def _activate_fallback_location(self, url): |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
106 |
"""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. |
107 |
for existing_fallback_repo in self.repository._fallback_repositories: |
108 |
if existing_fallback_repo.user_url == url: |
|
109 |
# This fallback is already configured. This probably only
|
|
110 |
# happens because BzrDir.sprout is a horrible mess. To avoid
|
|
111 |
# 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. |
112 |
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. |
113 |
return
|
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
114 |
repo = self._get_fallback_repository(url) |
|
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. |
115 |
if repo.has_same_location(self.repository): |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
116 |
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. |
117 |
self.repository.add_fallback_repository(repo) |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
118 |
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
119 |
def break_lock(self): |
120 |
"""Break a lock if one is present from another instance. |
|
121 |
||
122 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
123 |
an active process.
|
|
124 |
||
125 |
This will probe the repository for its lock as well.
|
|
126 |
"""
|
|
127 |
self.control_files.break_lock() |
|
128 |
self.repository.break_lock() |
|
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
129 |
master = self.get_master_branch() |
130 |
if master is not None: |
|
131 |
master.break_lock() |
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
132 |
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
133 |
def _check_stackable_repo(self): |
134 |
if not self.repository._format.supports_external_lookups: |
|
135 |
raise errors.UnstackableRepositoryFormat(self.repository._format, |
|
136 |
self.repository.base) |
|
137 |
||
|
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(). |
138 |
def _extend_partial_history(self, stop_index=None, stop_revision=None): |
139 |
"""Extend the partial history to include a given index |
|
140 |
||
141 |
If a stop_index is supplied, stop when that index has been reached.
|
|
142 |
If a stop_revision is supplied, stop when that revision is
|
|
143 |
encountered. Otherwise, stop when the beginning of history is
|
|
144 |
reached.
|
|
145 |
||
146 |
:param stop_index: The index which should be present. When it is
|
|
147 |
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. |
148 |
: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(). |
149 |
it is encountered, history extension will stop.
|
150 |
"""
|
|
151 |
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. |
152 |
self._partial_revision_history_cache = [self.last_revision()] |
153 |
repository._iter_for_revno( |
|
154 |
self.repository, self._partial_revision_history_cache, |
|
155 |
stop_index=stop_index, stop_revision=stop_revision) |
|
156 |
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION: |
|
157 |
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(). |
158 |
|
|
4332.3.5
by Robert Collins
Add Branch._get_check_refs. |
159 |
def _get_check_refs(self): |
160 |
"""Get the references needed for check(). |
|
161 |
||
162 |
See bzrlib.check.
|
|
163 |
"""
|
|
164 |
revid = self.last_revision() |
|
165 |
return [('revision-existence', revid), ('lefthand-distance', revid)] |
|
166 |
||
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
167 |
@staticmethod
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
168 |
def open(base, _unsupported=False, possible_transports=None): |
|
1815.1.1
by Jelmer Vernooij
Fix copy-pasted comment. |
169 |
"""Open the branch rooted at base. |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
170 |
|
|
1815.1.1
by Jelmer Vernooij
Fix copy-pasted comment. |
171 |
For instance, if the branch is at URL/.bzr/branch,
|
172 |
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. |
173 |
"""
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
174 |
control = bzrdir.BzrDir.open(base, _unsupported, |
175 |
possible_transports=possible_transports) |
|
|
5051.3.4
by Jelmer Vernooij
Support name to BzrDir.open_branch. |
176 |
return control.open_branch(unsupported=_unsupported) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
177 |
|
178 |
@staticmethod
|
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
179 |
def open_from_transport(transport, name=None, _unsupported=False): |
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
180 |
"""Open the branch rooted at transport""" |
181 |
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported) |
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
182 |
return control.open_branch(name=name, unsupported=_unsupported) |
|
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 |
"""
|
|
2485.8.37
by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp |
196 |
control, relpath = bzrdir.BzrDir.open_containing(url, |
197 |
possible_transports) |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
198 |
return control.open_branch(), relpath |
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
199 |
|
|
4032.3.5
by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch. |
200 |
def _push_should_merge_tags(self): |
201 |
"""Should _basic_push merge this branch's tags into the target? |
|
202 |
||
203 |
The default implementation returns False if this branch has no tags,
|
|
204 |
and True the rest of the time. Subclasses may override this.
|
|
205 |
"""
|
|
|
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. |
206 |
return self.supports_tags() and self.tags.get_tag_dict() |
|
4032.3.5
by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch. |
207 |
|
|
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
208 |
def get_config(self): |
|
5284.3.1
by Robert Collins
Document bzrlib.branch.Branch.get_config. |
209 |
"""Get a bzrlib.config.BranchConfig for this Branch. |
210 |
||
211 |
This can then be used to get and set configuration options for the
|
|
212 |
branch.
|
|
213 |
||
214 |
:return: A bzrlib.config.BranchConfig.
|
|
215 |
"""
|
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
216 |
return _mod_config.BranchConfig(self) |
|
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
217 |
|
|
4226.1.5
by Robert Collins
Reinstate the use of the Branch.get_config_file verb. |
218 |
def _get_config(self): |
219 |
"""Get the concrete config for just the config in this branch. |
|
220 |
||
221 |
This is not intended for client use; see Branch.get_config for the
|
|
222 |
public API.
|
|
223 |
||
224 |
Added in 1.14.
|
|
225 |
||
226 |
:return: An object supporting get_option and set_option.
|
|
227 |
"""
|
|
228 |
raise NotImplementedError(self._get_config) |
|
229 |
||
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
230 |
def _get_fallback_repository(self, url): |
231 |
"""Get the repository we fallback to at url.""" |
|
232 |
url = urlutils.join(self.base, url) |
|
|
5051.3.14
by Jelmer Vernooij
Remove use of BzrDir.open_branch() without arguments. |
233 |
a_branch = Branch.open(url, |
|
4226.1.4
by Robert Collins
Simplify code in RemoteBranch to use helpers from Branch. |
234 |
possible_transports=[self.bzrdir.root_transport]) |
|
5051.3.14
by Jelmer Vernooij
Remove use of BzrDir.open_branch() without arguments. |
235 |
return a_branch.repository |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
236 |
|
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
237 |
@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. |
238 |
def _get_tags_bytes(self): |
239 |
"""Get the bytes of a serialised tags dict. |
|
240 |
||
241 |
Note that not all branches support tags, nor do all use the same tags
|
|
242 |
logic: this method is specific to BasicTags. Other tag implementations
|
|
243 |
may use the same method name and behave differently, safely, because
|
|
244 |
of the double-dispatch via
|
|
245 |
format.make_tags->tags_instance->get_tags_dict.
|
|
246 |
||
247 |
:return: The bytes of the tags file.
|
|
248 |
:seealso: Branch._set_tags_bytes.
|
|
249 |
"""
|
|
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
250 |
if self._tags_bytes is None: |
251 |
self._tags_bytes = self._transport.get_bytes('tags') |
|
252 |
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. |
253 |
|
|
3815.3.4
by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch. |
254 |
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. |
255 |
config = self.get_config() |
|
3815.3.4
by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch. |
256 |
# explicit overrides master, but don't look for master if local is True
|
257 |
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 |
258 |
try: |
259 |
master = self.get_master_branch(possible_transports) |
|
|
5050.7.4
by Parth Malwankar
fixed recursion detection to handle shared repos |
260 |
if master and self.user_url == master.user_url: |
|
5050.7.5
by Parth Malwankar
better error message for RecursiveBind |
261 |
raise errors.RecursiveBind(self.user_url) |
|
3565.6.10
by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable |
262 |
if master is not None: |
263 |
# return the master branch value
|
|
|
3815.3.3
by Marius Kruger
apply Martin's fix for #293440 |
264 |
return master.nick |
|
5050.7.2
by Parth Malwankar
recursive binding now shows a clear error |
265 |
except errors.RecursiveBind, e: |
266 |
raise e |
|
|
3565.6.10
by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable |
267 |
except errors.BzrError, e: |
268 |
# Silently fall back to local implicit nick if the master is
|
|
269 |
# unavailable
|
|
270 |
mutter("Could not connect to bound branch, " |
|
271 |
"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. |
272 |
return config.get_nickname() |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
273 |
|
274 |
def _set_nick(self, nick): |
|
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
275 |
self.get_config().set_user_option('nickname', nick, warn_masked=True) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
276 |
|
277 |
nick = property(_get_nick, _set_nick) |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
278 |
|
279 |
def is_locked(self): |
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
280 |
raise NotImplementedError(self.is_locked) |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
281 |
|
|
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. |
282 |
def _lefthand_history(self, revision_id, last_rev=None, |
283 |
other_branch=None): |
|
284 |
if 'evil' in debug.debug_flags: |
|
285 |
mutter_callsite(4, "_lefthand_history scales with history.") |
|
286 |
# stop_revision must be a descendant of last_revision
|
|
287 |
graph = self.repository.get_graph() |
|
288 |
if last_rev is not None: |
|
289 |
if not graph.is_ancestor(last_rev, revision_id): |
|
290 |
# our previous tip is not merged into stop_revision
|
|
291 |
raise errors.DivergedBranches(self, other_branch) |
|
292 |
# make a new revision history from the graph
|
|
293 |
parents_map = graph.get_parent_map([revision_id]) |
|
294 |
if revision_id not in parents_map: |
|
295 |
raise errors.NoSuchRevision(self, revision_id) |
|
296 |
current_rev_id = revision_id |
|
297 |
new_history = [] |
|
298 |
check_not_reserved_id = _mod_revision.check_not_reserved_id |
|
299 |
# Do not include ghosts or graph origin in revision_history
|
|
300 |
while (current_rev_id in parents_map and |
|
301 |
len(parents_map[current_rev_id]) > 0): |
|
302 |
check_not_reserved_id(current_rev_id) |
|
303 |
new_history.append(current_rev_id) |
|
304 |
current_rev_id = parents_map[current_rev_id][0] |
|
305 |
parents_map = graph.get_parent_map([current_rev_id]) |
|
306 |
new_history.reverse() |
|
307 |
return new_history |
|
308 |
||
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
309 |
def lock_write(self, token=None): |
310 |
"""Lock the branch for write operations. |
|
311 |
||
312 |
:param token: A token to permit reacquiring a previously held and
|
|
313 |
preserved lock.
|
|
314 |
:return: A BranchWriteLockResult.
|
|
315 |
"""
|
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
316 |
raise NotImplementedError(self.lock_write) |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
317 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
318 |
def lock_read(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
319 |
"""Lock the branch for read operations. |
320 |
||
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
321 |
:return: A bzrlib.lock.LogicalLockResult.
|
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
322 |
"""
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
323 |
raise NotImplementedError(self.lock_read) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
324 |
|
325 |
def unlock(self): |
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
326 |
raise NotImplementedError(self.unlock) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
327 |
|
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
328 |
def peek_lock_mode(self): |
329 |
"""Return lock mode for the Branch: 'r', 'w' or None""" |
|
|
1185.70.6
by Martin Pool
review fixups from John |
330 |
raise NotImplementedError(self.peek_lock_mode) |
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
331 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
332 |
def get_physical_lock_status(self): |
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
333 |
raise NotImplementedError(self.get_physical_lock_status) |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
334 |
|
|
2418.5.12
by John Arbash Meinel
Move functions from BzrBranch to base Branch object. |
335 |
@needs_read_lock
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
336 |
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False): |
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
337 |
"""Return the revision_id for a dotted revno. |
338 |
||
339 |
:param revno: a tuple like (1,) or (1,1,2)
|
|
|
3949.2.4
by Ian Clatworthy
add top level revno cache |
340 |
:param _cache_reverse: a private parameter enabling storage
|
341 |
of the reverse mapping in a top level cache. (This should
|
|
342 |
only be done in selective circumstances as we want to
|
|
343 |
avoid having the mapping cached multiple times.)
|
|
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
344 |
:return: the revision_id
|
345 |
:raises errors.NoSuchRevision: if the revno doesn't exist
|
|
346 |
"""
|
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
347 |
rev_id = self._do_dotted_revno_to_revision_id(revno) |
348 |
if _cache_reverse: |
|
349 |
self._partial_revision_id_to_revno_cache[rev_id] = revno |
|
|
3949.2.4
by Ian Clatworthy
add top level revno cache |
350 |
return rev_id |
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
351 |
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
352 |
def _do_dotted_revno_to_revision_id(self, revno): |
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
353 |
"""Worker function for dotted_revno_to_revision_id. |
354 |
||
355 |
Subclasses should override this if they wish to
|
|
356 |
provide a more efficient implementation.
|
|
357 |
"""
|
|
358 |
if len(revno) == 1: |
|
359 |
return self.get_rev_id(revno[0]) |
|
360 |
revision_id_to_revno = self.get_revision_id_to_revno_map() |
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
361 |
revision_ids = [revision_id for revision_id, this_revno |
362 |
in revision_id_to_revno.iteritems() |
|
363 |
if revno == this_revno] |
|
364 |
if len(revision_ids) == 1: |
|
365 |
return revision_ids[0] |
|
|
3949.2.1
by Ian Clatworthy
Branch.dotted_revno_to_revision_id API |
366 |
else: |
367 |
revno_str = '.'.join(map(str, revno)) |
|
368 |
raise errors.NoSuchRevision(self, revno_str) |
|
369 |
||
370 |
@needs_read_lock
|
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
371 |
def revision_id_to_dotted_revno(self, revision_id): |
372 |
"""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. |
373 |
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
374 |
:return: a tuple like (1,) or (400,1,3).
|
375 |
"""
|
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
376 |
return self._do_revision_id_to_dotted_revno(revision_id) |
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
377 |
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
378 |
def _do_revision_id_to_dotted_revno(self, revision_id): |
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
379 |
"""Worker function for revision_id_to_revno.""" |
|
3949.2.4
by Ian Clatworthy
add top level revno cache |
380 |
# Try the caches if they are loaded
|
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
381 |
result = self._partial_revision_id_to_revno_cache.get(revision_id) |
382 |
if result is not None: |
|
383 |
return result |
|
384 |
if self._revision_id_to_revno_cache: |
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
385 |
result = self._revision_id_to_revno_cache.get(revision_id) |
|
3949.2.6
by Ian Clatworthy
review feedback from jam |
386 |
if result is None: |
387 |
raise errors.NoSuchRevision(self, revision_id) |
|
388 |
# Try the mainline as it's optimised
|
|
389 |
try: |
|
390 |
revno = self.revision_id_to_revno(revision_id) |
|
391 |
return (revno,) |
|
392 |
except errors.NoSuchRevision: |
|
393 |
# We need to load and use the full revno map after all
|
|
394 |
result = self.get_revision_id_to_revno_map().get(revision_id) |
|
395 |
if result is None: |
|
396 |
raise errors.NoSuchRevision(self, revision_id) |
|
|
3949.2.3
by Ian Clatworthy
add Branch.revision_id_to_dotted_revno() |
397 |
return result |
398 |
||
|
3949.2.7
by Ian Clatworthy
fix accidental needs_read_lock removal |
399 |
@needs_read_lock
|
|
2418.5.12
by John Arbash Meinel
Move functions from BzrBranch to base Branch object. |
400 |
def get_revision_id_to_revno_map(self): |
401 |
"""Return the revision_id => dotted revno map. |
|
402 |
||
403 |
This will be regenerated on demand, but will be cached.
|
|
404 |
||
405 |
:return: A dictionary mapping revision_id => dotted revno.
|
|
406 |
This dictionary should not be modified by the caller.
|
|
407 |
"""
|
|
408 |
if self._revision_id_to_revno_cache is not None: |
|
409 |
mapping = self._revision_id_to_revno_cache |
|
410 |
else: |
|
411 |
mapping = self._gen_revno_map() |
|
412 |
self._cache_revision_id_to_revno(mapping) |
|
413 |
# TODO: jam 20070417 Since this is being cached, should we be returning
|
|
414 |
# a copy?
|
|
415 |
# I would rather not, and instead just declare that users should not
|
|
416 |
# modify the return value.
|
|
417 |
return mapping |
|
418 |
||
419 |
def _gen_revno_map(self): |
|
420 |
"""Create a new mapping from revision ids to dotted revnos. |
|
421 |
||
422 |
Dotted revnos are generated based on the current tip in the revision
|
|
423 |
history.
|
|
424 |
This is the worker function for get_revision_id_to_revno_map, which
|
|
425 |
just caches the return value.
|
|
426 |
||
427 |
:return: A dictionary mapping revision_id => dotted revno.
|
|
428 |
"""
|
|
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
429 |
revision_id_to_revno = dict((rev_id, revno) |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
430 |
for rev_id, depth, revno, end_of_merge |
431 |
in self.iter_merge_sorted_revisions()) |
|
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
432 |
return revision_id_to_revno |
433 |
||
434 |
@needs_read_lock
|
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
435 |
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() |
436 |
stop_revision_id=None, stop_rule='exclude', direction='reverse'): |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
437 |
"""Walk the revisions for a branch in merge sorted order. |
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
438 |
|
|
3949.3.8
by Ian Clatworthy
feedback from poolie |
439 |
Merge sorted order is the output from a merge-aware,
|
440 |
topological sort, i.e. all parents come before their
|
|
441 |
children going forward; the opposite for reverse.
|
|
442 |
||
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
443 |
:param start_revision_id: the revision_id to begin walking from.
|
444 |
If None, the branch tip is used.
|
|
445 |
: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() |
446 |
after. If None, the rest of history is included.
|
447 |
:param stop_rule: if stop_revision_id is not None, the precise rule
|
|
448 |
to use for termination:
|
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
449 |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
450 |
* 'exclude' - leave the stop revision out of the result (default)
|
451 |
* 'include' - the stop revision is the last item in the result
|
|
452 |
* 'with-merges' - include the stop revision and all of its
|
|
453 |
merged revisions in the result
|
|
|
5155.1.5
by Vincent Ladeuil
Fixed as per Andrew's review. |
454 |
* 'with-merges-without-common-ancestry' - filter out revisions
|
455 |
that are in both ancestries
|
|
|
3949.3.3
by Ian Clatworthy
simplify the meaning of forward to be appropriate to this layer |
456 |
:param direction: either 'reverse' or 'forward':
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
457 |
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
458 |
* reverse means return the start_revision_id first, i.e.
|
459 |
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 |
460 |
* forward returns tuples in the opposite order to reverse.
|
461 |
Note in particular that forward does *not* do any intelligent
|
|
462 |
ordering w.r.t. depth as some clients of this API may like.
|
|
|
3949.3.8
by Ian Clatworthy
feedback from poolie |
463 |
(If required, that ought to be done at higher layers.)
|
464 |
||
465 |
:return: an iterator over (revision_id, depth, revno, end_of_merge)
|
|
466 |
tuples where:
|
|
467 |
||
468 |
* revision_id: the unique id of the revision
|
|
469 |
* depth: How many levels of merging deep this node has been
|
|
470 |
found.
|
|
471 |
* revno_sequence: This field provides a sequence of
|
|
472 |
revision numbers for all revisions. The format is:
|
|
473 |
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
|
|
474 |
branch that the revno is on. From left to right the REVNO numbers
|
|
475 |
are the sequence numbers within that branch of the revision.
|
|
476 |
* end_of_merge: When True the next node (earlier in history) is
|
|
477 |
part of a different merge.
|
|
|
3949.3.1
by Ian Clatworthy
introduce Branch.merge_sorted_revisions API |
478 |
"""
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
479 |
# Note: depth and revno values are in the context of the branch so
|
480 |
# we need the full graph to get stable numbers, regardless of the
|
|
481 |
# start_revision_id.
|
|
482 |
if self._merge_sorted_revisions_cache is None: |
|
483 |
last_revision = self.last_revision() |
|
|
4913.4.2
by Jelmer Vernooij
Add Repository.get_known_graph_ancestry. |
484 |
known_graph = self.repository.get_known_graph_ancestry( |
485 |
[last_revision]) |
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
486 |
self._merge_sorted_revisions_cache = known_graph.merge_sort( |
|
4913.4.2
by Jelmer Vernooij
Add Repository.get_known_graph_ancestry. |
487 |
last_revision) |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
488 |
filtered = self._filter_merge_sorted_revisions( |
489 |
self._merge_sorted_revisions_cache, start_revision_id, |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
490 |
stop_revision_id, stop_rule) |
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
491 |
# Make sure we don't return revisions that are not part of the
|
492 |
# start_revision_id ancestry.
|
|
|
5097.1.12
by Vincent Ladeuil
Implement the --exclude-common-ancestry log option. |
493 |
filtered = self._filter_start_non_ancestors(filtered) |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
494 |
if direction == 'reverse': |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
495 |
return filtered |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
496 |
if direction == 'forward': |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
497 |
return reversed(list(filtered)) |
|
3949.3.2
by Ian Clatworthy
feedback from jam |
498 |
else: |
499 |
raise ValueError('invalid direction %r' % direction) |
|
|
2418.5.12
by John Arbash Meinel
Move functions from BzrBranch to base Branch object. |
500 |
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
501 |
def _filter_merge_sorted_revisions(self, merge_sorted_revisions, |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
502 |
start_revision_id, stop_revision_id, stop_rule): |
|
3949.3.7
by Ian Clatworthy
drop seqnum from in-memory cache |
503 |
"""Iterate over an inclusive range of sorted revisions.""" |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
504 |
rev_iter = iter(merge_sorted_revisions) |
505 |
if start_revision_id is not None: |
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
506 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
507 |
rev_id = node.key |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
508 |
if rev_id != start_revision_id: |
509 |
continue
|
|
510 |
else: |
|
|
3936.3.30
by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature |
511 |
# The decision to include the start or not
|
512 |
# depends on the stop_rule if a stop is provided
|
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
513 |
# 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. |
514 |
rev_iter = itertools.chain(iter([node]), rev_iter) |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
515 |
break
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
516 |
if stop_revision_id is None: |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
517 |
# Yield everything
|
518 |
for node in rev_iter: |
|
|
5988.1.2
by Jelmer Vernooij
Fix log. |
519 |
rev_id = node.key |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
520 |
yield (rev_id, node.merge_depth, node.revno, |
521 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
522 |
elif stop_rule == 'exclude': |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
523 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
524 |
rev_id = node.key |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
525 |
if rev_id == stop_revision_id: |
526 |
return
|
|
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
527 |
yield (rev_id, node.merge_depth, node.revno, |
528 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
529 |
elif stop_rule == 'include': |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
530 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
531 |
rev_id = node.key |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
532 |
yield (rev_id, node.merge_depth, node.revno, |
533 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
534 |
if rev_id == stop_revision_id: |
535 |
return
|
|
|
5097.1.11
by Vincent Ladeuil
Fix bug #320119 in a crude way. |
536 |
elif stop_rule == 'with-merges-without-common-ancestry': |
537 |
# We want to exclude all revisions that are already part of the
|
|
538 |
# stop_revision_id ancestry.
|
|
539 |
graph = self.repository.get_graph() |
|
|
5155.1.3
by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once. |
540 |
ancestors = graph.find_unique_ancestors(start_revision_id, |
541 |
[stop_revision_id]) |
|
|
5097.1.11
by Vincent Ladeuil
Fix bug #320119 in a crude way. |
542 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
543 |
rev_id = node.key |
|
5155.1.3
by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once. |
544 |
if rev_id not in ancestors: |
|
5097.1.11
by Vincent Ladeuil
Fix bug #320119 in a crude way. |
545 |
continue
|
546 |
yield (rev_id, node.merge_depth, node.revno, |
|
547 |
node.end_of_merge) |
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
548 |
elif stop_rule == 'with-merges': |
|
3960.3.4
by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth |
549 |
stop_rev = self.repository.get_revision(stop_revision_id) |
550 |
if stop_rev.parent_ids: |
|
|
4511.3.15
by Marius Kruger
mainline_stop_rev -> left_parent |
551 |
left_parent = stop_rev.parent_ids[0] |
|
3960.3.4
by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth |
552 |
else: |
|
4511.3.15
by Marius Kruger
mainline_stop_rev -> left_parent |
553 |
left_parent = _mod_revision.NULL_REVISION |
554 |
# left_parent is the actual revision we want to stop logging at,
|
|
555 |
# 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. |
556 |
reached_stop_revision_id = False |
|
4511.3.12
by Marius Kruger
ununinvert logic and improve some variable names. |
557 |
revision_id_whitelist = [] |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
558 |
for node in rev_iter: |
|
5988.1.2
by Jelmer Vernooij
Fix log. |
559 |
rev_id = node.key |
|
4511.3.15
by Marius Kruger
mainline_stop_rev -> left_parent |
560 |
if rev_id == left_parent: |
561 |
# reached the left parent after the stop_revision
|
|
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
562 |
return
|
|
4511.3.12
by Marius Kruger
ununinvert logic and improve some variable names. |
563 |
if (not reached_stop_revision_id or |
564 |
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. |
565 |
yield (rev_id, node.merge_depth, node.revno, |
|
4593.5.34
by John Arbash Meinel
Change the KnownGraph.merge_sort api. |
566 |
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. |
567 |
if reached_stop_revision_id or rev_id == stop_revision_id: |
568 |
# only do the merged revs of rev_id from now on
|
|
569 |
rev = self.repository.get_revision(rev_id) |
|
570 |
if rev.parent_ids: |
|
571 |
reached_stop_revision_id = True |
|
|
4511.3.12
by Marius Kruger
ununinvert logic and improve some variable names. |
572 |
revision_id_whitelist.extend(rev.parent_ids) |
|
3960.3.1
by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions() |
573 |
else: |
574 |
raise ValueError('invalid stop_rule %r' % stop_rule) |
|
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
575 |
|
|
5097.1.12
by Vincent Ladeuil
Implement the --exclude-common-ancestry log option. |
576 |
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 |
577 |
# If we started from a dotted revno, we want to consider it as a tip
|
578 |
# and don't want to yield revisions that are not part of its
|
|
579 |
# ancestry. Given the order guaranteed by the merge sort, we will see
|
|
580 |
# uninteresting descendants of the first parent of our tip before the
|
|
581 |
# tip itself.
|
|
582 |
first = rev_iter.next() |
|
583 |
(rev_id, merge_depth, revno, end_of_merge) = first |
|
584 |
yield first |
|
585 |
if not merge_depth: |
|
586 |
# We start at a mainline revision so by definition, all others
|
|
587 |
# revisions in rev_iter are ancestors
|
|
588 |
for node in rev_iter: |
|
589 |
yield node |
|
590 |
||
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
591 |
clean = False |
|
5097.2.1
by Vincent Ladeuil
Fix bug #474807 but performance suffers. |
592 |
whitelist = set() |
|
5097.2.3
by Vincent Ladeuil
Better performance than before the fix. |
593 |
pmap = self.repository.get_parent_map([rev_id]) |
594 |
parents = pmap.get(rev_id, []) |
|
595 |
if parents: |
|
596 |
whitelist.update(parents) |
|
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
597 |
else: |
|
5097.1.8
by Vincent Ladeuil
Remove the comment about the missing test (it's not worth it at the |
598 |
# If there is no parents, there is nothing of interest left
|
599 |
||
600 |
# FIXME: It's hard to test this scenario here as this code is never
|
|
601 |
# called in that case. -- vila 20100322
|
|
602 |
return
|
|
603 |
||
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
604 |
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter: |
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
605 |
if not clean: |
606 |
if rev_id in whitelist: |
|
|
5097.2.3
by Vincent Ladeuil
Better performance than before the fix. |
607 |
pmap = self.repository.get_parent_map([rev_id]) |
608 |
parents = pmap.get(rev_id, []) |
|
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
609 |
whitelist.remove(rev_id) |
|
5097.2.3
by Vincent Ladeuil
Better performance than before the fix. |
610 |
whitelist.update(parents) |
|
5097.2.2
by Vincent Ladeuil
Fix performance. |
611 |
if merge_depth == 0: |
612 |
# We've reached the mainline, there is nothing left to
|
|
613 |
# filter
|
|
614 |
clean = True |
|
615 |
else: |
|
616 |
# A revision that is not part of the ancestry of our
|
|
617 |
# starting revision.
|
|
618 |
continue
|
|
|
5097.1.5
by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an |
619 |
yield (rev_id, merge_depth, revno, end_of_merge) |
620 |
||
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
621 |
def leave_lock_in_place(self): |
622 |
"""Tell this branch object not to release the physical lock when this |
|
623 |
object is unlocked.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
624 |
|
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
625 |
If lock_write doesn't return a token, then this method is not supported.
|
626 |
"""
|
|
627 |
self.control_files.leave_in_place() |
|
628 |
||
629 |
def dont_leave_lock_in_place(self): |
|
630 |
"""Tell this branch object to release the physical lock when this |
|
631 |
object is unlocked, even if it didn't originally acquire it.
|
|
632 |
||
633 |
If lock_write doesn't return a token, then this method is not supported.
|
|
634 |
"""
|
|
635 |
self.control_files.dont_leave_in_place() |
|
636 |
||
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
637 |
def bind(self, other): |
638 |
"""Bind the local branch the other branch. |
|
639 |
||
640 |
:param other: The branch to bind to
|
|
641 |
:type other: Branch
|
|
642 |
"""
|
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
643 |
raise errors.UpgradeRequired(self.user_url) |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
644 |
|
|
6123.9.11
by Jelmer Vernooij
Make get_append_revisions_only public. |
645 |
def get_append_revisions_only(self): |
646 |
"""Whether it is only possible to append revisions to the history. |
|
647 |
"""
|
|
|
6123.9.14
by Jelmer Vernooij
Fix RemoteBranch.get_append_revisions_only(). |
648 |
if not self._format.supports_set_append_revisions_only(): |
649 |
return False |
|
650 |
return self.get_config( |
|
651 |
).get_user_option_as_bool('append_revisions_only') |
|
|
6123.9.11
by Jelmer Vernooij
Make get_append_revisions_only public. |
652 |
|
|
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. |
653 |
def set_append_revisions_only(self, enabled): |
654 |
if not self._format.supports_set_append_revisions_only(): |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
655 |
raise errors.UpgradeRequired(self.user_url) |
|
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. |
656 |
if enabled: |
657 |
value = 'True' |
|
658 |
else: |
|
659 |
value = 'False' |
|
660 |
self.get_config().set_user_option('append_revisions_only', value, |
|
661 |
warn_masked=True) |
|
662 |
||
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
663 |
def set_reference_info(self, file_id, tree_path, branch_location): |
664 |
"""Set the branch location to use for a tree reference.""" |
|
665 |
raise errors.UnsupportedOperation(self.set_reference_info, self) |
|
666 |
||
667 |
def get_reference_info(self, file_id): |
|
668 |
"""Get the tree_path and branch_location for a tree reference.""" |
|
669 |
raise errors.UnsupportedOperation(self.get_reference_info, self) |
|
670 |
||
|
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. |
671 |
@needs_write_lock
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
672 |
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. |
673 |
"""Copy revisions from from_branch into this branch. |
674 |
||
675 |
:param from_branch: Where to copy from.
|
|
676 |
:param last_revision: What revision to stop at (None for at the end
|
|
677 |
of the branch.
|
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
678 |
:param limit: Optional rough limit of revisions to fetch
|
|
4065.1.1
by Robert Collins
Change the return value of fetch() to None. |
679 |
: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. |
680 |
"""
|
|
5852.1.4
by Jelmer Vernooij
Pass along limit=. |
681 |
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. |
682 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
683 |
def get_bound_location(self): |
|
1558.7.6
by Aaron Bentley
Fixed typo (Olaf Conradi) |
684 |
"""Return the URL of the branch we are bound to. |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
685 |
|
686 |
Older format branches cannot bind, please be sure to use a metadir
|
|
687 |
branch.
|
|
688 |
"""
|
|
689 |
return None |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
690 |
|
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
691 |
def get_old_bound_location(self): |
692 |
"""Return the URL of the branch we used to be bound to |
|
693 |
"""
|
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
694 |
raise errors.UpgradeRequired(self.user_url) |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
695 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
696 |
def get_commit_builder(self, parents, config=None, timestamp=None, |
697 |
timezone=None, committer=None, revprops=None, |
|
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
698 |
revision_id=None, lossy=False): |
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
699 |
"""Obtain a CommitBuilder for this branch. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
700 |
|
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
701 |
:param parents: Revision ids of the parents of the new revision.
|
702 |
:param config: Optional configuration to use.
|
|
703 |
:param timestamp: Optional timestamp recorded for commit.
|
|
704 |
:param timezone: Optional timezone for timestamp.
|
|
705 |
:param committer: Optional committer to set for commit.
|
|
706 |
:param revprops: Optional dictionary of revision properties.
|
|
707 |
:param revision_id: Optional revision id.
|
|
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
708 |
:param lossy: Whether to discard data that can not be natively
|
709 |
represented, when pushing to a foreign VCS
|
|
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
710 |
"""
|
711 |
||
712 |
if config is None: |
|
|
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
713 |
config = self.get_config() |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
714 |
|
|
2246.1.3
by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These |
715 |
return self.repository.get_commit_builder(self, parents, config, |
|
5777.6.1
by Jelmer Vernooij
Add --lossy option to 'bzr commit'. |
716 |
timestamp, timezone, committer, revprops, revision_id, |
717 |
lossy) |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
718 |
|
|
2810.2.1
by Martin Pool
merge vincent and cleanup |
719 |
def get_master_branch(self, possible_transports=None): |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
720 |
"""Return the branch we are bound to. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
721 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
722 |
:return: Either a Branch, or None
|
723 |
"""
|
|
724 |
return None |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
725 |
|
|
1770.3.2
by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic. |
726 |
def get_revision_delta(self, revno): |
727 |
"""Return the delta for one revision. |
|
728 |
||
729 |
The delta is relative to its mainline predecessor, or the
|
|
730 |
empty tree for revision 1.
|
|
731 |
"""
|
|
732 |
rh = self.revision_history() |
|
733 |
if not (1 <= revno <= len(rh)): |
|
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
734 |
raise errors.InvalidRevisionNumber(revno) |
|
1770.3.2
by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic. |
735 |
return self.repository.get_revision_delta(rh[revno-1]) |
736 |
||
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
737 |
def get_stacked_on_url(self): |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
738 |
"""Get the URL this branch is stacked against. |
739 |
||
740 |
:raises NotStacked: If the branch is not stacked.
|
|
741 |
:raises UnstackableBranchFormat: If the branch does not support
|
|
742 |
stacking.
|
|
743 |
"""
|
|
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
744 |
raise NotImplementedError(self.get_stacked_on_url) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
745 |
|
|
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
746 |
def print_file(self, file, revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
747 |
"""Print `file` to stdout.""" |
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
748 |
raise NotImplementedError(self.print_file) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
749 |
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
750 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
751 |
def set_revision_history(self, rev_history): |
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
752 |
"""See Branch.set_revision_history.""" |
|
5718.8.18
by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls. |
753 |
self._set_revision_history(rev_history) |
754 |
||
755 |
@needs_write_lock
|
|
756 |
def _set_revision_history(self, rev_history): |
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
757 |
if len(rev_history) == 0: |
758 |
revid = _mod_revision.NULL_REVISION |
|
759 |
else: |
|
760 |
revid = rev_history[-1] |
|
|
5718.8.15
by Jelmer Vernooij
Check left hand history in Branch.set_revision_history. |
761 |
if rev_history != self._lefthand_history(revid): |
762 |
raise errors.NotLefthandHistory(rev_history) |
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
763 |
self.set_last_revision_info(len(rev_history), revid) |
764 |
self._cache_revision_history(rev_history) |
|
|
5718.8.18
by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls. |
765 |
for hook in Branch.hooks['set_rh']: |
766 |
hook(self, rev_history) |
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
767 |
|
768 |
@needs_write_lock
|
|
769 |
def set_last_revision_info(self, revno, revision_id): |
|
|
5718.8.3
by Jelmer Vernooij
More branch restructuring. |
770 |
"""Set the last revision of this branch. |
771 |
||
772 |
The caller is responsible for checking that the revno is correct
|
|
773 |
for this revision id.
|
|
774 |
||
775 |
It may be possible to set the branch last revision to an id not
|
|
776 |
present in the repository. However, branches can also be
|
|
777 |
configured to check constraints on history, in which case this may not
|
|
778 |
be permitted.
|
|
779 |
"""
|
|
|
5883.1.1
by Jelmer Vernooij
Fix NotImplementedError contents. |
780 |
raise NotImplementedError(self.set_last_revision_info) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
781 |
|
|
4288.1.4
by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch. |
782 |
@needs_write_lock
|
|
5718.8.6
by Jelmer Vernooij
Move generate_revision_history. |
783 |
def generate_revision_history(self, revision_id, last_rev=None, |
784 |
other_branch=None): |
|
|
5718.8.18
by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls. |
785 |
"""See Branch.generate_revision_history""" |
|
5718.8.24
by Jelmer Vernooij
Implement generate_revision_history using graph. |
786 |
graph = self.repository.get_graph() |
|
6015.18.1
by Jelmer Vernooij
Fix entry in known_revnos for generate_revision_history. |
787 |
(last_revno, last_revid) = self.last_revision_info() |
|
5718.8.24
by Jelmer Vernooij
Implement generate_revision_history using graph. |
788 |
known_revision_ids = [ |
|
6015.18.1
by Jelmer Vernooij
Fix entry in known_revnos for generate_revision_history. |
789 |
(last_revid, last_revno), |
|
5718.8.24
by Jelmer Vernooij
Implement generate_revision_history using graph. |
790 |
(_mod_revision.NULL_REVISION, 0), |
791 |
]
|
|
792 |
if last_rev is not None: |
|
793 |
if not graph.is_ancestor(last_rev, revision_id): |
|
794 |
# our previous tip is not merged into stop_revision
|
|
795 |
raise errors.DivergedBranches(self, other_branch) |
|
796 |
revno = graph.find_distance_to_null(revision_id, known_revision_ids) |
|
|
5718.8.6
by Jelmer Vernooij
Move generate_revision_history. |
797 |
self.set_last_revision_info(revno, revision_id) |
798 |
||
799 |
@needs_write_lock
|
|
|
4288.1.4
by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch. |
800 |
def set_parent(self, url): |
801 |
"""See Branch.set_parent.""" |
|
802 |
# TODO: Maybe delete old location files?
|
|
803 |
# URLs should never be unicode, even on the local fs,
|
|
804 |
# FIXUP this and get_parent in a future branch format bump:
|
|
805 |
# read and rewrite the file. RBC 20060125
|
|
806 |
if url is not None: |
|
807 |
if isinstance(url, unicode): |
|
808 |
try: |
|
809 |
url = url.encode('ascii') |
|
810 |
except UnicodeEncodeError: |
|
811 |
raise errors.InvalidURL(url, |
|
812 |
"Urls must be 7-bit ascii, "
|
|
813 |
"use bzrlib.urlutils.escape") |
|
814 |
url = urlutils.relative_url(self.base, url) |
|
815 |
self._set_parent_location(url) |
|
816 |
||
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
817 |
@needs_write_lock
|
|
3537.3.3
by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url |
818 |
def set_stacked_on_url(self, url): |
|
3221.18.1
by Ian Clatworthy
tweaks by ianc during review |
819 |
"""Set the URL this branch is stacked against. |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
820 |
|
821 |
:raises UnstackableBranchFormat: If the branch does not support
|
|
822 |
stacking.
|
|
823 |
:raises UnstackableRepositoryFormat: If the repository does not support
|
|
824 |
stacking.
|
|
825 |
"""
|
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
826 |
if not self._format.supports_stacking(): |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
827 |
raise errors.UnstackableBranchFormat(self._format, self.user_url) |
|
4509.3.30
by Martin Pool
doc |
828 |
# XXX: Changing from one fallback repository to another does not check
|
829 |
# that all the data you need is present in the new fallback.
|
|
830 |
# Possibly it should.
|
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
831 |
self._check_stackable_repo() |
832 |
if not url: |
|
833 |
try: |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
834 |
old_url = self.get_stacked_on_url() |
835 |
except (errors.NotStacked, errors.UnstackableBranchFormat, |
|
836 |
errors.UnstackableRepositoryFormat): |
|
837 |
return
|
|
838 |
self._unstack() |
|
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
839 |
else: |
|
4379.2.2
by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly. |
840 |
self._activate_fallback_location(url) |
|
4226.1.3
by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7. |
841 |
# write this out after the repository is stacked to avoid setting a
|
842 |
# stacked config that doesn't work.
|
|
843 |
self._set_config_location('stacked_on_location', url) |
|
844 |
||
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
845 |
def _unstack(self): |
846 |
"""Change a branch to be unstacked, copying data as needed. |
|
|
5697.2.1
by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave. |
847 |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
848 |
Don't call this directly, use set_stacked_on_url(None).
|
849 |
"""
|
|
850 |
pb = ui.ui_factory.nested_progress_bar() |
|
851 |
try: |
|
|
6138.4.1
by Jonathan Riddell
add gettext to progress bar strings |
852 |
pb.update(gettext("Unstacking")) |
|
4509.3.16
by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback. |
853 |
# The basic approach here is to fetch the tip of the branch,
|
854 |
# including all available ghosts, from the existing stacked
|
|
855 |
# repository into a new repository object without the fallbacks.
|
|
856 |
#
|
|
857 |
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
|
|
858 |
# correct for CHKMap repostiories
|
|
859 |
old_repository = self.repository |
|
860 |
if len(old_repository._fallback_repositories) != 1: |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
861 |
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. |
862 |
"of %r (fallbacks: %r)" % (old_repository, |
863 |
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. |
864 |
# Open the new repository object.
|
865 |
# Repositories don't offer an interface to remove fallback
|
|
866 |
# repositories today; take the conceptually simpler option and just
|
|
867 |
# reopen it. We reopen it starting from the URL so that we
|
|
868 |
# get a separate connection for RemoteRepositories and can
|
|
869 |
# stream from one of them to the other. This does mean doing
|
|
870 |
# separate SSH connection setup, but unstacking is not a
|
|
871 |
# common operation so it's tolerable.
|
|
872 |
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base) |
|
873 |
new_repository = new_bzrdir.find_repository() |
|
874 |
if new_repository._fallback_repositories: |
|
875 |
raise AssertionError("didn't expect %r to have " |
|
876 |
"fallback_repositories"
|
|
877 |
% (self.repository,)) |
|
|
5325.1.4
by Andrew Bennetts
Improve comments. |
878 |
# Replace self.repository with the new repository.
|
879 |
# 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. |
880 |
# lock count) of self.repository to the new repository.
|
881 |
lock_token = old_repository.lock_write().repository_token |
|
882 |
self.repository = new_repository |
|
883 |
if isinstance(self, remote.RemoteBranch): |
|
|
5325.1.4
by Andrew Bennetts
Improve comments. |
884 |
# Remote branches can have a second reference to the old
|
885 |
# 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. |
886 |
if self._real_branch is not None: |
887 |
self._real_branch.repository = new_repository |
|
888 |
self.repository.lock_write(token=lock_token) |
|
889 |
if lock_token is not None: |
|
890 |
old_repository.leave_lock_in_place() |
|
|
4509.3.16
by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback. |
891 |
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. |
892 |
if lock_token is not None: |
893 |
# XXX: self.repository.leave_lock_in_place() before this
|
|
894 |
# function will not be preserved. Fortunately that doesn't
|
|
|
5325.1.4
by Andrew Bennetts
Improve comments. |
895 |
# affect the current default format (2a), and would be a
|
896 |
# 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. |
897 |
# - Andrew Bennetts, 2010/06/30
|
898 |
self.repository.dont_leave_lock_in_place() |
|
899 |
old_lock_count = 0 |
|
900 |
while True: |
|
901 |
try: |
|
902 |
old_repository.unlock() |
|
903 |
except errors.LockNotHeld: |
|
904 |
break
|
|
905 |
old_lock_count += 1 |
|
906 |
if old_lock_count == 0: |
|
907 |
raise AssertionError( |
|
908 |
'old_repository should have been locked at least once.') |
|
909 |
for i in range(old_lock_count-1): |
|
910 |
self.repository.lock_write() |
|
911 |
# 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. |
912 |
old_repository.lock_read() |
913 |
try: |
|
914 |
# XXX: If you unstack a branch while it has a working tree
|
|
915 |
# with a pending merge, the pending-merged revisions will no
|
|
916 |
# longer be present. You can (probably) revert and remerge.
|
|
|
5651.5.1
by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646) |
917 |
try: |
918 |
tags_to_fetch = set(self.tags.get_reverse_tag_dict()) |
|
919 |
except errors.TagsNotSupported: |
|
920 |
tags_to_fetch = set() |
|
921 |
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository, |
|
922 |
old_repository, required_ids=[self.last_revision()], |
|
923 |
if_present_ids=tags_to_fetch, find_ghosts=True).execute() |
|
924 |
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. |
925 |
finally: |
926 |
old_repository.unlock() |
|
|
4509.3.9
by Martin Pool
Split out Branch._unstack |
927 |
finally: |
928 |
pb.finished() |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
929 |
|
|
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. |
930 |
def _set_tags_bytes(self, bytes): |
931 |
"""Mirror method for _get_tags_bytes. |
|
932 |
||
933 |
:seealso: Branch._get_tags_bytes.
|
|
934 |
"""
|
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
935 |
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked) |
936 |
op.add_cleanup(self.lock_write().unlock) |
|
937 |
return op.run_simple(bytes) |
|
|
5535.2.3
by Andrew Bennetts
Reset cached tags when mutating tags. |
938 |
|
939 |
def _set_tags_bytes_locked(self, bytes): |
|
940 |
self._tags_bytes = bytes |
|
941 |
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. |
942 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
943 |
def _cache_revision_history(self, rev_history): |
944 |
"""Set the cached revision history to rev_history. |
|
945 |
||
946 |
The revision_history method will use this cache to avoid regenerating
|
|
947 |
the revision history.
|
|
948 |
||
949 |
This API is semi-public; it only for use by subclasses, all other code
|
|
950 |
should consider it to be private.
|
|
951 |
"""
|
|
952 |
self._revision_history_cache = rev_history |
|
953 |
||
|
2418.5.6
by John Arbash Meinel
Cache the revision_id => revno map as appropriate. |
954 |
def _cache_revision_id_to_revno(self, revision_id_to_revno): |
955 |
"""Set the cached revision_id => revno map to revision_id_to_revno. |
|
956 |
||
957 |
This API is semi-public; it only for use by subclasses, all other code
|
|
958 |
should consider it to be private.
|
|
959 |
"""
|
|
960 |
self._revision_id_to_revno_cache = revision_id_to_revno |
|
961 |
||
|
2375.1.6
by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state. |
962 |
def _clear_cached_state(self): |
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
963 |
"""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. |
964 |
|
965 |
This means the next call to revision_history will need to call
|
|
966 |
_gen_revision_history.
|
|
967 |
||
968 |
This API is semi-public; it only for use by subclasses, all other code
|
|
969 |
should consider it to be private.
|
|
970 |
"""
|
|
971 |
self._revision_history_cache = None |
|
|
2418.5.6
by John Arbash Meinel
Cache the revision_id => revno map as appropriate. |
972 |
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. |
973 |
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. |
974 |
self._master_branch_cache = None |
|
3949.3.4
by Ian Clatworthy
jam feedback: start & stop limits; simple caching |
975 |
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(). |
976 |
self._partial_revision_history_cache = [] |
977 |
self._partial_revision_id_to_revno_cache = {} |
|
|
5535.2.1
by Andrew Bennetts
Cache a branch's tags during a read-lock. |
978 |
self._tags_bytes = None |
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
979 |
|
980 |
def _gen_revision_history(self): |
|
981 |
"""Return sequence of revision hashes on to this branch. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
982 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
983 |
Unlike revision_history, this method always regenerates or rereads the
|
984 |
revision history, i.e. it does not cache the result, so repeated calls
|
|
985 |
may be expensive.
|
|
986 |
||
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
987 |
Concrete subclasses should override this instead of revision_history so
|
988 |
that subclasses do not need to deal with caching logic.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
989 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
990 |
This API is semi-public; it only for use by subclasses, all other code
|
991 |
should consider it to be private.
|
|
992 |
"""
|
|
993 |
raise NotImplementedError(self._gen_revision_history) |
|
994 |
||
995 |
@needs_read_lock
|
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
996 |
def revision_history(self): |
|
2592.3.113
by Robert Collins
Various -Devil checks in branch.py. |
997 |
"""Return sequence of revision ids on this branch. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
998 |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
999 |
This method will cache the revision history for as long as it is safe to
|
1000 |
do so.
|
|
1001 |
"""
|
|
|
2592.3.113
by Robert Collins
Various -Devil checks in branch.py. |
1002 |
if 'evil' in debug.debug_flags: |
1003 |
mutter_callsite(3, "revision_history scales with history.") |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
1004 |
if self._revision_history_cache is not None: |
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
1005 |
history = self._revision_history_cache |
1006 |
else: |
|
1007 |
history = self._gen_revision_history() |
|
1008 |
self._cache_revision_history(history) |
|
|
2375.1.3
by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history. |
1009 |
return list(history) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1010 |
|
1011 |
def revno(self): |
|
1012 |
"""Return current revision number for this branch. |
|
1013 |
||
1014 |
That is equivalent to the number of revisions committed to
|
|
1015 |
this branch.
|
|
1016 |
"""
|
|
|
3066.1.1
by John Arbash Meinel
Make the default Branch.revno() implementation just be a thunk to last_revision_info. |
1017 |
return self.last_revision_info()[0] |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1018 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1019 |
def unbind(self): |
1020 |
"""Older format branches cannot bind or unbind.""" |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
1021 |
raise errors.UpgradeRequired(self.user_url) |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1022 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1023 |
def last_revision(self): |
|
3211.2.1
by Robert Collins
* Creating a new branch no longer tries to read the entire revision-history |
1024 |
"""Return last revision id, or NULL_REVISION.""" |
1025 |
return self.last_revision_info()[1] |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1026 |
|
|
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. |
1027 |
@needs_read_lock
|
|
2249.4.1
by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow |
1028 |
def last_revision_info(self): |
1029 |
"""Return information about the last revision. |
|
1030 |
||
|
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. |
1031 |
: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 |
1032 |
"""
|
|
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. |
1033 |
if self._last_revision_info_cache is None: |
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
1034 |
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. |
1035 |
return self._last_revision_info_cache |
1036 |
||
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
1037 |
def _read_last_revision_info(self): |
|
5718.8.3
by Jelmer Vernooij
More branch restructuring. |
1038 |
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 |
1039 |
|
|
5809.2.1
by Jelmer Vernooij
Deprecate Branch.update_revisions. |
1040 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
4048.2.2
by Jelmer Vernooij
New Branch.import_last_Revision_info() function used to pull revisions into the master branch during commit. |
1041 |
def import_last_revision_info(self, source_repo, revno, revid): |
1042 |
"""Set the last revision info, importing from another repo if necessary. |
|
1043 |
||
1044 |
:param source_repo: Source repository to optionally fetch from
|
|
1045 |
:param revno: Revision number of the new tip
|
|
1046 |
:param revid: Revision id of the new tip
|
|
1047 |
"""
|
|
1048 |
if not self.repository.has_same_location(source_repo): |
|
1049 |
self.repository.fetch(source_repo, revision_id=revid) |
|
1050 |
self.set_last_revision_info(revno, revid) |
|
1051 |
||
|
5777.7.1
by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags. |
1052 |
def import_last_revision_info_and_tags(self, source, revno, revid, |
1053 |
lossy=False): |
|
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1054 |
"""Set the last revision info, importing from another repo if necessary. |
1055 |
||
1056 |
This is used by the bound branch code to upload a revision to
|
|
1057 |
the master branch first before updating the tip of the local branch.
|
|
1058 |
Revisions referenced by source's tags are also transferred.
|
|
1059 |
||
|
5535.3.35
by Andrew Bennetts
Fix deprecation warning from some tests, correct some docstrings. |
1060 |
:param source: Source branch to optionally fetch from
|
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1061 |
:param revno: Revision number of the new tip
|
1062 |
: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. |
1063 |
:param lossy: Whether to discard metadata that can not be
|
1064 |
natively represented
|
|
1065 |
:return: Tuple with the new revision number and revision id
|
|
1066 |
(should only be different from the arguments when lossy=True)
|
|
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1067 |
"""
|
1068 |
if not self.repository.has_same_location(source.repository): |
|
|
5741.1.8
by Jelmer Vernooij
Remove fetch_tags argument. |
1069 |
self.fetch(source, revid) |
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1070 |
self.set_last_revision_info(revno, revid) |
|
5777.7.1
by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags. |
1071 |
return (revno, revid) |
|
5535.3.31
by Andrew Bennetts
Cope with tags that reference missing revisions. |
1072 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1073 |
def revision_id_to_revno(self, revision_id): |
1074 |
"""Given a revision id, return its revno""" |
|
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
1075 |
if _mod_revision.is_null(revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1076 |
return 0 |
1077 |
history = self.revision_history() |
|
1078 |
try: |
|
1079 |
return history.index(revision_id) + 1 |
|
1080 |
except ValueError: |
|
|
2418.5.5
by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno |
1081 |
raise errors.NoSuchRevision(self, revision_id) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1082 |
|
|
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(). |
1083 |
@needs_read_lock
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1084 |
def get_rev_id(self, revno, history=None): |
1085 |
"""Find the revision id of the specified revno.""" |
|
1086 |
if revno == 0: |
|
|
2598.5.10
by Aaron Bentley
Return NULL_REVISION instead of None for the null revision |
1087 |
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(). |
1088 |
last_revno, last_revid = self.last_revision_info() |
1089 |
if revno == last_revno: |
|
1090 |
return last_revid |
|
1091 |
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 |
1092 |
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(). |
1093 |
distance_from_last = last_revno - revno |
1094 |
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. |
1095 |
self._extend_partial_history(distance_from_last) |
1096 |
return self._partial_revision_history_cache[distance_from_last] |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1097 |
|
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
1098 |
def pull(self, source, overwrite=False, stop_revision=None, |
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
1099 |
possible_transports=None, *args, **kwargs): |
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1100 |
"""Mirror source into this branch. |
1101 |
||
1102 |
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. |
1103 |
|
1104 |
:returns: PullResult instance
|
|
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1105 |
"""
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
1106 |
return InterBranch.get(source, self).pull(overwrite=overwrite, |
1107 |
stop_revision=stop_revision, |
|
1108 |
possible_transports=possible_transports, *args, **kwargs) |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1109 |
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
1110 |
def push(self, target, overwrite=False, stop_revision=None, lossy=False, |
1111 |
*args, **kwargs): |
|
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1112 |
"""Mirror this branch into target. |
1113 |
||
1114 |
This branch is considered to be 'local', having low latency.
|
|
1115 |
"""
|
|
|
4211.1.3
by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push(). |
1116 |
return InterBranch.get(self, target).push(overwrite, stop_revision, |
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
1117 |
lossy, *args, **kwargs) |
|
4347.2.1
by Jelmer Vernooij
Move dpush onto an InterBranch object. |
1118 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1119 |
def basis_tree(self): |
|
1852.5.1
by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree. |
1120 |
"""Return `Tree` object for last revision.""" |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1121 |
return self.repository.revision_tree(self.last_revision()) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1122 |
|
1123 |
def get_parent(self): |
|
1124 |
"""Return the parent location of the branch. |
|
1125 |
||
|
4031.1.1
by Alexander Belchenko
Parent location is not used as default for push. |
1126 |
This is the default location for pull/missing. The usual
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1127 |
pattern is that the user can override it by specifying a
|
1128 |
location.
|
|
1129 |
"""
|
|
|
4078.2.1
by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch. |
1130 |
parent = self._get_parent_location() |
1131 |
if parent is None: |
|
1132 |
return parent |
|
1133 |
# This is an old-format absolute path to a local branch
|
|
1134 |
# turn it into a url
|
|
1135 |
if parent.startswith('/'): |
|
1136 |
parent = urlutils.local_path_to_url(parent.decode('utf8')) |
|
1137 |
try: |
|
1138 |
return urlutils.join(self.base[:-1], parent) |
|
1139 |
except errors.InvalidURLJoin, e: |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
1140 |
raise errors.InaccessibleParent(parent, self.user_url) |
|
4078.2.1
by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch. |
1141 |
|
1142 |
def _get_parent_location(self): |
|
1143 |
raise NotImplementedError(self._get_parent_location) |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1144 |
|
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1145 |
def _set_config_location(self, name, url, config=None, |
1146 |
make_relative=False): |
|
1147 |
if config is None: |
|
1148 |
config = self.get_config() |
|
1149 |
if url is None: |
|
1150 |
url = '' |
|
1151 |
elif make_relative: |
|
1152 |
url = urlutils.relative_url(self.base, url) |
|
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
1153 |
config.set_user_option(name, url, warn_masked=True) |
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1154 |
|
1155 |
def _get_config_location(self, name, config=None): |
|
1156 |
if config is None: |
|
1157 |
config = self.get_config() |
|
1158 |
location = config.get_user_option(name) |
|
1159 |
if location == '': |
|
1160 |
location = None |
|
1161 |
return location |
|
1162 |
||
|
4382.3.1
by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations |
1163 |
def get_child_submit_format(self): |
1164 |
"""Return the preferred format of submissions to this branch.""" |
|
1165 |
return self.get_config().get_user_option("child_submit_format") |
|
1166 |
||
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
1167 |
def get_submit_branch(self): |
1168 |
"""Return the submit location of the branch. |
|
1169 |
||
1170 |
This is the default location for bundle. The usual
|
|
1171 |
pattern is that the user can override it by specifying a
|
|
1172 |
location.
|
|
1173 |
"""
|
|
1174 |
return self.get_config().get_user_option('submit_branch') |
|
1175 |
||
1176 |
def set_submit_branch(self, location): |
|
1177 |
"""Return the submit location of the branch. |
|
1178 |
||
1179 |
This is the default location for bundle. The usual
|
|
1180 |
pattern is that the user can override it by specifying a
|
|
1181 |
location.
|
|
1182 |
"""
|
|
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
1183 |
self.get_config().set_user_option('submit_branch', location, |
1184 |
warn_masked=True) |
|
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
1185 |
|
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1186 |
def get_public_branch(self): |
1187 |
"""Return the public location of the branch. |
|
1188 |
||
|
4031.3.1
by Frank Aspell
Fixing various typos |
1189 |
This is used by merge directives.
|
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
1190 |
"""
|
1191 |
return self._get_config_location('public_branch') |
|
1192 |
||
1193 |
def set_public_branch(self, location): |
|
1194 |
"""Return the submit location of the branch. |
|
1195 |
||
1196 |
This is the default location for bundle. The usual
|
|
1197 |
pattern is that the user can override it by specifying a
|
|
1198 |
location.
|
|
1199 |
"""
|
|
1200 |
self._set_config_location('public_branch', location) |
|
1201 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1202 |
def get_push_location(self): |
1203 |
"""Return the None or the location to push this branch to.""" |
|
|
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
1204 |
push_loc = self.get_config().get_user_option('push_location') |
1205 |
return push_loc |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1206 |
|
1207 |
def set_push_location(self, location): |
|
1208 |
"""Set a new push location for this branch.""" |
|
|
1910.3.2
by Andrew Bennetts
Improve some NotImplementedErrors. |
1209 |
raise NotImplementedError(self.set_push_location) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1210 |
|
|
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. |
1211 |
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid): |
1212 |
"""Run the post_change_branch_tip hooks.""" |
|
1213 |
hooks = Branch.hooks['post_change_branch_tip'] |
|
1214 |
if not hooks: |
|
1215 |
return
|
|
1216 |
new_revno, new_revid = self.last_revision_info() |
|
1217 |
params = ChangeBranchTipParams( |
|
1218 |
self, old_revno, new_revno, old_revid, new_revid) |
|
1219 |
for hook in hooks: |
|
1220 |
hook(params) |
|
1221 |
||
1222 |
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid): |
|
1223 |
"""Run the pre_change_branch_tip hooks.""" |
|
1224 |
hooks = Branch.hooks['pre_change_branch_tip'] |
|
1225 |
if not hooks: |
|
1226 |
return
|
|
1227 |
old_revno, old_revid = self.last_revision_info() |
|
1228 |
params = ChangeBranchTipParams( |
|
1229 |
self, old_revno, new_revno, old_revid, new_revid) |
|
1230 |
for hook in hooks: |
|
|
4943.1.1
by Robert Collins
Do not fiddle with exceptions in the pre_change_branch_tip hook running code. |
1231 |
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. |
1232 |
|
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
1233 |
@needs_write_lock
|
1234 |
def update(self): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1235 |
"""Synchronise this branch with the master branch if any. |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
1236 |
|
1237 |
:return: None or the last_revision pivoted out during the update.
|
|
1238 |
"""
|
|
1239 |
return None |
|
1240 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1241 |
def check_revno(self, revno): |
1242 |
"""\ |
|
1243 |
Check whether a revno corresponds to any revision.
|
|
1244 |
Zero (the NULL revision) is considered valid.
|
|
1245 |
"""
|
|
1246 |
if revno != 0: |
|
1247 |
self.check_real_revno(revno) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1248 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1249 |
def check_real_revno(self, revno): |
1250 |
"""\ |
|
1251 |
Check whether a revno corresponds to a real revision.
|
|
1252 |
Zero (the NULL revision) is considered invalid
|
|
1253 |
"""
|
|
1254 |
if revno < 1 or revno > self.revno(): |
|
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
1255 |
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. |
1256 |
|
1257 |
@needs_read_lock
|
|
|
4050.1.1
by Robert Collins
Fix race condition with branch hooks during cloning when the new branch is stacked. |
1258 |
def clone(self, to_bzrdir, revision_id=None, repository_policy=None): |
|
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. |
1259 |
"""Clone this branch into to_bzrdir preserving all semantic values. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1260 |
|
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1261 |
Most API users will want 'create_clone_on_transport', which creates a
|
1262 |
new bzrdir and branch on the fly.
|
|
1263 |
||
|
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. |
1264 |
revision_id: if not None, the revision history in the new branch will
|
1265 |
be truncated to end with revision_id.
|
|
1266 |
"""
|
|
|
3650.5.1
by Aaron Bentley
Fix push to use clone all the time. |
1267 |
result = to_bzrdir.create_branch() |
|
4288.1.8
by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn. |
1268 |
result.lock_write() |
1269 |
try: |
|
1270 |
if repository_policy is not None: |
|
1271 |
repository_policy.configure_branch(result) |
|
1272 |
self.copy_content_into(result, revision_id=revision_id) |
|
1273 |
finally: |
|
1274 |
result.unlock() |
|
1275 |
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. |
1276 |
|
1277 |
@needs_read_lock
|
|
|
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. |
1278 |
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None, |
1279 |
repository=None): |
|
|
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. |
1280 |
"""Create a new line of development from the branch, into to_bzrdir. |
|
3650.2.1
by Aaron Bentley
Fix sprout to honour cloning format |
1281 |
|
1282 |
to_bzrdir controls the branch format.
|
|
1283 |
||
|
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. |
1284 |
revision_id: if not None, the revision history in the new branch will
|
1285 |
be truncated to end with revision_id.
|
|
1286 |
"""
|
|
|
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. |
1287 |
if (repository_policy is not None and |
1288 |
repository_policy.requires_stacking()): |
|
1289 |
to_bzrdir._format.require_stacking(_skip_repo=True) |
|
|
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. |
1290 |
result = to_bzrdir.create_branch(repository=repository) |
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
1291 |
result.lock_write() |
|
4288.1.8
by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn. |
1292 |
try: |
1293 |
if repository_policy is not None: |
|
1294 |
repository_policy.configure_branch(result) |
|
1295 |
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. |
1296 |
master_url = self.get_bound_location() |
1297 |
if master_url is None: |
|
|
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. |
1298 |
result.set_parent(self.bzrdir.root_transport.base) |
1299 |
else: |
|
|
6015.7.1
by John Arbash Meinel
No need to open the master branch just to get its URL. |
1300 |
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. |
1301 |
finally: |
1302 |
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. |
1303 |
return result |
1304 |
||
|
2230.3.18
by Aaron Bentley
Handle history sync as a special operation |
1305 |
def _synchronize_history(self, destination, revision_id): |
|
2230.3.35
by Aaron Bentley
Add documentation for synchonize_history |
1306 |
"""Synchronize last revision and revision history between branches. |
1307 |
||
1308 |
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. |
1309 |
BzrBranch6, but works for BzrBranch5, as long as the destination's
|
1310 |
repository contains all the lefthand ancestors of the intended
|
|
1311 |
last_revision. If not, set_last_revision_info will fail.
|
|
|
2230.3.35
by Aaron Bentley
Add documentation for synchonize_history |
1312 |
|
1313 |
:param destination: The branch to copy the history into
|
|
1314 |
:param revision_id: The revision-id to truncate history at. May
|
|
1315 |
be None to copy complete history.
|
|
1316 |
"""
|
|
|
3834.3.1
by Andrew Bennetts
Get rid of revision_history() call during copy_content_into. |
1317 |
source_revno, source_revision_id = self.last_revision_info() |
1318 |
if revision_id is None: |
|
1319 |
revno, revision_id = source_revno, source_revision_id |
|
|
3650.3.3
by Aaron Bentley
fix sprout |
1320 |
else: |
|
4266.3.8
by Jelmer Vernooij
Consistently use find_distance_to_null. |
1321 |
graph = self.repository.get_graph() |
|
4266.3.1
by Jelmer Vernooij
Support cloning of branches with ghosts in the left hand side history. |
1322 |
try: |
|
4266.3.8
by Jelmer Vernooij
Consistently use find_distance_to_null. |
1323 |
revno = graph.find_distance_to_null(revision_id, |
1324 |
[(source_revision_id, source_revno)]) |
|
1325 |
except errors.GhostRevisionsHaveNoRevno: |
|
1326 |
# Default to 1, if we can't find anything else
|
|
1327 |
revno = 1 |
|
|
3834.3.1
by Andrew Bennetts
Get rid of revision_history() call during copy_content_into. |
1328 |
destination.set_last_revision_info(revno, revision_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1329 |
|
|
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. |
1330 |
def copy_content_into(self, destination, revision_id=None): |
1331 |
"""Copy the content of self into destination. |
|
1332 |
||
1333 |
revision_id: if not None, the revision history in the new branch will
|
|
1334 |
be truncated to end with revision_id.
|
|
1335 |
"""
|
|
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
1336 |
return InterBranch.get(self, destination).copy_content_into( |
1337 |
revision_id=revision_id) |
|
|
4273.1.6
by Aaron Bentley
Ensure references are rebased. |
1338 |
|
1339 |
def update_references(self, target): |
|
|
4273.1.8
by Aaron Bentley
Handle references in push, pull, merge. |
1340 |
if not getattr(self._format, 'supports_reference_locations', False): |
1341 |
return
|
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
1342 |
reference_dict = self._get_all_reference_info() |
|
4273.1.9
by Aaron Bentley
Cleanup |
1343 |
if len(reference_dict) == 0: |
1344 |
return
|
|
|
4273.1.6
by Aaron Bentley
Ensure references are rebased. |
1345 |
old_base = self.base |
1346 |
new_base = target.base |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
1347 |
target_reference_dict = target._get_all_reference_info() |
|
4273.1.6
by Aaron Bentley
Ensure references are rebased. |
1348 |
for file_id, (tree_path, branch_location) in ( |
1349 |
reference_dict.items()): |
|
1350 |
branch_location = urlutils.rebase_url(branch_location, |
|
1351 |
old_base, new_base) |
|
|
4273.1.7
by Aaron Bentley
Make update_references do a merge. |
1352 |
target_reference_dict.setdefault( |
1353 |
file_id, (tree_path, branch_location)) |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
1354 |
target._set_all_reference_info(target_reference_dict) |
|
1185.66.1
by Aaron Bentley
Merged from mainline |
1355 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1356 |
@needs_read_lock
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1357 |
def check(self, refs): |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1358 |
"""Check consistency of the branch. |
1359 |
||
1360 |
In particular this checks that revisions given in the revision-history
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1361 |
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 |
1362 |
present in the repository.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1363 |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1364 |
Callers will typically also want to check the repository.
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1365 |
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1366 |
:param refs: Calculated refs for this branch as specified by
|
1367 |
branch._get_check_refs()
|
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1368 |
:return: A BranchCheckResult.
|
1369 |
"""
|
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
1370 |
result = BranchCheckResult(self) |
|
3389.2.1
by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent. |
1371 |
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. |
1372 |
actual_revno = refs[('lefthand-distance', last_revision_id)] |
1373 |
if actual_revno != last_revno: |
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
1374 |
result.errors.append(errors.BzrCheckError( |
1375 |
'revno does not match len(mainline) %s != %s' % ( |
|
|
4332.3.7
by Robert Collins
Convert Branch.check to take a refs dict as well. |
1376 |
last_revno, actual_revno))) |
1377 |
# TODO: We should probably also check that self.revision_history
|
|
1378 |
# matches the repository for older branch formats.
|
|
1379 |
# If looking for the code that cross-checks repository parents against
|
|
1380 |
# the iter_reverse_revision_history output, that is now a repository
|
|
1381 |
# specific check.
|
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
1382 |
return result |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1383 |
|
|
6127.1.9
by Jelmer Vernooij
Add lightweight option to _get_checkout_format(). |
1384 |
def _get_checkout_format(self, lightweight=False): |
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1385 |
"""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. |
1386 |
Weaves are used if this branch's repository uses weaves.
|
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1387 |
"""
|
|
5582.10.3
by Jelmer Vernooij
Remove custom code for presplitout. |
1388 |
format = self.repository.bzrdir.checkout_metadir() |
1389 |
format.set_branch_format(self._format) |
|
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1390 |
return format |
1391 |
||
|
4044.1.1
by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push. |
1392 |
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. |
1393 |
stacked_on=None, create_prefix=False, use_existing_dir=False, |
1394 |
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. |
1395 |
"""Create a clone of this branch and its bzrdir. |
1396 |
||
1397 |
:param to_transport: The transport to clone onto.
|
|
1398 |
:param revision_id: The revision id to use as tip in the new branch.
|
|
1399 |
If None the tip is obtained from this branch.
|
|
1400 |
: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. |
1401 |
:param create_prefix: Create any missing directories leading up to
|
1402 |
to_transport.
|
|
1403 |
: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. |
1404 |
"""
|
|
4044.1.2
by Robert Collins
Reinstate the TODO comment about bzrdir.clone_on_transport. |
1405 |
# XXX: Fix the bzrdir API to allow getting the branch back from the
|
1406 |
# clone call. Or something. 20090224 RBC/spiv.
|
|
|
5147.4.1
by Jelmer Vernooij
Pass branch names in more places. |
1407 |
# XXX: Should this perhaps clone colocated branches as well,
|
1408 |
# 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. |
1409 |
if revision_id is None: |
1410 |
revision_id = self.last_revision() |
|
|
4634.105.1
by Andrew Bennetts
Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory. |
1411 |
dir_to = self.bzrdir.clone_on_transport(to_transport, |
1412 |
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. |
1413 |
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. |
1414 |
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. |
1415 |
return dir_to.open_branch() |
1416 |
||
|
2245.2.1
by Robert Collins
Split branch pushing out of branch pulling. |
1417 |
def create_checkout(self, to_location, revision_id=None, |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1418 |
lightweight=False, accelerator_tree=None, |
1419 |
hardlink=False): |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1420 |
"""Create a checkout of a branch. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1421 |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1422 |
:param to_location: The url to produce the checkout at
|
1423 |
:param revision_id: The revision to check out
|
|
|
1551.8.5
by Aaron Bentley
Change name to create_checkout |
1424 |
:param lightweight: If True, produce a lightweight checkout, otherwise,
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1425 |
produce a bound branch (heavyweight checkout)
|
|
3123.5.17
by Aaron Bentley
Update docs |
1426 |
:param accelerator_tree: A tree which can be used for retrieving file
|
1427 |
contents more quickly than the revision tree, i.e. a workingtree.
|
|
1428 |
The revision tree will be used for cases where accelerator_tree's
|
|
1429 |
content is different.
|
|
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1430 |
:param hardlink: If true, hard-link files from accelerator_tree,
|
1431 |
where possible.
|
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1432 |
:return: The tree of the created checkout
|
1433 |
"""
|
|
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1434 |
t = transport.get_transport(to_location) |
|
2475.3.3
by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base() |
1435 |
t.ensure_base() |
|
6127.1.9
by Jelmer Vernooij
Add lightweight option to _get_checkout_format(). |
1436 |
format = self._get_checkout_format(lightweight=lightweight) |
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1437 |
if lightweight: |
|
2100.3.26
by Aaron Bentley
checkout type is maintained for subtrees |
1438 |
checkout = format.initialize_on_transport(t) |
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1439 |
from_branch = BranchReferenceFormat().initialize(checkout, |
1440 |
target_branch=self) |
|
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1441 |
else: |
1442 |
checkout_branch = bzrdir.BzrDir.create_branch_convenience( |
|
|
1910.2.39
by Aaron Bentley
Fix checkout bug |
1443 |
to_location, force_new_tree=False, format=format) |
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1444 |
checkout = checkout_branch.bzrdir |
1445 |
checkout_branch.bind(self) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1446 |
# 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 |
1447 |
# branch tip correctly, and seed it with history.
|
1448 |
checkout_branch.pull(self, stop_revision=revision_id) |
|
|
2955.5.3
by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout. |
1449 |
from_branch=None |
1450 |
tree = checkout.create_workingtree(revision_id, |
|
|
3123.5.2
by Aaron Bentley
Allow checkout --files_from |
1451 |
from_branch=from_branch, |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1452 |
accelerator_tree=accelerator_tree, |
1453 |
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. |
1454 |
basis_tree = tree.basis_tree() |
1455 |
basis_tree.lock_read() |
|
1456 |
try: |
|
1457 |
for path, file_id in basis_tree.iter_references(): |
|
1458 |
reference_parent = self.reference_parent(file_id, path) |
|
1459 |
reference_parent.create_checkout(tree.abspath(path), |
|
1460 |
basis_tree.get_reference_revision(file_id, path), |
|
1461 |
lightweight) |
|
1462 |
finally: |
|
1463 |
basis_tree.unlock() |
|
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
1464 |
return tree |
|
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
1465 |
|
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
1466 |
@needs_write_lock
|
1467 |
def reconcile(self, thorough=True): |
|
1468 |
"""Make sure the data stored in this branch is consistent.""" |
|
1469 |
from bzrlib.reconcile import BranchReconciler |
|
1470 |
reconciler = BranchReconciler(self, thorough=thorough) |
|
1471 |
reconciler.reconcile() |
|
1472 |
return reconciler |
|
1473 |
||
|
4273.1.4
by Aaron Bentley
Relative reference locations are branch-relative. |
1474 |
def reference_parent(self, file_id, path, possible_transports=None): |
|
2100.3.29
by Aaron Bentley
Get merge working initially |
1475 |
"""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. |
1476 |
|
|
2100.3.29
by Aaron Bentley
Get merge working initially |
1477 |
:param file_id: The file_id of the tree reference
|
1478 |
:param path: The path of the file_id in the tree
|
|
1479 |
:return: A branch associated with the file_id
|
|
1480 |
"""
|
|
1481 |
# FIXME should provide multiple branches, based on config
|
|
|
5158.6.11
by Martin Pool
Revert some fragile dependencies of branch on .base |
1482 |
return Branch.open(self.bzrdir.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 |
1483 |
possible_transports=possible_transports) |
|
2100.3.23
by Aaron Bentley
Nested checkouts kinda work |
1484 |
|
|
2220.2.30
by Martin Pool
split out tag-merging code and add some tests |
1485 |
def supports_tags(self): |
1486 |
return self._format.supports_tags() |
|
1487 |
||
|
5086.4.7
by Jelmer Vernooij
Put automatic_tag_name on Branch. |
1488 |
def automatic_tag_name(self, revision_id): |
1489 |
"""Try to automatically find the tag name for a revision. |
|
1490 |
||
1491 |
:param revision_id: Revision id of the revision.
|
|
|
5086.4.8
by Jelmer Vernooij
Review comments from Ian. |
1492 |
: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. |
1493 |
"""
|
1494 |
for hook in Branch.hooks['automatic_tag_name']: |
|
1495 |
ret = hook(self, revision_id) |
|
1496 |
if ret is not None: |
|
1497 |
return ret |
|
1498 |
return None |
|
1499 |
||
|
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. |
1500 |
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph, |
1501 |
other_branch): |
|
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1502 |
"""Ensure that revision_b is a descendant of revision_a. |
1503 |
||
1504 |
This is a helper function for update_revisions.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1505 |
|
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1506 |
:raises: DivergedBranches if revision_b has diverged from revision_a.
|
1507 |
:returns: True if revision_b is a descendant of revision_a.
|
|
1508 |
"""
|
|
1509 |
relation = self._revision_relations(revision_a, revision_b, graph) |
|
1510 |
if relation == 'b_descends_from_a': |
|
1511 |
return True |
|
1512 |
elif relation == 'diverged': |
|
1513 |
raise errors.DivergedBranches(self, other_branch) |
|
1514 |
elif relation == 'a_descends_from_b': |
|
1515 |
return False |
|
1516 |
else: |
|
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
1517 |
raise AssertionError("invalid relation: %r" % (relation,)) |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1518 |
|
1519 |
def _revision_relations(self, revision_a, revision_b, graph): |
|
1520 |
"""Determine the relationship between two revisions. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1521 |
|
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1522 |
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
|
1523 |
"""
|
|
1524 |
heads = graph.heads([revision_a, revision_b]) |
|
1525 |
if heads == set([revision_b]): |
|
1526 |
return 'b_descends_from_a' |
|
1527 |
elif heads == set([revision_a, revision_b]): |
|
1528 |
# These branches have diverged
|
|
1529 |
return 'diverged' |
|
1530 |
elif heads == set([revision_a]): |
|
1531 |
return 'a_descends_from_b' |
|
1532 |
else: |
|
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
1533 |
raise AssertionError("invalid heads: %r" % (heads,)) |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
1534 |
|
|
5741.1.11
by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision. |
1535 |
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. |
1536 |
"""Return the heads that must and that should be fetched to copy this |
1537 |
branch into another repo.
|
|
1538 |
||
1539 |
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
|
|
1540 |
set of heads that must be fetched. if_present_fetch is a set of
|
|
1541 |
heads that must be fetched if present, but no error is necessary if
|
|
1542 |
they are not present.
|
|
1543 |
"""
|
|
|
5741.1.11
by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision. |
1544 |
# For bzr native formats must_fetch is just the tip, and if_present_fetch
|
1545 |
# are the tags.
|
|
1546 |
must_fetch = set([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. |
1547 |
if_present_fetch = set() |
1548 |
c = self.get_config() |
|
1549 |
include_tags = c.get_user_option_as_bool('branch.fetch_tags', |
|
1550 |
default=False) |
|
1551 |
if include_tags: |
|
1552 |
try: |
|
1553 |
if_present_fetch = set(self.tags.get_reverse_tag_dict()) |
|
1554 |
except errors.TagsNotSupported: |
|
1555 |
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. |
1556 |
must_fetch.discard(_mod_revision.NULL_REVISION) |
1557 |
if_present_fetch.discard(_mod_revision.NULL_REVISION) |
|
1558 |
return must_fetch, if_present_fetch |
|
1559 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1560 |
|
|
5669.3.10
by Jelmer Vernooij
Use ControlComponentFormat. |
1561 |
class BranchFormat(controldir.ControlComponentFormat): |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1562 |
"""An encapsulation of the initialization and open routines for a format. |
1563 |
||
1564 |
Formats provide three things:
|
|
1565 |
* An initialization routine,
|
|
1566 |
* a format string,
|
|
1567 |
* an open routine.
|
|
1568 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1569 |
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 |
1570 |
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 |
1571 |
can be classes themselves with class methods - it simply depends on
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1572 |
whether state is needed for a given format or not.
|
1573 |
||
1574 |
Once a format is deprecated, just deprecate the initialize and open
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1575 |
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. |
1576 |
object will be created every time regardless.
|
1577 |
"""
|
|
1578 |
||
|
2363.5.5
by Aaron Bentley
add info.describe_format |
1579 |
def __eq__(self, other): |
1580 |
return self.__class__ is other.__class__ |
|
1581 |
||
1582 |
def __ne__(self, other): |
|
1583 |
return not (self == other) |
|
1584 |
||
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1585 |
@classmethod
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1586 |
def find_format(klass, a_bzrdir, name=None): |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1587 |
"""Return the format for the branch object in a_bzrdir.""" |
1588 |
try: |
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1589 |
transport = a_bzrdir.get_branch_transport(None, name=name) |
|
4708.2.1
by Martin
Ensure all files opened by bazaar proper are explicitly closed |
1590 |
format_string = transport.get_bytes("format") |
|
5662.2.6
by Jelmer Vernooij
add more tests. |
1591 |
return format_registry.get(format_string) |
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
1592 |
except errors.NoSuchFile: |
|
4734.4.7
by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails) |
1593 |
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir) |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1594 |
except KeyError: |
|
3246.3.2
by Daniel Watkins
Modified uses of errors.UnknownFormatError. |
1595 |
raise errors.UnknownFormatError(format=format_string, kind='branch') |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1596 |
|
1597 |
@classmethod
|
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1598 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1599 |
def get_default_format(klass): |
1600 |
"""Return the current default format.""" |
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1601 |
return format_registry.get_default() |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1602 |
|
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1603 |
@classmethod
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1604 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1605 |
def get_formats(klass): |
1606 |
"""Get all the known formats. |
|
1607 |
||
1608 |
Warning: This triggers a load of all lazy registered formats: do not
|
|
1609 |
use except when that is desireed.
|
|
1610 |
"""
|
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1611 |
return format_registry._get_all() |
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1612 |
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
1613 |
def get_reference(self, a_bzrdir, name=None): |
|
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
1614 |
"""Get the target reference of the branch in a_bzrdir. |
1615 |
||
1616 |
format probing must have been completed before calling
|
|
1617 |
this method - it is assumed that the format of the branch
|
|
1618 |
in a_bzrdir is correct.
|
|
1619 |
||
1620 |
:param a_bzrdir: The bzrdir to get the branch data from.
|
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
1621 |
: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. |
1622 |
:return: None if the branch is not a reference branch.
|
1623 |
"""
|
|
1624 |
return None |
|
1625 |
||
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1626 |
@classmethod
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
1627 |
def set_reference(self, a_bzrdir, name, to_branch): |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1628 |
"""Set the target reference of the branch in a_bzrdir. |
1629 |
||
1630 |
format probing must have been completed before calling
|
|
1631 |
this method - it is assumed that the format of the branch
|
|
1632 |
in a_bzrdir is correct.
|
|
1633 |
||
1634 |
:param a_bzrdir: The bzrdir to set the branch reference for.
|
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
1635 |
:param name: Name of colocated branch to set, None for default
|
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
1636 |
:param to_branch: branch that the checkout is to reference
|
1637 |
"""
|
|
1638 |
raise NotImplementedError(self.set_reference) |
|
1639 |
||
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1640 |
def get_format_string(self): |
1641 |
"""Return the ASCII format string that identifies this format.""" |
|
1642 |
raise NotImplementedError(self.get_format_string) |
|
1643 |
||
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
1644 |
def get_format_description(self): |
1645 |
"""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). |
1646 |
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 |
1647 |
|
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1648 |
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch): |
1649 |
hooks = Branch.hooks['post_branch_init'] |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1650 |
if not hooks: |
1651 |
return
|
|
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1652 |
params = BranchInitHookParams(self, a_bzrdir, name, branch) |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1653 |
for hook in hooks: |
1654 |
hook(params) |
|
1655 |
||
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
1656 |
def initialize(self, a_bzrdir, name=None, repository=None, |
1657 |
append_revisions_only=None): |
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1658 |
"""Create a branch of this format in a_bzrdir. |
1659 |
|
|
1660 |
:param name: Name of the colocated branch to create.
|
|
1661 |
"""
|
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1662 |
raise NotImplementedError(self.initialize) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1663 |
|
|
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. |
1664 |
def is_supported(self): |
1665 |
"""Is this format supported? |
|
1666 |
||
1667 |
Supported formats can be initialized and opened.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1668 |
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. |
1669 |
some other features depending on the reason for not being supported.
|
1670 |
"""
|
|
1671 |
return True |
|
1672 |
||
|
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. |
1673 |
def make_tags(self, branch): |
1674 |
"""Create a tags object for branch. |
|
1675 |
||
1676 |
This method is on BranchFormat, because BranchFormats are reflected
|
|
1677 |
over the wire via network_name(), whereas full Branch instances require
|
|
1678 |
multiple VFS method calls to operate at all.
|
|
1679 |
||
1680 |
The default implementation returns a disabled-tags instance.
|
|
1681 |
||
1682 |
Note that it is normal for branch to be a RemoteBranch when using tags
|
|
1683 |
on a RemoteBranch.
|
|
1684 |
"""
|
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
1685 |
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. |
1686 |
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
1687 |
def network_name(self): |
1688 |
"""A simple byte string uniquely identifying this format for RPC calls. |
|
1689 |
||
1690 |
MetaDir branch formats use their disk format string to identify the
|
|
1691 |
repository over the wire. All in one formats such as bzr < 0.8, and
|
|
1692 |
foreign formats like svn/git and hg should use some marker which is
|
|
1693 |
unique and immutable.
|
|
1694 |
"""
|
|
1695 |
raise NotImplementedError(self.network_name) |
|
1696 |
||
|
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. |
1697 |
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False, |
1698 |
found_repository=None): |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1699 |
"""Return the branch object for a_bzrdir |
1700 |
||
|
4160.2.12
by Andrew Bennetts
Improve docstrings and remove a line of cruft. |
1701 |
:param a_bzrdir: A BzrDir that contains a branch.
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
1702 |
:param name: Name of colocated branch to open
|
|
4160.2.12
by Andrew Bennetts
Improve docstrings and remove a line of cruft. |
1703 |
:param _found: a private parameter, do not use it. It is used to
|
1704 |
indicate if format probing has already be done.
|
|
1705 |
:param ignore_fallbacks: when set, no fallback branches will be opened
|
|
1706 |
(if there are any). Default is to open fallbacks.
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1707 |
"""
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1708 |
raise NotImplementedError(self.open) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1709 |
|
1710 |
@classmethod
|
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1711 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1712 |
def register_format(klass, format): |
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1713 |
"""Register a metadir format. |
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1714 |
|
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1715 |
See MetaDirBranchFormatFactory for the ability to register a format
|
1716 |
without loading the code the format needs until it is actually used.
|
|
1717 |
"""
|
|
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
1718 |
format_registry.register(format) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1719 |
|
|
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. |
1720 |
@classmethod
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1721 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1722 |
def set_default_format(klass, format): |
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
1723 |
format_registry.set_default(format) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1724 |
|
|
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. |
1725 |
def supports_set_append_revisions_only(self): |
1726 |
"""True if this format supports set_append_revisions_only.""" |
|
1727 |
return False |
|
1728 |
||
|
3575.2.2
by Martin Pool
branch --stacked should force a stacked format |
1729 |
def supports_stacking(self): |
1730 |
"""True if this format records a stacked-on branch.""" |
|
1731 |
return False |
|
1732 |
||
|
5674.1.1
by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat. |
1733 |
def supports_leaving_lock(self): |
1734 |
"""True if this format supports leaving locks in place.""" |
|
1735 |
return False # by default |
|
1736 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1737 |
@classmethod
|
|
5662.2.6
by Jelmer Vernooij
add more tests. |
1738 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
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. |
1739 |
def unregister_format(klass, format): |
|
5662.2.3
by Jelmer Vernooij
Fix tests. |
1740 |
format_registry.remove(format) |
|
5642.2.1
by Jelmer Vernooij
Allow the registration of non-metadir branch formats. |
1741 |
|
|
1553.4.8
by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the |
1742 |
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. |
1743 |
return self.get_format_description().rstrip() |
|
1553.4.8
by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the |
1744 |
|
|
2220.2.10
by Martin Pool
(broken) start moving things to branches |
1745 |
def supports_tags(self): |
1746 |
"""True if this format supports tags stored in the branch""" |
|
1747 |
return False # by default |
|
1748 |
||
|
6123.4.6
by Jelmer Vernooij
Move flags to BranchFormat. |
1749 |
def tags_are_versioned(self): |
1750 |
"""Whether the tag container for this branch versions tags.""" |
|
1751 |
return False |
|
1752 |
||
1753 |
def supports_tags_referencing_ghosts(self): |
|
1754 |
"""True if tags can reference ghost revisions.""" |
|
1755 |
return True |
|
1756 |
||
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
1757 |
|
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1758 |
class MetaDirBranchFormatFactory(registry._LazyObjectGetter): |
|
5305.1.2
by Robert Collins
More clarity about how to use the lazy registration feature. |
1759 |
"""A factory for a BranchFormat object, permitting simple lazy registration. |
1760 |
|
|
1761 |
While none of the built in BranchFormats are lazy registered yet,
|
|
1762 |
bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
|
|
1763 |
use it, and the bzr-loom plugin uses it as well (see
|
|
1764 |
bzrlib.plugins.loom.formats).
|
|
1765 |
"""
|
|
|
5305.1.1
by Robert Collins
``Branch`` formats can now be loaded lazily by registering a |
1766 |
|
1767 |
def __init__(self, format_string, module_name, member_name): |
|
1768 |
"""Create a MetaDirBranchFormatFactory. |
|
1769 |
||
1770 |
:param format_string: The format string the format has.
|
|
1771 |
:param module_name: Module to load the format class from.
|
|
1772 |
:param member_name: Attribute name within the module for the format class.
|
|
1773 |
"""
|
|
1774 |
registry._LazyObjectGetter.__init__(self, module_name, member_name) |
|
1775 |
self._format_string = format_string |
|
1776 |
||
1777 |
def get_format_string(self): |
|
1778 |
"""See BranchFormat.get_format_string.""" |
|
1779 |
return self._format_string |
|
1780 |
||
1781 |
def __call__(self): |
|
1782 |
"""Used for network_format_registry support.""" |
|
1783 |
return self.get_obj()() |
|
1784 |
||
1785 |
||
|
2370.4.1
by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented |
1786 |
class BranchHooks(Hooks): |
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1787 |
"""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 |
1788 |
|
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1789 |
e.g. ['set_rh'] Is the list of items to be called when the
|
1790 |
set_revision_history function is invoked.
|
|
1791 |
"""
|
|
1792 |
||
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1793 |
def __init__(self): |
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1794 |
"""Create the default hooks. |
1795 |
||
1796 |
These are all empty initially, because by default nothing should get
|
|
1797 |
notified.
|
|
1798 |
"""
|
|
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1799 |
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks") |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1800 |
self.add_hook('set_rh', |
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1801 |
"Invoked whenever the revision history has been set via "
|
1802 |
"set_revision_history. The api signature is (branch, "
|
|
1803 |
"revision_history), and the branch will be write-locked. "
|
|
1804 |
"The set_rh hook can be expensive for bzr to trigger, a better "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1805 |
"hook to use is Branch.post_change_branch_tip.", (0, 15)) |
1806 |
self.add_hook('open', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1807 |
"Called with the Branch object that has been opened after a "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1808 |
"branch is opened.", (1, 8)) |
1809 |
self.add_hook('post_push', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1810 |
"Called after a push operation completes. post_push is called "
|
|
4053.3.4
by Jelmer Vernooij
Update branch hooks documentation. |
1811 |
"with a bzrlib.branch.BranchPushResult object and only runs in the "
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1812 |
"bzr client.", (0, 15)) |
1813 |
self.add_hook('post_pull', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1814 |
"Called after a pull operation completes. post_pull is called "
|
1815 |
"with a bzrlib.branch.PullResult object and only runs in the "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1816 |
"bzr client.", (0, 15)) |
1817 |
self.add_hook('pre_commit', |
|
|
5430.4.2
by Vincent Ladeuil
Fix typo in Branch.pre_commit HookPoint docstring. |
1818 |
"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. |
1819 |
"completed. pre_commit is called with (local, master, old_revno, "
|
1820 |
"old_revid, future_revno, future_revid, tree_delta, future_tree"
|
|
1821 |
"). old_revid is NULL_REVISION for the first commit to a branch, "
|
|
1822 |
"tree_delta is a TreeDelta object describing changes from the "
|
|
1823 |
"basis revision. hooks MUST NOT modify this delta. "
|
|
1824 |
" future_tree is an in-memory tree obtained from "
|
|
1825 |
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1826 |
"tree.", (0,91)) |
1827 |
self.add_hook('post_commit', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1828 |
"Called in the bzr client after a commit has completed. "
|
1829 |
"post_commit is called with (local, master, old_revno, old_revid, "
|
|
1830 |
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1831 |
"commit to a branch.", (0, 15)) |
1832 |
self.add_hook('post_uncommit', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1833 |
"Called in the bzr client after an uncommit completes. "
|
1834 |
"post_uncommit is called with (local, master, old_revno, "
|
|
1835 |
"old_revid, new_revno, new_revid) where local is the local branch "
|
|
1836 |
"or None, master is the target branch, and an empty branch "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1837 |
"receives new_revno of 0, new_revid of None.", (0, 15)) |
1838 |
self.add_hook('pre_change_branch_tip', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1839 |
"Called in bzr client and server before a change to the tip of a "
|
1840 |
"branch is made. pre_change_branch_tip is called with a "
|
|
1841 |
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1842 |
"commit, uncommit will all trigger this hook.", (1, 6)) |
1843 |
self.add_hook('post_change_branch_tip', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1844 |
"Called in bzr client and server after a change to the tip of a "
|
1845 |
"branch is made. post_change_branch_tip is called with a "
|
|
1846 |
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1847 |
"commit, uncommit will all trigger this hook.", (1, 4)) |
1848 |
self.add_hook('transform_fallback_location', |
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
1849 |
"Called when a stacked branch is activating its fallback "
|
1850 |
"locations. transform_fallback_location is called with (branch, "
|
|
1851 |
"url), and should return a new url. Returning the same url "
|
|
1852 |
"allows it to be used as-is, returning a different one can be "
|
|
1853 |
"used to cause the branch to stack on a closer copy of that "
|
|
1854 |
"fallback_location. Note that the branch cannot have history "
|
|
1855 |
"accessing methods called on it during this hook because the "
|
|
1856 |
"fallback locations have not been activated. When there are "
|
|
1857 |
"multiple hooks installed for transform_fallback_location, "
|
|
1858 |
"all are called with the url returned from the previous hook."
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1859 |
"The order is however undefined.", (1, 9)) |
1860 |
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) |
1861 |
"Called to determine an automatic tag name for a revision. "
|
|
5086.4.5
by Jelmer Vernooij
Make automatic_tag_name a hook on Branch. |
1862 |
"automatic_tag_name is called with (branch, revision_id) and "
|
1863 |
"should return a tag name or None if no tag name could be "
|
|
|
5086.4.9
by Jelmer Vernooij
Update documentation. |
1864 |
"determined. The first non-None tag name returned will be used.", |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1865 |
(2, 2)) |
1866 |
self.add_hook('post_branch_init', |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1867 |
"Called after new branch initialization completes. "
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1868 |
"post_branch_init is called with a "
|
1869 |
"bzrlib.branch.BranchInitHookParams. "
|
|
1870 |
"Note that init, branch and checkout (both heavyweight and "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1871 |
"lightweight) will all trigger this hook.", (2, 2)) |
1872 |
self.add_hook('post_switch', |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1873 |
"Called after a checkout switches branch. "
|
1874 |
"post_switch is called with a "
|
|
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
1875 |
"bzrlib.branch.SwitchHookParams.", (2, 2)) |
|
5086.4.5
by Jelmer Vernooij
Make automatic_tag_name a hook on Branch. |
1876 |
|
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1877 |
|
1878 |
||
1879 |
# install the default hooks into the Branch class.
|
|
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1880 |
Branch.hooks = BranchHooks() |
|
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
1881 |
|
1882 |
||
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1883 |
class ChangeBranchTipParams(object): |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1884 |
"""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() |
1885 |
|
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1886 |
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() |
1887 |
|
|
3331.1.13
by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID. |
1888 |
:ivar branch: the branch being changed
|
1889 |
:ivar old_revno: revision number before the change
|
|
1890 |
:ivar new_revno: revision number after the change
|
|
1891 |
:ivar old_revid: revision id before the change
|
|
1892 |
: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() |
1893 |
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1894 |
The revid fields are strings. The revno fields are integers.
|
1895 |
"""
|
|
1896 |
||
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1897 |
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 |
1898 |
"""Create a group of ChangeBranchTip parameters. |
1899 |
||
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1900 |
:param branch: The branch being changed.
|
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1901 |
:param old_revno: Revision number before the change.
|
1902 |
:param new_revno: Revision number after the change.
|
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1903 |
:param old_revid: Tip revision id before the change.
|
1904 |
:param new_revid: Tip revision id after the change.
|
|
1905 |
"""
|
|
|
3331.1.7
by James Henstridge
Make the branch a member of the ChangeBranchTipParams object. |
1906 |
self.branch = branch |
|
3331.1.5
by James Henstridge
Put revno before revid in method arguments to match last_revision_info() |
1907 |
self.old_revno = old_revno |
1908 |
self.new_revno = new_revno |
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1909 |
self.old_revid = old_revid |
1910 |
self.new_revid = new_revid |
|
1911 |
||
|
3517.2.3
by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks. |
1912 |
def __eq__(self, other): |
1913 |
return self.__dict__ == other.__dict__ |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1914 |
|
|
3517.2.3
by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks. |
1915 |
def __repr__(self): |
1916 |
return "<%s of %s from (%s, %s) to (%s, %s)>" % ( |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1917 |
self.__class__.__name__, self.branch, |
|
3517.2.3
by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks. |
1918 |
self.old_revno, self.old_revid, self.new_revno, self.new_revid) |
1919 |
||
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1920 |
|
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1921 |
class BranchInitHookParams(object): |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1922 |
"""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', |
1923 |
|
1924 |
There are 4 fields that hooks may wish to access:
|
|
1925 |
||
1926 |
:ivar format: the branch format
|
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1927 |
:ivar bzrdir: the BzrDir 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', |
1928 |
: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. |
1929 |
:ivar branch: the branch created
|
1930 |
||
1931 |
Note that for lightweight checkouts, the bzrdir and format fields refer to
|
|
1932 |
the checkout, hence they are different from the corresponding fields in
|
|
1933 |
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', |
1934 |
"""
|
1935 |
||
1936 |
def __init__(self, format, a_bzrdir, name, branch): |
|
|
5107.3.2
by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency, |
1937 |
"""Create a group of BranchInitHook parameters. |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1938 |
|
1939 |
:param format: the branch format
|
|
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
1940 |
:param a_bzrdir: the BzrDir where the branch will be/has been
|
1941 |
initialized
|
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1942 |
: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. |
1943 |
:param branch: the branch created
|
1944 |
||
1945 |
Note that for lightweight checkouts, the bzrdir and format fields refer
|
|
1946 |
to the checkout, hence they are different from the corresponding fields
|
|
1947 |
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', |
1948 |
"""
|
1949 |
self.format = format |
|
1950 |
self.bzrdir = a_bzrdir |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1951 |
self.name = name |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1952 |
self.branch = branch |
1953 |
||
1954 |
def __eq__(self, other): |
|
1955 |
return self.__dict__ == other.__dict__ |
|
1956 |
||
1957 |
def __repr__(self): |
|
|
5050.21.1
by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__. |
1958 |
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', |
1959 |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1960 |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1961 |
class SwitchHookParams(object): |
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
1962 |
"""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', |
1963 |
|
1964 |
There are 4 fields that hooks may wish to access:
|
|
1965 |
||
1966 |
:ivar control_dir: BzrDir of the checkout to change
|
|
1967 |
:ivar to_branch: branch that the checkout is to reference
|
|
1968 |
:ivar force: skip the check for local commits in a heavy checkout
|
|
1969 |
:ivar revision_id: revision ID to switch to (or None)
|
|
1970 |
"""
|
|
1971 |
||
1972 |
def __init__(self, control_dir, to_branch, force, revision_id): |
|
1973 |
"""Create a group of SwitchHook parameters. |
|
1974 |
||
1975 |
:param control_dir: BzrDir of the checkout to change
|
|
1976 |
:param to_branch: branch that the checkout is to reference
|
|
1977 |
:param force: skip the check for local commits in a heavy checkout
|
|
1978 |
:param revision_id: revision ID to switch to (or None)
|
|
1979 |
"""
|
|
1980 |
self.control_dir = control_dir |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1981 |
self.to_branch = to_branch |
1982 |
self.force = force |
|
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
1983 |
self.revision_id = revision_id |
1984 |
||
1985 |
def __eq__(self, other): |
|
1986 |
return self.__dict__ == other.__dict__ |
|
1987 |
||
1988 |
def __repr__(self): |
|
1989 |
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__, |
|
1990 |
self.control_dir, self.to_branch, |
|
1991 |
self.revision_id) |
|
|
3323.2.1
by Ian Clatworthy
first cut at post_change_branch_tip hook |
1992 |
|
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
1993 |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
1994 |
class BranchFormatMetadir(BranchFormat): |
1995 |
"""Common logic for meta-dir based branch formats.""" |
|
1996 |
||
1997 |
def _branch_class(self): |
|
1998 |
"""What class to instantiate on open calls.""" |
|
1999 |
raise NotImplementedError(self._branch_class) |
|
2000 |
||
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2001 |
def _get_initial_config(self, append_revisions_only=None): |
2002 |
if append_revisions_only: |
|
2003 |
return "append_revisions_only = True\n" |
|
2004 |
else: |
|
2005 |
# Avoid writing anything if append_revisions_only is disabled,
|
|
2006 |
# as that is the default.
|
|
2007 |
return "" |
|
2008 |
||
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
2009 |
def _initialize_helper(self, a_bzrdir, utf8_files, name=None, |
2010 |
repository=None): |
|
2011 |
"""Initialize a branch in a bzrdir, with specified files |
|
2012 |
||
2013 |
:param a_bzrdir: The bzrdir to initialize the branch in
|
|
2014 |
:param utf8_files: The files to create as a list of
|
|
2015 |
(filename, content) tuples
|
|
2016 |
:param name: Name of colocated branch to create, if any
|
|
2017 |
:return: a branch in this format
|
|
2018 |
"""
|
|
2019 |
mutter('creating branch %r in %s', self, a_bzrdir.user_url) |
|
2020 |
branch_transport = a_bzrdir.get_branch_transport(self, name=name) |
|
2021 |
control_files = lockable_files.LockableFiles(branch_transport, |
|
2022 |
'lock', lockdir.LockDir) |
|
2023 |
control_files.create_lock() |
|
2024 |
control_files.lock_write() |
|
2025 |
try: |
|
2026 |
utf8_files += [('format', self.get_format_string())] |
|
2027 |
for (filename, content) in utf8_files: |
|
2028 |
branch_transport.put_bytes( |
|
2029 |
filename, content, |
|
2030 |
mode=a_bzrdir._get_file_mode()) |
|
2031 |
finally: |
|
2032 |
control_files.unlock() |
|
2033 |
branch = self.open(a_bzrdir, name, _found=True, |
|
2034 |
found_repository=repository) |
|
2035 |
self._run_post_branch_init_hooks(a_bzrdir, name, branch) |
|
2036 |
return branch |
|
2037 |
||
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
2038 |
def network_name(self): |
2039 |
"""A simple byte string uniquely identifying this format for RPC calls. |
|
2040 |
||
2041 |
Metadir branch formats use their format string.
|
|
2042 |
"""
|
|
2043 |
return self.get_format_string() |
|
2044 |
||
|
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. |
2045 |
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False, |
2046 |
found_repository=None): |
|
|
4160.2.12
by Andrew Bennetts
Improve docstrings and remove a line of cruft. |
2047 |
"""See BranchFormat.open().""" |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2048 |
if not _found: |
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2049 |
format = BranchFormat.find_format(a_bzrdir, name=name) |
|
3221.13.3
by Ian Clatworthy
Merge bzr.dev r3466 |
2050 |
if format.__class__ != self.__class__: |
2051 |
raise AssertionError("wrong format %r found for %r" % |
|
2052 |
(format, self)) |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2053 |
transport = a_bzrdir.get_branch_transport(None, name=name) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2054 |
try: |
2055 |
control_files = lockable_files.LockableFiles(transport, 'lock', |
|
2056 |
lockdir.LockDir) |
|
|
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. |
2057 |
if found_repository is None: |
2058 |
found_repository = a_bzrdir.find_repository() |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2059 |
return self._branch_class()(_format=self, |
2060 |
_control_files=control_files, |
|
|
5085.1.1
by Jelmer Vernooij
Let branches know about their colocated name. |
2061 |
name=name, |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2062 |
a_bzrdir=a_bzrdir, |
|
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. |
2063 |
_repository=found_repository, |
|
4160.2.6
by Andrew Bennetts
Add ignore_fallbacks flag. |
2064 |
ignore_fallbacks=ignore_fallbacks) |
|
3221.13.3
by Ian Clatworthy
Merge bzr.dev r3466 |
2065 |
except errors.NoSuchFile: |
|
4734.4.7
by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails) |
2066 |
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2067 |
|
2068 |
def __init__(self): |
|
2069 |
super(BranchFormatMetadir, self).__init__() |
|
2070 |
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1() |
|
|
3834.5.2
by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format. |
2071 |
self._matchingbzrdir.set_branch_format(self) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2072 |
|
2073 |
def supports_tags(self): |
|
2074 |
return True |
|
2075 |
||
|
5674.1.1
by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat. |
2076 |
def supports_leaving_lock(self): |
2077 |
return True |
|
2078 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2079 |
|
2080 |
class BzrBranchFormat5(BranchFormatMetadir): |
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2081 |
"""Bzr branch format 5. |
2082 |
||
2083 |
This format has:
|
|
2084 |
- a revision-history file.
|
|
2085 |
- a format string
|
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
2086 |
- a lock dir guarding the branch itself
|
2087 |
- all of this stored in a branch/ subdirectory
|
|
|
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
2088 |
- works with shared repositories.
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
2089 |
|
2090 |
This format is new in bzr 0.8.
|
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2091 |
"""
|
2092 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2093 |
def _branch_class(self): |
2094 |
return BzrBranch5 |
|
2095 |
||
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2096 |
def get_format_string(self): |
2097 |
"""See BranchFormat.get_format_string().""" |
|
2098 |
return "Bazaar-NG branch format 5\n" |
|
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
2099 |
|
2100 |
def get_format_description(self): |
|
2101 |
"""See BranchFormat.get_format_description().""" |
|
2102 |
return "Branch format 5" |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2103 |
|
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2104 |
def initialize(self, a_bzrdir, name=None, repository=None, |
2105 |
append_revisions_only=None): |
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2106 |
"""Create a branch of this format in a_bzrdir.""" |
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2107 |
if append_revisions_only: |
2108 |
raise errors.UpgradeRequired(a_bzrdir.user_url) |
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2109 |
utf8_files = [('revision-history', ''), |
2110 |
('branch-name', ''), |
|
2111 |
]
|
|
|
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. |
2112 |
return self._initialize_helper(a_bzrdir, utf8_files, name, repository) |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2113 |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2114 |
def supports_tags(self): |
2115 |
return False |
|
2116 |
||
2117 |
||
2118 |
class BzrBranchFormat6(BranchFormatMetadir): |
|
|
2696.3.1
by Martin Pool
(broken) start switching format to dirstate-tags |
2119 |
"""Branch format with last-revision and tags. |
|
2230.3.12
by Aaron Bentley
Clean up trailing whitespace |
2120 |
|
|
2230.3.38
by Aaron Bentley
Update docs per Martin's suggestion |
2121 |
Unlike previous formats, this has no explicit revision history. Instead,
|
2122 |
this just stores the last-revision, and the left-hand history leading
|
|
2123 |
up to there is the history.
|
|
2124 |
||
2125 |
This format was introduced in bzr 0.15
|
|
|
2696.3.1
by Martin Pool
(broken) start switching format to dirstate-tags |
2126 |
and became the default in 0.91.
|
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2127 |
"""
|
2128 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2129 |
def _branch_class(self): |
2130 |
return BzrBranch6 |
|
2131 |
||
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2132 |
def get_format_string(self): |
2133 |
"""See BranchFormat.get_format_string().""" |
|
|
2255.2.230
by Robert Collins
Update tree format signatures to mention introducing bzr version. |
2134 |
return "Bazaar Branch Format 6 (bzr 0.15)\n" |
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2135 |
|
2136 |
def get_format_description(self): |
|
2137 |
"""See BranchFormat.get_format_description().""" |
|
2138 |
return "Branch format 6" |
|
2139 |
||
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2140 |
def initialize(self, a_bzrdir, name=None, repository=None, |
2141 |
append_revisions_only=None): |
|
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2142 |
"""Create a branch of this format in a_bzrdir.""" |
|
2230.3.51
by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info |
2143 |
utf8_files = [('last-revision', '0 null:\n'), |
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2144 |
('branch.conf', |
2145 |
self._get_initial_config(append_revisions_only)), |
|
|
2220.2.28
by Martin Pool
Integrate tags with Branch6: |
2146 |
('tags', ''), |
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2147 |
]
|
|
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. |
2148 |
return self._initialize_helper(a_bzrdir, utf8_files, name, repository) |
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2149 |
|
|
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. |
2150 |
def make_tags(self, branch): |
2151 |
"""See bzrlib.branch.BranchFormat.make_tags().""" |
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
2152 |
return _mod_tag.BasicTags(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. |
2153 |
|
|
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. |
2154 |
def supports_set_append_revisions_only(self): |
2155 |
return True |
|
|
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. |
2156 |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2157 |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2158 |
class BzrBranchFormat8(BranchFormatMetadir): |
2159 |
"""Metadir format supporting storing locations of subtree branches.""" |
|
2160 |
||
2161 |
def _branch_class(self): |
|
2162 |
return BzrBranch8 |
|
2163 |
||
2164 |
def get_format_string(self): |
|
2165 |
"""See BranchFormat.get_format_string().""" |
|
2166 |
return "Bazaar Branch Format 8 (needs bzr 1.15)\n" |
|
2167 |
||
2168 |
def get_format_description(self): |
|
2169 |
"""See BranchFormat.get_format_description().""" |
|
2170 |
return "Branch format 8" |
|
2171 |
||
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2172 |
def initialize(self, a_bzrdir, name=None, repository=None, |
2173 |
append_revisions_only=None): |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2174 |
"""Create a branch of this format in a_bzrdir.""" |
2175 |
utf8_files = [('last-revision', '0 null:\n'), |
|
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2176 |
('branch.conf', |
2177 |
self._get_initial_config(append_revisions_only)), |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2178 |
('tags', ''), |
2179 |
('references', '') |
|
2180 |
]
|
|
|
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. |
2181 |
return self._initialize_helper(a_bzrdir, utf8_files, name, repository) |
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2182 |
|
2183 |
def make_tags(self, branch): |
|
2184 |
"""See bzrlib.branch.BranchFormat.make_tags().""" |
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
2185 |
return _mod_tag.BasicTags(branch) |
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2186 |
|
|
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. |
2187 |
def supports_set_append_revisions_only(self): |
2188 |
return True |
|
2189 |
||
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2190 |
def supports_stacking(self): |
2191 |
return True |
|
2192 |
||
|
4273.1.5
by Aaron Bentley
Ensure references are propagated by sprout/clone. |
2193 |
supports_reference_locations = True |
2194 |
||
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2195 |
|
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
2196 |
class BzrBranchFormat7(BranchFormatMetadir): |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2197 |
"""Branch format with last-revision, tags, and a stacked location pointer. |
2198 |
||
2199 |
The stacked location pointer is passed down to the repository and requires
|
|
2200 |
a repository format with supports_external_lookups = True.
|
|
2201 |
||
|
3221.13.6
by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3 |
2202 |
This format was introduced in bzr 1.6.
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2203 |
"""
|
2204 |
||
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2205 |
def initialize(self, a_bzrdir, name=None, repository=None, |
2206 |
append_revisions_only=None): |
|
|
4273.1.12
by Aaron Bentley
Don't create reference files for older formats. |
2207 |
"""Create a branch of this format in a_bzrdir.""" |
2208 |
utf8_files = [('last-revision', '0 null:\n'), |
|
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2209 |
('branch.conf', |
2210 |
self._get_initial_config(append_revisions_only)), |
|
|
4273.1.12
by Aaron Bentley
Don't create reference files for older formats. |
2211 |
('tags', ''), |
2212 |
]
|
|
|
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. |
2213 |
return self._initialize_helper(a_bzrdir, utf8_files, name, repository) |
|
4273.1.12
by Aaron Bentley
Don't create reference files for older formats. |
2214 |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2215 |
def _branch_class(self): |
2216 |
return BzrBranch7 |
|
2217 |
||
2218 |
def get_format_string(self): |
|
2219 |
"""See BranchFormat.get_format_string().""" |
|
|
3221.13.6
by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3 |
2220 |
return "Bazaar Branch Format 7 (needs bzr 1.6)\n" |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2221 |
|
2222 |
def get_format_description(self): |
|
2223 |
"""See BranchFormat.get_format_description().""" |
|
2224 |
return "Branch format 7" |
|
2225 |
||
|
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. |
2226 |
def supports_set_append_revisions_only(self): |
2227 |
return True |
|
2228 |
||
|
5757.1.2
by Jelmer Vernooij
Add separate file for knit pack repository formats. |
2229 |
def supports_stacking(self): |
2230 |
return True |
|
2231 |
||
|
5757.1.4
by Jelmer Vernooij
Add bzrlib.repofmt.knitpack_repo to the blacklist in test_import_tariff. |
2232 |
def make_tags(self, branch): |
2233 |
"""See bzrlib.branch.BranchFormat.make_tags().""" |
|
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
2234 |
return _mod_tag.BasicTags(branch) |
|
5757.1.4
by Jelmer Vernooij
Add bzrlib.repofmt.knitpack_repo to the blacklist in test_import_tariff. |
2235 |
|
|
4273.1.5
by Aaron Bentley
Ensure references are propagated by sprout/clone. |
2236 |
supports_reference_locations = False |
2237 |
||
|
2230.3.1
by Aaron Bentley
Get branch6 creation working |
2238 |
|
|
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. |
2239 |
class BranchReferenceFormat(BranchFormat): |
2240 |
"""Bzr branch reference format. |
|
2241 |
||
2242 |
Branch references are used in implementing checkouts, they
|
|
2243 |
act as an alias to the real branch which is at some other url.
|
|
2244 |
||
2245 |
This format has:
|
|
2246 |
- A location file
|
|
2247 |
- a format string
|
|
2248 |
"""
|
|
2249 |
||
2250 |
def get_format_string(self): |
|
2251 |
"""See BranchFormat.get_format_string().""" |
|
2252 |
return "Bazaar-NG Branch Reference Format 1\n" |
|
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
2253 |
|
2254 |
def get_format_description(self): |
|
2255 |
"""See BranchFormat.get_format_description().""" |
|
2256 |
return "Checkout reference format 1" |
|
|
2955.5.2
by Vincent Ladeuil
Fix first unwanted connection. |
2257 |
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
2258 |
def get_reference(self, a_bzrdir, name=None): |
|
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
2259 |
"""See BranchFormat.get_reference().""" |
|
5147.4.6
by Jelmer Vernooij
consistency in names |
2260 |
transport = a_bzrdir.get_branch_transport(None, name=name) |
|
4708.2.1
by Martin
Ensure all files opened by bazaar proper are explicitly closed |
2261 |
return transport.get_bytes('location') |
|
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
2262 |
|
|
5147.4.6
by Jelmer Vernooij
consistency in names |
2263 |
def set_reference(self, a_bzrdir, name, to_branch): |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
2264 |
"""See BranchFormat.set_reference().""" |
|
5147.4.6
by Jelmer Vernooij
consistency in names |
2265 |
transport = a_bzrdir.get_branch_transport(None, name=name) |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
2266 |
location = transport.put_bytes('location', to_branch.base) |
2267 |
||
|
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. |
2268 |
def initialize(self, a_bzrdir, name=None, target_branch=None, |
|
6123.9.12
by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize. |
2269 |
repository=None, append_revisions_only=None): |
|
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. |
2270 |
"""Create a branch of this format in a_bzrdir.""" |
2271 |
if target_branch is None: |
|
2272 |
# this format does not implement branch itself, thus the implicit
|
|
2273 |
# creation contract must see it as uninitializable
|
|
2274 |
raise errors.UninitializableFormat(self) |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2275 |
mutter('creating branch reference in %s', a_bzrdir.user_url) |
|
6082.1.1
by Jelmer Vernooij
Don't attempt to create branch references in control directories that don't support it. |
2276 |
if a_bzrdir._format.fixed_components: |
2277 |
raise errors.IncompatibleFormat(self, a_bzrdir._format) |
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2278 |
branch_transport = a_bzrdir.get_branch_transport(self, name=name) |
|
1955.3.9
by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes |
2279 |
branch_transport.put_bytes('location', |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2280 |
target_branch.bzrdir.user_url) |
|
1955.3.9
by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes |
2281 |
branch_transport.put_bytes('format', self.get_format_string()) |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
2282 |
branch = self.open( |
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2283 |
a_bzrdir, name, _found=True, |
|
2955.5.2
by Vincent Ladeuil
Fix first unwanted connection. |
2284 |
possible_transports=[target_branch.bzrdir.root_transport]) |
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
2285 |
self._run_post_branch_init_hooks(a_bzrdir, name, branch) |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
2286 |
return branch |
|
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. |
2287 |
|
2288 |
def __init__(self): |
|
2289 |
super(BranchReferenceFormat, self).__init__() |
|
2290 |
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1() |
|
|
3834.5.2
by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format. |
2291 |
self._matchingbzrdir.set_branch_format(self) |
|
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. |
2292 |
|
2293 |
def _make_reference_clone_function(format, a_branch): |
|
2294 |
"""Create a clone() routine for a branch dynamically.""" |
|
|
4050.1.3
by Robert Collins
Add missed new parameter for branch reference cloning. |
2295 |
def clone(to_bzrdir, revision_id=None, |
2296 |
repository_policy=None): |
|
|
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. |
2297 |
"""See Branch.clone().""" |
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2298 |
return format.initialize(to_bzrdir, target_branch=a_branch) |
|
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. |
2299 |
# cannot obey revision_id limits when cloning a reference ...
|
2300 |
# FIXME RBC 20060210 either nuke revision_id for clone, or
|
|
2301 |
# emit some sort of warning/error to the caller ?!
|
|
2302 |
return clone |
|
2303 |
||
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2304 |
def open(self, a_bzrdir, name=None, _found=False, location=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. |
2305 |
possible_transports=None, ignore_fallbacks=False, |
2306 |
found_repository=None): |
|
|
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. |
2307 |
"""Return the branch that the branch reference in a_bzrdir points at. |
2308 |
||
|
4160.2.12
by Andrew Bennetts
Improve docstrings and remove a line of cruft. |
2309 |
:param a_bzrdir: A BzrDir that contains a branch.
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2310 |
:param name: Name of colocated branch to open, if any
|
|
4160.2.12
by Andrew Bennetts
Improve docstrings and remove a line of cruft. |
2311 |
:param _found: a private parameter, do not use it. It is used to
|
2312 |
indicate if format probing has already be done.
|
|
2313 |
:param ignore_fallbacks: when set, no fallback branches will be opened
|
|
2314 |
(if there are any). Default is to open fallbacks.
|
|
2315 |
:param location: The location of the referenced branch. If
|
|
2316 |
unspecified, this will be determined from the branch reference in
|
|
2317 |
a_bzrdir.
|
|
2318 |
:param possible_transports: An optional reusable transports list.
|
|
|
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. |
2319 |
"""
|
2320 |
if not _found: |
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2321 |
format = BranchFormat.find_format(a_bzrdir, name=name) |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
2322 |
if format.__class__ != self.__class__: |
2323 |
raise AssertionError("wrong format %r found for %r" % |
|
2324 |
(format, self)) |
|
|
2018.6.1
by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS. |
2325 |
if location is None: |
|
5147.4.4
by Jelmer Vernooij
Support colocated branches in BranchReference. |
2326 |
location = self.get_reference(a_bzrdir, name) |
|
2955.5.2
by Vincent Ladeuil
Fix first unwanted connection. |
2327 |
real_bzrdir = bzrdir.BzrDir.open( |
2328 |
location, possible_transports=possible_transports) |
|
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
2329 |
result = real_bzrdir.open_branch(name=name, |
2330 |
ignore_fallbacks=ignore_fallbacks) |
|
|
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. |
2331 |
# this changes the behaviour of result.clone to create a new reference
|
2332 |
# rather than a copy of the content of the branch.
|
|
2333 |
# I did not use a proxy object because that needs much more extensive
|
|
2334 |
# testing, and we are only changing one behaviour at the moment.
|
|
2335 |
# If we decide to alter more behaviours - i.e. the implicit nickname
|
|
2336 |
# then this should be refactored to introduce a tested proxy branch
|
|
2337 |
# and a subclass of that for use in overriding clone() and ....
|
|
2338 |
# - RBC 20060210
|
|
2339 |
result.clone = self._make_reference_clone_function(result) |
|
2340 |
return result |
|
2341 |
||
2342 |
||
|
5669.3.9
by Jelmer Vernooij
Consistent naming. |
2343 |
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry): |
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
2344 |
"""Branch format registry.""" |
2345 |
||
2346 |
def __init__(self, other_registry=None): |
|
2347 |
super(BranchFormatRegistry, self).__init__(other_registry) |
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
2348 |
self._default_format = None |
2349 |
||
2350 |
def set_default(self, format): |
|
2351 |
self._default_format = format |
|
2352 |
||
2353 |
def get_default(self): |
|
2354 |
return self._default_format |
|
2355 |
||
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
2356 |
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
2357 |
network_format_registry = registry.FormatRegistry() |
2358 |
"""Registry of formats indexed by their network name.
|
|
2359 |
||
|
4070.2.1
by Robert Collins
Add a BzrDirFormat.network_name. |
2360 |
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. |
2361 |
referring to formats with smart server operations. See
|
2362 |
BranchFormat.network_name() for more detail.
|
|
2363 |
"""
|
|
2364 |
||
|
5662.2.1
by Jelmer Vernooij
Add BranchFormatRegistry. |
2365 |
format_registry = BranchFormatRegistry(network_format_registry) |
2366 |
||
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
2367 |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
2368 |
# formats which have no format string are not discoverable
|
2369 |
# and not independently creatable, so are not registered.
|
|
|
2696.3.3
by Martin Pool
Start setting the default format to dirstate-tags |
2370 |
__format5 = BzrBranchFormat5() |
2371 |
__format6 = BzrBranchFormat6() |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2372 |
__format7 = BzrBranchFormat7() |
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2373 |
__format8 = BzrBranchFormat8() |
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
2374 |
format_registry.register(__format5) |
2375 |
format_registry.register(BranchReferenceFormat()) |
|
2376 |
format_registry.register(__format6) |
|
2377 |
format_registry.register(__format7) |
|
2378 |
format_registry.register(__format8) |
|
2379 |
format_registry.set_default(__format7) |
|
|
4032.3.1
by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls. |
2380 |
|
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
2381 |
|
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
2382 |
class BranchWriteLockResult(LogicalLockResult): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2383 |
"""The result of write locking a branch. |
2384 |
||
2385 |
:ivar branch_token: The token obtained from the underlying branch lock, or
|
|
2386 |
None.
|
|
2387 |
:ivar unlock: A callable which will unlock the lock.
|
|
2388 |
"""
|
|
2389 |
||
2390 |
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. |
2391 |
LogicalLockResult.__init__(self, unlock) |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2392 |
self.branch_token = branch_token |
2393 |
||
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
2394 |
def __repr__(self): |
|
5200.3.5
by Robert Collins
Add __str__ to the new helper classes. |
2395 |
return "BranchWriteLockResult(%s, %s)" % (self.branch_token, |
2396 |
self.unlock) |
|
2397 |
||
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2398 |
|
|
4731.1.2
by Andrew Bennetts
Refactor to reduce duplication. |
2399 |
class BzrBranch(Branch, _RelockDebugMixin): |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
2400 |
"""A branch stored in the actual filesystem. |
2401 |
||
2402 |
Note that it's "local" in the context of the filesystem; it doesn't
|
|
2403 |
really matter if it's on an nfs/smb/afs/coda/... share, as long as
|
|
2404 |
it's writable, and can be accessed via the normal filesystem API.
|
|
|
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
2405 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2406 |
:ivar _transport: Transport for file operations on this branch's
|
|
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
2407 |
control files, typically pointing to the .bzr/branch directory.
|
2408 |
:ivar repository: Repository for this branch.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2409 |
:ivar base: The url of the base directory for this branch; the one
|
|
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
2410 |
containing the .bzr directory.
|
|
5085.1.1
by Jelmer Vernooij
Let branches know about their colocated name. |
2411 |
:ivar name: Optional colocated branch name as it exists in the control
|
2412 |
directory.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
2413 |
"""
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2414 |
|
|
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
2415 |
def __init__(self, _format=None, |
|
5085.1.1
by Jelmer Vernooij
Let branches know about their colocated name. |
2416 |
_control_files=None, a_bzrdir=None, name=None, |
2417 |
_repository=None, ignore_fallbacks=False): |
|
|
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
2418 |
"""Create new branch object at a particular location.""" |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2419 |
if a_bzrdir is None: |
|
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
2420 |
raise ValueError('a_bzrdir must be supplied') |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
2421 |
else: |
2422 |
self.bzrdir = a_bzrdir |
|
|
2220.2.16
by mbp at sourcefrog
Make Branch._transport be the branch's control file transport |
2423 |
self._base = self.bzrdir.transport.clone('..').base |
|
5085.1.1
by Jelmer Vernooij
Let branches know about their colocated name. |
2424 |
self.name = name |
|
3446.1.1
by Martin Pool
merge further LockableFile deprecations |
2425 |
# XXX: We should be able to just do
|
2426 |
# self.base = self.bzrdir.root_transport.base
|
|
2427 |
# but this does not quite work yet -- mbp 20080522
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
2428 |
self._format = _format |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
2429 |
if _control_files is None: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2430 |
raise ValueError('BzrBranch _control_files is None') |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
2431 |
self.control_files = _control_files |
|
2220.2.16
by mbp at sourcefrog
Make Branch._transport be the branch's control file transport |
2432 |
self._transport = _control_files._transport |
|
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
2433 |
self.repository = _repository |
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
2434 |
Branch.__init__(self) |
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
2435 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
2436 |
def __str__(self): |
|
5085.1.1
by Jelmer Vernooij
Let branches know about their colocated name. |
2437 |
if self.name is None: |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2438 |
return '%s(%s)' % (self.__class__.__name__, self.user_url) |
|
5085.1.1
by Jelmer Vernooij
Let branches know about their colocated name. |
2439 |
else: |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2440 |
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url, |
2441 |
self.name) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
2442 |
|
2443 |
__repr__ = __str__ |
|
2444 |
||
|
907.1.17
by John Arbash Meinel
Adding a Branch.base property, removing pull_loc() |
2445 |
def _get_base(self): |
|
2220.2.16
by mbp at sourcefrog
Make Branch._transport be the branch's control file transport |
2446 |
"""Returns the directory containing the control directory.""" |
|
1185.69.2
by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch |
2447 |
return self._base |
|
907.1.17
by John Arbash Meinel
Adding a Branch.base property, removing pull_loc() |
2448 |
|
|
1442.1.5
by Robert Collins
Give branch.base a docstring. |
2449 |
base = property(_get_base, doc="The URL for the root of this branch.") |
|
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
2450 |
|
|
4226.1.5
by Robert Collins
Reinstate the use of the Branch.get_config_file verb. |
2451 |
def _get_config(self): |
|
6105.1.1
by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import. |
2452 |
return _mod_config.TransportConfig(self._transport, 'branch.conf') |
|
4226.1.5
by Robert Collins
Reinstate the use of the Branch.get_config_file verb. |
2453 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
2454 |
def is_locked(self): |
2455 |
return self.control_files.is_locked() |
|
2456 |
||
|
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
2457 |
def lock_write(self, token=None): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2458 |
"""Lock the branch for write operations. |
2459 |
||
2460 |
:param token: A token to permit reacquiring a previously held and
|
|
2461 |
preserved lock.
|
|
2462 |
:return: A BranchWriteLockResult.
|
|
2463 |
"""
|
|
|
4731.1.2
by Andrew Bennetts
Refactor to reduce duplication. |
2464 |
if not self.is_locked(): |
2465 |
self._note_lock('w') |
|
|
4288.1.12
by Robert Collins
Review feedback. |
2466 |
# All-in-one needs to always unlock/lock.
|
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
2467 |
repo_control = getattr(self.repository, 'control_files', None) |
|
4288.1.11
by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent). |
2468 |
if self.control_files == repo_control or not self.is_locked(): |
|
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
2469 |
self.repository._warn_if_deprecated(self) |
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
2470 |
self.repository.lock_write() |
2471 |
took_lock = True |
|
2472 |
else: |
|
2473 |
took_lock = False |
|
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
2474 |
try: |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2475 |
return BranchWriteLockResult(self.unlock, |
2476 |
self.control_files.lock_write(token=token)) |
|
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
2477 |
except: |
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
2478 |
if took_lock: |
2479 |
self.repository.unlock() |
|
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
2480 |
raise
|
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
2481 |
|
|
1185.65.3
by Aaron Bentley
Fixed locking-- all tests pass |
2482 |
def lock_read(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2483 |
"""Lock the branch for read operations. |
2484 |
||
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
2485 |
:return: A bzrlib.lock.LogicalLockResult.
|
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
2486 |
"""
|
|
4731.1.2
by Andrew Bennetts
Refactor to reduce duplication. |
2487 |
if not self.is_locked(): |
2488 |
self._note_lock('r') |
|
|
4288.1.12
by Robert Collins
Review feedback. |
2489 |
# All-in-one needs to always unlock/lock.
|
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
2490 |
repo_control = getattr(self.repository, 'control_files', None) |
|
4288.1.11
by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent). |
2491 |
if self.control_files == repo_control or not self.is_locked(): |
|
4840.2.7
by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to |
2492 |
self.repository._warn_if_deprecated(self) |
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
2493 |
self.repository.lock_read() |
2494 |
took_lock = True |
|
2495 |
else: |
|
2496 |
took_lock = False |
|
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
2497 |
try: |
|
1711.8.3
by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository |
2498 |
self.control_files.lock_read() |
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
2499 |
return LogicalLockResult(self.unlock) |
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
2500 |
except: |
|
4288.1.10
by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects. |
2501 |
if took_lock: |
2502 |
self.repository.unlock() |
|
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
2503 |
raise
|
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
2504 |
|
|
4634.85.11
by Andrew Bennetts
Suppress most errors from Branch.unlock too. |
2505 |
@only_raises(errors.LockNotHeld, errors.LockBroken) |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
2506 |
def unlock(self): |
|
4288.1.11
by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent). |
2507 |
try: |
2508 |
self.control_files.unlock() |
|
2509 |
finally: |
|
|
4288.1.12
by Robert Collins
Review feedback. |
2510 |
# All-in-one needs to always unlock/lock.
|
|
4288.1.11
by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent). |
2511 |
repo_control = getattr(self.repository, 'control_files', None) |
2512 |
if (self.control_files == repo_control or |
|
2513 |
not self.control_files.is_locked()): |
|
2514 |
self.repository.unlock() |
|
2515 |
if not self.control_files.is_locked(): |
|
2516 |
# we just released the lock
|
|
2517 |
self._clear_cached_state() |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2518 |
|
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
2519 |
def peek_lock_mode(self): |
2520 |
if self.control_files._lock_count == 0: |
|
2521 |
return None |
|
2522 |
else: |
|
2523 |
return self.control_files._lock_mode |
|
2524 |
||
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
2525 |
def get_physical_lock_status(self): |
2526 |
return self.control_files.get_physical_lock_status() |
|
2527 |
||
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
2528 |
@needs_read_lock
|
|
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
2529 |
def print_file(self, file, revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
2530 |
"""See Branch.print_file.""" |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
2531 |
return self.repository.print_file(file, revision_id) |
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
2532 |
|
|
5718.7.15
by Jelmer Vernooij
Decorate _set_revision_history rather than set_revision_history. |
2533 |
@needs_write_lock
|
|
2230.3.51
by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info |
2534 |
def set_last_revision_info(self, revno, revision_id): |
|
5718.8.12
by Jelmer Vernooij
Fix raising of InvalidRevisionId. |
2535 |
if not revision_id or not isinstance(revision_id, basestring): |
2536 |
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self) |
|
|
5718.8.3
by Jelmer Vernooij
More branch restructuring. |
2537 |
revision_id = _mod_revision.ensure_null(revision_id) |
2538 |
old_revno, old_revid = self.last_revision_info() |
|
|
6123.9.11
by Jelmer Vernooij
Make get_append_revisions_only public. |
2539 |
if self.get_append_revisions_only(): |
|
5718.8.3
by Jelmer Vernooij
More branch restructuring. |
2540 |
self._check_history_violation(revision_id) |
2541 |
self._run_pre_change_branch_tip_hooks(revno, revision_id) |
|
2542 |
self._write_last_revision_info(revno, revision_id) |
|
2543 |
self._clear_cached_state() |
|
2544 |
self._last_revision_info_cache = revno, revision_id |
|
2545 |
self._run_post_change_branch_tip_hooks(old_revno, old_revid) |
|
|
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
2546 |
|
|
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
2547 |
def basis_tree(self): |
2548 |
"""See Branch.basis_tree.""" |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
2549 |
return self.repository.revision_tree(self.last_revision()) |
|
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
2550 |
|
|
2230.3.8
by Aaron Bentley
Abstract mechanism from policy getting/setting parents |
2551 |
def _get_parent_location(self): |
2552 |
_locs = ['parent', 'pull', 'x-pull'] |
|
2553 |
for l in _locs: |
|
2554 |
try: |
|
|
3407.2.1
by Martin Pool
Deprecate LockableFiles.get |
2555 |
return self._transport.get_bytes(l).strip('\n') |
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
2556 |
except errors.NoSuchFile: |
|
2230.3.8
by Aaron Bentley
Abstract mechanism from policy getting/setting parents |
2557 |
pass
|
2558 |
return None |
|
2559 |
||
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
2560 |
def get_stacked_on_url(self): |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2561 |
raise errors.UnstackableBranchFormat(self._format, self.user_url) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2562 |
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
2563 |
def set_push_location(self, location): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
2564 |
"""See Branch.set_push_location.""" |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
2565 |
self.get_config().set_user_option( |
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
2566 |
'push_location', location, |
2567 |
store=_mod_config.STORE_LOCATION_NORECURSE) |
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
2568 |
|
|
2230.3.8
by Aaron Bentley
Abstract mechanism from policy getting/setting parents |
2569 |
def _set_parent_location(self, url): |
2570 |
if url is None: |
|
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
2571 |
self._transport.delete('parent') |
|
2230.3.8
by Aaron Bentley
Abstract mechanism from policy getting/setting parents |
2572 |
else: |
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
2573 |
self._transport.put_bytes('parent', url + '\n', |
|
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
2574 |
mode=self.bzrdir._get_file_mode()) |
|
1150
by Martin Pool
- add new Branch.set_parent and tests |
2575 |
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
2576 |
@needs_write_lock
|
2577 |
def unbind(self): |
|
2578 |
"""If bound, unbind""" |
|
2579 |
return self.set_bound_location(None) |
|
2580 |
||
2581 |
@needs_write_lock
|
|
2582 |
def bind(self, other): |
|
2583 |
"""Bind this branch to the branch other. |
|
2584 |
||
2585 |
This does not push or pull data between the branches, though it does
|
|
2586 |
check for divergence to raise an error when the branches are not
|
|
2587 |
either the same, or one a prefix of the other. That behaviour may not
|
|
2588 |
be useful, so that check may be removed in future.
|
|
2589 |
||
2590 |
:param other: The branch to bind to
|
|
2591 |
:type other: Branch
|
|
2592 |
"""
|
|
2593 |
# TODO: jam 20051230 Consider checking if the target is bound
|
|
2594 |
# It is debatable whether you should be able to bind to
|
|
2595 |
# a branch which is itself bound.
|
|
2596 |
# Committing is obviously forbidden,
|
|
2597 |
# but binding itself may not be.
|
|
2598 |
# Since we *have* to check at commit time, we don't
|
|
2599 |
# *need* to check here
|
|
2600 |
||
2601 |
# we want to raise diverged if:
|
|
2602 |
# last_rev is not in the other_last_rev history, AND
|
|
2603 |
# other_last_rev is not in our history, and do it without pulling
|
|
2604 |
# history around
|
|
2605 |
self.set_bound_location(other.base) |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
2606 |
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
2607 |
def get_bound_location(self): |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
2608 |
try: |
|
3388.2.1
by Martin Pool
Deprecate LockableFiles.get_utf8 |
2609 |
return self._transport.get_bytes('bound')[:-1] |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
2610 |
except errors.NoSuchFile: |
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
2611 |
return None |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
2612 |
|
2613 |
@needs_read_lock
|
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
2614 |
def get_master_branch(self, possible_transports=None): |
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
2615 |
"""Return the branch we are bound to. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2616 |
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
2617 |
:return: Either a Branch, or None
|
2618 |
"""
|
|
|
5609.25.3
by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock. |
2619 |
if self._master_branch_cache is None: |
2620 |
self._master_branch_cache = self._get_master_branch( |
|
2621 |
possible_transports) |
|
2622 |
return self._master_branch_cache |
|
2623 |
||
2624 |
def _get_master_branch(self, possible_transports): |
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
2625 |
bound_loc = self.get_bound_location() |
2626 |
if not bound_loc: |
|
2627 |
return None |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
2628 |
try: |
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
2629 |
return Branch.open(bound_loc, |
2630 |
possible_transports=possible_transports) |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
2631 |
except (errors.NotBranchError, errors.ConnectionError), e: |
2632 |
raise errors.BoundBranchConnectionFailure( |
|
2633 |
self, bound_loc, e) |
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
2634 |
|
|
1505.1.5
by John Arbash Meinel
Added a test for the unbind command. |
2635 |
@needs_write_lock
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
2636 |
def set_bound_location(self, location): |
|
1505.1.27
by John Arbash Meinel
Adding tests against an sftp branch. |
2637 |
"""Set the target where this branch is bound to. |
2638 |
||
2639 |
:param location: URL to the target branch
|
|
2640 |
"""
|
|
|
5609.25.3
by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock. |
2641 |
self._master_branch_cache = None |
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
2642 |
if location: |
|
3446.1.1
by Martin Pool
merge further LockableFile deprecations |
2643 |
self._transport.put_bytes('bound', location+'\n', |
2644 |
mode=self.bzrdir._get_file_mode()) |
|
|
1185.64.2
by Goffredo Baroncelli
- implemented some suggestion by Robert Collins |
2645 |
else: |
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
2646 |
try: |
|
3407.2.3
by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files |
2647 |
self._transport.delete('bound') |
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
2648 |
except errors.NoSuchFile: |
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
2649 |
return False |
2650 |
return True |
|
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
2651 |
|
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
2652 |
@needs_write_lock
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
2653 |
def update(self, possible_transports=None): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2654 |
"""Synchronise this branch with the master branch if any. |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
2655 |
|
2656 |
:return: None or the last_revision that was pivoted out during the
|
|
2657 |
update.
|
|
2658 |
"""
|
|
|
2806.2.2
by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport. |
2659 |
master = self.get_master_branch(possible_transports) |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
2660 |
if master is not None: |
|
2653.2.4
by Aaron Bentley
Remove get_ancestry usage from branch |
2661 |
old_tip = _mod_revision.ensure_null(self.last_revision()) |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
2662 |
self.pull(master, overwrite=True) |
|
2653.2.4
by Aaron Bentley
Remove get_ancestry usage from branch |
2663 |
if self.repository.get_graph().is_ancestor(old_tip, |
2664 |
_mod_revision.ensure_null(self.last_revision())): |
|
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
2665 |
return None |
2666 |
return old_tip |
|
2667 |
return None |
|
2668 |
||
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
2669 |
def _read_last_revision_info(self): |
2670 |
revision_string = self._transport.get_bytes('last-revision') |
|
2671 |
revno, revision_id = revision_string.rstrip('\n').split(' ', 1) |
|
2672 |
revision_id = cache_utf8.get_cached_utf8(revision_id) |
|
2673 |
revno = int(revno) |
|
2674 |
return revno, revision_id |
|
2675 |
||
2676 |
def _write_last_revision_info(self, revno, revision_id): |
|
2677 |
"""Simply write out the revision id, with no checks. |
|
2678 |
||
2679 |
Use set_last_revision_info to perform this safely.
|
|
2680 |
||
2681 |
Does not update the revision_history cache.
|
|
2682 |
"""
|
|
2683 |
revision_id = _mod_revision.ensure_null(revision_id) |
|
2684 |
out_string = '%d %s\n' % (revno, revision_id) |
|
2685 |
self._transport.put_bytes('last-revision', out_string, |
|
2686 |
mode=self.bzrdir._get_file_mode()) |
|
2687 |
||
2688 |
||
2689 |
class FullHistoryBzrBranch(BzrBranch): |
|
2690 |
"""Bzr branch which contains the full revision history.""" |
|
2691 |
||
2692 |
@needs_write_lock
|
|
2693 |
def set_last_revision_info(self, revno, revision_id): |
|
|
5718.8.12
by Jelmer Vernooij
Fix raising of InvalidRevisionId. |
2694 |
if not revision_id or not isinstance(revision_id, basestring): |
2695 |
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self) |
|
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
2696 |
revision_id = _mod_revision.ensure_null(revision_id) |
2697 |
# this old format stores the full history, but this api doesn't
|
|
2698 |
# provide it, so we must generate, and might as well check it's
|
|
2699 |
# correct
|
|
2700 |
history = self._lefthand_history(revision_id) |
|
2701 |
if len(history) != revno: |
|
2702 |
raise AssertionError('%d != %d' % (len(history), revno)) |
|
2703 |
self._set_revision_history(history) |
|
2704 |
||
2705 |
def _read_last_revision_info(self): |
|
2706 |
rh = self.revision_history() |
|
2707 |
revno = len(rh) |
|
2708 |
if revno: |
|
2709 |
return (revno, rh[-1]) |
|
2710 |
else: |
|
2711 |
return (0, _mod_revision.NULL_REVISION) |
|
2712 |
||
2713 |
@deprecated_method(deprecated_in((2, 4, 0))) |
|
2714 |
@needs_write_lock
|
|
2715 |
def set_revision_history(self, rev_history): |
|
2716 |
"""See Branch.set_revision_history.""" |
|
2717 |
self._set_revision_history(rev_history) |
|
2718 |
||
2719 |
def _set_revision_history(self, rev_history): |
|
2720 |
if 'evil' in debug.debug_flags: |
|
2721 |
mutter_callsite(3, "set_revision_history scales with history.") |
|
2722 |
check_not_reserved_id = _mod_revision.check_not_reserved_id |
|
2723 |
for rev_id in rev_history: |
|
2724 |
check_not_reserved_id(rev_id) |
|
2725 |
if Branch.hooks['post_change_branch_tip']: |
|
2726 |
# Don't calculate the last_revision_info() if there are no hooks
|
|
2727 |
# that will use it.
|
|
2728 |
old_revno, old_revid = self.last_revision_info() |
|
2729 |
if len(rev_history) == 0: |
|
2730 |
revid = _mod_revision.NULL_REVISION |
|
2731 |
else: |
|
2732 |
revid = rev_history[-1] |
|
2733 |
self._run_pre_change_branch_tip_hooks(len(rev_history), revid) |
|
2734 |
self._write_revision_history(rev_history) |
|
2735 |
self._clear_cached_state() |
|
2736 |
self._cache_revision_history(rev_history) |
|
2737 |
for hook in Branch.hooks['set_rh']: |
|
2738 |
hook(self, rev_history) |
|
2739 |
if Branch.hooks['post_change_branch_tip']: |
|
2740 |
self._run_post_change_branch_tip_hooks(old_revno, old_revid) |
|
2741 |
||
2742 |
def _write_revision_history(self, history): |
|
2743 |
"""Factored out of set_revision_history. |
|
2744 |
||
2745 |
This performs the actual writing to disk.
|
|
2746 |
It is intended to be called by set_revision_history."""
|
|
2747 |
self._transport.put_bytes( |
|
2748 |
'revision-history', '\n'.join(history), |
|
2749 |
mode=self.bzrdir._get_file_mode()) |
|
2750 |
||
2751 |
def _gen_revision_history(self): |
|
2752 |
history = self._transport.get_bytes('revision-history').split('\n') |
|
2753 |
if history[-1:] == ['']: |
|
2754 |
# There shouldn't be a trailing newline, but just in case.
|
|
2755 |
history.pop() |
|
2756 |
return history |
|
2757 |
||
2758 |
def _synchronize_history(self, destination, revision_id): |
|
|
5718.8.11
by Jelmer Vernooij
Fix _synchronize_history check. |
2759 |
if not isinstance(destination, FullHistoryBzrBranch): |
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
2760 |
super(BzrBranch, self)._synchronize_history( |
2761 |
destination, revision_id) |
|
2762 |
return
|
|
2763 |
if revision_id == _mod_revision.NULL_REVISION: |
|
2764 |
new_history = [] |
|
2765 |
else: |
|
2766 |
new_history = self.revision_history() |
|
2767 |
if revision_id is not None and new_history != []: |
|
2768 |
try: |
|
2769 |
new_history = new_history[:new_history.index(revision_id) + 1] |
|
2770 |
except ValueError: |
|
2771 |
rev = self.repository.get_revision(revision_id) |
|
2772 |
new_history = rev.get_history(self.repository)[1:] |
|
2773 |
destination._set_revision_history(new_history) |
|
2774 |
||
|
5718.8.6
by Jelmer Vernooij
Move generate_revision_history. |
2775 |
@needs_write_lock
|
2776 |
def generate_revision_history(self, revision_id, last_rev=None, |
|
2777 |
other_branch=None): |
|
2778 |
"""Create a new revision history that will finish with revision_id. |
|
2779 |
||
2780 |
:param revision_id: the new tip to use.
|
|
2781 |
:param last_rev: The previous last_revision. If not None, then this
|
|
2782 |
must be a ancestory of revision_id, or DivergedBranches is raised.
|
|
2783 |
:param other_branch: The other branch that DivergedBranches should
|
|
2784 |
raise with respect to.
|
|
2785 |
"""
|
|
2786 |
self._set_revision_history(self._lefthand_history(revision_id, |
|
2787 |
last_rev, other_branch)) |
|
2788 |
||
|
5718.8.2
by Jelmer Vernooij
Split out full history branch code. |
2789 |
|
2790 |
class BzrBranch5(FullHistoryBzrBranch): |
|
2791 |
"""A format 5 branch. This supports new features over plain branches. |
|
2792 |
||
2793 |
It has support for a master_branch which is the data for bound branches.
|
|
2794 |
"""
|
|
2795 |
||
2796 |
||
2797 |
class BzrBranch8(BzrBranch): |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2798 |
"""A branch that stores tree-reference locations.""" |
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
2799 |
|
2800 |
def _open_hook(self): |
|
|
4160.2.6
by Andrew Bennetts
Add ignore_fallbacks flag. |
2801 |
if self._ignore_fallbacks: |
2802 |
return
|
|
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
2803 |
try: |
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
2804 |
url = self.get_stacked_on_url() |
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
2805 |
except (errors.UnstackableRepositoryFormat, errors.NotStacked, |
2806 |
errors.UnstackableBranchFormat): |
|
2807 |
pass
|
|
2808 |
else: |
|
|
3770.2.1
by Michael Hudson
test and feature |
2809 |
for hook in Branch.hooks['transform_fallback_location']: |
2810 |
url = hook(self, url) |
|
|
3770.2.3
by Michael Hudson
check for None being returned for a hook |
2811 |
if url is None: |
2812 |
hook_name = Branch.hooks.get_hook_name(hook) |
|
2813 |
raise AssertionError( |
|
2814 |
"'transform_fallback_location' hook %s returned " |
|
2815 |
"None, not a URL." % hook_name) |
|
|
4379.2.2
by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly. |
2816 |
self._activate_fallback_location(url) |
|
3221.11.11
by Robert Collins
Ensure opening a stacked branch gives a ready to use repository. |
2817 |
|
|
4160.2.8
by Andrew Bennetts
Slightly less messy BzrBranch7.__init__. |
2818 |
def __init__(self, *args, **kwargs): |
2819 |
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False) |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2820 |
super(BzrBranch8, self).__init__(*args, **kwargs) |
|
3060.3.1
by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again. |
2821 |
self._last_revision_info_cache = None |
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2822 |
self._reference_info = None |
|
3060.3.1
by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again. |
2823 |
|
2824 |
def _clear_cached_state(self): |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2825 |
super(BzrBranch8, self)._clear_cached_state() |
|
3060.3.1
by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again. |
2826 |
self._last_revision_info_cache = None |
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2827 |
self._reference_info = None |
|
3060.3.1
by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again. |
2828 |
|
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
2829 |
def _check_history_violation(self, revision_id): |
|
5718.8.23
by Jelmer Vernooij
Avoid Branch._lefthand_history when checking for history violations. |
2830 |
current_revid = self.last_revision() |
2831 |
last_revision = _mod_revision.ensure_null(current_revid) |
|
|
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
2832 |
if _mod_revision.is_null(last_revision): |
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
2833 |
return
|
|
5718.8.23
by Jelmer Vernooij
Avoid Branch._lefthand_history when checking for history violations. |
2834 |
graph = self.repository.get_graph() |
2835 |
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id): |
|
2836 |
if lh_ancestor == current_revid: |
|
2837 |
return
|
|
2838 |
raise errors.AppendRevisionsOnlyViolation(self.user_url) |
|
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
2839 |
|
|
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
2840 |
def _gen_revision_history(self): |
|
2230.3.2
by Aaron Bentley
Get all branch tests passing |
2841 |
"""Generate the revision history from last revision |
2842 |
"""
|
|
|
3495.2.1
by Aaron Bentley
Tolerate ghosts in mainline (#235055) |
2843 |
last_revno, last_revision = self.last_revision_info() |
2844 |
self._extend_partial_history(stop_index=last_revno-1) |
|
|
3298.2.10
by Aaron Bentley
Refactor partial history code |
2845 |
return list(reversed(self._partial_revision_history_cache)) |
2846 |
||
|
2230.3.36
by Aaron Bentley
Refactor getting/setting locations with config |
2847 |
@needs_write_lock
|
2848 |
def _set_parent_location(self, url): |
|
2849 |
"""Set the parent branch""" |
|
2850 |
self._set_config_location('parent_location', url, make_relative=True) |
|
|
2230.3.3
by Aaron Bentley
Add more config testing |
2851 |
|
2852 |
@needs_read_lock
|
|
|
2230.3.8
by Aaron Bentley
Abstract mechanism from policy getting/setting parents |
2853 |
def _get_parent_location(self): |
|
2230.3.3
by Aaron Bentley
Add more config testing |
2854 |
"""Set the parent branch""" |
|
2230.3.36
by Aaron Bentley
Refactor getting/setting locations with config |
2855 |
return self._get_config_location('parent_location') |
|
2230.3.3
by Aaron Bentley
Add more config testing |
2856 |
|
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2857 |
@needs_write_lock
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
2858 |
def _set_all_reference_info(self, info_dict): |
2859 |
"""Replace all reference info stored in a branch. |
|
2860 |
||
2861 |
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
|
|
2862 |
"""
|
|
2863 |
s = StringIO() |
|
2864 |
writer = rio.RioWriter(s) |
|
2865 |
for key, (tree_path, branch_location) in info_dict.iteritems(): |
|
2866 |
stanza = rio.Stanza(file_id=key, tree_path=tree_path, |
|
2867 |
branch_location=branch_location) |
|
2868 |
writer.write_stanza(stanza) |
|
2869 |
self._transport.put_bytes('references', s.getvalue()) |
|
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2870 |
self._reference_info = info_dict |
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
2871 |
|
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2872 |
@needs_read_lock
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
2873 |
def _get_all_reference_info(self): |
2874 |
"""Return all the reference info stored in a branch. |
|
2875 |
||
2876 |
:return: A dict of {file_id: (tree_path, branch_location)}
|
|
2877 |
"""
|
|
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2878 |
if self._reference_info is not None: |
2879 |
return self._reference_info |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2880 |
rio_file = self._transport.get('references') |
2881 |
try: |
|
2882 |
stanzas = rio.read_stanzas(rio_file) |
|
2883 |
info_dict = dict((s['file_id'], (s['tree_path'], |
|
2884 |
s['branch_location'])) for s in stanzas) |
|
2885 |
finally: |
|
2886 |
rio_file.close() |
|
|
4273.1.15
by Aaron Bentley
Add reference_info caching. |
2887 |
self._reference_info = info_dict |
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2888 |
return info_dict |
2889 |
||
2890 |
def set_reference_info(self, file_id, tree_path, branch_location): |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
2891 |
"""Set the branch location to use for a tree reference. |
2892 |
||
2893 |
:param file_id: The file-id of the tree reference.
|
|
2894 |
:param tree_path: The path of the tree reference in the tree.
|
|
2895 |
:param branch_location: The location of the branch to retrieve tree
|
|
2896 |
references from.
|
|
2897 |
"""
|
|
2898 |
info_dict = self._get_all_reference_info() |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2899 |
info_dict[file_id] = (tree_path, branch_location) |
2900 |
if None in (tree_path, branch_location): |
|
2901 |
if tree_path is not None: |
|
2902 |
raise ValueError('tree_path must be None when branch_location' |
|
2903 |
' is None.') |
|
2904 |
if branch_location is not None: |
|
2905 |
raise ValueError('branch_location must be None when tree_path' |
|
2906 |
' is None.') |
|
2907 |
del info_dict[file_id] |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
2908 |
self._set_all_reference_info(info_dict) |
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2909 |
|
2910 |
def get_reference_info(self, file_id): |
|
|
4273.1.11
by Aaron Bentley
Clean up naming and docstrings |
2911 |
"""Get the tree_path and branch_location for a tree reference. |
2912 |
||
2913 |
:return: a tuple of (tree_path, branch_location)
|
|
2914 |
"""
|
|
2915 |
return self._get_all_reference_info().get(file_id, (None, None)) |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
2916 |
|
|
4273.1.4
by Aaron Bentley
Relative reference locations are branch-relative. |
2917 |
def reference_parent(self, file_id, path, possible_transports=None): |
|
4273.1.2
by Aaron Bentley
Use reference_info to get reference_parent. |
2918 |
"""Return the parent branch for a tree-reference file_id. |
2919 |
||
2920 |
:param file_id: The file_id of the tree reference
|
|
2921 |
:param path: The path of the file_id in the tree
|
|
2922 |
:return: A branch associated with the file_id
|
|
2923 |
"""
|
|
2924 |
branch_location = self.get_reference_info(file_id)[1] |
|
2925 |
if branch_location is None: |
|
|
4273.1.4
by Aaron Bentley
Relative reference locations are branch-relative. |
2926 |
return Branch.reference_parent(self, file_id, path, |
2927 |
possible_transports) |
|
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
2928 |
branch_location = urlutils.join(self.user_url, branch_location) |
|
4273.1.4
by Aaron Bentley
Relative reference locations are branch-relative. |
2929 |
return Branch.open(branch_location, |
2930 |
possible_transports=possible_transports) |
|
|
4273.1.2
by Aaron Bentley
Use reference_info to get reference_parent. |
2931 |
|
|
2230.3.3
by Aaron Bentley
Add more config testing |
2932 |
def set_push_location(self, location): |
2933 |
"""See Branch.set_push_location.""" |
|
|
2230.3.36
by Aaron Bentley
Refactor getting/setting locations with config |
2934 |
self._set_config_location('push_location', location) |
|
2230.3.3
by Aaron Bentley
Add more config testing |
2935 |
|
2936 |
def set_bound_location(self, location): |
|
2937 |
"""See Branch.set_push_location.""" |
|
|
5609.25.5
by Andrew Bennetts
Add tests that get_master_branch isn't cached when it shouldn't be, and fix a bug that reveals. |
2938 |
self._master_branch_cache = None |
|
2230.3.7
by Aaron Bentley
Fix binding return values |
2939 |
result = None |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
2940 |
config = self.get_config() |
|
2230.3.6
by Aaron Bentley
work in progress bind stuff |
2941 |
if location is None: |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
2942 |
if config.get_user_option('bound') != 'True': |
|
2230.3.7
by Aaron Bentley
Fix binding return values |
2943 |
return False |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
2944 |
else: |
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
2945 |
config.set_user_option('bound', 'False', warn_masked=True) |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
2946 |
return True |
2947 |
else: |
|
|
2230.3.36
by Aaron Bentley
Refactor getting/setting locations with config |
2948 |
self._set_config_location('bound_location', location, |
2949 |
config=config) |
|
|
1551.15.35
by Aaron Bentley
Warn when setting config values that will be masked (#122286) |
2950 |
config.set_user_option('bound', 'True', warn_masked=True) |
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
2951 |
return True |
2952 |
||
2953 |
def _get_bound_location(self, bound): |
|
2954 |
"""Return the bound location in the config file. |
|
2955 |
||
2956 |
Return None if the bound parameter does not match"""
|
|
2957 |
config = self.get_config() |
|
2958 |
config_bound = (config.get_user_option('bound') == 'True') |
|
2959 |
if config_bound != bound: |
|
2960 |
return None |
|
|
2230.3.36
by Aaron Bentley
Refactor getting/setting locations with config |
2961 |
return self._get_config_location('bound_location', config=config) |
|
2230.3.3
by Aaron Bentley
Add more config testing |
2962 |
|
|
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
2963 |
def get_bound_location(self): |
2964 |
"""See Branch.set_push_location.""" |
|
2965 |
return self._get_bound_location(True) |
|
2966 |
||
2967 |
def get_old_bound_location(self): |
|
2968 |
"""See Branch.get_old_bound_location""" |
|
2969 |
return self._get_bound_location(False) |
|
2970 |
||
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
2971 |
def get_stacked_on_url(self): |
|
3691.2.12
by Martin Pool
Add test for coping without Branch.get_stacked_on_url |
2972 |
# you can always ask for the URL; but you might not be able to use it
|
2973 |
# if the repo can't support stacking.
|
|
2974 |
## self._check_stackable_repo()
|
|
|
5993.4.1
by Andrew Bennetts
Make Branch.open more than 3x faster. |
2975 |
# stacked_on_location is only ever defined in branch.conf, so don't
|
2976 |
# waste effort reading the whole stack of config files.
|
|
2977 |
config = self.get_config()._get_branch_data_config() |
|
2978 |
stacked_url = self._get_config_location('stacked_on_location', |
|
2979 |
config=config) |
|
|
3221.18.2
by Ian Clatworthy
store stacked-on location in branch.conf |
2980 |
if stacked_url is None: |
|
3221.11.6
by Robert Collins
Stackable branch fixes. |
2981 |
raise errors.NotStacked(self) |
2982 |
return stacked_url |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
2983 |
|
|
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
2984 |
@needs_read_lock
|
|
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
2985 |
def get_rev_id(self, revno, history=None): |
2986 |
"""Find the revision id of the specified revno.""" |
|
2987 |
if revno == 0: |
|
2988 |
return _mod_revision.NULL_REVISION |
|
2989 |
||
2990 |
last_revno, last_revision_id = self.last_revision_info() |
|
2991 |
if revno <= 0 or revno > last_revno: |
|
2992 |
raise errors.NoSuchRevision(self, revno) |
|
2993 |
||
2994 |
if history is not None: |
|
|
3298.3.3
by Aaron Bentley
Update from review |
2995 |
return history[revno - 1] |
|
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
2996 |
|
|
3298.2.10
by Aaron Bentley
Refactor partial history code |
2997 |
index = last_revno - revno |
|
3298.3.2
by Aaron Bentley
Catch history mismatch, cleanup |
2998 |
if len(self._partial_revision_history_cache) <= index: |
2999 |
self._extend_partial_history(stop_index=index) |
|
|
3298.2.10
by Aaron Bentley
Refactor partial history code |
3000 |
if len(self._partial_revision_history_cache) > index: |
3001 |
return self._partial_revision_history_cache[index] |
|
|
3060.3.6
by Lukáš Lalinský
Implement partial history cache in BzrBranch6. |
3002 |
else: |
|
3298.2.10
by Aaron Bentley
Refactor partial history code |
3003 |
raise errors.NoSuchRevision(self, revno) |
|
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
3004 |
|
|
3298.2.12
by Aaron Bentley
Add Branch6.revision_id_to_revno |
3005 |
@needs_read_lock
|
3006 |
def revision_id_to_revno(self, revision_id): |
|
3007 |
"""Given a revision id, return its revno""" |
|
3008 |
if _mod_revision.is_null(revision_id): |
|
3009 |
return 0 |
|
3010 |
try: |
|
3011 |
index = self._partial_revision_history_cache.index(revision_id) |
|
3012 |
except ValueError: |
|
|
5689.2.1
by Jelmer Vernooij
Properly raise GhostsHaveNoRevno in revision_id_to_revno. |
3013 |
try: |
3014 |
self._extend_partial_history(stop_revision=revision_id) |
|
3015 |
except errors.RevisionNotPresent, e: |
|
3016 |
raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id) |
|
|
3298.2.12
by Aaron Bentley
Add Branch6.revision_id_to_revno |
3017 |
index = len(self._partial_revision_history_cache) - 1 |
3018 |
if self._partial_revision_history_cache[index] != revision_id: |
|
3019 |
raise errors.NoSuchRevision(self, revision_id) |
|
3020 |
return self.revno() - index |
|
3021 |
||
|
2230.3.34
by Aaron Bentley
cleanup |
3022 |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
3023 |
class BzrBranch7(BzrBranch8): |
3024 |
"""A branch with support for a fallback repository.""" |
|
3025 |
||
3026 |
def set_reference_info(self, file_id, tree_path, branch_location): |
|
3027 |
Branch.set_reference_info(self, file_id, tree_path, branch_location) |
|
3028 |
||
3029 |
def get_reference_info(self, file_id): |
|
3030 |
Branch.get_reference_info(self, file_id) |
|
3031 |
||
|
4273.1.4
by Aaron Bentley
Relative reference locations are branch-relative. |
3032 |
def reference_parent(self, file_id, path, possible_transports=None): |
3033 |
return Branch.reference_parent(self, file_id, path, |
|
3034 |
possible_transports) |
|
|
4273.1.2
by Aaron Bentley
Use reference_info to get reference_parent. |
3035 |
|
|
4273.1.1
by Aaron Bentley
Implement branch format for tree references. |
3036 |
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
3037 |
class BzrBranch6(BzrBranch7): |
3038 |
"""See BzrBranchFormat6 for the capabilities of this branch. |
|
3039 |
||
|
3221.18.1
by Ian Clatworthy
tweaks by ianc during review |
3040 |
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
|
3041 |
i.e. stacking.
|
|
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
3042 |
"""
|
3043 |
||
|
3537.3.1
by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url |
3044 |
def get_stacked_on_url(self): |
|
5158.6.3
by Martin Pool
Update some Branch calls to use ControlComponent style. |
3045 |
raise errors.UnstackableBranchFormat(self._format, self.user_url) |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
3046 |
|
3047 |
||
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
3048 |
######################################################################
|
3049 |
# results of operations
|
|
3050 |
||
|
2220.2.37
by Martin Pool
Report conflicting tags from push. |
3051 |
|
3052 |
class _Result(object): |
|
3053 |
||
3054 |
def _show_tag_conficts(self, to_file): |
|
3055 |
if not getattr(self, 'tag_conflicts', None): |
|
3056 |
return
|
|
3057 |
to_file.write('Conflicting tags:\n') |
|
3058 |
for name, value1, value2 in self.tag_conflicts: |
|
3059 |
to_file.write(' %s\n' % (name, )) |
|
3060 |
||
3061 |
||
3062 |
class PullResult(_Result): |
|
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
3063 |
"""Result of a Branch.pull operation. |
3064 |
||
3065 |
:ivar old_revno: Revision number before pull.
|
|
3066 |
:ivar new_revno: Revision number after pull.
|
|
3067 |
:ivar old_revid: Tip revision id before pull.
|
|
3068 |
:ivar new_revid: Tip revision id after pull.
|
|
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
3069 |
: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. |
3070 |
:ivar master_branch: Master branch of the target, or the target if no
|
3071 |
Master
|
|
3072 |
: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. |
3073 |
: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. |
3074 |
: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. |
3075 |
: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 |
3076 |
"""
|
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
3077 |
|
|
5348.1.2
by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change |
3078 |
@deprecated_method(deprecated_in((2, 3, 0))) |
|
2297.1.3
by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull() |
3079 |
def __int__(self): |
|
5348.1.2
by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change |
3080 |
"""Return the relative change in revno. |
3081 |
||
3082 |
:deprecated: Use `new_revno` and `old_revno` instead.
|
|
3083 |
"""
|
|
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
3084 |
return self.new_revno - self.old_revno |
3085 |
||
|
2220.2.39
by Martin Pool
Pull also merges tags and warns if they conflict |
3086 |
def report(self, to_file): |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
3087 |
tag_conflicts = getattr(self, "tag_conflicts", None) |
3088 |
tag_updates = getattr(self, "tag_updates", None) |
|
|
3200.1.1
by James Westby
Make pull --quiet more quiet. Fixes #185907. |
3089 |
if not is_quiet(): |
|
6112.4.1
by Jelmer Vernooij
Show how many tags have been updated in bzr pull. |
3090 |
if self.old_revid != self.new_revid: |
|
3200.1.1
by James Westby
Make pull --quiet more quiet. Fixes #185907. |
3091 |
to_file.write('Now on revision %d.\n' % self.new_revno) |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
3092 |
if tag_updates: |
3093 |
to_file.write('%d tag(s) updated.\n' % len(tag_updates)) |
|
3094 |
if self.old_revid == self.new_revid and not tag_updates: |
|
3095 |
if not tag_conflicts: |
|
|
6112.4.1
by Jelmer Vernooij
Show how many tags have been updated in bzr pull. |
3096 |
to_file.write('No revisions or tags to pull.\n') |
3097 |
else: |
|
3098 |
to_file.write('No revisions to pull.\n') |
|
|
2220.2.39
by Martin Pool
Pull also merges tags and warns if they conflict |
3099 |
self._show_tag_conficts(to_file) |
3100 |
||
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
3101 |
|
|
4053.3.1
by Jelmer Vernooij
Rename PushResult to BranchPushResult. |
3102 |
class BranchPushResult(_Result): |
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
3103 |
"""Result of a Branch.push operation. |
3104 |
||
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
3105 |
:ivar old_revno: Revision number (eg 10) of the target before push.
|
3106 |
:ivar new_revno: Revision number (eg 12) of the target after push.
|
|
3107 |
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
|
|
3108 |
before the push.
|
|
3109 |
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
|
|
3110 |
after the push.
|
|
3111 |
:ivar source_branch: Source branch object that the push was from. This is
|
|
3112 |
read locked, and generally is a local (and thus low latency) branch.
|
|
3113 |
:ivar master_branch: If target is a bound branch, the master branch of
|
|
3114 |
target, or target itself. Always write locked.
|
|
3115 |
:ivar target_branch: The direct Branch where data is being sent (write
|
|
3116 |
locked).
|
|
3117 |
:ivar local_branch: If the target is a bound branch this will be the
|
|
3118 |
target, otherwise it will be None.
|
|
|
2297.1.6
by Martin Pool
Add docs for Results, give some members cleaner names |
3119 |
"""
|
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
3120 |
|
|
5348.1.2
by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change |
3121 |
@deprecated_method(deprecated_in((2, 3, 0))) |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
3122 |
def __int__(self): |
|
5348.1.2
by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change |
3123 |
"""Return the relative change in revno. |
3124 |
||
3125 |
:deprecated: Use `new_revno` and `old_revno` instead.
|
|
3126 |
"""
|
|
|
2297.1.3
by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull() |
3127 |
return self.new_revno - self.old_revno |
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
3128 |
|
|
2220.2.37
by Martin Pool
Report conflicting tags from push. |
3129 |
def report(self, to_file): |
|
6112.4.5
by Jelmer Vernooij
Add note about bzr pull / bzr push output inconsistency. |
3130 |
# TODO: This function gets passed a to_file, but then
|
3131 |
# ignores it and calls note() instead. This is also
|
|
3132 |
# inconsistent with PullResult(), which writes to stdout.
|
|
3133 |
# -- JRV20110901, bug #838853
|
|
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
3134 |
tag_conflicts = getattr(self, "tag_conflicts", None) |
3135 |
tag_updates = getattr(self, "tag_updates", None) |
|
|
6112.4.2
by Jelmer Vernooij
Fix tag tests. |
3136 |
if not is_quiet(): |
3137 |
if self.old_revid != self.new_revid: |
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
3138 |
note(gettext('Pushed up to revision %d.') % self.new_revno) |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
3139 |
if tag_updates: |
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
3140 |
note(gettext('%d tag(s) updated.') % len(tag_updates)) |
|
6112.4.3
by Jelmer Vernooij
Fix push tests. |
3141 |
if self.old_revid == self.new_revid and not tag_updates: |
3142 |
if not tag_conflicts: |
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
3143 |
note(gettext('No new revisions or tags to push.')) |
|
6112.4.2
by Jelmer Vernooij
Fix tag tests. |
3144 |
else: |
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
3145 |
note(gettext('No new revisions to push.')) |
|
2220.2.37
by Martin Pool
Report conflicting tags from push. |
3146 |
self._show_tag_conficts(to_file) |
3147 |
||
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
3148 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
3149 |
class BranchCheckResult(object): |
3150 |
"""Results of checking branch consistency. |
|
3151 |
||
3152 |
:see: Branch.check
|
|
3153 |
"""
|
|
3154 |
||
3155 |
def __init__(self, branch): |
|
3156 |
self.branch = branch |
|
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
3157 |
self.errors = [] |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
3158 |
|
3159 |
def report_results(self, verbose): |
|
3160 |
"""Report the check results via trace.note. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
3161 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
3162 |
:param verbose: Requests more detailed display of what was checked,
|
3163 |
if any.
|
|
3164 |
"""
|
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
3165 |
note(gettext('checked branch %s format %s'), self.branch.user_url, |
|
4332.3.3
by Robert Collins
Alter Branch.check to log errors rather than raising. |
3166 |
self.branch._format) |
3167 |
for error in self.errors: |
|
|
6138.3.1
by Jonathan Riddell
use gettext() in more files |
3168 |
note(gettext('found error:%s'), error) |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
3169 |
|
3170 |
||
|
2230.3.29
by Aaron Bentley
Implement conversion to branch 6 |
3171 |
class Converter5to6(object): |
3172 |
"""Perform an in-place upgrade of format 5 to format 6""" |
|
3173 |
||
3174 |
def convert(self, branch): |
|
3175 |
# Data for 5 and 6 can peacefully coexist.
|
|
3176 |
format = BzrBranchFormat6() |
|
3177 |
new_branch = format.open(branch.bzrdir, _found=True) |
|
3178 |
||
3179 |
# Copy source data into target
|
|
|
3331.1.15
by Andrew Bennetts
Use _write_last_revision_info rather than set_last_revision_info in Converter5to6, because we just want to write the last-revision file, not trigger hooks with half-converted branches. |
3180 |
new_branch._write_last_revision_info(*branch.last_revision_info()) |
|
2230.3.29
by Aaron Bentley
Implement conversion to branch 6 |
3181 |
new_branch.set_parent(branch.get_parent()) |
3182 |
new_branch.set_bound_location(branch.get_bound_location()) |
|
3183 |
new_branch.set_push_location(branch.get_push_location()) |
|
3184 |
||
|
2220.2.43
by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning |
3185 |
# New branch has no tags by default
|
3186 |
new_branch.tags._set_tag_dict({}) |
|
3187 |
||
|
2230.3.29
by Aaron Bentley
Implement conversion to branch 6 |
3188 |
# Copying done; now update target format
|
|
3407.2.5
by Martin Pool
Deprecate LockableFiles.put_utf8 |
3189 |
new_branch._transport.put_bytes('format', |
3190 |
format.get_format_string(), |
|
|
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
3191 |
mode=new_branch.bzrdir._get_file_mode()) |
|
2230.3.29
by Aaron Bentley
Implement conversion to branch 6 |
3192 |
|
3193 |
# Clean up old files
|
|
|
3407.2.13
by Martin Pool
Remove indirection through control_files to get transports |
3194 |
new_branch._transport.delete('revision-history') |
|
2230.3.29
by Aaron Bentley
Implement conversion to branch 6 |
3195 |
try: |
3196 |
branch.set_parent(None) |
|
|
3236.1.2
by Michael Hudson
clean up branch.py imports |
3197 |
except errors.NoSuchFile: |
|
2230.3.29
by Aaron Bentley
Implement conversion to branch 6 |
3198 |
pass
|
3199 |
branch.set_bound_location(None) |
|
|
3221.11.4
by Robert Collins
Add a converter for format 7 branches. |
3200 |
|
3201 |
||
3202 |
class Converter6to7(object): |
|
3203 |
"""Perform an in-place upgrade of format 6 to format 7""" |
|
3204 |
||
3205 |
def convert(self, branch): |
|
|
3221.11.5
by Robert Collins
Correctly handle multi-step branch upgrades. |
3206 |
format = BzrBranchFormat7() |
|
3221.18.2
by Ian Clatworthy
store stacked-on location in branch.conf |
3207 |
branch._set_config_location('stacked_on_location', '') |
|
3221.11.4
by Robert Collins
Add a converter for format 7 branches. |
3208 |
# update target format
|
|
3221.13.5
by Ian Clatworthy
fix LockableFiles deprecations |
3209 |
branch._transport.put_bytes('format', format.get_format_string()) |
|
3758.1.1
by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock() |
3210 |
|
3211 |
||
|
4273.1.13
by Aaron Bentley
Implement upgrade from branch format 7 to 8. |
3212 |
class Converter7to8(object): |
|
5906.1.1
by Jelmer Vernooij
Remove unused constants, fix docstring. |
3213 |
"""Perform an in-place upgrade of format 7 to format 8""" |
|
4273.1.13
by Aaron Bentley
Implement upgrade from branch format 7 to 8. |
3214 |
|
3215 |
def convert(self, branch): |
|
3216 |
format = BzrBranchFormat8() |
|
3217 |
branch._transport.put_bytes('references', '') |
|
3218 |
# update target format
|
|
3219 |
branch._transport.put_bytes('format', format.get_format_string()) |
|
3220 |
||
|
3758.1.1
by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock() |
3221 |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
3222 |
class InterBranch(InterObject): |
3223 |
"""This class represents operations taking place between two branches. |
|
3224 |
||
3225 |
Its instances have methods like pull() and push() and contain
|
|
3226 |
references to the source and target repositories these operations
|
|
3227 |
can be carried out on.
|
|
3228 |
"""
|
|
3229 |
||
3230 |
_optimisers = [] |
|
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
3231 |
"""The available optimised InterBranch types.""" |
3232 |
||
|
5297.2.1
by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns |
3233 |
@classmethod
|
3234 |
def _get_branch_formats_to_test(klass): |
|
3235 |
"""Return an iterable of format tuples for testing. |
|
3236 |
|
|
3237 |
:return: An iterable of (from_format, to_format) to use when testing
|
|
3238 |
this InterBranch class. Each InterBranch class should define this
|
|
3239 |
method itself.
|
|
3240 |
"""
|
|
3241 |
raise NotImplementedError(klass._get_branch_formats_to_test) |
|
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
3242 |
|
|
5297.2.2
by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one. |
3243 |
@needs_write_lock
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3244 |
def pull(self, overwrite=False, stop_revision=None, |
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
3245 |
possible_transports=None, local=False): |
|
4000.5.10
by Jelmer Vernooij
Fix comment for InterBranch.pull. |
3246 |
"""Mirror source into target branch. |
3247 |
||
3248 |
The target branch is considered to be 'local', having low latency.
|
|
3249 |
||
3250 |
:returns: PullResult instance
|
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3251 |
"""
|
3252 |
raise NotImplementedError(self.pull) |
|
3253 |
||
|
5297.2.2
by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one. |
3254 |
@needs_write_lock
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
3255 |
def push(self, overwrite=False, stop_revision=None, lossy=False, |
|
4211.1.3
by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push(). |
3256 |
_override_hook_source_branch=None): |
3257 |
"""Mirror the source branch into the target branch. |
|
3258 |
||
3259 |
The source branch is considered to be 'local', having low latency.
|
|
3260 |
"""
|
|
3261 |
raise NotImplementedError(self.push) |
|
3262 |
||
|
5358.1.1
by Jelmer Vernooij
Add stub for InterBranch.copy_content_into. |
3263 |
@needs_write_lock
|
3264 |
def copy_content_into(self, revision_id=None): |
|
3265 |
"""Copy the content of source into target |
|
3266 |
||
3267 |
revision_id: if not None, the revision history in the new branch will
|
|
3268 |
be truncated to end with revision_id.
|
|
3269 |
"""
|
|
3270 |
raise NotImplementedError(self.copy_content_into) |
|
3271 |
||
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
3272 |
@needs_write_lock
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
3273 |
def fetch(self, stop_revision=None, limit=None): |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
3274 |
"""Fetch revisions. |
3275 |
||
3276 |
:param stop_revision: Last revision to fetch
|
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
3277 |
:param limit: Optional rough limit of revisions to fetch
|
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
3278 |
"""
|
3279 |
raise NotImplementedError(self.fetch) |
|
3280 |
||
|
3978.3.11
by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push. |
3281 |
|
3282 |
class GenericInterBranch(InterBranch): |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3283 |
"""InterBranch implementation that uses public Branch functions.""" |
3284 |
||
3285 |
@classmethod
|
|
3286 |
def is_compatible(klass, source, target): |
|
3287 |
# GenericBranch uses the public API, so always compatible
|
|
3288 |
return True |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
3289 |
|
|
5297.2.1
by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns |
3290 |
@classmethod
|
3291 |
def _get_branch_formats_to_test(klass): |
|
|
5662.2.2
by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry. |
3292 |
return [(format_registry.get_default(), format_registry.get_default())] |
|
4000.5.3
by Jelmer Vernooij
Add tests for InterBranch. |
3293 |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3294 |
@classmethod
|
3295 |
def unwrap_format(klass, format): |
|
3296 |
if isinstance(format, remote.RemoteBranchFormat): |
|
3297 |
format._ensure_real() |
|
3298 |
return format._custom_format |
|
|
5050.53.4
by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge. |
3299 |
return format |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3300 |
|
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
3301 |
@needs_write_lock
|
3302 |
def copy_content_into(self, revision_id=None): |
|
3303 |
"""Copy the content of source into target |
|
3304 |
||
3305 |
revision_id: if not None, the revision history in the new branch will
|
|
3306 |
be truncated to end with revision_id.
|
|
3307 |
"""
|
|
3308 |
self.source.update_references(self.target) |
|
3309 |
self.source._synchronize_history(self.target, revision_id) |
|
3310 |
try: |
|
3311 |
parent = self.source.get_parent() |
|
3312 |
except errors.InaccessibleParent, e: |
|
3313 |
mutter('parent was not accessible to copy: %s', e) |
|
3314 |
else: |
|
3315 |
if parent: |
|
3316 |
self.target.set_parent(parent) |
|
3317 |
if self.source._push_should_merge_tags(): |
|
|
5284.4.3
by Robert Collins
Fix missed self.source change in copy_content_into. |
3318 |
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 |
3319 |
|
3320 |
@needs_write_lock
|
|
|
5852.1.1
by Jelmer Vernooij
Add limit argument to Branch.fetch. |
3321 |
def fetch(self, stop_revision=None, limit=None): |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
3322 |
if self.target.base == self.source.base: |
3323 |
return (0, []) |
|
3324 |
self.source.lock_read() |
|
3325 |
try: |
|
|
5741.1.6
by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch. |
3326 |
fetch_spec_factory = fetch.FetchSpecFactory() |
3327 |
fetch_spec_factory.source_branch = self.source |
|
3328 |
fetch_spec_factory.source_branch_stop_revision_id = stop_revision |
|
3329 |
fetch_spec_factory.source_repo = self.source.repository |
|
3330 |
fetch_spec_factory.target_repo = self.target.repository |
|
3331 |
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING |
|
|
5852.1.5
by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches. |
3332 |
fetch_spec_factory.limit = limit |
|
5741.1.6
by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch. |
3333 |
fetch_spec = fetch_spec_factory.make_fetch_spec() |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
3334 |
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. |
3335 |
fetch_spec=fetch_spec) |
|
5741.1.1
by Jelmer Vernooij
Move fetch implementation to InterBranch. |
3336 |
finally: |
3337 |
self.source.unlock() |
|
3338 |
||
|
5809.2.1
by Jelmer Vernooij
Deprecate Branch.update_revisions. |
3339 |
@needs_write_lock
|
3340 |
def _update_revisions(self, stop_revision=None, overwrite=False, |
|
|
5809.2.4
by Jelmer Vernooij
remove unused argument. |
3341 |
graph=None): |
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
3342 |
other_revno, other_last_revision = self.source.last_revision_info() |
3343 |
stop_revno = None # unknown |
|
3344 |
if stop_revision is None: |
|
3345 |
stop_revision = other_last_revision |
|
3346 |
if _mod_revision.is_null(stop_revision): |
|
3347 |
# if there are no commits, we're done.
|
|
3348 |
return
|
|
3349 |
stop_revno = other_revno |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
3350 |
|
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
3351 |
# what's the current last revision, before we fetch [and change it
|
3352 |
# possibly]
|
|
3353 |
last_rev = _mod_revision.ensure_null(self.target.last_revision()) |
|
3354 |
# we fetch here so that we don't process data twice in the common
|
|
3355 |
# case of having something to pull, and so that the check for
|
|
3356 |
# already merged can operate on the just fetched graph, which will
|
|
3357 |
# be cached in memory.
|
|
|
5741.1.8
by Jelmer Vernooij
Remove fetch_tags argument. |
3358 |
self.fetch(stop_revision=stop_revision) |
|
5284.4.2
by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to |
3359 |
# Check to see if one is an ancestor of the other
|
3360 |
if not overwrite: |
|
3361 |
if graph is None: |
|
3362 |
graph = self.target.repository.get_graph() |
|
3363 |
if self.target._check_if_descendant_or_diverged( |
|
3364 |
stop_revision, last_rev, graph, self.source): |
|
3365 |
# stop_revision is a descendant of last_rev, but we aren't
|
|
3366 |
# overwriting, so we're done.
|
|
3367 |
return
|
|
3368 |
if stop_revno is None: |
|
3369 |
if graph is None: |
|
3370 |
graph = self.target.repository.get_graph() |
|
3371 |
this_revno, this_last_revision = \ |
|
3372 |
self.target.last_revision_info() |
|
3373 |
stop_revno = graph.find_distance_to_null(stop_revision, |
|
3374 |
[(other_last_revision, other_revno), |
|
3375 |
(this_last_revision, this_revno)]) |
|
3376 |
self.target.set_last_revision_info(stop_revno, stop_revision) |
|
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
3377 |
|
|
5297.2.2
by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one. |
3378 |
@needs_write_lock
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3379 |
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 |
3380 |
possible_transports=None, run_hooks=True, |
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
3381 |
_override_hook_target=None, local=False): |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3382 |
"""Pull from source into self, updating my master if any. |
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3383 |
|
3384 |
:param run_hooks: Private parameter - if false, this branch
|
|
3385 |
is being called because it's the master of the primary branch,
|
|
3386 |
so it should not run its hooks.
|
|
3387 |
"""
|
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3388 |
bound_location = self.target.get_bound_location() |
3389 |
if local and not bound_location: |
|
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
3390 |
raise errors.LocalRequiresBoundBranch() |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3391 |
master_branch = None |
|
5609.50.1
by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files |
3392 |
source_is_master = False |
3393 |
if bound_location: |
|
|
5609.50.2
by Vincent Ladeuil
Fix typos caught by Jonathan. |
3394 |
# bound_location comes from a config file, some care has to be
|
3395 |
# taken to relate it to source.user_url
|
|
|
5609.50.1
by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files |
3396 |
normalized = urlutils.normalize_url(bound_location) |
3397 |
try: |
|
3398 |
relpath = self.source.user_transport.relpath(normalized) |
|
3399 |
source_is_master = (relpath == '') |
|
3400 |
except (errors.PathNotChild, errors.InvalidURL): |
|
3401 |
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. |
3402 |
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 |
3403 |
# not pulling from master, so we need to update master.
|
3404 |
master_branch = self.target.get_master_branch(possible_transports) |
|
3405 |
master_branch.lock_write() |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3406 |
try: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3407 |
if master_branch: |
3408 |
# pull from source into master.
|
|
3409 |
master_branch.pull(self.source, overwrite, stop_revision, |
|
3410 |
run_hooks=False) |
|
3411 |
return self._pull(overwrite, |
|
3412 |
stop_revision, _hook_master=master_branch, |
|
3413 |
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. |
3414 |
_override_hook_target=_override_hook_target, |
3415 |
merge_tags_to_master=not source_is_master) |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3416 |
finally: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3417 |
if master_branch: |
3418 |
master_branch.unlock() |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3419 |
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
3420 |
def push(self, overwrite=False, stop_revision=None, lossy=False, |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3421 |
_override_hook_source_branch=None): |
3422 |
"""See InterBranch.push. |
|
3423 |
||
3424 |
This is the basic concrete implementation of push()
|
|
3425 |
||
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
3426 |
:param _override_hook_source_branch: If specified, run the hooks
|
3427 |
passing this Branch as the source, rather than self. This is for
|
|
3428 |
use of RemoteBranch, where push is delegated to the underlying
|
|
3429 |
vfs-based Branch.
|
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3430 |
"""
|
|
5853.2.2
by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push. |
3431 |
if lossy: |
3432 |
raise errors.LossyPushToSameVCS(self.source, self.target) |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3433 |
# TODO: Public option to disable running hooks - should be trivial but
|
3434 |
# needs tests.
|
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
3435 |
|
3436 |
op = cleanup.OperationWithCleanups(self._push_with_bound_branches) |
|
3437 |
op.add_cleanup(self.source.lock_read().unlock) |
|
3438 |
op.add_cleanup(self.target.lock_write().unlock) |
|
3439 |
return op.run(overwrite, stop_revision, |
|
3440 |
_override_hook_source_branch=_override_hook_source_branch) |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3441 |
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
3442 |
def _basic_push(self, overwrite, stop_revision): |
3443 |
"""Basic implementation of push without bound branches or hooks. |
|
3444 |
||
3445 |
Must be called with source read locked and target write locked.
|
|
3446 |
"""
|
|
3447 |
result = BranchPushResult() |
|
3448 |
result.source_branch = self.source |
|
3449 |
result.target_branch = self.target |
|
3450 |
result.old_revno, result.old_revid = self.target.last_revision_info() |
|
3451 |
self.source.update_references(self.target) |
|
3452 |
if result.old_revid != stop_revision: |
|
3453 |
# We assume that during 'push' this repository is closer than
|
|
3454 |
# the target.
|
|
3455 |
graph = self.source.repository.get_graph(self.target.repository) |
|
3456 |
self._update_revisions(stop_revision, overwrite=overwrite, |
|
3457 |
graph=graph) |
|
3458 |
if self.source._push_should_merge_tags(): |
|
|
6112.4.4
by Jelmer Vernooij
Fix long lines. |
3459 |
result.tag_updates, result.tag_conflicts = ( |
3460 |
self.source.tags.merge_to(self.target.tags, overwrite)) |
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
3461 |
result.new_revno, result.new_revid = self.target.last_revision_info() |
3462 |
return result |
|
3463 |
||
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
3464 |
def _push_with_bound_branches(self, operation, overwrite, stop_revision, |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3465 |
_override_hook_source_branch=None): |
3466 |
"""Push from source into target, and into target's master if any. |
|
3467 |
"""
|
|
3468 |
def _run_hooks(): |
|
3469 |
if _override_hook_source_branch: |
|
3470 |
result.source_branch = _override_hook_source_branch |
|
3471 |
for hook in Branch.hooks['post_push']: |
|
3472 |
hook(result) |
|
3473 |
||
3474 |
bound_location = self.target.get_bound_location() |
|
3475 |
if bound_location and self.target.base != bound_location: |
|
3476 |
# there is a master branch.
|
|
3477 |
#
|
|
3478 |
# XXX: Why the second check? Is it even supported for a branch to
|
|
3479 |
# be bound to itself? -- mbp 20070507
|
|
3480 |
master_branch = self.target.get_master_branch() |
|
3481 |
master_branch.lock_write() |
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
3482 |
operation.add_cleanup(master_branch.unlock) |
3483 |
# push into the master from the source branch.
|
|
3484 |
master_inter = InterBranch.get(self.source, master_branch) |
|
3485 |
master_inter._basic_push(overwrite, stop_revision) |
|
3486 |
# and push into the target branch from the source. Note that
|
|
3487 |
# we push from the source branch again, because it's considered
|
|
3488 |
# the highest bandwidth repository.
|
|
3489 |
result = self._basic_push(overwrite, stop_revision) |
|
3490 |
result.master_branch = master_branch |
|
3491 |
result.local_branch = self.target |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3492 |
else: |
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
3493 |
master_branch = None |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3494 |
# no master branch
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
3495 |
result = self._basic_push(overwrite, stop_revision) |
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3496 |
# TODO: Why set master_branch and local_branch if there's no
|
3497 |
# binding? Maybe cleaner to just leave them unset? -- mbp
|
|
3498 |
# 20070504
|
|
3499 |
result.master_branch = self.target |
|
3500 |
result.local_branch = None |
|
|
5915.1.1
by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead. |
3501 |
_run_hooks() |
3502 |
return result |
|
|
4211.1.1
by Jelmer Vernooij
Move Branch.push to InterBranch.push. |
3503 |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3504 |
def _pull(self, overwrite=False, stop_revision=None, |
3505 |
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. |
3506 |
_override_hook_target=None, local=False, |
3507 |
merge_tags_to_master=True): |
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3508 |
"""See Branch.pull. |
3509 |
||
3510 |
This function is the core worker, used by GenericInterBranch.pull to
|
|
3511 |
avoid duplication when pulling source->master and source->local.
|
|
3512 |
||
3513 |
:param _hook_master: Private parameter - set the branch to
|
|
3514 |
be supplied as the master to pull hooks.
|
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3515 |
:param run_hooks: Private parameter - if false, this branch
|
3516 |
is being called because it's the master of the primary branch,
|
|
3517 |
so it should not run its hooks.
|
|
|
5662.2.6
by Jelmer Vernooij
add more tests. |
3518 |
is being called because it's the master of the primary branch,
|
3519 |
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 |
3520 |
:param _override_hook_target: Private parameter - set the branch to be
|
3521 |
supplied as the target_branch to pull hooks.
|
|
3522 |
:param local: Only update the local branch, and not the bound branch.
|
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3523 |
"""
|
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3524 |
# This type of branch can't be bound.
|
3525 |
if local: |
|
|
4000.5.21
by Jelmer Vernooij
Merge bzr.dev. |
3526 |
raise errors.LocalRequiresBoundBranch() |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3527 |
result = PullResult() |
3528 |
result.source_branch = self.source |
|
3529 |
if _override_hook_target is None: |
|
3530 |
result.target_branch = self.target |
|
3531 |
else: |
|
3532 |
result.target_branch = _override_hook_target |
|
3533 |
self.source.lock_read() |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3534 |
try: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3535 |
# We assume that during 'pull' the target repository is closer than
|
3536 |
# the source one.
|
|
3537 |
self.source.update_references(self.target) |
|
3538 |
graph = self.target.repository.get_graph(self.source.repository) |
|
3539 |
# TODO: Branch formats should have a flag that indicates
|
|
3540 |
# that revno's are expensive, and pull() should honor that flag.
|
|
3541 |
# -- JRV20090506
|
|
3542 |
result.old_revno, result.old_revid = \ |
|
3543 |
self.target.last_revision_info() |
|
|
5809.2.3
by Jelmer Vernooij
Kill update_revisions private implementation. |
3544 |
self._update_revisions(stop_revision, overwrite=overwrite, |
|
5809.2.1
by Jelmer Vernooij
Deprecate Branch.update_revisions. |
3545 |
graph=graph) |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3546 |
# TODO: The old revid should be specified when merging tags,
|
3547 |
# so a tags implementation that versions tags can only
|
|
3548 |
# pull in the most recent changes. -- JRV20090506
|
|
|
6112.4.4
by Jelmer Vernooij
Fix long lines. |
3549 |
result.tag_updates, result.tag_conflicts = ( |
3550 |
self.source.tags.merge_to(self.target.tags, overwrite, |
|
3551 |
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 |
3552 |
result.new_revno, result.new_revid = self.target.last_revision_info() |
3553 |
if _hook_master: |
|
3554 |
result.master_branch = _hook_master |
|
3555 |
result.local_branch = result.target_branch |
|
3556 |
else: |
|
3557 |
result.master_branch = result.target_branch |
|
3558 |
result.local_branch = None |
|
3559 |
if run_hooks: |
|
3560 |
for hook in Branch.hooks['post_pull']: |
|
3561 |
hook(result) |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3562 |
finally: |
|
5284.4.1
by Robert Collins
* Fetching was slightly confused about the best code to use and was |
3563 |
self.source.unlock() |
3564 |
return result |
|
|
4000.5.9
by Jelmer Vernooij
Add InterBranch.pull(). |
3565 |
|
3566 |
||
|
4000.5.1
by Jelmer Vernooij
Add InterBranch. |
3567 |
InterBranch.register_optimiser(GenericInterBranch) |