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