13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
18
from cStringIO import StringIO
23
20
from bzrlib.lazy_import import lazy_import
24
21
lazy_import(globals(), """
22
from copy import deepcopy
23
from unittest import TestSuite
24
from warnings import warn
26
27
from bzrlib import (
31
config as _mod_config,
40
revision as _mod_revision,
30
config as _mod_config,
35
revision as _mod_revision,
42
from bzrlib.config import BranchConfig, TreeConfig
43
from bzrlib.lockable_files import LockableFiles, TransportLock
44
from bzrlib.tag import (
48
from bzrlib.i18n import gettext, ngettext
51
# Explicitly import bzrlib.bzrdir so that the BzrProber
52
# is guaranteed to be registered.
58
from bzrlib.decorators import (
50
from bzrlib.decorators import needs_read_lock, needs_write_lock
51
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
52
HistoryMissing, InvalidRevisionId,
53
InvalidRevisionNumber, LockError, NoSuchFile,
54
NoSuchRevision, NoWorkingTree, NotVersionedError,
55
NotBranchError, UninitializableFormat,
56
UnlistableStore, UnlistableBranch,
63
58
from bzrlib.hooks import Hooks
64
from bzrlib.inter import InterObject
65
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
66
from bzrlib import registry
67
from bzrlib.symbol_versioning import (
71
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
74
class Branch(controldir.ControlComponent):
59
from bzrlib.symbol_versioning import (deprecated_function,
63
zero_eight, zero_nine, zero_sixteen,
65
from bzrlib.trace import mutter, note
68
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
69
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
70
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
73
# TODO: Maybe include checks for common corruption of newlines, etc?
75
# TODO: Some operations like log might retrieve the same revisions
76
# repeatedly to calculate deltas. We could perhaps have a weakref
77
# cache in memory to make this faster. In general anything can be
78
# cached in memory between lock and unlock operations. .. nb thats
79
# what the transaction identity map provides
82
######################################################################
75
86
"""Branch holding a history of revisions.
78
Base directory/url of the branch; using control_url and
79
control_transport is more standardized.
80
:ivar hooks: An instance of BranchHooks.
81
:ivar _master_branch_cache: cached result of get_master_branch, see
89
Base directory/url of the branch.
91
hooks: An instance of BranchHooks.
84
93
# this is really an instance variable - FIXME move it there
89
def control_transport(self):
90
return self._transport
93
def user_transport(self):
94
return self.bzrdir.user_transport
96
def __init__(self, possible_transports=None):
97
self.tags = self._format.make_tags(self)
97
# override this to set the strategy for storing tags
99
return DisabledTags(self)
101
def __init__(self, *ignored, **ignored_too):
102
self.tags = self._make_tags()
98
103
self._revision_history_cache = None
99
104
self._revision_id_to_revno_cache = None
100
self._partial_revision_id_to_revno_cache = {}
101
self._partial_revision_history_cache = []
102
self._tags_bytes = None
103
self._last_revision_info_cache = None
104
self._master_branch_cache = None
105
self._merge_sorted_revisions_cache = None
106
self._open_hook(possible_transports)
107
hooks = Branch.hooks['open']
111
def _open_hook(self, possible_transports):
112
"""Called by init to allow simpler extension of the base class."""
114
def _activate_fallback_location(self, url, possible_transports):
115
"""Activate the branch/repository from url as a fallback repository."""
116
for existing_fallback_repo in self.repository._fallback_repositories:
117
if existing_fallback_repo.user_url == url:
118
# This fallback is already configured. This probably only
119
# happens because ControlDir.sprout is a horrible mess. To avoid
120
# confusing _unstack we don't add this a second time.
121
mutter('duplicate activation of fallback %r on %r', url, self)
123
repo = self._get_fallback_repository(url, possible_transports)
124
if repo.has_same_location(self.repository):
125
raise errors.UnstackableLocationError(self.user_url, url)
126
self.repository.add_fallback_repository(repo)
128
106
def break_lock(self):
129
107
"""Break a lock if one is present from another instance.
139
117
if master is not None:
140
118
master.break_lock()
142
def _check_stackable_repo(self):
143
if not self.repository._format.supports_external_lookups:
144
raise errors.UnstackableRepositoryFormat(self.repository._format,
145
self.repository.base)
147
def _extend_partial_history(self, stop_index=None, stop_revision=None):
148
"""Extend the partial history to include a given index
150
If a stop_index is supplied, stop when that index has been reached.
151
If a stop_revision is supplied, stop when that revision is
152
encountered. Otherwise, stop when the beginning of history is
155
:param stop_index: The index which should be present. When it is
156
present, history extension will stop.
157
:param stop_revision: The revision id which should be present. When
158
it is encountered, history extension will stop.
160
if len(self._partial_revision_history_cache) == 0:
161
self._partial_revision_history_cache = [self.last_revision()]
162
repository._iter_for_revno(
163
self.repository, self._partial_revision_history_cache,
164
stop_index=stop_index, stop_revision=stop_revision)
165
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
166
self._partial_revision_history_cache.pop()
168
def _get_check_refs(self):
169
"""Get the references needed for check().
173
revid = self.last_revision()
174
return [('revision-existence', revid), ('lefthand-distance', revid)]
177
def open(base, _unsupported=False, possible_transports=None):
121
@deprecated_method(zero_eight)
122
def open_downlevel(base):
123
"""Open a branch which may be of an old format."""
124
return Branch.open(base, _unsupported=True)
127
def open(base, _unsupported=False):
178
128
"""Open the branch rooted at base.
180
130
For instance, if the branch is at URL/.bzr/branch,
181
131
Branch.open(URL) -> a Branch instance.
183
control = controldir.ControlDir.open(base, _unsupported,
184
possible_transports=possible_transports)
185
return control.open_branch(unsupported=_unsupported,
186
possible_transports=possible_transports)
189
def open_from_transport(transport, name=None, _unsupported=False,
190
possible_transports=None):
191
"""Open the branch rooted at transport"""
192
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
193
return control.open_branch(name=name, unsupported=_unsupported,
194
possible_transports=possible_transports)
197
def open_containing(url, possible_transports=None):
133
control = bzrdir.BzrDir.open(base, _unsupported)
134
return control.open_branch(_unsupported)
137
def open_containing(url):
198
138
"""Open an existing branch which contains url.
200
140
This probes for a branch at url, and searches upwards from there.
202
142
Basically we keep looking up until we find the control directory or
203
143
run into the root. If there isn't one, raises NotBranchError.
204
If there is one and it is either an unrecognised format or an unsupported
144
If there is one and it is either an unrecognised format or an unsupported
205
145
format, UnknownFormatError or UnsupportedFormatError are raised.
206
146
If there is one, it is returned, along with the unused portion of url.
208
control, relpath = controldir.ControlDir.open_containing(url,
210
branch = control.open_branch(possible_transports=possible_transports)
211
return (branch, relpath)
213
def _push_should_merge_tags(self):
214
"""Should _basic_push merge this branch's tags into the target?
216
The default implementation returns False if this branch has no tags,
217
and True the rest of the time. Subclasses may override this.
219
return self.supports_tags() and self.tags.get_tag_dict()
148
control, relpath = bzrdir.BzrDir.open_containing(url)
149
return control.open_branch(), relpath
152
@deprecated_function(zero_eight)
153
def initialize(base):
154
"""Create a new working tree and branch, rooted at 'base' (url)
156
NOTE: This will soon be deprecated in favour of creation
159
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
161
@deprecated_function(zero_eight)
162
def setup_caching(self, cache_root):
163
"""Subclasses that care about caching should override this, and set
164
up cached stores located under cache_root.
166
NOTE: This is unused.
221
170
def get_config(self):
222
"""Get a bzrlib.config.BranchConfig for this Branch.
224
This can then be used to get and set configuration options for the
227
:return: A bzrlib.config.BranchConfig.
229
return _mod_config.BranchConfig(self)
231
def get_config_stack(self):
232
"""Get a bzrlib.config.BranchStack for this Branch.
234
This can then be used to get and set configuration options for the
237
:return: A bzrlib.config.BranchStack.
239
return _mod_config.BranchStack(self)
241
def _get_config(self):
242
"""Get the concrete config for just the config in this branch.
244
This is not intended for client use; see Branch.get_config for the
249
:return: An object supporting get_option and set_option.
251
raise NotImplementedError(self._get_config)
253
def _get_fallback_repository(self, url, possible_transports):
254
"""Get the repository we fallback to at url."""
255
url = urlutils.join(self.base, url)
256
a_branch = Branch.open(url, possible_transports=possible_transports)
257
return a_branch.repository
260
def _get_tags_bytes(self):
261
"""Get the bytes of a serialised tags dict.
263
Note that not all branches support tags, nor do all use the same tags
264
logic: this method is specific to BasicTags. Other tag implementations
265
may use the same method name and behave differently, safely, because
266
of the double-dispatch via
267
format.make_tags->tags_instance->get_tags_dict.
269
:return: The bytes of the tags file.
270
:seealso: Branch._set_tags_bytes.
272
if self._tags_bytes is None:
273
self._tags_bytes = self._transport.get_bytes('tags')
274
return self._tags_bytes
276
def _get_nick(self, local=False, possible_transports=None):
277
config = self.get_config()
278
# explicit overrides master, but don't look for master if local is True
279
if not local and not config.has_explicit_nickname():
281
master = self.get_master_branch(possible_transports)
282
if master and self.user_url == master.user_url:
283
raise errors.RecursiveBind(self.user_url)
284
if master is not None:
285
# return the master branch value
287
except errors.RecursiveBind, e:
289
except errors.BzrError, e:
290
# Silently fall back to local implicit nick if the master is
292
mutter("Could not connect to bound branch, "
293
"falling back to local nick.\n " + str(e))
294
return config.get_nickname()
171
return BranchConfig(self)
174
return self.get_config().get_nickname()
296
176
def _set_nick(self, nick):
297
self.get_config().set_user_option('nickname', nick, warn_masked=True)
177
self.get_config().set_user_option('nickname', nick)
299
179
nick = property(_get_nick, _set_nick)
301
181
def is_locked(self):
302
182
raise NotImplementedError(self.is_locked)
304
def _lefthand_history(self, revision_id, last_rev=None,
306
if 'evil' in debug.debug_flags:
307
mutter_callsite(4, "_lefthand_history scales with history.")
308
# stop_revision must be a descendant of last_revision
309
graph = self.repository.get_graph()
310
if last_rev is not None:
311
if not graph.is_ancestor(last_rev, revision_id):
312
# our previous tip is not merged into stop_revision
313
raise errors.DivergedBranches(self, other_branch)
314
# make a new revision history from the graph
315
parents_map = graph.get_parent_map([revision_id])
316
if revision_id not in parents_map:
317
raise errors.NoSuchRevision(self, revision_id)
318
current_rev_id = revision_id
320
check_not_reserved_id = _mod_revision.check_not_reserved_id
321
# Do not include ghosts or graph origin in revision_history
322
while (current_rev_id in parents_map and
323
len(parents_map[current_rev_id]) > 0):
324
check_not_reserved_id(current_rev_id)
325
new_history.append(current_rev_id)
326
current_rev_id = parents_map[current_rev_id][0]
327
parents_map = graph.get_parent_map([current_rev_id])
328
new_history.reverse()
331
def lock_write(self, token=None):
332
"""Lock the branch for write operations.
334
:param token: A token to permit reacquiring a previously held and
336
:return: A BranchWriteLockResult.
184
def lock_write(self):
338
185
raise NotImplementedError(self.lock_write)
340
187
def lock_read(self):
341
"""Lock the branch for read operations.
343
:return: A bzrlib.lock.LogicalLockResult.
345
188
raise NotImplementedError(self.lock_read)
347
190
def unlock(self):
449
228
:return: A dictionary mapping revision_id => dotted revno.
230
last_revision = self.last_revision()
231
revision_graph = self.repository.get_revision_graph(last_revision)
232
merge_sorted_revisions = tsort.merge_sort(
451
237
revision_id_to_revno = dict((rev_id, revno)
452
for rev_id, depth, revno, end_of_merge
453
in self.iter_merge_sorted_revisions())
238
for seq_num, rev_id, depth, revno, end_of_merge
239
in merge_sorted_revisions)
454
240
return revision_id_to_revno
457
def iter_merge_sorted_revisions(self, start_revision_id=None,
458
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
459
"""Walk the revisions for a branch in merge sorted order.
461
Merge sorted order is the output from a merge-aware,
462
topological sort, i.e. all parents come before their
463
children going forward; the opposite for reverse.
465
:param start_revision_id: the revision_id to begin walking from.
466
If None, the branch tip is used.
467
:param stop_revision_id: the revision_id to terminate the walk
468
after. If None, the rest of history is included.
469
:param stop_rule: if stop_revision_id is not None, the precise rule
470
to use for termination:
472
* 'exclude' - leave the stop revision out of the result (default)
473
* 'include' - the stop revision is the last item in the result
474
* 'with-merges' - include the stop revision and all of its
475
merged revisions in the result
476
* 'with-merges-without-common-ancestry' - filter out revisions
477
that are in both ancestries
478
:param direction: either 'reverse' or 'forward':
480
* reverse means return the start_revision_id first, i.e.
481
start at the most recent revision and go backwards in history
482
* forward returns tuples in the opposite order to reverse.
483
Note in particular that forward does *not* do any intelligent
484
ordering w.r.t. depth as some clients of this API may like.
485
(If required, that ought to be done at higher layers.)
487
:return: an iterator over (revision_id, depth, revno, end_of_merge)
490
* revision_id: the unique id of the revision
491
* depth: How many levels of merging deep this node has been
493
* revno_sequence: This field provides a sequence of
494
revision numbers for all revisions. The format is:
495
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
496
branch that the revno is on. From left to right the REVNO numbers
497
are the sequence numbers within that branch of the revision.
498
* end_of_merge: When True the next node (earlier in history) is
499
part of a different merge.
501
# Note: depth and revno values are in the context of the branch so
502
# we need the full graph to get stable numbers, regardless of the
504
if self._merge_sorted_revisions_cache is None:
505
last_revision = self.last_revision()
506
known_graph = self.repository.get_known_graph_ancestry(
508
self._merge_sorted_revisions_cache = known_graph.merge_sort(
510
filtered = self._filter_merge_sorted_revisions(
511
self._merge_sorted_revisions_cache, start_revision_id,
512
stop_revision_id, stop_rule)
513
# Make sure we don't return revisions that are not part of the
514
# start_revision_id ancestry.
515
filtered = self._filter_start_non_ancestors(filtered)
516
if direction == 'reverse':
518
if direction == 'forward':
519
return reversed(list(filtered))
521
raise ValueError('invalid direction %r' % direction)
523
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
524
start_revision_id, stop_revision_id, stop_rule):
525
"""Iterate over an inclusive range of sorted revisions."""
526
rev_iter = iter(merge_sorted_revisions)
527
if start_revision_id is not None:
528
for node in rev_iter:
530
if rev_id != start_revision_id:
533
# The decision to include the start or not
534
# depends on the stop_rule if a stop is provided
535
# so pop this node back into the iterator
536
rev_iter = itertools.chain(iter([node]), rev_iter)
538
if stop_revision_id is None:
540
for node in rev_iter:
542
yield (rev_id, node.merge_depth, node.revno,
544
elif stop_rule == 'exclude':
545
for node in rev_iter:
547
if rev_id == stop_revision_id:
549
yield (rev_id, node.merge_depth, node.revno,
551
elif stop_rule == 'include':
552
for node in rev_iter:
554
yield (rev_id, node.merge_depth, node.revno,
556
if rev_id == stop_revision_id:
558
elif stop_rule == 'with-merges-without-common-ancestry':
559
# We want to exclude all revisions that are already part of the
560
# stop_revision_id ancestry.
561
graph = self.repository.get_graph()
562
ancestors = graph.find_unique_ancestors(start_revision_id,
564
for node in rev_iter:
566
if rev_id not in ancestors:
568
yield (rev_id, node.merge_depth, node.revno,
570
elif stop_rule == 'with-merges':
571
stop_rev = self.repository.get_revision(stop_revision_id)
572
if stop_rev.parent_ids:
573
left_parent = stop_rev.parent_ids[0]
575
left_parent = _mod_revision.NULL_REVISION
576
# left_parent is the actual revision we want to stop logging at,
577
# since we want to show the merged revisions after the stop_rev too
578
reached_stop_revision_id = False
579
revision_id_whitelist = []
580
for node in rev_iter:
582
if rev_id == left_parent:
583
# reached the left parent after the stop_revision
585
if (not reached_stop_revision_id or
586
rev_id in revision_id_whitelist):
587
yield (rev_id, node.merge_depth, node.revno,
589
if reached_stop_revision_id or rev_id == stop_revision_id:
590
# only do the merged revs of rev_id from now on
591
rev = self.repository.get_revision(rev_id)
593
reached_stop_revision_id = True
594
revision_id_whitelist.extend(rev.parent_ids)
596
raise ValueError('invalid stop_rule %r' % stop_rule)
598
def _filter_start_non_ancestors(self, rev_iter):
599
# If we started from a dotted revno, we want to consider it as a tip
600
# and don't want to yield revisions that are not part of its
601
# ancestry. Given the order guaranteed by the merge sort, we will see
602
# uninteresting descendants of the first parent of our tip before the
604
first = rev_iter.next()
605
(rev_id, merge_depth, revno, end_of_merge) = first
608
# We start at a mainline revision so by definition, all others
609
# revisions in rev_iter are ancestors
610
for node in rev_iter:
615
pmap = self.repository.get_parent_map([rev_id])
616
parents = pmap.get(rev_id, [])
618
whitelist.update(parents)
620
# If there is no parents, there is nothing of interest left
622
# FIXME: It's hard to test this scenario here as this code is never
623
# called in that case. -- vila 20100322
626
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
628
if rev_id in whitelist:
629
pmap = self.repository.get_parent_map([rev_id])
630
parents = pmap.get(rev_id, [])
631
whitelist.remove(rev_id)
632
whitelist.update(parents)
634
# We've reached the mainline, there is nothing left to
638
# A revision that is not part of the ancestry of our
641
yield (rev_id, merge_depth, revno, end_of_merge)
643
242
def leave_lock_in_place(self):
644
243
"""Tell this branch object not to release the physical lock when this
645
244
object is unlocked.
647
246
If lock_write doesn't return a token, then this method is not supported.
649
248
self.control_files.leave_in_place()
721
331
:param committer: Optional committer to set for commit.
722
332
:param revprops: Optional dictionary of revision properties.
723
333
:param revision_id: Optional revision id.
724
:param lossy: Whether to discard data that can not be natively
725
represented, when pushing to a foreign VCS
728
if config_stack is None:
729
config_stack = self.get_config_stack()
731
return self.repository.get_commit_builder(self, parents, config_stack,
732
timestamp, timezone, committer, revprops, revision_id,
735
def get_master_branch(self, possible_transports=None):
337
config = self.get_config()
339
return self.repository.get_commit_builder(self, parents, config,
340
timestamp, timezone, committer, revprops, revision_id)
342
def get_master_branch(self):
736
343
"""Return the branch we are bound to.
738
345
:return: Either a Branch, or None
742
@deprecated_method(deprecated_in((2, 5, 0)))
743
349
def get_revision_delta(self, revno):
744
350
"""Return the delta for one revision.
746
352
The delta is relative to its mainline predecessor, or the
747
353
empty tree for revision 1.
750
revid = self.get_rev_id(revno)
751
except errors.NoSuchRevision:
752
raise errors.InvalidRevisionNumber(revno)
753
return self.repository.get_revision_delta(revid)
755
def get_stacked_on_url(self):
756
"""Get the URL this branch is stacked against.
758
:raises NotStacked: If the branch is not stacked.
759
:raises UnstackableBranchFormat: If the branch does not support
355
assert isinstance(revno, int)
356
rh = self.revision_history()
357
if not (1 <= revno <= len(rh)):
358
raise InvalidRevisionNumber(revno)
359
return self.repository.get_revision_delta(rh[revno-1])
361
@deprecated_method(zero_sixteen)
362
def get_root_id(self):
363
"""Return the id of this branches root
365
Deprecated: branches don't have root ids-- trees do.
366
Use basis_tree().get_root_id() instead.
762
raise NotImplementedError(self.get_stacked_on_url)
368
raise NotImplementedError(self.get_root_id)
764
370
def print_file(self, file, revision_id):
765
371
"""Print `file` to stdout."""
766
372
raise NotImplementedError(self.print_file)
768
@deprecated_method(deprecated_in((2, 4, 0)))
374
def append_revision(self, *revision_ids):
375
raise NotImplementedError(self.append_revision)
769
377
def set_revision_history(self, rev_history):
770
"""See Branch.set_revision_history."""
771
self._set_revision_history(rev_history)
774
def _set_revision_history(self, rev_history):
775
if len(rev_history) == 0:
776
revid = _mod_revision.NULL_REVISION
778
revid = rev_history[-1]
779
if rev_history != self._lefthand_history(revid):
780
raise errors.NotLefthandHistory(rev_history)
781
self.set_last_revision_info(len(rev_history), revid)
782
self._cache_revision_history(rev_history)
783
for hook in Branch.hooks['set_rh']:
784
hook(self, rev_history)
787
def set_last_revision_info(self, revno, revision_id):
788
"""Set the last revision of this branch.
790
The caller is responsible for checking that the revno is correct
791
for this revision id.
793
It may be possible to set the branch last revision to an id not
794
present in the repository. However, branches can also be
795
configured to check constraints on history, in which case this may not
798
raise NotImplementedError(self.set_last_revision_info)
801
def generate_revision_history(self, revision_id, last_rev=None,
803
"""See Branch.generate_revision_history"""
804
graph = self.repository.get_graph()
805
(last_revno, last_revid) = self.last_revision_info()
806
known_revision_ids = [
807
(last_revid, last_revno),
808
(_mod_revision.NULL_REVISION, 0),
810
if last_rev is not None:
811
if not graph.is_ancestor(last_rev, revision_id):
812
# our previous tip is not merged into stop_revision
813
raise errors.DivergedBranches(self, other_branch)
814
revno = graph.find_distance_to_null(revision_id, known_revision_ids)
815
self.set_last_revision_info(revno, revision_id)
818
def set_parent(self, url):
819
"""See Branch.set_parent."""
820
# TODO: Maybe delete old location files?
821
# URLs should never be unicode, even on the local fs,
822
# FIXUP this and get_parent in a future branch format bump:
823
# read and rewrite the file. RBC 20060125
825
if isinstance(url, unicode):
827
url = url.encode('ascii')
828
except UnicodeEncodeError:
829
raise errors.InvalidURL(url,
830
"Urls must be 7-bit ascii, "
831
"use bzrlib.urlutils.escape")
832
url = urlutils.relative_url(self.base, url)
833
self._set_parent_location(url)
836
def set_stacked_on_url(self, url):
837
"""Set the URL this branch is stacked against.
839
:raises UnstackableBranchFormat: If the branch does not support
841
:raises UnstackableRepositoryFormat: If the repository does not support
844
if not self._format.supports_stacking():
845
raise errors.UnstackableBranchFormat(self._format, self.user_url)
846
# XXX: Changing from one fallback repository to another does not check
847
# that all the data you need is present in the new fallback.
848
# Possibly it should.
849
self._check_stackable_repo()
852
old_url = self.get_stacked_on_url()
853
except (errors.NotStacked, errors.UnstackableBranchFormat,
854
errors.UnstackableRepositoryFormat):
858
self._activate_fallback_location(url,
859
possible_transports=[self.bzrdir.root_transport])
860
# write this out after the repository is stacked to avoid setting a
861
# stacked config that doesn't work.
862
self._set_config_location('stacked_on_location', url)
865
"""Change a branch to be unstacked, copying data as needed.
867
Don't call this directly, use set_stacked_on_url(None).
869
pb = ui.ui_factory.nested_progress_bar()
871
pb.update(gettext("Unstacking"))
872
# The basic approach here is to fetch the tip of the branch,
873
# including all available ghosts, from the existing stacked
874
# repository into a new repository object without the fallbacks.
876
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
877
# correct for CHKMap repostiories
878
old_repository = self.repository
879
if len(old_repository._fallback_repositories) != 1:
880
raise AssertionError("can't cope with fallback repositories "
881
"of %r (fallbacks: %r)" % (old_repository,
882
old_repository._fallback_repositories))
883
# Open the new repository object.
884
# Repositories don't offer an interface to remove fallback
885
# repositories today; take the conceptually simpler option and just
886
# reopen it. We reopen it starting from the URL so that we
887
# get a separate connection for RemoteRepositories and can
888
# stream from one of them to the other. This does mean doing
889
# separate SSH connection setup, but unstacking is not a
890
# common operation so it's tolerable.
891
new_bzrdir = controldir.ControlDir.open(
892
self.bzrdir.root_transport.base)
893
new_repository = new_bzrdir.find_repository()
894
if new_repository._fallback_repositories:
895
raise AssertionError("didn't expect %r to have "
896
"fallback_repositories"
897
% (self.repository,))
898
# Replace self.repository with the new repository.
899
# Do our best to transfer the lock state (i.e. lock-tokens and
900
# lock count) of self.repository to the new repository.
901
lock_token = old_repository.lock_write().repository_token
902
self.repository = new_repository
903
if isinstance(self, remote.RemoteBranch):
904
# Remote branches can have a second reference to the old
905
# repository that need to be replaced.
906
if self._real_branch is not None:
907
self._real_branch.repository = new_repository
908
self.repository.lock_write(token=lock_token)
909
if lock_token is not None:
910
old_repository.leave_lock_in_place()
911
old_repository.unlock()
912
if lock_token is not None:
913
# XXX: self.repository.leave_lock_in_place() before this
914
# function will not be preserved. Fortunately that doesn't
915
# affect the current default format (2a), and would be a
916
# corner-case anyway.
917
# - Andrew Bennetts, 2010/06/30
918
self.repository.dont_leave_lock_in_place()
922
old_repository.unlock()
923
except errors.LockNotHeld:
926
if old_lock_count == 0:
927
raise AssertionError(
928
'old_repository should have been locked at least once.')
929
for i in range(old_lock_count-1):
930
self.repository.lock_write()
931
# Fetch from the old repository into the new.
932
old_repository.lock_read()
934
# XXX: If you unstack a branch while it has a working tree
935
# with a pending merge, the pending-merged revisions will no
936
# longer be present. You can (probably) revert and remerge.
938
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
939
except errors.TagsNotSupported:
940
tags_to_fetch = set()
941
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
942
old_repository, required_ids=[self.last_revision()],
943
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
944
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
946
old_repository.unlock()
950
def _set_tags_bytes(self, bytes):
951
"""Mirror method for _get_tags_bytes.
953
:seealso: Branch._get_tags_bytes.
955
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked)
956
op.add_cleanup(self.lock_write().unlock)
957
return op.run_simple(bytes)
959
def _set_tags_bytes_locked(self, bytes):
960
self._tags_bytes = bytes
961
return self._transport.put_bytes('tags', bytes)
378
raise NotImplementedError(self.set_revision_history)
963
380
def _cache_revision_history(self, rev_history):
964
381
"""Set the cached revision history to rev_history.
1038
443
That is equivalent to the number of revisions committed to
1041
return self.last_revision_info()[0]
446
return len(self.revision_history())
1043
448
def unbind(self):
1044
449
"""Older format branches cannot bind or unbind."""
1045
raise errors.UpgradeRequired(self.user_url)
450
raise errors.UpgradeRequired(self.base)
452
def set_append_revisions_only(self, enabled):
453
"""Older format branches are never restricted to append-only"""
454
raise errors.UpgradeRequired(self.base)
1047
456
def last_revision(self):
1048
"""Return last revision id, or NULL_REVISION."""
1049
return self.last_revision_info()[1]
457
"""Return last revision id, or None"""
458
ph = self.revision_history()
1052
464
def last_revision_info(self):
1053
465
"""Return information about the last revision.
1055
:return: A tuple (revno, revision_id).
1057
if self._last_revision_info_cache is None:
1058
self._last_revision_info_cache = self._read_last_revision_info()
1059
return self._last_revision_info_cache
1061
def _read_last_revision_info(self):
1062
raise NotImplementedError(self._read_last_revision_info)
1064
@deprecated_method(deprecated_in((2, 4, 0)))
1065
def import_last_revision_info(self, source_repo, revno, revid):
1066
"""Set the last revision info, importing from another repo if necessary.
1068
:param source_repo: Source repository to optionally fetch from
1069
:param revno: Revision number of the new tip
1070
:param revid: Revision id of the new tip
1072
if not self.repository.has_same_location(source_repo):
1073
self.repository.fetch(source_repo, revision_id=revid)
1074
self.set_last_revision_info(revno, revid)
1076
def import_last_revision_info_and_tags(self, source, revno, revid,
1078
"""Set the last revision info, importing from another repo if necessary.
1080
This is used by the bound branch code to upload a revision to
1081
the master branch first before updating the tip of the local branch.
1082
Revisions referenced by source's tags are also transferred.
1084
:param source: Source branch to optionally fetch from
1085
:param revno: Revision number of the new tip
1086
:param revid: Revision id of the new tip
1087
:param lossy: Whether to discard metadata that can not be
1088
natively represented
1089
:return: Tuple with the new revision number and revision id
1090
(should only be different from the arguments when lossy=True)
1092
if not self.repository.has_same_location(source.repository):
1093
self.fetch(source, revid)
1094
self.set_last_revision_info(revno, revid)
1095
return (revno, revid)
467
:return: A tuple (revno, last_revision_id).
469
rh = self.revision_history()
472
return (revno, rh[-1])
474
return (0, _mod_revision.NULL_REVISION)
476
def missing_revisions(self, other, stop_revision=None):
477
"""Return a list of new revisions that would perfectly fit.
479
If self and other have not diverged, return a list of the revisions
480
present in other, but missing from self.
482
self_history = self.revision_history()
483
self_len = len(self_history)
484
other_history = other.revision_history()
485
other_len = len(other_history)
486
common_index = min(self_len, other_len) -1
487
if common_index >= 0 and \
488
self_history[common_index] != other_history[common_index]:
489
raise DivergedBranches(self, other)
491
if stop_revision is None:
492
stop_revision = other_len
494
assert isinstance(stop_revision, int)
495
if stop_revision > other_len:
496
raise errors.NoSuchRevision(self, stop_revision)
497
return other_history[self_len:stop_revision]
499
def update_revisions(self, other, stop_revision=None):
500
"""Pull in new perfect-fit revisions.
502
:param other: Another Branch to pull from
503
:param stop_revision: Updated until the given revision
506
raise NotImplementedError(self.update_revisions)
1097
508
def revision_id_to_revno(self, revision_id):
1098
509
"""Given a revision id, return its revno"""
1099
if _mod_revision.is_null(revision_id):
510
if revision_id is None:
1101
history = self._revision_history()
512
revision_id = osutils.safe_revision_id(revision_id)
513
history = self.revision_history()
1103
515
return history.index(revision_id) + 1
1104
516
except ValueError:
1105
517
raise errors.NoSuchRevision(self, revision_id)
1108
519
def get_rev_id(self, revno, history=None):
1109
520
"""Find the revision id of the specified revno."""
1111
return _mod_revision.NULL_REVISION
1112
last_revno, last_revid = self.last_revision_info()
1113
if revno == last_revno:
1115
if revno <= 0 or revno > last_revno:
524
history = self.revision_history()
525
if revno <= 0 or revno > len(history):
1116
526
raise errors.NoSuchRevision(self, revno)
1117
distance_from_last = last_revno - revno
1118
if len(self._partial_revision_history_cache) <= distance_from_last:
1119
self._extend_partial_history(distance_from_last)
1120
return self._partial_revision_history_cache[distance_from_last]
527
return history[revno - 1]
1122
def pull(self, source, overwrite=False, stop_revision=None,
1123
possible_transports=None, *args, **kwargs):
529
def pull(self, source, overwrite=False, stop_revision=None):
1124
530
"""Mirror source into this branch.
1126
532
This branch is considered to be 'local', having low latency.
1128
534
:returns: PullResult instance
1130
return InterBranch.get(source, self).pull(overwrite=overwrite,
1131
stop_revision=stop_revision,
1132
possible_transports=possible_transports, *args, **kwargs)
536
raise NotImplementedError(self.pull)
1134
def push(self, target, overwrite=False, stop_revision=None, lossy=False,
538
def push(self, target, overwrite=False, stop_revision=None):
1136
539
"""Mirror this branch into target.
1138
541
This branch is considered to be 'local', having low latency.
1140
return InterBranch.get(self, target).push(overwrite, stop_revision,
1141
lossy, *args, **kwargs)
543
raise NotImplementedError(self.push)
1143
545
def basis_tree(self):
1144
546
"""Return `Tree` object for last revision."""
1145
547
return self.repository.revision_tree(self.last_revision())
549
def rename_one(self, from_rel, to_rel):
552
This can change the directory or the filename or both.
554
raise NotImplementedError(self.rename_one)
556
def move(self, from_paths, to_name):
559
to_name must exist as a versioned directory.
561
If to_name exists and is a directory, the files are moved into
562
it, keeping their old names. If it is a directory,
564
Note that to_name is only the last component of the new name;
565
this doesn't change the directory.
567
This returns a list of (from_path, to_path) pairs for each
570
raise NotImplementedError(self.move)
1147
572
def get_parent(self):
1148
573
"""Return the parent location of the branch.
1150
This is the default location for pull/missing. The usual
575
This is the default location for push/pull/missing. The usual
1151
576
pattern is that the user can override it by specifying a
1154
parent = self._get_parent_location()
1157
# This is an old-format absolute path to a local branch
1158
# turn it into a url
1159
if parent.startswith('/'):
1160
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1162
return urlutils.join(self.base[:-1], parent)
1163
except errors.InvalidURLJoin, e:
1164
raise errors.InaccessibleParent(parent, self.user_url)
1166
def _get_parent_location(self):
1167
raise NotImplementedError(self._get_parent_location)
579
raise NotImplementedError(self.get_parent)
1169
581
def _set_config_location(self, name, url, config=None,
1170
582
make_relative=False):
1271
659
self.check_real_revno(revno)
1273
661
def check_real_revno(self, revno):
1275
663
Check whether a revno corresponds to a real revision.
1276
664
Zero (the NULL revision) is considered invalid
1278
666
if revno < 1 or revno > self.revno():
1279
raise errors.InvalidRevisionNumber(revno)
667
raise InvalidRevisionNumber(revno)
1281
669
@needs_read_lock
1282
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
670
def clone(self, to_bzrdir, revision_id=None):
1283
671
"""Clone this branch into to_bzrdir preserving all semantic values.
1285
Most API users will want 'create_clone_on_transport', which creates a
1286
new bzrdir and branch on the fly.
1288
673
revision_id: if not None, the revision history in the new branch will
1289
674
be truncated to end with revision_id.
1291
result = to_bzrdir.create_branch()
1294
if repository_policy is not None:
1295
repository_policy.configure_branch(result)
1296
self.copy_content_into(result, revision_id=revision_id)
676
result = self._format.initialize(to_bzrdir)
677
self.copy_content_into(result, revision_id=revision_id)
1301
680
@needs_read_lock
1302
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None,
681
def sprout(self, to_bzrdir, revision_id=None):
1304
682
"""Create a new line of development from the branch, into to_bzrdir.
1306
to_bzrdir controls the branch format.
1308
684
revision_id: if not None, the revision history in the new branch will
1309
685
be truncated to end with revision_id.
1311
if (repository_policy is not None and
1312
repository_policy.requires_stacking()):
1313
to_bzrdir._format.require_stacking(_skip_repo=True)
1314
result = to_bzrdir.create_branch(repository=repository)
1317
if repository_policy is not None:
1318
repository_policy.configure_branch(result)
1319
self.copy_content_into(result, revision_id=revision_id)
1320
master_url = self.get_bound_location()
1321
if master_url is None:
1322
result.set_parent(self.bzrdir.root_transport.base)
1324
result.set_parent(master_url)
687
result = self._format.initialize(to_bzrdir)
688
self.copy_content_into(result, revision_id=revision_id)
689
result.set_parent(self.bzrdir.root_transport.base)
1329
692
def _synchronize_history(self, destination, revision_id):
1330
693
"""Synchronize last revision and revision history between branches.
1332
695
This version is most efficient when the destination is also a
1333
BzrBranch6, but works for BzrBranch5, as long as the destination's
1334
repository contains all the lefthand ancestors of the intended
1335
last_revision. If not, set_last_revision_info will fail.
696
BzrBranch5, but works for BzrBranch6 as long as the revision
697
history is the true lefthand parent history, and all of the revisions
698
are in the destination's repository. If not, set_revision_history
1337
701
:param destination: The branch to copy the history into
1338
702
:param revision_id: The revision-id to truncate history at. May
1339
703
be None to copy complete history.
1341
source_revno, source_revision_id = self.last_revision_info()
1342
if revision_id is None:
1343
revno, revision_id = source_revno, source_revision_id
1345
graph = self.repository.get_graph()
705
new_history = self.revision_history()
706
if revision_id is not None:
707
revision_id = osutils.safe_revision_id(revision_id)
1347
revno = graph.find_distance_to_null(revision_id,
1348
[(source_revision_id, source_revno)])
1349
except errors.GhostRevisionsHaveNoRevno:
1350
# Default to 1, if we can't find anything else
1352
destination.set_last_revision_info(revno, revision_id)
709
new_history = new_history[:new_history.index(revision_id) + 1]
711
rev = self.repository.get_revision(revision_id)
712
new_history = rev.get_history(self.repository)[1:]
713
destination.set_revision_history(new_history)
1354
716
def copy_content_into(self, destination, revision_id=None):
1355
717
"""Copy the content of self into destination.
1357
719
revision_id: if not None, the revision history in the new branch will
1358
720
be truncated to end with revision_id.
1360
return InterBranch.get(self, destination).copy_content_into(
1361
revision_id=revision_id)
1363
def update_references(self, target):
1364
if not getattr(self._format, 'supports_reference_locations', False):
1366
reference_dict = self._get_all_reference_info()
1367
if len(reference_dict) == 0:
1369
old_base = self.base
1370
new_base = target.base
1371
target_reference_dict = target._get_all_reference_info()
1372
for file_id, (tree_path, branch_location) in (
1373
reference_dict.items()):
1374
branch_location = urlutils.rebase_url(branch_location,
1376
target_reference_dict.setdefault(
1377
file_id, (tree_path, branch_location))
1378
target._set_all_reference_info(target_reference_dict)
722
self._synchronize_history(destination, revision_id)
724
parent = self.get_parent()
725
except errors.InaccessibleParent, e:
726
mutter('parent was not accessible to copy: %s', e)
729
destination.set_parent(parent)
730
self.tags.merge_to(destination.tags)
1380
732
@needs_read_lock
1381
def check(self, refs):
1382
734
"""Check consistency of the branch.
1384
736
In particular this checks that revisions given in the revision-history
1385
do actually match up in the revision graph, and that they're all
737
do actually match up in the revision graph, and that they're all
1386
738
present in the repository.
1388
740
Callers will typically also want to check the repository.
1390
:param refs: Calculated refs for this branch as specified by
1391
branch._get_check_refs()
1392
742
:return: A BranchCheckResult.
1394
result = BranchCheckResult(self)
1395
last_revno, last_revision_id = self.last_revision_info()
1396
actual_revno = refs[('lefthand-distance', last_revision_id)]
1397
if actual_revno != last_revno:
1398
result.errors.append(errors.BzrCheckError(
1399
'revno does not match len(mainline) %s != %s' % (
1400
last_revno, actual_revno)))
1401
# TODO: We should probably also check that self.revision_history
1402
# matches the repository for older branch formats.
1403
# If looking for the code that cross-checks repository parents against
1404
# the Graph.iter_lefthand_ancestry output, that is now a repository
744
mainline_parent_id = None
745
for revision_id in self.revision_history():
747
revision = self.repository.get_revision(revision_id)
748
except errors.NoSuchRevision, e:
749
raise errors.BzrCheckError("mainline revision {%s} not in repository"
751
# In general the first entry on the revision history has no parents.
752
# But it's not illegal for it to have parents listed; this can happen
753
# in imports from Arch when the parents weren't reachable.
754
if mainline_parent_id is not None:
755
if mainline_parent_id not in revision.parent_ids:
756
raise errors.BzrCheckError("previous revision {%s} not listed among "
758
% (mainline_parent_id, revision_id))
759
mainline_parent_id = revision_id
760
return BranchCheckResult(self)
1408
def _get_checkout_format(self, lightweight=False):
762
def _get_checkout_format(self):
1409
763
"""Return the most suitable metadir for a checkout of this branch.
1410
764
Weaves are used if this branch's repository uses weaves.
1412
format = self.repository.bzrdir.checkout_metadir()
1413
format.set_branch_format(self._format)
766
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
767
from bzrlib.repofmt import weaverepo
768
format = bzrdir.BzrDirMetaFormat1()
769
format.repository_format = weaverepo.RepositoryFormat7()
771
format = self.repository.bzrdir.checkout_metadir()
772
format.set_branch_format(self._format)
1416
def create_clone_on_transport(self, to_transport, revision_id=None,
1417
stacked_on=None, create_prefix=False, use_existing_dir=False,
1419
"""Create a clone of this branch and its bzrdir.
1421
:param to_transport: The transport to clone onto.
1422
:param revision_id: The revision id to use as tip in the new branch.
1423
If None the tip is obtained from this branch.
1424
:param stacked_on: An optional URL to stack the clone on.
1425
:param create_prefix: Create any missing directories leading up to
1427
:param use_existing_dir: Use an existing directory if one exists.
1429
# XXX: Fix the bzrdir API to allow getting the branch back from the
1430
# clone call. Or something. 20090224 RBC/spiv.
1431
# XXX: Should this perhaps clone colocated branches as well,
1432
# rather than just the default branch? 20100319 JRV
1433
if revision_id is None:
1434
revision_id = self.last_revision()
1435
dir_to = self.bzrdir.clone_on_transport(to_transport,
1436
revision_id=revision_id, stacked_on=stacked_on,
1437
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
1439
return dir_to.open_branch()
1441
775
def create_checkout(self, to_location, revision_id=None,
1442
lightweight=False, accelerator_tree=None,
1444
777
"""Create a checkout of a branch.
1446
779
:param to_location: The url to produce the checkout at
1447
780
:param revision_id: The revision to check out
1448
781
:param lightweight: If True, produce a lightweight checkout, otherwise,
1449
produce a bound branch (heavyweight checkout)
1450
:param accelerator_tree: A tree which can be used for retrieving file
1451
contents more quickly than the revision tree, i.e. a workingtree.
1452
The revision tree will be used for cases where accelerator_tree's
1453
content is different.
1454
:param hardlink: If true, hard-link files from accelerator_tree,
782
produce a bound branch (heavyweight checkout)
1456
783
:return: The tree of the created checkout
1458
785
t = transport.get_transport(to_location)
1460
format = self._get_checkout_format(lightweight=lightweight)
788
format = self._get_checkout_format()
1462
789
checkout = format.initialize_on_transport(t)
1463
from_branch = BranchReferenceFormat().initialize(checkout,
790
BranchReferenceFormat().initialize(checkout, self)
1466
checkout_branch = controldir.ControlDir.create_branch_convenience(
792
format = self._get_checkout_format()
793
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1467
794
to_location, force_new_tree=False, format=format)
1468
795
checkout = checkout_branch.bzrdir
1469
796
checkout_branch.bind(self)
1470
# pull up to the specified revision_id to set the initial
797
# pull up to the specified revision_id to set the initial
1471
798
# branch tip correctly, and seed it with history.
1472
799
checkout_branch.pull(self, stop_revision=revision_id)
1474
tree = checkout.create_workingtree(revision_id,
1475
from_branch=from_branch,
1476
accelerator_tree=accelerator_tree,
800
tree = checkout.create_workingtree(revision_id)
1478
801
basis_tree = tree.basis_tree()
1479
802
basis_tree.lock_read()
1487
810
basis_tree.unlock()
1491
def reconcile(self, thorough=True):
1492
"""Make sure the data stored in this branch is consistent."""
1493
from bzrlib.reconcile import BranchReconciler
1494
reconciler = BranchReconciler(self, thorough=thorough)
1495
reconciler.reconcile()
1498
def reference_parent(self, file_id, path, possible_transports=None):
813
def reference_parent(self, file_id, path):
1499
814
"""Return the parent branch for a tree-reference file_id
1501
815
:param file_id: The file_id of the tree reference
1502
816
:param path: The path of the file_id in the tree
1503
817
:return: A branch associated with the file_id
1505
819
# FIXME should provide multiple branches, based on config
1506
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1507
possible_transports=possible_transports)
820
return Branch.open(self.bzrdir.root_transport.clone(path).base)
1509
822
def supports_tags(self):
1510
823
return self._format.supports_tags()
1512
def automatic_tag_name(self, revision_id):
1513
"""Try to automatically find the tag name for a revision.
1515
:param revision_id: Revision id of the revision.
1516
:return: A tag name or None if no tag name could be determined.
1518
for hook in Branch.hooks['automatic_tag_name']:
1519
ret = hook(self, revision_id)
1524
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1526
"""Ensure that revision_b is a descendant of revision_a.
1528
This is a helper function for update_revisions.
1530
:raises: DivergedBranches if revision_b has diverged from revision_a.
1531
:returns: True if revision_b is a descendant of revision_a.
1533
relation = self._revision_relations(revision_a, revision_b, graph)
1534
if relation == 'b_descends_from_a':
1536
elif relation == 'diverged':
1537
raise errors.DivergedBranches(self, other_branch)
1538
elif relation == 'a_descends_from_b':
1541
raise AssertionError("invalid relation: %r" % (relation,))
1543
def _revision_relations(self, revision_a, revision_b, graph):
1544
"""Determine the relationship between two revisions.
1546
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1548
heads = graph.heads([revision_a, revision_b])
1549
if heads == set([revision_b]):
1550
return 'b_descends_from_a'
1551
elif heads == set([revision_a, revision_b]):
1552
# These branches have diverged
1554
elif heads == set([revision_a]):
1555
return 'a_descends_from_b'
1557
raise AssertionError("invalid heads: %r" % (heads,))
1559
def heads_to_fetch(self):
1560
"""Return the heads that must and that should be fetched to copy this
1561
branch into another repo.
1563
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
1564
set of heads that must be fetched. if_present_fetch is a set of
1565
heads that must be fetched if present, but no error is necessary if
1566
they are not present.
1568
# For bzr native formats must_fetch is just the tip, and if_present_fetch
1570
must_fetch = set([self.last_revision()])
1571
if_present_fetch = set()
1572
c = self.get_config()
1573
include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1577
if_present_fetch = set(self.tags.get_reverse_tag_dict())
1578
except errors.TagsNotSupported:
1580
must_fetch.discard(_mod_revision.NULL_REVISION)
1581
if_present_fetch.discard(_mod_revision.NULL_REVISION)
1582
return must_fetch, if_present_fetch
1585
class BranchFormat(controldir.ControlComponentFormat):
826
class BranchFormat(object):
1586
827
"""An encapsulation of the initialization and open routines for a format.
1588
829
Formats provide three things:
1590
831
* a format string,
1591
832
* an open routine.
1593
Formats are placed in an dict by their format string for reference
1594
during branch opening. It's not required that these be instances, they
1595
can be classes themselves with class methods - it simply depends on
834
Formats are placed in an dict by their format string for reference
835
during branch opening. Its not required that these be instances, they
836
can be classes themselves with class methods - it simply depends on
1596
837
whether state is needed for a given format or not.
1598
839
Once a format is deprecated, just deprecate the initialize and open
1599
methods on the format class. Do not deprecate the object, as the
840
methods on the format class. Do not deprecate the object, as the
1600
841
object will be created every time regardless.
1603
def __eq__(self, other):
1604
return self.__class__ is other.__class__
1606
def __ne__(self, other):
1607
return not (self == other)
1610
@deprecated_method(deprecated_in((2, 4, 0)))
844
_default_format = None
845
"""The default format used for new branches."""
848
"""The known formats."""
851
def find_format(klass, a_bzrdir):
852
"""Return the format for the branch object in a_bzrdir."""
854
transport = a_bzrdir.get_branch_transport(None)
855
format_string = transport.get("format").read()
856
return klass._formats[format_string]
858
raise NotBranchError(path=transport.base)
860
raise errors.UnknownFormatError(format=format_string)
1611
863
def get_default_format(klass):
1612
864
"""Return the current default format."""
1613
return format_registry.get_default()
1616
@deprecated_method(deprecated_in((2, 4, 0)))
1617
def get_formats(klass):
1618
"""Get all the known formats.
1620
Warning: This triggers a load of all lazy registered formats: do not
1621
use except when that is desireed.
1623
return format_registry._get_all()
1625
def get_reference(self, controldir, name=None):
1626
"""Get the target reference of the branch in controldir.
865
return klass._default_format
867
def get_reference(self, a_bzrdir):
868
"""Get the target reference of the branch in a_bzrdir.
1628
870
format probing must have been completed before calling
1629
871
this method - it is assumed that the format of the branch
1630
in controldir is correct.
872
in a_bzrdir is correct.
1632
:param controldir: The controldir to get the branch data from.
1633
:param name: Name of the colocated branch to fetch
874
:param a_bzrdir: The bzrdir to get the branch data from.
1634
875
:return: None if the branch is not a reference branch.
1639
def set_reference(self, controldir, name, to_branch):
1640
"""Set the target reference of the branch in controldir.
1642
format probing must have been completed before calling
1643
this method - it is assumed that the format of the branch
1644
in controldir is correct.
1646
:param controldir: The controldir to set the branch reference for.
1647
:param name: Name of colocated branch to set, None for default
1648
:param to_branch: branch that the checkout is to reference
1650
raise NotImplementedError(self.set_reference)
879
def get_format_string(self):
880
"""Return the ASCII format string that identifies this format."""
881
raise NotImplementedError(self.get_format_string)
1652
883
def get_format_description(self):
1653
884
"""Return the short format description for this format."""
1654
885
raise NotImplementedError(self.get_format_description)
1656
def _run_post_branch_init_hooks(self, controldir, name, branch):
1657
hooks = Branch.hooks['post_branch_init']
1660
params = BranchInitHookParams(self, controldir, name, branch)
1664
def initialize(self, controldir, name=None, repository=None,
1665
append_revisions_only=None):
1666
"""Create a branch of this format in controldir.
1668
:param name: Name of the colocated branch to create.
887
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
889
"""Initialize a branch in a bzrdir, with specified files
891
:param a_bzrdir: The bzrdir to initialize the branch in
892
:param utf8_files: The files to create as a list of
893
(filename, content) tuples
894
:param set_format: If True, set the format with
895
self.get_format_string. (BzrBranch4 has its format set
897
:return: a branch in this format
899
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
900
branch_transport = a_bzrdir.get_branch_transport(self)
902
'metadir': ('lock', lockdir.LockDir),
903
'branch4': ('branch-lock', lockable_files.TransportLock),
905
lock_name, lock_class = lock_map[lock_type]
906
control_files = lockable_files.LockableFiles(branch_transport,
907
lock_name, lock_class)
908
control_files.create_lock()
909
control_files.lock_write()
911
control_files.put_utf8('format', self.get_format_string())
913
for file, content in utf8_files:
914
control_files.put_utf8(file, content)
916
control_files.unlock()
917
return self.open(a_bzrdir, _found=True)
919
def initialize(self, a_bzrdir):
920
"""Create a branch of this format in a_bzrdir."""
1670
921
raise NotImplementedError(self.initialize)
1672
923
def is_supported(self):
1673
924
"""Is this format supported?
1675
926
Supported formats can be initialized and opened.
1676
Unsupported formats may not support initialization or committing or
927
Unsupported formats may not support initialization or committing or
1677
928
some other features depending on the reason for not being supported.
1681
def make_tags(self, branch):
1682
"""Create a tags object for branch.
1684
This method is on BranchFormat, because BranchFormats are reflected
1685
over the wire via network_name(), whereas full Branch instances require
1686
multiple VFS method calls to operate at all.
1688
The default implementation returns a disabled-tags instance.
1690
Note that it is normal for branch to be a RemoteBranch when using tags
1693
return _mod_tag.DisabledTags(branch)
1695
def network_name(self):
1696
"""A simple byte string uniquely identifying this format for RPC calls.
1698
MetaDir branch formats use their disk format string to identify the
1699
repository over the wire. All in one formats such as bzr < 0.8, and
1700
foreign formats like svn/git and hg should use some marker which is
1701
unique and immutable.
1703
raise NotImplementedError(self.network_name)
1705
def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
1706
found_repository=None, possible_transports=None):
1707
"""Return the branch object for controldir.
1709
:param controldir: A ControlDir that contains a branch.
1710
:param name: Name of colocated branch to open
1711
:param _found: a private parameter, do not use it. It is used to
1712
indicate if format probing has already be done.
1713
:param ignore_fallbacks: when set, no fallback branches will be opened
1714
(if there are any). Default is to open fallbacks.
932
def open(self, a_bzrdir, _found=False):
933
"""Return the branch object for a_bzrdir
935
_found is a private parameter, do not use it. It is used to indicate
936
if format probing has already be done.
1716
938
raise NotImplementedError(self.open)
1719
@deprecated_method(deprecated_in((2, 4, 0)))
1720
941
def register_format(klass, format):
1721
"""Register a metadir format.
1723
See MetaDirBranchFormatFactory for the ability to register a format
1724
without loading the code the format needs until it is actually used.
1726
format_registry.register(format)
942
klass._formats[format.get_format_string()] = format
1729
@deprecated_method(deprecated_in((2, 4, 0)))
1730
945
def set_default_format(klass, format):
1731
format_registry.set_default(format)
1733
def supports_set_append_revisions_only(self):
1734
"""True if this format supports set_append_revisions_only."""
1737
def supports_stacking(self):
1738
"""True if this format records a stacked-on branch."""
1741
def supports_leaving_lock(self):
1742
"""True if this format supports leaving locks in place."""
1743
return False # by default
946
klass._default_format = format
1746
@deprecated_method(deprecated_in((2, 4, 0)))
1747
949
def unregister_format(klass, format):
1748
format_registry.remove(format)
950
assert klass._formats[format.get_format_string()] is format
951
del klass._formats[format.get_format_string()]
1750
953
def __str__(self):
1751
return self.get_format_description().rstrip()
954
return self.get_format_string().rstrip()
1753
956
def supports_tags(self):
1754
957
"""True if this format supports tags stored in the branch"""
1755
958
return False # by default
1757
def tags_are_versioned(self):
1758
"""Whether the tag container for this branch versions tags."""
1761
def supports_tags_referencing_ghosts(self):
1762
"""True if tags can reference ghost revisions."""
1766
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
1767
"""A factory for a BranchFormat object, permitting simple lazy registration.
1769
While none of the built in BranchFormats are lazy registered yet,
1770
bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1771
use it, and the bzr-loom plugin uses it as well (see
1772
bzrlib.plugins.loom.formats).
1775
def __init__(self, format_string, module_name, member_name):
1776
"""Create a MetaDirBranchFormatFactory.
1778
:param format_string: The format string the format has.
1779
:param module_name: Module to load the format class from.
1780
:param member_name: Attribute name within the module for the format class.
1782
registry._LazyObjectGetter.__init__(self, module_name, member_name)
1783
self._format_string = format_string
1785
def get_format_string(self):
1786
"""See BranchFormat.get_format_string."""
1787
return self._format_string
1790
"""Used for network_format_registry support."""
1791
return self.get_obj()()
960
# XXX: Probably doesn't really belong here -- mbp 20070212
961
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
963
branch_transport = a_bzrdir.get_branch_transport(self)
964
control_files = lockable_files.LockableFiles(branch_transport,
965
lock_filename, lock_class)
966
control_files.create_lock()
967
control_files.lock_write()
969
for filename, content in utf8_files:
970
control_files.put_utf8(filename, content)
972
control_files.unlock()
1794
975
class BranchHooks(Hooks):
1795
976
"""A dictionary mapping hook name to a list of callables for branch hooks.
1797
978
e.g. ['set_rh'] Is the list of items to be called when the
1798
979
set_revision_history function is invoked.
1804
985
These are all empty initially, because by default nothing should get
1807
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1808
self.add_hook('set_rh',
1809
"Invoked whenever the revision history has been set via "
1810
"set_revision_history. The api signature is (branch, "
1811
"revision_history), and the branch will be write-locked. "
1812
"The set_rh hook can be expensive for bzr to trigger, a better "
1813
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1814
self.add_hook('open',
1815
"Called with the Branch object that has been opened after a "
1816
"branch is opened.", (1, 8))
1817
self.add_hook('post_push',
1818
"Called after a push operation completes. post_push is called "
1819
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1820
"bzr client.", (0, 15))
1821
self.add_hook('post_pull',
1822
"Called after a pull operation completes. post_pull is called "
1823
"with a bzrlib.branch.PullResult object and only runs in the "
1824
"bzr client.", (0, 15))
1825
self.add_hook('pre_commit',
1826
"Called after a commit is calculated but before it is "
1827
"completed. pre_commit is called with (local, master, old_revno, "
1828
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1829
"). old_revid is NULL_REVISION for the first commit to a branch, "
1830
"tree_delta is a TreeDelta object describing changes from the "
1831
"basis revision. hooks MUST NOT modify this delta. "
1832
" future_tree is an in-memory tree obtained from "
1833
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1835
self.add_hook('post_commit',
1836
"Called in the bzr client after a commit has completed. "
1837
"post_commit is called with (local, master, old_revno, old_revid, "
1838
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1839
"commit to a branch.", (0, 15))
1840
self.add_hook('post_uncommit',
1841
"Called in the bzr client after an uncommit completes. "
1842
"post_uncommit is called with (local, master, old_revno, "
1843
"old_revid, new_revno, new_revid) where local is the local branch "
1844
"or None, master is the target branch, and an empty branch "
1845
"receives new_revno of 0, new_revid of None.", (0, 15))
1846
self.add_hook('pre_change_branch_tip',
1847
"Called in bzr client and server before a change to the tip of a "
1848
"branch is made. pre_change_branch_tip is called with a "
1849
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1850
"commit, uncommit will all trigger this hook.", (1, 6))
1851
self.add_hook('post_change_branch_tip',
1852
"Called in bzr client and server after a change to the tip of a "
1853
"branch is made. post_change_branch_tip is called with a "
1854
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1855
"commit, uncommit will all trigger this hook.", (1, 4))
1856
self.add_hook('transform_fallback_location',
1857
"Called when a stacked branch is activating its fallback "
1858
"locations. transform_fallback_location is called with (branch, "
1859
"url), and should return a new url. Returning the same url "
1860
"allows it to be used as-is, returning a different one can be "
1861
"used to cause the branch to stack on a closer copy of that "
1862
"fallback_location. Note that the branch cannot have history "
1863
"accessing methods called on it during this hook because the "
1864
"fallback locations have not been activated. When there are "
1865
"multiple hooks installed for transform_fallback_location, "
1866
"all are called with the url returned from the previous hook."
1867
"The order is however undefined.", (1, 9))
1868
self.add_hook('automatic_tag_name',
1869
"Called to determine an automatic tag name for a revision. "
1870
"automatic_tag_name is called with (branch, revision_id) and "
1871
"should return a tag name or None if no tag name could be "
1872
"determined. The first non-None tag name returned will be used.",
1874
self.add_hook('post_branch_init',
1875
"Called after new branch initialization completes. "
1876
"post_branch_init is called with a "
1877
"bzrlib.branch.BranchInitHookParams. "
1878
"Note that init, branch and checkout (both heavyweight and "
1879
"lightweight) will all trigger this hook.", (2, 2))
1880
self.add_hook('post_switch',
1881
"Called after a checkout switches branch. "
1882
"post_switch is called with a "
1883
"bzrlib.branch.SwitchHookParams.", (2, 2))
989
# Introduced in 0.15:
990
# invoked whenever the revision history has been set
991
# with set_revision_history. The api signature is
992
# (branch, revision_history), and the branch will
995
# invoked after a push operation completes.
996
# the api signature is
998
# containing the members
999
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1000
# where local is the local target branch or None, master is the target
1001
# master branch, and the rest should be self explanatory. The source
1002
# is read locked and the target branches write locked. Source will
1003
# be the local low-latency branch.
1004
self['post_push'] = []
1005
# invoked after a pull operation completes.
1006
# the api signature is
1008
# containing the members
1009
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1010
# where local is the local branch or None, master is the target
1011
# master branch, and the rest should be self explanatory. The source
1012
# is read locked and the target branches write locked. The local
1013
# branch is the low-latency branch.
1014
self['post_pull'] = []
1015
# invoked after a commit operation completes.
1016
# the api signature is
1017
# (local, master, old_revno, old_revid, new_revno, new_revid)
1018
# old_revid is NULL_REVISION for the first commit to a branch.
1019
self['post_commit'] = []
1020
# invoked after a uncommit operation completes.
1021
# the api signature is
1022
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1023
# local is the local branch or None, master is the target branch,
1024
# and an empty branch recieves new_revno of 0, new_revid of None.
1025
self['post_uncommit'] = []
1887
1028
# install the default hooks into the Branch class.
1888
1029
Branch.hooks = BranchHooks()
1891
class ChangeBranchTipParams(object):
1892
"""Object holding parameters passed to `*_change_branch_tip` hooks.
1894
There are 5 fields that hooks may wish to access:
1896
:ivar branch: the branch being changed
1897
:ivar old_revno: revision number before the change
1898
:ivar new_revno: revision number after the change
1899
:ivar old_revid: revision id before the change
1900
:ivar new_revid: revision id after the change
1902
The revid fields are strings. The revno fields are integers.
1905
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1906
"""Create a group of ChangeBranchTip parameters.
1908
:param branch: The branch being changed.
1909
:param old_revno: Revision number before the change.
1910
:param new_revno: Revision number after the change.
1911
:param old_revid: Tip revision id before the change.
1912
:param new_revid: Tip revision id after the change.
1914
self.branch = branch
1915
self.old_revno = old_revno
1916
self.new_revno = new_revno
1917
self.old_revid = old_revid
1918
self.new_revid = new_revid
1920
def __eq__(self, other):
1921
return self.__dict__ == other.__dict__
1924
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1925
self.__class__.__name__, self.branch,
1926
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1929
class BranchInitHookParams(object):
1930
"""Object holding parameters passed to `*_branch_init` hooks.
1932
There are 4 fields that hooks may wish to access:
1934
:ivar format: the branch format
1935
:ivar bzrdir: the ControlDir where the branch will be/has been initialized
1936
:ivar name: name of colocated branch, if any (or None)
1937
:ivar branch: the branch created
1939
Note that for lightweight checkouts, the bzrdir and format fields refer to
1940
the checkout, hence they are different from the corresponding fields in
1941
branch, which refer to the original branch.
1944
def __init__(self, format, controldir, name, branch):
1945
"""Create a group of BranchInitHook parameters.
1947
:param format: the branch format
1948
:param controldir: the ControlDir where the branch will be/has been
1950
:param name: name of colocated branch, if any (or None)
1951
:param branch: the branch created
1953
Note that for lightweight checkouts, the bzrdir and format fields refer
1954
to the checkout, hence they are different from the corresponding fields
1955
in branch, which refer to the original branch.
1957
self.format = format
1958
self.bzrdir = controldir
1960
self.branch = branch
1962
def __eq__(self, other):
1963
return self.__dict__ == other.__dict__
1966
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1969
class SwitchHookParams(object):
1970
"""Object holding parameters passed to `*_switch` hooks.
1972
There are 4 fields that hooks may wish to access:
1974
:ivar control_dir: ControlDir of the checkout to change
1975
:ivar to_branch: branch that the checkout is to reference
1976
:ivar force: skip the check for local commits in a heavy checkout
1977
:ivar revision_id: revision ID to switch to (or None)
1980
def __init__(self, control_dir, to_branch, force, revision_id):
1981
"""Create a group of SwitchHook parameters.
1983
:param control_dir: ControlDir of the checkout to change
1984
:param to_branch: branch that the checkout is to reference
1985
:param force: skip the check for local commits in a heavy checkout
1986
:param revision_id: revision ID to switch to (or None)
1988
self.control_dir = control_dir
1989
self.to_branch = to_branch
1991
self.revision_id = revision_id
1993
def __eq__(self, other):
1994
return self.__dict__ == other.__dict__
1997
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1998
self.control_dir, self.to_branch,
2002
class BranchFormatMetadir(bzrdir.BzrDirMetaComponentFormat, BranchFormat):
2003
"""Base class for branch formats that live in meta directories.
2007
BranchFormat.__init__(self)
2008
bzrdir.BzrDirMetaComponentFormat.__init__(self)
2011
def find_format(klass, controldir, name=None):
2012
"""Return the format for the branch object in controldir."""
2014
transport = controldir.get_branch_transport(None, name=name)
2015
except errors.NoSuchFile:
2016
raise errors.NotBranchError(path=name, bzrdir=controldir)
2018
format_string = transport.get_bytes("format")
2019
except errors.NoSuchFile:
2020
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
2021
return klass._find_format(format_registry, 'branch', format_string)
2023
def _branch_class(self):
2024
"""What class to instantiate on open calls."""
2025
raise NotImplementedError(self._branch_class)
2027
def _get_initial_config(self, append_revisions_only=None):
2028
if append_revisions_only:
2029
return "append_revisions_only = True\n"
2031
# Avoid writing anything if append_revisions_only is disabled,
2032
# as that is the default.
2035
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
2037
"""Initialize a branch in a bzrdir, with specified files
2039
:param a_bzrdir: The bzrdir to initialize the branch in
2040
:param utf8_files: The files to create as a list of
2041
(filename, content) tuples
2042
:param name: Name of colocated branch to create, if any
2043
:return: a branch in this format
2045
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2046
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2047
control_files = lockable_files.LockableFiles(branch_transport,
2048
'lock', lockdir.LockDir)
2049
control_files.create_lock()
2050
control_files.lock_write()
2052
utf8_files += [('format', self.get_format_string())]
2053
for (filename, content) in utf8_files:
2054
branch_transport.put_bytes(
2056
mode=a_bzrdir._get_file_mode())
2058
control_files.unlock()
2059
branch = self.open(a_bzrdir, name, _found=True,
2060
found_repository=repository)
2061
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2064
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2065
found_repository=None, possible_transports=None):
2066
"""See BranchFormat.open()."""
2068
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2069
if format.__class__ != self.__class__:
2070
raise AssertionError("wrong format %r found for %r" %
2072
transport = a_bzrdir.get_branch_transport(None, name=name)
1032
class BzrBranchFormat4(BranchFormat):
1033
"""Bzr branch format 4.
1036
- a revision-history file.
1037
- a branch-lock lock file [ to be shared with the bzrdir ]
1040
def get_format_description(self):
1041
"""See BranchFormat.get_format_description()."""
1042
return "Branch format 4"
1044
def initialize(self, a_bzrdir):
1045
"""Create a branch of this format in a_bzrdir."""
1046
utf8_files = [('revision-history', ''),
1047
('branch-name', ''),
1049
return self._initialize_helper(a_bzrdir, utf8_files,
1050
lock_type='branch4', set_format=False)
1053
super(BzrBranchFormat4, self).__init__()
1054
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1056
def open(self, a_bzrdir, _found=False):
1057
"""Return the branch object for a_bzrdir
1059
_found is a private parameter, do not use it. It is used to indicate
1060
if format probing has already be done.
1063
# we are being called directly and must probe.
1064
raise NotImplementedError
1065
return BzrBranch(_format=self,
1066
_control_files=a_bzrdir._control_files,
1068
_repository=a_bzrdir.open_repository())
1071
return "Bazaar-NG branch format 4"
1074
class BzrBranchFormat5(BranchFormat):
1075
"""Bzr branch format 5.
1078
- a revision-history file.
1080
- a lock dir guarding the branch itself
1081
- all of this stored in a branch/ subdirectory
1082
- works with shared repositories.
1084
This format is new in bzr 0.8.
1087
def get_format_string(self):
1088
"""See BranchFormat.get_format_string()."""
1089
return "Bazaar-NG branch format 5\n"
1091
def get_format_description(self):
1092
"""See BranchFormat.get_format_description()."""
1093
return "Branch format 5"
1095
def initialize(self, a_bzrdir):
1096
"""Create a branch of this format in a_bzrdir."""
1097
utf8_files = [('revision-history', ''),
1098
('branch-name', ''),
1100
return self._initialize_helper(a_bzrdir, utf8_files)
1103
super(BzrBranchFormat5, self).__init__()
1104
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1106
def open(self, a_bzrdir, _found=False):
1107
"""Return the branch object for a_bzrdir
1109
_found is a private parameter, do not use it. It is used to indicate
1110
if format probing has already be done.
1113
format = BranchFormat.find_format(a_bzrdir)
1114
assert format.__class__ == self.__class__
1116
transport = a_bzrdir.get_branch_transport(None)
2074
1117
control_files = lockable_files.LockableFiles(transport, 'lock',
2075
1118
lockdir.LockDir)
2076
if found_repository is None:
2077
found_repository = a_bzrdir.find_repository()
2078
return self._branch_class()(_format=self,
1119
return BzrBranch5(_format=self,
2079
1120
_control_files=control_files,
2081
1121
a_bzrdir=a_bzrdir,
2082
_repository=found_repository,
2083
ignore_fallbacks=ignore_fallbacks,
2084
possible_transports=possible_transports)
2085
except errors.NoSuchFile:
2086
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
2089
def _matchingbzrdir(self):
2090
ret = bzrdir.BzrDirMetaFormat1()
2091
ret.set_branch_format(self)
2094
def supports_tags(self):
2097
def supports_leaving_lock(self):
2101
class BzrBranchFormat5(BranchFormatMetadir):
2102
"""Bzr branch format 5.
2105
- a revision-history file.
2107
- a lock dir guarding the branch itself
2108
- all of this stored in a branch/ subdirectory
2109
- works with shared repositories.
2111
This format is new in bzr 0.8.
2114
def _branch_class(self):
2118
def get_format_string(cls):
2119
"""See BranchFormat.get_format_string()."""
2120
return "Bazaar-NG branch format 5\n"
2122
def get_format_description(self):
2123
"""See BranchFormat.get_format_description()."""
2124
return "Branch format 5"
2126
def initialize(self, a_bzrdir, name=None, repository=None,
2127
append_revisions_only=None):
2128
"""Create a branch of this format in a_bzrdir."""
2129
if append_revisions_only:
2130
raise errors.UpgradeRequired(a_bzrdir.user_url)
2131
utf8_files = [('revision-history', ''),
2132
('branch-name', ''),
2134
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2136
def supports_tags(self):
2140
class BzrBranchFormat6(BranchFormatMetadir):
2141
"""Branch format with last-revision and tags.
1122
_repository=a_bzrdir.find_repository())
1124
raise NotBranchError(path=transport.base)
1127
class BzrBranchFormat6(BzrBranchFormat5):
1128
"""Branch format with last-revision
2143
1130
Unlike previous formats, this has no explicit revision history. Instead,
2144
1131
this just stores the last-revision, and the left-hand history leading
2145
1132
up to there is the history.
2147
1134
This format was introduced in bzr 0.15
2148
and became the default in 0.91.
2151
def _branch_class(self):
2155
def get_format_string(cls):
1137
def get_format_string(self):
2156
1138
"""See BranchFormat.get_format_string()."""
2157
1139
return "Bazaar Branch Format 6 (bzr 0.15)\n"
2160
1142
"""See BranchFormat.get_format_description()."""
2161
1143
return "Branch format 6"
2163
def initialize(self, a_bzrdir, name=None, repository=None,
2164
append_revisions_only=None):
2165
"""Create a branch of this format in a_bzrdir."""
2166
utf8_files = [('last-revision', '0 null:\n'),
2168
self._get_initial_config(append_revisions_only)),
2171
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2173
def make_tags(self, branch):
2174
"""See bzrlib.branch.BranchFormat.make_tags()."""
2175
return _mod_tag.BasicTags(branch)
2177
def supports_set_append_revisions_only(self):
2181
class BzrBranchFormat8(BranchFormatMetadir):
2182
"""Metadir format supporting storing locations of subtree branches."""
2184
def _branch_class(self):
2188
def get_format_string(cls):
2189
"""See BranchFormat.get_format_string()."""
2190
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2192
def get_format_description(self):
2193
"""See BranchFormat.get_format_description()."""
2194
return "Branch format 8"
2196
def initialize(self, a_bzrdir, name=None, repository=None,
2197
append_revisions_only=None):
2198
"""Create a branch of this format in a_bzrdir."""
2199
utf8_files = [('last-revision', '0 null:\n'),
2201
self._get_initial_config(append_revisions_only)),
2205
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2207
def make_tags(self, branch):
2208
"""See bzrlib.branch.BranchFormat.make_tags()."""
2209
return _mod_tag.BasicTags(branch)
2211
def supports_set_append_revisions_only(self):
2214
def supports_stacking(self):
2217
supports_reference_locations = True
2220
class BzrBranchFormat7(BranchFormatMetadir):
2221
"""Branch format with last-revision, tags, and a stacked location pointer.
2223
The stacked location pointer is passed down to the repository and requires
2224
a repository format with supports_external_lookups = True.
2226
This format was introduced in bzr 1.6.
2229
def initialize(self, a_bzrdir, name=None, repository=None,
2230
append_revisions_only=None):
2231
"""Create a branch of this format in a_bzrdir."""
2232
utf8_files = [('last-revision', '0 null:\n'),
2234
self._get_initial_config(append_revisions_only)),
2237
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2239
def _branch_class(self):
2243
def get_format_string(cls):
2244
"""See BranchFormat.get_format_string()."""
2245
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
2247
def get_format_description(self):
2248
"""See BranchFormat.get_format_description()."""
2249
return "Branch format 7"
2251
def supports_set_append_revisions_only(self):
2254
def supports_stacking(self):
2257
def make_tags(self, branch):
2258
"""See bzrlib.branch.BranchFormat.make_tags()."""
2259
return _mod_tag.BasicTags(branch)
2261
supports_reference_locations = False
2264
class BranchReferenceFormat(BranchFormatMetadir):
1145
def initialize(self, a_bzrdir):
1146
"""Create a branch of this format in a_bzrdir."""
1147
utf8_files = [('last-revision', '0 null:\n'),
1148
('branch-name', ''),
1149
('branch.conf', ''),
1152
return self._initialize_helper(a_bzrdir, utf8_files)
1154
def open(self, a_bzrdir, _found=False):
1155
"""Return the branch object for a_bzrdir
1157
_found is a private parameter, do not use it. It is used to indicate
1158
if format probing has already be done.
1161
format = BranchFormat.find_format(a_bzrdir)
1162
assert format.__class__ == self.__class__
1163
transport = a_bzrdir.get_branch_transport(None)
1164
control_files = lockable_files.LockableFiles(transport, 'lock',
1166
return BzrBranch6(_format=self,
1167
_control_files=control_files,
1169
_repository=a_bzrdir.find_repository())
1171
def supports_tags(self):
1175
class BranchReferenceFormat(BranchFormat):
2265
1176
"""Bzr branch reference format.
2267
1178
Branch references are used in implementing checkouts, they
2272
1183
- a format string
2276
def get_format_string(cls):
1186
def get_format_string(self):
2277
1187
"""See BranchFormat.get_format_string()."""
2278
1188
return "Bazaar-NG Branch Reference Format 1\n"
2280
1190
def get_format_description(self):
2281
1191
"""See BranchFormat.get_format_description()."""
2282
1192
return "Checkout reference format 1"
2284
def get_reference(self, a_bzrdir, name=None):
1194
def get_reference(self, a_bzrdir):
2285
1195
"""See BranchFormat.get_reference()."""
2286
transport = a_bzrdir.get_branch_transport(None, name=name)
2287
return transport.get_bytes('location')
2289
def set_reference(self, a_bzrdir, name, to_branch):
2290
"""See BranchFormat.set_reference()."""
2291
transport = a_bzrdir.get_branch_transport(None, name=name)
2292
location = transport.put_bytes('location', to_branch.base)
2294
def initialize(self, a_bzrdir, name=None, target_branch=None,
2295
repository=None, append_revisions_only=None):
1196
transport = a_bzrdir.get_branch_transport(None)
1197
return transport.get('location').read()
1199
def initialize(self, a_bzrdir, target_branch=None):
2296
1200
"""Create a branch of this format in a_bzrdir."""
2297
1201
if target_branch is None:
2298
1202
# this format does not implement branch itself, thus the implicit
2299
1203
# creation contract must see it as uninitializable
2300
1204
raise errors.UninitializableFormat(self)
2301
mutter('creating branch reference in %s', a_bzrdir.user_url)
2302
if a_bzrdir._format.fixed_components:
2303
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2304
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1205
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1206
branch_transport = a_bzrdir.get_branch_transport(self)
2305
1207
branch_transport.put_bytes('location',
2306
target_branch.user_url)
1208
target_branch.bzrdir.root_transport.base)
2307
1209
branch_transport.put_bytes('format', self.get_format_string())
2309
a_bzrdir, name, _found=True,
2310
possible_transports=[target_branch.bzrdir.root_transport])
2311
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1210
return self.open(a_bzrdir, _found=True)
1213
super(BranchReferenceFormat, self).__init__()
1214
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2314
1216
def _make_reference_clone_function(format, a_branch):
2315
1217
"""Create a clone() routine for a branch dynamically."""
2316
def clone(to_bzrdir, revision_id=None,
2317
repository_policy=None):
1218
def clone(to_bzrdir, revision_id=None):
2318
1219
"""See Branch.clone()."""
2319
return format.initialize(to_bzrdir, target_branch=a_branch)
1220
return format.initialize(to_bzrdir, a_branch)
2320
1221
# cannot obey revision_id limits when cloning a reference ...
2321
1222
# FIXME RBC 20060210 either nuke revision_id for clone, or
2322
1223
# emit some sort of warning/error to the caller ?!
2325
def open(self, a_bzrdir, name=None, _found=False, location=None,
2326
possible_transports=None, ignore_fallbacks=False,
2327
found_repository=None):
1226
def open(self, a_bzrdir, _found=False, location=None):
2328
1227
"""Return the branch that the branch reference in a_bzrdir points at.
2330
:param a_bzrdir: A BzrDir that contains a branch.
2331
:param name: Name of colocated branch to open, if any
2332
:param _found: a private parameter, do not use it. It is used to
2333
indicate if format probing has already be done.
2334
:param ignore_fallbacks: when set, no fallback branches will be opened
2335
(if there are any). Default is to open fallbacks.
2336
:param location: The location of the referenced branch. If
2337
unspecified, this will be determined from the branch reference in
2339
:param possible_transports: An optional reusable transports list.
1229
_found is a private parameter, do not use it. It is used to indicate
1230
if format probing has already be done.
2342
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2343
if format.__class__ != self.__class__:
2344
raise AssertionError("wrong format %r found for %r" %
1233
format = BranchFormat.find_format(a_bzrdir)
1234
assert format.__class__ == self.__class__
2346
1235
if location is None:
2347
location = self.get_reference(a_bzrdir, name)
2348
real_bzrdir = controldir.ControlDir.open(
2349
location, possible_transports=possible_transports)
2350
result = real_bzrdir.open_branch(name=name,
2351
ignore_fallbacks=ignore_fallbacks,
2352
possible_transports=possible_transports)
1236
location = self.get_reference(a_bzrdir)
1237
real_bzrdir = bzrdir.BzrDir.open(location)
1238
result = real_bzrdir.open_branch()
2353
1239
# this changes the behaviour of result.clone to create a new reference
2354
1240
# rather than a copy of the content of the branch.
2355
1241
# I did not use a proxy object because that needs much more extensive
2365
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
2366
"""Branch format registry."""
2368
def __init__(self, other_registry=None):
2369
super(BranchFormatRegistry, self).__init__(other_registry)
2370
self._default_format = None
2372
def set_default(self, format):
2373
self._default_format = format
2375
def get_default(self):
2376
return self._default_format
2379
network_format_registry = registry.FormatRegistry()
2380
"""Registry of formats indexed by their network name.
2382
The network name for a branch format is an identifier that can be used when
2383
referring to formats with smart server operations. See
2384
BranchFormat.network_name() for more detail.
2387
format_registry = BranchFormatRegistry(network_format_registry)
2390
1251
# formats which have no format string are not discoverable
2391
1252
# and not independently creatable, so are not registered.
2392
__format5 = BzrBranchFormat5()
2393
__format6 = BzrBranchFormat6()
2394
__format7 = BzrBranchFormat7()
2395
__format8 = BzrBranchFormat8()
2396
format_registry.register(__format5)
2397
format_registry.register(BranchReferenceFormat())
2398
format_registry.register(__format6)
2399
format_registry.register(__format7)
2400
format_registry.register(__format8)
2401
format_registry.set_default(__format7)
2404
class BranchWriteLockResult(LogicalLockResult):
2405
"""The result of write locking a branch.
2407
:ivar branch_token: The token obtained from the underlying branch lock, or
2409
:ivar unlock: A callable which will unlock the lock.
2412
def __init__(self, unlock, branch_token):
2413
LogicalLockResult.__init__(self, unlock)
2414
self.branch_token = branch_token
2417
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2421
class BzrBranch(Branch, _RelockDebugMixin):
1253
__default_format = BzrBranchFormat5()
1254
BranchFormat.register_format(__default_format)
1255
BranchFormat.register_format(BranchReferenceFormat())
1256
BranchFormat.register_format(BzrBranchFormat6())
1257
BranchFormat.set_default_format(__default_format)
1258
_legacy_formats = [BzrBranchFormat4(),
1261
class BzrBranch(Branch):
2422
1262
"""A branch stored in the actual filesystem.
2424
1264
Note that it's "local" in the context of the filesystem; it doesn't
2425
1265
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2426
1266
it's writable, and can be accessed via the normal filesystem API.
2428
:ivar _transport: Transport for file operations on this branch's
2429
control files, typically pointing to the .bzr/branch directory.
2430
:ivar repository: Repository for this branch.
2431
:ivar base: The url of the base directory for this branch; the one
2432
containing the .bzr directory.
2433
:ivar name: Optional colocated branch name as it exists in the control
2437
1269
def __init__(self, _format=None,
2438
_control_files=None, a_bzrdir=None, name=None,
2439
_repository=None, ignore_fallbacks=False,
2440
possible_transports=None):
1270
_control_files=None, a_bzrdir=None, _repository=None):
2441
1271
"""Create new branch object at a particular location."""
1272
Branch.__init__(self)
2442
1273
if a_bzrdir is None:
2443
1274
raise ValueError('a_bzrdir must be supplied')
2445
1276
self.bzrdir = a_bzrdir
2446
self._user_transport = self.bzrdir.transport.clone('..')
2447
if name is not None:
2448
self._user_transport.set_segment_parameter(
2449
"branch", urlutils.escape(name))
2450
self._base = self._user_transport.base
1277
# self._transport used to point to the directory containing the
1278
# control directory, but was not used - now it's just the transport
1279
# for the branch control files. mbp 20070212
1280
self._base = self.bzrdir.transport.clone('..').base
2452
1281
self._format = _format
2453
1282
if _control_files is None:
2454
1283
raise ValueError('BzrBranch _control_files is None')
2455
1284
self.control_files = _control_files
2456
1285
self._transport = _control_files._transport
2457
1286
self.repository = _repository
2458
Branch.__init__(self, possible_transports)
2460
1288
def __str__(self):
2461
return '%s(%s)' % (self.__class__.__name__, self.user_url)
1289
return '%s(%r)' % (self.__class__.__name__, self.base)
2463
1291
__repr__ = __str__
2558
1353
return self.repository.print_file(file, revision_id)
2560
1355
@needs_write_lock
1356
def append_revision(self, *revision_ids):
1357
"""See Branch.append_revision."""
1358
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1359
for revision_id in revision_ids:
1360
_mod_revision.check_not_reserved_id(revision_id)
1361
mutter("add {%s} to revision-history" % revision_id)
1362
rev_history = self.revision_history()
1363
rev_history.extend(revision_ids)
1364
self.set_revision_history(rev_history)
1366
def _write_revision_history(self, history):
1367
"""Factored out of set_revision_history.
1369
This performs the actual writing to disk.
1370
It is intended to be called by BzrBranch5.set_revision_history."""
1371
self.control_files.put_bytes(
1372
'revision-history', '\n'.join(history))
1375
def set_revision_history(self, rev_history):
1376
"""See Branch.set_revision_history."""
1377
rev_history = [osutils.safe_revision_id(r) for r in rev_history]
1378
self._clear_cached_state()
1379
self._write_revision_history(rev_history)
1380
self._cache_revision_history(rev_history)
1381
for hook in Branch.hooks['set_rh']:
1382
hook(self, rev_history)
2561
1385
def set_last_revision_info(self, revno, revision_id):
2562
if not revision_id or not isinstance(revision_id, basestring):
2563
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2564
revision_id = _mod_revision.ensure_null(revision_id)
2565
old_revno, old_revid = self.last_revision_info()
2566
if self.get_append_revisions_only():
2567
self._check_history_violation(revision_id)
2568
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2569
self._write_last_revision_info(revno, revision_id)
2570
self._clear_cached_state()
2571
self._last_revision_info_cache = revno, revision_id
2572
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
1386
revision_id = osutils.safe_revision_id(revision_id)
1387
history = self._lefthand_history(revision_id)
1388
assert len(history) == revno, '%d != %d' % (len(history), revno)
1389
self.set_revision_history(history)
1391
def _gen_revision_history(self):
1392
history = self.control_files.get('revision-history').read().split('\n')
1393
if history[-1:] == ['']:
1394
# There shouldn't be a trailing newline, but just in case.
1398
def _lefthand_history(self, revision_id, last_rev=None,
1400
# stop_revision must be a descendant of last_revision
1401
stop_graph = self.repository.get_revision_graph(revision_id)
1402
if last_rev is not None and last_rev not in stop_graph:
1403
# our previous tip is not merged into stop_revision
1404
raise errors.DivergedBranches(self, other_branch)
1405
# make a new revision history from the graph
1406
current_rev_id = revision_id
1408
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1409
new_history.append(current_rev_id)
1410
current_rev_id_parents = stop_graph[current_rev_id]
1412
current_rev_id = current_rev_id_parents[0]
1414
current_rev_id = None
1415
new_history.reverse()
1419
def generate_revision_history(self, revision_id, last_rev=None,
1421
"""Create a new revision history that will finish with revision_id.
1423
:param revision_id: the new tip to use.
1424
:param last_rev: The previous last_revision. If not None, then this
1425
must be a ancestory of revision_id, or DivergedBranches is raised.
1426
:param other_branch: The other branch that DivergedBranches should
1427
raise with respect to.
1429
revision_id = osutils.safe_revision_id(revision_id)
1430
self.set_revision_history(self._lefthand_history(revision_id,
1431
last_rev, other_branch))
1434
def update_revisions(self, other, stop_revision=None):
1435
"""See Branch.update_revisions."""
1438
if stop_revision is None:
1439
stop_revision = other.last_revision()
1440
if stop_revision is None:
1441
# if there are no commits, we're done.
1444
stop_revision = osutils.safe_revision_id(stop_revision)
1445
# whats the current last revision, before we fetch [and change it
1447
last_rev = self.last_revision()
1448
# we fetch here regardless of whether we need to so that we pickup
1450
self.fetch(other, stop_revision)
1451
my_ancestry = self.repository.get_ancestry(last_rev)
1452
if stop_revision in my_ancestry:
1453
# last_revision is a descendant of stop_revision
1455
self.generate_revision_history(stop_revision, last_rev=last_rev,
2574
1460
def basis_tree(self):
2575
1461
"""See Branch.basis_tree."""
2576
1462
return self.repository.revision_tree(self.last_revision())
1464
@deprecated_method(zero_eight)
1465
def working_tree(self):
1466
"""Create a Working tree object for this branch."""
1468
from bzrlib.transport.local import LocalTransport
1469
if (self.base.find('://') != -1 or
1470
not isinstance(self._transport, LocalTransport)):
1471
raise NoWorkingTree(self.base)
1472
return self.bzrdir.open_workingtree()
1475
def pull(self, source, overwrite=False, stop_revision=None,
1476
_hook_master=None, run_hooks=True):
1479
:param _hook_master: Private parameter - set the branch to
1480
be supplied as the master to push hooks.
1481
:param run_hooks: Private parameter - if false, this branch
1482
is being called because it's the master of the primary branch,
1483
so it should not run its hooks.
1485
result = PullResult()
1486
result.source_branch = source
1487
result.target_branch = self
1490
result.old_revno, result.old_revid = self.last_revision_info()
1492
self.update_revisions(source, stop_revision)
1493
except DivergedBranches:
1497
if stop_revision is None:
1498
stop_revision = source.last_revision()
1499
self.generate_revision_history(stop_revision)
1500
result.tag_conflicts = source.tags.merge_to(self.tags)
1501
result.new_revno, result.new_revid = self.last_revision_info()
1503
result.master_branch = _hook_master
1504
result.local_branch = self
1506
result.master_branch = self
1507
result.local_branch = None
1509
for hook in Branch.hooks['post_pull']:
2578
1515
def _get_parent_location(self):
2579
1516
_locs = ['parent', 'pull', 'x-pull']
2580
1517
for l in _locs:
2582
return self._transport.get_bytes(l).strip('\n')
2583
except errors.NoSuchFile:
1519
return self.control_files.get(l).read().strip('\n')
2587
def get_stacked_on_url(self):
2588
raise errors.UnstackableBranchFormat(self._format, self.user_url)
1525
def push(self, target, overwrite=False, stop_revision=None,
1526
_override_hook_source_branch=None):
1529
This is the basic concrete implementation of push()
1531
:param _override_hook_source_branch: If specified, run
1532
the hooks passing this Branch as the source, rather than self.
1533
This is for use of RemoteBranch, where push is delegated to the
1534
underlying vfs-based Branch.
1536
# TODO: Public option to disable running hooks - should be trivial but
1540
result = self._push_with_bound_branches(target, overwrite,
1542
_override_hook_source_branch=_override_hook_source_branch)
1547
def _push_with_bound_branches(self, target, overwrite,
1549
_override_hook_source_branch=None):
1550
"""Push from self into target, and into target's master if any.
1552
This is on the base BzrBranch class even though it doesn't support
1553
bound branches because the *target* might be bound.
1556
if _override_hook_source_branch:
1557
result.source_branch = _override_hook_source_branch
1558
for hook in Branch.hooks['post_push']:
1561
bound_location = target.get_bound_location()
1562
if bound_location and target.base != bound_location:
1563
# there is a master branch.
1565
# XXX: Why the second check? Is it even supported for a branch to
1566
# be bound to itself? -- mbp 20070507
1567
master_branch = target.get_master_branch()
1568
master_branch.lock_write()
1570
# push into the master from this branch.
1571
self._basic_push(master_branch, overwrite, stop_revision)
1572
# and push into the target branch from this. Note that we push from
1573
# this branch again, because its considered the highest bandwidth
1575
result = self._basic_push(target, overwrite, stop_revision)
1576
result.master_branch = master_branch
1577
result.local_branch = target
1581
master_branch.unlock()
1584
result = self._basic_push(target, overwrite, stop_revision)
1585
# TODO: Why set master_branch and local_branch if there's no
1586
# binding? Maybe cleaner to just leave them unset? -- mbp
1588
result.master_branch = target
1589
result.local_branch = None
1593
def _basic_push(self, target, overwrite, stop_revision):
1594
"""Basic implementation of push without bound branches or hooks.
1596
Must be called with self read locked and target write locked.
1598
result = PushResult()
1599
result.source_branch = self
1600
result.target_branch = target
1601
result.old_revno, result.old_revid = target.last_revision_info()
1603
target.update_revisions(self, stop_revision)
1604
except DivergedBranches:
1608
target.set_revision_history(self.revision_history())
1609
result.tag_conflicts = self.tags.merge_to(target.tags)
1610
result.new_revno, result.new_revid = target.last_revision_info()
1613
def get_parent(self):
1614
"""See Branch.get_parent."""
1616
assert self.base[-1] == '/'
1617
parent = self._get_parent_location()
1620
# This is an old-format absolute path to a local branch
1621
# turn it into a url
1622
if parent.startswith('/'):
1623
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1625
return urlutils.join(self.base[:-1], parent)
1626
except errors.InvalidURLJoin, e:
1627
raise errors.InaccessibleParent(parent, self.base)
2590
1629
def set_push_location(self, location):
2591
1630
"""See Branch.set_push_location."""
2593
1632
'push_location', location,
2594
1633
store=_mod_config.STORE_LOCATION_NORECURSE)
1636
def set_parent(self, url):
1637
"""See Branch.set_parent."""
1638
# TODO: Maybe delete old location files?
1639
# URLs should never be unicode, even on the local fs,
1640
# FIXUP this and get_parent in a future branch format bump:
1641
# read and rewrite the file, and have the new format code read
1642
# using .get not .get_utf8. RBC 20060125
1644
if isinstance(url, unicode):
1646
url = url.encode('ascii')
1647
except UnicodeEncodeError:
1648
raise errors.InvalidURL(url,
1649
"Urls must be 7-bit ascii, "
1650
"use bzrlib.urlutils.escape")
1651
url = urlutils.relative_url(self.base, url)
1652
self._set_parent_location(url)
2596
1654
def _set_parent_location(self, url):
2597
1655
if url is None:
2598
self._transport.delete('parent')
2600
self._transport.put_bytes('parent', url + '\n',
2601
mode=self.bzrdir._get_file_mode())
2605
"""If bound, unbind"""
2606
return self.set_bound_location(None)
1656
self.control_files._transport.delete('parent')
1658
assert isinstance(url, str)
1659
self.control_files.put_bytes('parent', url + '\n')
1661
@deprecated_function(zero_nine)
1662
def tree_config(self):
1663
"""DEPRECATED; call get_config instead.
1664
TreeConfig has become part of BranchConfig."""
1665
return TreeConfig(self)
1668
class BzrBranch5(BzrBranch):
1669
"""A format 5 branch. This supports new features over plan branches.
1671
It has support for a master_branch which is the data for bound branches.
1679
super(BzrBranch5, self).__init__(_format=_format,
1680
_control_files=_control_files,
1682
_repository=_repository)
1685
def pull(self, source, overwrite=False, stop_revision=None,
1687
"""Pull from source into self, updating my master if any.
1689
:param run_hooks: Private parameter - if false, this branch
1690
is being called because it's the master of the primary branch,
1691
so it should not run its hooks.
1693
bound_location = self.get_bound_location()
1694
master_branch = None
1695
if bound_location and source.base != bound_location:
1696
# not pulling from master, so we need to update master.
1697
master_branch = self.get_master_branch()
1698
master_branch.lock_write()
1701
# pull from source into master.
1702
master_branch.pull(source, overwrite, stop_revision,
1704
return super(BzrBranch5, self).pull(source, overwrite,
1705
stop_revision, _hook_master=master_branch,
1706
run_hooks=run_hooks)
1709
master_branch.unlock()
1711
def get_bound_location(self):
1713
return self.control_files.get_utf8('bound').read()[:-1]
1714
except errors.NoSuchFile:
1718
def get_master_branch(self):
1719
"""Return the branch we are bound to.
1721
:return: Either a Branch, or None
1723
This could memoise the branch, but if thats done
1724
it must be revalidated on each new lock.
1725
So for now we just don't memoise it.
1726
# RBC 20060304 review this decision.
1728
bound_loc = self.get_bound_location()
1732
return Branch.open(bound_loc)
1733
except (errors.NotBranchError, errors.ConnectionError), e:
1734
raise errors.BoundBranchConnectionFailure(
1738
def set_bound_location(self, location):
1739
"""Set the target where this branch is bound to.
1741
:param location: URL to the target branch
1744
self.control_files.put_utf8('bound', location+'\n')
1747
self.control_files._transport.delete('bound')
2608
1752
@needs_write_lock
2609
1753
def bind(self, other):
2629
1773
# last_rev is not in the other_last_rev history, AND
2630
1774
# other_last_rev is not in our history, and do it without pulling
2631
1775
# history around
1776
last_rev = self.last_revision()
1777
if last_rev is not None:
1780
other_last_rev = other.last_revision()
1781
if other_last_rev is not None:
1782
# neither branch is new, we have to do some work to
1783
# ascertain diversion.
1784
remote_graph = other.repository.get_revision_graph(
1786
local_graph = self.repository.get_revision_graph(last_rev)
1787
if (last_rev not in remote_graph and
1788
other_last_rev not in local_graph):
1789
raise errors.DivergedBranches(self, other)
2632
1792
self.set_bound_location(other.base)
2634
def get_bound_location(self):
2636
return self._transport.get_bytes('bound')[:-1]
2637
except errors.NoSuchFile:
2641
def get_master_branch(self, possible_transports=None):
2642
"""Return the branch we are bound to.
2644
:return: Either a Branch, or None
2646
if self._master_branch_cache is None:
2647
self._master_branch_cache = self._get_master_branch(
2648
possible_transports)
2649
return self._master_branch_cache
2651
def _get_master_branch(self, possible_transports):
2652
bound_loc = self.get_bound_location()
2656
return Branch.open(bound_loc,
2657
possible_transports=possible_transports)
2658
except (errors.NotBranchError, errors.ConnectionError), e:
2659
raise errors.BoundBranchConnectionFailure(
2663
def set_bound_location(self, location):
2664
"""Set the target where this branch is bound to.
2666
:param location: URL to the target branch
2668
self._master_branch_cache = None
2670
self._transport.put_bytes('bound', location+'\n',
2671
mode=self.bzrdir._get_file_mode())
2674
self._transport.delete('bound')
2675
except errors.NoSuchFile:
2680
def update(self, possible_transports=None):
2681
"""Synchronise this branch with the master branch if any.
1796
"""If bound, unbind"""
1797
return self.set_bound_location(None)
1801
"""Synchronise this branch with the master branch if any.
2683
1803
:return: None or the last_revision that was pivoted out during the
2686
master = self.get_master_branch(possible_transports)
1806
master = self.get_master_branch()
2687
1807
if master is not None:
2688
old_tip = _mod_revision.ensure_null(self.last_revision())
1808
old_tip = self.last_revision()
2689
1809
self.pull(master, overwrite=True)
2690
if self.repository.get_graph().is_ancestor(old_tip,
2691
_mod_revision.ensure_null(self.last_revision())):
1810
if old_tip in self.repository.get_ancestry(self.last_revision()):
2696
def _read_last_revision_info(self):
2697
revision_string = self._transport.get_bytes('last-revision')
1816
class BzrBranchExperimental(BzrBranch5):
1817
"""Bzr experimental branch format
1820
- a revision-history file.
1822
- a lock dir guarding the branch itself
1823
- all of this stored in a branch/ subdirectory
1824
- works with shared repositories.
1825
- a tag dictionary in the branch
1827
This format is new in bzr 0.15, but shouldn't be used for real data,
1830
This class acts as it's own BranchFormat.
1833
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1836
def get_format_string(cls):
1837
"""See BranchFormat.get_format_string()."""
1838
return "Bazaar-NG branch format experimental\n"
1841
def get_format_description(cls):
1842
"""See BranchFormat.get_format_description()."""
1843
return "Experimental branch format"
1846
def get_reference(cls, a_bzrdir):
1847
"""Get the target reference of the branch in a_bzrdir.
1849
format probing must have been completed before calling
1850
this method - it is assumed that the format of the branch
1851
in a_bzrdir is correct.
1853
:param a_bzrdir: The bzrdir to get the branch data from.
1854
:return: None if the branch is not a reference branch.
1859
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1861
branch_transport = a_bzrdir.get_branch_transport(cls)
1862
control_files = lockable_files.LockableFiles(branch_transport,
1863
lock_filename, lock_class)
1864
control_files.create_lock()
1865
control_files.lock_write()
1867
for filename, content in utf8_files:
1868
control_files.put_utf8(filename, content)
1870
control_files.unlock()
1873
def initialize(cls, a_bzrdir):
1874
"""Create a branch of this format in a_bzrdir."""
1875
utf8_files = [('format', cls.get_format_string()),
1876
('revision-history', ''),
1877
('branch-name', ''),
1880
cls._initialize_control_files(a_bzrdir, utf8_files,
1881
'lock', lockdir.LockDir)
1882
return cls.open(a_bzrdir, _found=True)
1885
def open(cls, a_bzrdir, _found=False):
1886
"""Return the branch object for a_bzrdir
1888
_found is a private parameter, do not use it. It is used to indicate
1889
if format probing has already be done.
1892
format = BranchFormat.find_format(a_bzrdir)
1893
assert format.__class__ == cls
1894
transport = a_bzrdir.get_branch_transport(None)
1895
control_files = lockable_files.LockableFiles(transport, 'lock',
1897
return cls(_format=cls,
1898
_control_files=control_files,
1900
_repository=a_bzrdir.find_repository())
1903
def is_supported(cls):
1906
def _make_tags(self):
1907
return BasicTags(self)
1910
def supports_tags(cls):
1914
BranchFormat.register_format(BzrBranchExperimental)
1917
class BzrBranch6(BzrBranch5):
1920
def last_revision_info(self):
1921
revision_string = self.control_files.get('last-revision').read()
2698
1922
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2699
1923
revision_id = cache_utf8.get_cached_utf8(revision_id)
2700
1924
revno = int(revno)
2701
1925
return revno, revision_id
1927
def last_revision(self):
1928
"""Return last revision id, or None"""
1929
revision_id = self.last_revision_info()[1]
1930
if revision_id == _mod_revision.NULL_REVISION:
2703
1934
def _write_last_revision_info(self, revno, revision_id):
2704
1935
"""Simply write out the revision id, with no checks.
2706
1937
Use set_last_revision_info to perform this safely.
2708
1939
Does not update the revision_history cache.
1940
Intended to be called by set_last_revision_info and
1941
_write_revision_history.
2710
revision_id = _mod_revision.ensure_null(revision_id)
1943
if revision_id is None:
1944
revision_id = 'null:'
2711
1945
out_string = '%d %s\n' % (revno, revision_id)
2712
self._transport.put_bytes('last-revision', out_string,
2713
mode=self.bzrdir._get_file_mode())
2716
class FullHistoryBzrBranch(BzrBranch):
2717
"""Bzr branch which contains the full revision history."""
1946
self.control_files.put_bytes('last-revision', out_string)
2719
1948
@needs_write_lock
2720
1949
def set_last_revision_info(self, revno, revision_id):
2721
if not revision_id or not isinstance(revision_id, basestring):
2722
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2723
revision_id = _mod_revision.ensure_null(revision_id)
2724
# this old format stores the full history, but this api doesn't
2725
# provide it, so we must generate, and might as well check it's
2727
history = self._lefthand_history(revision_id)
2728
if len(history) != revno:
2729
raise AssertionError('%d != %d' % (len(history), revno))
2730
self._set_revision_history(history)
2732
def _read_last_revision_info(self):
2733
rh = self._revision_history()
2736
return (revno, rh[-1])
2738
return (0, _mod_revision.NULL_REVISION)
2740
@deprecated_method(deprecated_in((2, 4, 0)))
2742
def set_revision_history(self, rev_history):
2743
"""See Branch.set_revision_history."""
2744
self._set_revision_history(rev_history)
2746
def _set_revision_history(self, rev_history):
2747
if 'evil' in debug.debug_flags:
2748
mutter_callsite(3, "set_revision_history scales with history.")
2749
check_not_reserved_id = _mod_revision.check_not_reserved_id
2750
for rev_id in rev_history:
2751
check_not_reserved_id(rev_id)
2752
if Branch.hooks['post_change_branch_tip']:
2753
# Don't calculate the last_revision_info() if there are no hooks
2755
old_revno, old_revid = self.last_revision_info()
2756
if len(rev_history) == 0:
2757
revid = _mod_revision.NULL_REVISION
2759
revid = rev_history[-1]
2760
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2761
self._write_revision_history(rev_history)
1950
revision_id = osutils.safe_revision_id(revision_id)
1951
if self._get_append_revisions_only():
1952
self._check_history_violation(revision_id)
1953
self._write_last_revision_info(revno, revision_id)
2762
1954
self._clear_cached_state()
2763
self._cache_revision_history(rev_history)
2764
for hook in Branch.hooks['set_rh']:
2765
hook(self, rev_history)
2766
if Branch.hooks['post_change_branch_tip']:
2767
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2769
def _write_revision_history(self, history):
2770
"""Factored out of set_revision_history.
2772
This performs the actual writing to disk.
2773
It is intended to be called by set_revision_history."""
2774
self._transport.put_bytes(
2775
'revision-history', '\n'.join(history),
2776
mode=self.bzrdir._get_file_mode())
2778
def _gen_revision_history(self):
2779
history = self._transport.get_bytes('revision-history').split('\n')
2780
if history[-1:] == ['']:
2781
# There shouldn't be a trailing newline, but just in case.
2785
def _synchronize_history(self, destination, revision_id):
2786
if not isinstance(destination, FullHistoryBzrBranch):
2787
super(BzrBranch, self)._synchronize_history(
2788
destination, revision_id)
2790
if revision_id == _mod_revision.NULL_REVISION:
2793
new_history = self._revision_history()
2794
if revision_id is not None and new_history != []:
2796
new_history = new_history[:new_history.index(revision_id) + 1]
2798
rev = self.repository.get_revision(revision_id)
2799
new_history = rev.get_history(self.repository)[1:]
2800
destination._set_revision_history(new_history)
2803
def generate_revision_history(self, revision_id, last_rev=None,
2805
"""Create a new revision history that will finish with revision_id.
2807
:param revision_id: the new tip to use.
2808
:param last_rev: The previous last_revision. If not None, then this
2809
must be a ancestory of revision_id, or DivergedBranches is raised.
2810
:param other_branch: The other branch that DivergedBranches should
2811
raise with respect to.
2813
self._set_revision_history(self._lefthand_history(revision_id,
2814
last_rev, other_branch))
2817
class BzrBranch5(FullHistoryBzrBranch):
2818
"""A format 5 branch. This supports new features over plain branches.
2820
It has support for a master_branch which is the data for bound branches.
2824
class BzrBranch8(BzrBranch):
2825
"""A branch that stores tree-reference locations."""
2827
def _open_hook(self, possible_transports=None):
2828
if self._ignore_fallbacks:
2830
if possible_transports is None:
2831
possible_transports = [self.bzrdir.root_transport]
2833
url = self.get_stacked_on_url()
2834
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2835
errors.UnstackableBranchFormat):
2838
for hook in Branch.hooks['transform_fallback_location']:
2839
url = hook(self, url)
2841
hook_name = Branch.hooks.get_hook_name(hook)
2842
raise AssertionError(
2843
"'transform_fallback_location' hook %s returned "
2844
"None, not a URL." % hook_name)
2845
self._activate_fallback_location(url,
2846
possible_transports=possible_transports)
2848
def __init__(self, *args, **kwargs):
2849
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2850
super(BzrBranch8, self).__init__(*args, **kwargs)
2851
self._last_revision_info_cache = None
2852
self._reference_info = None
2854
def _clear_cached_state(self):
2855
super(BzrBranch8, self)._clear_cached_state()
2856
self._last_revision_info_cache = None
2857
self._reference_info = None
2859
1956
def _check_history_violation(self, revision_id):
2860
current_revid = self.last_revision()
2861
last_revision = _mod_revision.ensure_null(current_revid)
2862
if _mod_revision.is_null(last_revision):
1957
last_revision = self.last_revision()
1958
if last_revision is None:
2864
graph = self.repository.get_graph()
2865
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2866
if lh_ancestor == current_revid:
2868
raise errors.AppendRevisionsOnlyViolation(self.user_url)
1960
if last_revision not in self._lefthand_history(revision_id):
1961
raise errors.AppendRevisionsOnlyViolation(self.base)
2870
1963
def _gen_revision_history(self):
2871
1964
"""Generate the revision history from last revision
2873
last_revno, last_revision = self.last_revision_info()
2874
self._extend_partial_history(stop_index=last_revno-1)
2875
return list(reversed(self._partial_revision_history_cache))
1966
history = list(self.repository.iter_reverse_revision_history(
1967
self.last_revision()))
1971
def _write_revision_history(self, history):
1972
"""Factored out of set_revision_history.
1974
This performs the actual writing to disk, with format-specific checks.
1975
It is intended to be called by BzrBranch5.set_revision_history.
1977
if len(history) == 0:
1978
last_revision = 'null:'
1980
if history != self._lefthand_history(history[-1]):
1981
raise errors.NotLefthandHistory(history)
1982
last_revision = history[-1]
1983
if self._get_append_revisions_only():
1984
self._check_history_violation(last_revision)
1985
self._write_last_revision_info(len(history), last_revision)
1988
def append_revision(self, *revision_ids):
1989
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1990
if len(revision_ids) == 0:
1992
prev_revno, prev_revision = self.last_revision_info()
1993
for revision in self.repository.get_revisions(revision_ids):
1994
if prev_revision == _mod_revision.NULL_REVISION:
1995
if revision.parent_ids != []:
1996
raise errors.NotLeftParentDescendant(self, prev_revision,
1997
revision.revision_id)
1999
if revision.parent_ids[0] != prev_revision:
2000
raise errors.NotLeftParentDescendant(self, prev_revision,
2001
revision.revision_id)
2002
prev_revision = revision.revision_id
2003
self.set_last_revision_info(prev_revno + len(revision_ids),
2877
2006
@needs_write_lock
2878
2007
def _set_parent_location(self, url):
2884
2013
"""Set the parent branch"""
2885
2014
return self._get_config_location('parent_location')
2888
def _set_all_reference_info(self, info_dict):
2889
"""Replace all reference info stored in a branch.
2891
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2894
writer = rio.RioWriter(s)
2895
for key, (tree_path, branch_location) in info_dict.iteritems():
2896
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2897
branch_location=branch_location)
2898
writer.write_stanza(stanza)
2899
self._transport.put_bytes('references', s.getvalue())
2900
self._reference_info = info_dict
2903
def _get_all_reference_info(self):
2904
"""Return all the reference info stored in a branch.
2906
:return: A dict of {file_id: (tree_path, branch_location)}
2908
if self._reference_info is not None:
2909
return self._reference_info
2910
rio_file = self._transport.get('references')
2912
stanzas = rio.read_stanzas(rio_file)
2913
info_dict = dict((s['file_id'], (s['tree_path'],
2914
s['branch_location'])) for s in stanzas)
2917
self._reference_info = info_dict
2920
def set_reference_info(self, file_id, tree_path, branch_location):
2921
"""Set the branch location to use for a tree reference.
2923
:param file_id: The file-id of the tree reference.
2924
:param tree_path: The path of the tree reference in the tree.
2925
:param branch_location: The location of the branch to retrieve tree
2928
info_dict = self._get_all_reference_info()
2929
info_dict[file_id] = (tree_path, branch_location)
2930
if None in (tree_path, branch_location):
2931
if tree_path is not None:
2932
raise ValueError('tree_path must be None when branch_location'
2934
if branch_location is not None:
2935
raise ValueError('branch_location must be None when tree_path'
2937
del info_dict[file_id]
2938
self._set_all_reference_info(info_dict)
2940
def get_reference_info(self, file_id):
2941
"""Get the tree_path and branch_location for a tree reference.
2943
:return: a tuple of (tree_path, branch_location)
2945
return self._get_all_reference_info().get(file_id, (None, None))
2947
def reference_parent(self, file_id, path, possible_transports=None):
2948
"""Return the parent branch for a tree-reference file_id.
2950
:param file_id: The file_id of the tree reference
2951
:param path: The path of the file_id in the tree
2952
:return: A branch associated with the file_id
2954
branch_location = self.get_reference_info(file_id)[1]
2955
if branch_location is None:
2956
return Branch.reference_parent(self, file_id, path,
2957
possible_transports)
2958
branch_location = urlutils.join(self.user_url, branch_location)
2959
return Branch.open(branch_location,
2960
possible_transports=possible_transports)
2962
2016
def set_push_location(self, location):
2963
2017
"""See Branch.set_push_location."""
2964
2018
self._set_config_location('push_location', location)
2966
2020
def set_bound_location(self, location):
2967
2021
"""See Branch.set_push_location."""
2968
self._master_branch_cache = None
2970
2023
config = self.get_config()
2971
2024
if location is None:
2972
2025
if config.get_user_option('bound') != 'True':
2975
config.set_user_option('bound', 'False', warn_masked=True)
2028
config.set_user_option('bound', 'False')
2978
2031
self._set_config_location('bound_location', location,
2980
config.set_user_option('bound', 'True', warn_masked=True)
2033
config.set_user_option('bound', 'True')
2983
2036
def _get_bound_location(self, bound):
2998
2051
"""See Branch.get_old_bound_location"""
2999
2052
return self._get_bound_location(False)
3001
def get_stacked_on_url(self):
3002
# you can always ask for the URL; but you might not be able to use it
3003
# if the repo can't support stacking.
3004
## self._check_stackable_repo()
3005
# stacked_on_location is only ever defined in branch.conf, so don't
3006
# waste effort reading the whole stack of config files.
3007
config = self.get_config()._get_branch_data_config()
3008
stacked_url = self._get_config_location('stacked_on_location',
3010
if stacked_url is None:
3011
raise errors.NotStacked(self)
3015
def get_rev_id(self, revno, history=None):
3016
"""Find the revision id of the specified revno."""
3018
return _mod_revision.NULL_REVISION
3020
last_revno, last_revision_id = self.last_revision_info()
3021
if revno <= 0 or revno > last_revno:
3022
raise errors.NoSuchRevision(self, revno)
3024
if history is not None:
3025
return history[revno - 1]
3027
index = last_revno - revno
3028
if len(self._partial_revision_history_cache) <= index:
3029
self._extend_partial_history(stop_index=index)
3030
if len(self._partial_revision_history_cache) > index:
3031
return self._partial_revision_history_cache[index]
3033
raise errors.NoSuchRevision(self, revno)
3036
def revision_id_to_revno(self, revision_id):
3037
"""Given a revision id, return its revno"""
3038
if _mod_revision.is_null(revision_id):
3041
index = self._partial_revision_history_cache.index(revision_id)
3044
self._extend_partial_history(stop_revision=revision_id)
3045
except errors.RevisionNotPresent, e:
3046
raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3047
index = len(self._partial_revision_history_cache) - 1
3049
raise errors.NoSuchRevision(self, revision_id)
3050
if self._partial_revision_history_cache[index] != revision_id:
3051
raise errors.NoSuchRevision(self, revision_id)
3052
return self.revno() - index
3055
class BzrBranch7(BzrBranch8):
3056
"""A branch with support for a fallback repository."""
3058
def set_reference_info(self, file_id, tree_path, branch_location):
3059
Branch.set_reference_info(self, file_id, tree_path, branch_location)
3061
def get_reference_info(self, file_id):
3062
Branch.get_reference_info(self, file_id)
3064
def reference_parent(self, file_id, path, possible_transports=None):
3065
return Branch.reference_parent(self, file_id, path,
3066
possible_transports)
3069
class BzrBranch6(BzrBranch7):
3070
"""See BzrBranchFormat6 for the capabilities of this branch.
3072
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2054
def set_append_revisions_only(self, enabled):
2059
self.get_config().set_user_option('append_revisions_only', value)
2061
def _get_append_revisions_only(self):
2062
value = self.get_config().get_user_option('append_revisions_only')
2063
return value == 'True'
2065
def _synchronize_history(self, destination, revision_id):
2066
"""Synchronize last revision and revision history between branches.
2068
This version is most efficient when the destination is also a
2069
BzrBranch6, but works for BzrBranch5, as long as the destination's
2070
repository contains all the lefthand ancestors of the intended
2071
last_revision. If not, set_last_revision_info will fail.
2073
:param destination: The branch to copy the history into
2074
:param revision_id: The revision-id to truncate history at. May
2075
be None to copy complete history.
2077
if revision_id is None:
2078
revno, revision_id = self.last_revision_info()
2080
revno = self.revision_id_to_revno(revision_id)
2081
destination.set_last_revision_info(revno, revision_id)
2083
def _make_tags(self):
2084
return BasicTags(self)
2087
class BranchTestProviderAdapter(object):
2088
"""A tool to generate a suite testing multiple branch formats at once.
2090
This is done by copying the test once for each transport and injecting
2091
the transport_server, transport_readonly_server, and branch_format
2092
classes into each copy. Each copy is also given a new id() to make it
3076
def get_stacked_on_url(self):
3077
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2096
def __init__(self, transport_server, transport_readonly_server, formats,
2097
vfs_transport_factory=None):
2098
self._transport_server = transport_server
2099
self._transport_readonly_server = transport_readonly_server
2100
self._formats = formats
2102
def adapt(self, test):
2103
result = TestSuite()
2104
for branch_format, bzrdir_format in self._formats:
2105
new_test = deepcopy(test)
2106
new_test.transport_server = self._transport_server
2107
new_test.transport_readonly_server = self._transport_readonly_server
2108
new_test.bzrdir_format = bzrdir_format
2109
new_test.branch_format = branch_format
2110
def make_new_test_id():
2111
# the format can be either a class or an instance
2112
name = getattr(branch_format, '__name__',
2113
branch_format.__class__.__name__)
2114
new_id = "%s(%s)" % (new_test.id(), name)
2115
return lambda: new_id
2116
new_test.id = make_new_test_id()
2117
result.addTest(new_test)
3080
2121
######################################################################
3098
2139
:ivar new_revno: Revision number after pull.
3099
2140
:ivar old_revid: Tip revision id before pull.
3100
2141
:ivar new_revid: Tip revision id after pull.
3101
:ivar source_branch: Source (local) branch object. (read locked)
3102
:ivar master_branch: Master branch of the target, or the target if no
3104
:ivar local_branch: target branch if there is a Master, else None
3105
:ivar target_branch: Target/destination branch object. (write locked)
3106
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3107
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
2142
:ivar source_branch: Source (local) branch object.
2143
:ivar master_branch: Master branch of the target, or None.
2144
:ivar target_branch: Target/destination branch object.
3110
@deprecated_method(deprecated_in((2, 3, 0)))
3111
2147
def __int__(self):
3112
"""Return the relative change in revno.
3114
:deprecated: Use `new_revno` and `old_revno` instead.
2148
# DEPRECATED: pull used to return the change in revno
3116
2149
return self.new_revno - self.old_revno
3118
2151
def report(self, to_file):
3119
tag_conflicts = getattr(self, "tag_conflicts", None)
3120
tag_updates = getattr(self, "tag_updates", None)
3122
if self.old_revid != self.new_revid:
3123
to_file.write('Now on revision %d.\n' % self.new_revno)
3125
to_file.write('%d tag(s) updated.\n' % len(tag_updates))
3126
if self.old_revid == self.new_revid and not tag_updates:
3127
if not tag_conflicts:
3128
to_file.write('No revisions or tags to pull.\n')
3130
to_file.write('No revisions to pull.\n')
2152
if self.old_revid == self.new_revid:
2153
to_file.write('No revisions to pull.\n')
2155
to_file.write('Now on revision %d.\n' % self.new_revno)
3131
2156
self._show_tag_conficts(to_file)
3134
class BranchPushResult(_Result):
2159
class PushResult(_Result):
3135
2160
"""Result of a Branch.push operation.
3137
:ivar old_revno: Revision number (eg 10) of the target before push.
3138
:ivar new_revno: Revision number (eg 12) of the target after push.
3139
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3141
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3143
:ivar source_branch: Source branch object that the push was from. This is
3144
read locked, and generally is a local (and thus low latency) branch.
3145
:ivar master_branch: If target is a bound branch, the master branch of
3146
target, or target itself. Always write locked.
3147
:ivar target_branch: The direct Branch where data is being sent (write
3149
:ivar local_branch: If the target is a bound branch this will be the
3150
target, otherwise it will be None.
2162
:ivar old_revno: Revision number before push.
2163
:ivar new_revno: Revision number after push.
2164
:ivar old_revid: Tip revision id before push.
2165
:ivar new_revid: Tip revision id after push.
2166
:ivar source_branch: Source branch object.
2167
:ivar master_branch: Master branch of the target, or None.
2168
:ivar target_branch: Target/destination branch object.
3153
@deprecated_method(deprecated_in((2, 3, 0)))
3154
2171
def __int__(self):
3155
"""Return the relative change in revno.
3157
:deprecated: Use `new_revno` and `old_revno` instead.
2172
# DEPRECATED: push used to return the change in revno
3159
2173
return self.new_revno - self.old_revno
3161
2175
def report(self, to_file):
3162
# TODO: This function gets passed a to_file, but then
3163
# ignores it and calls note() instead. This is also
3164
# inconsistent with PullResult(), which writes to stdout.
3165
# -- JRV20110901, bug #838853
3166
tag_conflicts = getattr(self, "tag_conflicts", None)
3167
tag_updates = getattr(self, "tag_updates", None)
3169
if self.old_revid != self.new_revid:
3170
note(gettext('Pushed up to revision %d.') % self.new_revno)
3172
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
3173
if self.old_revid == self.new_revid and not tag_updates:
3174
if not tag_conflicts:
3175
note(gettext('No new revisions or tags to push.'))
3177
note(gettext('No new revisions to push.'))
2176
"""Write a human-readable description of the result."""
2177
if self.old_revid == self.new_revid:
2178
to_file.write('No new revisions to push.\n')
2180
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
3178
2181
self._show_tag_conficts(to_file)
3218
2219
new_branch.tags._set_tag_dict({})
3220
2221
# Copying done; now update target format
3221
new_branch._transport.put_bytes('format',
3222
format.get_format_string(),
3223
mode=new_branch.bzrdir._get_file_mode())
2222
new_branch.control_files.put_utf8('format',
2223
format.get_format_string())
3225
2225
# Clean up old files
3226
new_branch._transport.delete('revision-history')
2226
new_branch.control_files._transport.delete('revision-history')
3228
2228
branch.set_parent(None)
3229
except errors.NoSuchFile:
3231
2231
branch.set_bound_location(None)
3234
class Converter6to7(object):
3235
"""Perform an in-place upgrade of format 6 to format 7"""
3237
def convert(self, branch):
3238
format = BzrBranchFormat7()
3239
branch._set_config_location('stacked_on_location', '')
3240
# update target format
3241
branch._transport.put_bytes('format', format.get_format_string())
3244
class Converter7to8(object):
3245
"""Perform an in-place upgrade of format 7 to format 8"""
3247
def convert(self, branch):
3248
format = BzrBranchFormat8()
3249
branch._transport.put_bytes('references', '')
3250
# update target format
3251
branch._transport.put_bytes('format', format.get_format_string())
3254
class InterBranch(InterObject):
3255
"""This class represents operations taking place between two branches.
3257
Its instances have methods like pull() and push() and contain
3258
references to the source and target repositories these operations
3259
can be carried out on.
3263
"""The available optimised InterBranch types."""
3266
def _get_branch_formats_to_test(klass):
3267
"""Return an iterable of format tuples for testing.
3269
:return: An iterable of (from_format, to_format) to use when testing
3270
this InterBranch class. Each InterBranch class should define this
3273
raise NotImplementedError(klass._get_branch_formats_to_test)
3276
def pull(self, overwrite=False, stop_revision=None,
3277
possible_transports=None, local=False):
3278
"""Mirror source into target branch.
3280
The target branch is considered to be 'local', having low latency.
3282
:returns: PullResult instance
3284
raise NotImplementedError(self.pull)
3287
def push(self, overwrite=False, stop_revision=None, lossy=False,
3288
_override_hook_source_branch=None):
3289
"""Mirror the source branch into the target branch.
3291
The source branch is considered to be 'local', having low latency.
3293
raise NotImplementedError(self.push)
3296
def copy_content_into(self, revision_id=None):
3297
"""Copy the content of source into target
3299
revision_id: if not None, the revision history in the new branch will
3300
be truncated to end with revision_id.
3302
raise NotImplementedError(self.copy_content_into)
3305
def fetch(self, stop_revision=None, limit=None):
3308
:param stop_revision: Last revision to fetch
3309
:param limit: Optional rough limit of revisions to fetch
3311
raise NotImplementedError(self.fetch)
3314
class GenericInterBranch(InterBranch):
3315
"""InterBranch implementation that uses public Branch functions."""
3318
def is_compatible(klass, source, target):
3319
# GenericBranch uses the public API, so always compatible
3323
def _get_branch_formats_to_test(klass):
3324
return [(format_registry.get_default(), format_registry.get_default())]
3327
def unwrap_format(klass, format):
3328
if isinstance(format, remote.RemoteBranchFormat):
3329
format._ensure_real()
3330
return format._custom_format
3334
def copy_content_into(self, revision_id=None):
3335
"""Copy the content of source into target
3337
revision_id: if not None, the revision history in the new branch will
3338
be truncated to end with revision_id.
3340
self.source.update_references(self.target)
3341
self.source._synchronize_history(self.target, revision_id)
3343
parent = self.source.get_parent()
3344
except errors.InaccessibleParent, e:
3345
mutter('parent was not accessible to copy: %s', e)
3348
self.target.set_parent(parent)
3349
if self.source._push_should_merge_tags():
3350
self.source.tags.merge_to(self.target.tags)
3353
def fetch(self, stop_revision=None, limit=None):
3354
if self.target.base == self.source.base:
3356
self.source.lock_read()
3358
fetch_spec_factory = fetch.FetchSpecFactory()
3359
fetch_spec_factory.source_branch = self.source
3360
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3361
fetch_spec_factory.source_repo = self.source.repository
3362
fetch_spec_factory.target_repo = self.target.repository
3363
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3364
fetch_spec_factory.limit = limit
3365
fetch_spec = fetch_spec_factory.make_fetch_spec()
3366
return self.target.repository.fetch(self.source.repository,
3367
fetch_spec=fetch_spec)
3369
self.source.unlock()
3372
def _update_revisions(self, stop_revision=None, overwrite=False,
3374
other_revno, other_last_revision = self.source.last_revision_info()
3375
stop_revno = None # unknown
3376
if stop_revision is None:
3377
stop_revision = other_last_revision
3378
if _mod_revision.is_null(stop_revision):
3379
# if there are no commits, we're done.
3381
stop_revno = other_revno
3383
# what's the current last revision, before we fetch [and change it
3385
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3386
# we fetch here so that we don't process data twice in the common
3387
# case of having something to pull, and so that the check for
3388
# already merged can operate on the just fetched graph, which will
3389
# be cached in memory.
3390
self.fetch(stop_revision=stop_revision)
3391
# Check to see if one is an ancestor of the other
3394
graph = self.target.repository.get_graph()
3395
if self.target._check_if_descendant_or_diverged(
3396
stop_revision, last_rev, graph, self.source):
3397
# stop_revision is a descendant of last_rev, but we aren't
3398
# overwriting, so we're done.
3400
if stop_revno is None:
3402
graph = self.target.repository.get_graph()
3403
this_revno, this_last_revision = \
3404
self.target.last_revision_info()
3405
stop_revno = graph.find_distance_to_null(stop_revision,
3406
[(other_last_revision, other_revno),
3407
(this_last_revision, this_revno)])
3408
self.target.set_last_revision_info(stop_revno, stop_revision)
3411
def pull(self, overwrite=False, stop_revision=None,
3412
possible_transports=None, run_hooks=True,
3413
_override_hook_target=None, local=False):
3414
"""Pull from source into self, updating my master if any.
3416
:param run_hooks: Private parameter - if false, this branch
3417
is being called because it's the master of the primary branch,
3418
so it should not run its hooks.
3420
bound_location = self.target.get_bound_location()
3421
if local and not bound_location:
3422
raise errors.LocalRequiresBoundBranch()
3423
master_branch = None
3424
source_is_master = False
3426
# bound_location comes from a config file, some care has to be
3427
# taken to relate it to source.user_url
3428
normalized = urlutils.normalize_url(bound_location)
3430
relpath = self.source.user_transport.relpath(normalized)
3431
source_is_master = (relpath == '')
3432
except (errors.PathNotChild, errors.InvalidURL):
3433
source_is_master = False
3434
if not local and bound_location and not source_is_master:
3435
# not pulling from master, so we need to update master.
3436
master_branch = self.target.get_master_branch(possible_transports)
3437
master_branch.lock_write()
3440
# pull from source into master.
3441
master_branch.pull(self.source, overwrite, stop_revision,
3443
return self._pull(overwrite,
3444
stop_revision, _hook_master=master_branch,
3445
run_hooks=run_hooks,
3446
_override_hook_target=_override_hook_target,
3447
merge_tags_to_master=not source_is_master)
3450
master_branch.unlock()
3452
def push(self, overwrite=False, stop_revision=None, lossy=False,
3453
_override_hook_source_branch=None):
3454
"""See InterBranch.push.
3456
This is the basic concrete implementation of push()
3458
:param _override_hook_source_branch: If specified, run the hooks
3459
passing this Branch as the source, rather than self. This is for
3460
use of RemoteBranch, where push is delegated to the underlying
3464
raise errors.LossyPushToSameVCS(self.source, self.target)
3465
# TODO: Public option to disable running hooks - should be trivial but
3468
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3469
op.add_cleanup(self.source.lock_read().unlock)
3470
op.add_cleanup(self.target.lock_write().unlock)
3471
return op.run(overwrite, stop_revision,
3472
_override_hook_source_branch=_override_hook_source_branch)
3474
def _basic_push(self, overwrite, stop_revision):
3475
"""Basic implementation of push without bound branches or hooks.
3477
Must be called with source read locked and target write locked.
3479
result = BranchPushResult()
3480
result.source_branch = self.source
3481
result.target_branch = self.target
3482
result.old_revno, result.old_revid = self.target.last_revision_info()
3483
self.source.update_references(self.target)
3484
if result.old_revid != stop_revision:
3485
# We assume that during 'push' this repository is closer than
3487
graph = self.source.repository.get_graph(self.target.repository)
3488
self._update_revisions(stop_revision, overwrite=overwrite,
3490
if self.source._push_should_merge_tags():
3491
result.tag_updates, result.tag_conflicts = (
3492
self.source.tags.merge_to(self.target.tags, overwrite))
3493
result.new_revno, result.new_revid = self.target.last_revision_info()
3496
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3497
_override_hook_source_branch=None):
3498
"""Push from source into target, and into target's master if any.
3501
if _override_hook_source_branch:
3502
result.source_branch = _override_hook_source_branch
3503
for hook in Branch.hooks['post_push']:
3506
bound_location = self.target.get_bound_location()
3507
if bound_location and self.target.base != bound_location:
3508
# there is a master branch.
3510
# XXX: Why the second check? Is it even supported for a branch to
3511
# be bound to itself? -- mbp 20070507
3512
master_branch = self.target.get_master_branch()
3513
master_branch.lock_write()
3514
operation.add_cleanup(master_branch.unlock)
3515
# push into the master from the source branch.
3516
master_inter = InterBranch.get(self.source, master_branch)
3517
master_inter._basic_push(overwrite, stop_revision)
3518
# and push into the target branch from the source. Note that
3519
# we push from the source branch again, because it's considered
3520
# the highest bandwidth repository.
3521
result = self._basic_push(overwrite, stop_revision)
3522
result.master_branch = master_branch
3523
result.local_branch = self.target
3525
master_branch = None
3527
result = self._basic_push(overwrite, stop_revision)
3528
# TODO: Why set master_branch and local_branch if there's no
3529
# binding? Maybe cleaner to just leave them unset? -- mbp
3531
result.master_branch = self.target
3532
result.local_branch = None
3536
def _pull(self, overwrite=False, stop_revision=None,
3537
possible_transports=None, _hook_master=None, run_hooks=True,
3538
_override_hook_target=None, local=False,
3539
merge_tags_to_master=True):
3542
This function is the core worker, used by GenericInterBranch.pull to
3543
avoid duplication when pulling source->master and source->local.
3545
:param _hook_master: Private parameter - set the branch to
3546
be supplied as the master to pull hooks.
3547
:param run_hooks: Private parameter - if false, this branch
3548
is being called because it's the master of the primary branch,
3549
so it should not run its hooks.
3550
is being called because it's the master of the primary branch,
3551
so it should not run its hooks.
3552
:param _override_hook_target: Private parameter - set the branch to be
3553
supplied as the target_branch to pull hooks.
3554
:param local: Only update the local branch, and not the bound branch.
3556
# This type of branch can't be bound.
3558
raise errors.LocalRequiresBoundBranch()
3559
result = PullResult()
3560
result.source_branch = self.source
3561
if _override_hook_target is None:
3562
result.target_branch = self.target
3564
result.target_branch = _override_hook_target
3565
self.source.lock_read()
3567
# We assume that during 'pull' the target repository is closer than
3569
self.source.update_references(self.target)
3570
graph = self.target.repository.get_graph(self.source.repository)
3571
# TODO: Branch formats should have a flag that indicates
3572
# that revno's are expensive, and pull() should honor that flag.
3574
result.old_revno, result.old_revid = \
3575
self.target.last_revision_info()
3576
self._update_revisions(stop_revision, overwrite=overwrite,
3578
# TODO: The old revid should be specified when merging tags,
3579
# so a tags implementation that versions tags can only
3580
# pull in the most recent changes. -- JRV20090506
3581
result.tag_updates, result.tag_conflicts = (
3582
self.source.tags.merge_to(self.target.tags, overwrite,
3583
ignore_master=not merge_tags_to_master))
3584
result.new_revno, result.new_revid = self.target.last_revision_info()
3586
result.master_branch = _hook_master
3587
result.local_branch = result.target_branch
3589
result.master_branch = result.target_branch
3590
result.local_branch = None
3592
for hook in Branch.hooks['post_pull']:
3595
self.source.unlock()
3599
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
