1
# Copyright (C) 2005-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
21
from cStringIO import StringIO
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
31
config as _mod_config,
40
revision as _mod_revision,
48
from bzrlib.i18n import gettext, ngettext
51
# Explicitly import bzrlib.bzrdir so that the BzrProber
52
# is guaranteed to be registered.
59
from bzrlib.decorators import (
64
from bzrlib.hooks import Hooks
65
from bzrlib.inter import InterObject
66
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
67
from bzrlib import registry
68
from bzrlib.symbol_versioning import (
72
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
75
class Branch(controldir.ControlComponent):
76
"""Branch holding a history of revisions.
79
Base directory/url of the branch; using control_url and
80
control_transport is more standardized.
81
:ivar hooks: An instance of BranchHooks.
82
:ivar _master_branch_cache: cached result of get_master_branch, see
85
# this is really an instance variable - FIXME move it there
90
def control_transport(self):
91
return self._transport
94
def user_transport(self):
95
return self.bzrdir.user_transport
97
def __init__(self, possible_transports=None):
98
self.tags = self._format.make_tags(self)
99
self._revision_history_cache = None
100
self._revision_id_to_revno_cache = None
101
self._partial_revision_id_to_revno_cache = {}
102
self._partial_revision_history_cache = []
103
self._tags_bytes = None
104
self._last_revision_info_cache = None
105
self._master_branch_cache = None
106
self._merge_sorted_revisions_cache = None
107
self._open_hook(possible_transports)
108
hooks = Branch.hooks['open']
112
def _open_hook(self, possible_transports):
113
"""Called by init to allow simpler extension of the base class."""
115
def _activate_fallback_location(self, url, possible_transports):
116
"""Activate the branch/repository from url as a fallback repository."""
117
for existing_fallback_repo in self.repository._fallback_repositories:
118
if existing_fallback_repo.user_url == url:
119
# This fallback is already configured. This probably only
120
# happens because ControlDir.sprout is a horrible mess. To avoid
121
# confusing _unstack we don't add this a second time.
122
mutter('duplicate activation of fallback %r on %r', url, self)
124
repo = self._get_fallback_repository(url, possible_transports)
125
if repo.has_same_location(self.repository):
126
raise errors.UnstackableLocationError(self.user_url, url)
127
self.repository.add_fallback_repository(repo)
129
def break_lock(self):
130
"""Break a lock if one is present from another instance.
132
Uses the ui factory to ask for confirmation if the lock may be from
135
This will probe the repository for its lock as well.
137
self.control_files.break_lock()
138
self.repository.break_lock()
139
master = self.get_master_branch()
140
if master is not None:
143
def _check_stackable_repo(self):
144
if not self.repository._format.supports_external_lookups:
145
raise errors.UnstackableRepositoryFormat(self.repository._format,
146
self.repository.base)
148
def _extend_partial_history(self, stop_index=None, stop_revision=None):
149
"""Extend the partial history to include a given index
151
If a stop_index is supplied, stop when that index has been reached.
152
If a stop_revision is supplied, stop when that revision is
153
encountered. Otherwise, stop when the beginning of history is
156
:param stop_index: The index which should be present. When it is
157
present, history extension will stop.
158
:param stop_revision: The revision id which should be present. When
159
it is encountered, history extension will stop.
161
if len(self._partial_revision_history_cache) == 0:
162
self._partial_revision_history_cache = [self.last_revision()]
163
repository._iter_for_revno(
164
self.repository, self._partial_revision_history_cache,
165
stop_index=stop_index, stop_revision=stop_revision)
166
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
167
self._partial_revision_history_cache.pop()
169
def _get_check_refs(self):
170
"""Get the references needed for check().
174
revid = self.last_revision()
175
return [('revision-existence', revid), ('lefthand-distance', revid)]
178
def open(base, _unsupported=False, possible_transports=None):
179
"""Open the branch rooted at base.
181
For instance, if the branch is at URL/.bzr/branch,
182
Branch.open(URL) -> a Branch instance.
184
control = controldir.ControlDir.open(base, _unsupported,
185
possible_transports=possible_transports)
186
return control.open_branch(unsupported=_unsupported,
187
possible_transports=possible_transports)
190
def open_from_transport(transport, name=None, _unsupported=False,
191
possible_transports=None):
192
"""Open the branch rooted at transport"""
193
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
194
return control.open_branch(name=name, unsupported=_unsupported,
195
possible_transports=possible_transports)
198
def open_containing(url, possible_transports=None):
199
"""Open an existing branch which contains url.
201
This probes for a branch at url, and searches upwards from there.
203
Basically we keep looking up until we find the control directory or
204
run into the root. If there isn't one, raises NotBranchError.
205
If there is one and it is either an unrecognised format or an unsupported
206
format, UnknownFormatError or UnsupportedFormatError are raised.
207
If there is one, it is returned, along with the unused portion of url.
209
control, relpath = controldir.ControlDir.open_containing(url,
211
branch = control.open_branch(possible_transports=possible_transports)
212
return (branch, relpath)
214
def _push_should_merge_tags(self):
215
"""Should _basic_push merge this branch's tags into the target?
217
The default implementation returns False if this branch has no tags,
218
and True the rest of the time. Subclasses may override this.
220
return self.supports_tags() and self.tags.get_tag_dict()
222
def get_config(self):
223
"""Get a bzrlib.config.BranchConfig for this Branch.
225
This can then be used to get and set configuration options for the
228
:return: A bzrlib.config.BranchConfig.
230
return _mod_config.BranchConfig(self)
232
def get_config_stack(self):
233
"""Get a bzrlib.config.BranchStack for this Branch.
235
This can then be used to get and set configuration options for the
238
:return: A bzrlib.config.BranchStack.
240
return _mod_config.BranchStack(self)
242
def _get_config(self):
243
"""Get the concrete config for just the config in this branch.
245
This is not intended for client use; see Branch.get_config for the
250
:return: An object supporting get_option and set_option.
252
raise NotImplementedError(self._get_config)
254
def _get_fallback_repository(self, url, possible_transports):
255
"""Get the repository we fallback to at url."""
256
url = urlutils.join(self.base, url)
257
a_branch = Branch.open(url, possible_transports=possible_transports)
258
return a_branch.repository
261
def _get_tags_bytes(self):
262
"""Get the bytes of a serialised tags dict.
264
Note that not all branches support tags, nor do all use the same tags
265
logic: this method is specific to BasicTags. Other tag implementations
266
may use the same method name and behave differently, safely, because
267
of the double-dispatch via
268
format.make_tags->tags_instance->get_tags_dict.
270
:return: The bytes of the tags file.
271
:seealso: Branch._set_tags_bytes.
273
if self._tags_bytes is None:
274
self._tags_bytes = self._transport.get_bytes('tags')
275
return self._tags_bytes
277
def _get_nick(self, local=False, possible_transports=None):
278
config = self.get_config()
279
# explicit overrides master, but don't look for master if local is True
280
if not local and not config.has_explicit_nickname():
282
master = self.get_master_branch(possible_transports)
283
if master and self.user_url == master.user_url:
284
raise errors.RecursiveBind(self.user_url)
285
if master is not None:
286
# return the master branch value
288
except errors.RecursiveBind, e:
290
except errors.BzrError, e:
291
# Silently fall back to local implicit nick if the master is
293
mutter("Could not connect to bound branch, "
294
"falling back to local nick.\n " + str(e))
295
return config.get_nickname()
297
def _set_nick(self, nick):
298
self.get_config().set_user_option('nickname', nick, warn_masked=True)
300
nick = property(_get_nick, _set_nick)
303
raise NotImplementedError(self.is_locked)
305
def _lefthand_history(self, revision_id, last_rev=None,
307
if 'evil' in debug.debug_flags:
308
mutter_callsite(4, "_lefthand_history scales with history.")
309
# stop_revision must be a descendant of last_revision
310
graph = self.repository.get_graph()
311
if last_rev is not None:
312
if not graph.is_ancestor(last_rev, revision_id):
313
# our previous tip is not merged into stop_revision
314
raise errors.DivergedBranches(self, other_branch)
315
# make a new revision history from the graph
316
parents_map = graph.get_parent_map([revision_id])
317
if revision_id not in parents_map:
318
raise errors.NoSuchRevision(self, revision_id)
319
current_rev_id = revision_id
321
check_not_reserved_id = _mod_revision.check_not_reserved_id
322
# Do not include ghosts or graph origin in revision_history
323
while (current_rev_id in parents_map and
324
len(parents_map[current_rev_id]) > 0):
325
check_not_reserved_id(current_rev_id)
326
new_history.append(current_rev_id)
327
current_rev_id = parents_map[current_rev_id][0]
328
parents_map = graph.get_parent_map([current_rev_id])
329
new_history.reverse()
332
def lock_write(self, token=None):
333
"""Lock the branch for write operations.
335
:param token: A token to permit reacquiring a previously held and
337
:return: A BranchWriteLockResult.
339
raise NotImplementedError(self.lock_write)
342
"""Lock the branch for read operations.
344
:return: A bzrlib.lock.LogicalLockResult.
346
raise NotImplementedError(self.lock_read)
349
raise NotImplementedError(self.unlock)
351
def peek_lock_mode(self):
352
"""Return lock mode for the Branch: 'r', 'w' or None"""
353
raise NotImplementedError(self.peek_lock_mode)
355
def get_physical_lock_status(self):
356
raise NotImplementedError(self.get_physical_lock_status)
359
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
360
"""Return the revision_id for a dotted revno.
362
:param revno: a tuple like (1,) or (1,1,2)
363
:param _cache_reverse: a private parameter enabling storage
364
of the reverse mapping in a top level cache. (This should
365
only be done in selective circumstances as we want to
366
avoid having the mapping cached multiple times.)
367
:return: the revision_id
368
:raises errors.NoSuchRevision: if the revno doesn't exist
370
rev_id = self._do_dotted_revno_to_revision_id(revno)
372
self._partial_revision_id_to_revno_cache[rev_id] = revno
375
def _do_dotted_revno_to_revision_id(self, revno):
376
"""Worker function for dotted_revno_to_revision_id.
378
Subclasses should override this if they wish to
379
provide a more efficient implementation.
382
return self.get_rev_id(revno[0])
383
revision_id_to_revno = self.get_revision_id_to_revno_map()
384
revision_ids = [revision_id for revision_id, this_revno
385
in revision_id_to_revno.iteritems()
386
if revno == this_revno]
387
if len(revision_ids) == 1:
388
return revision_ids[0]
390
revno_str = '.'.join(map(str, revno))
391
raise errors.NoSuchRevision(self, revno_str)
394
def revision_id_to_dotted_revno(self, revision_id):
395
"""Given a revision id, return its dotted revno.
397
:return: a tuple like (1,) or (400,1,3).
399
return self._do_revision_id_to_dotted_revno(revision_id)
401
def _do_revision_id_to_dotted_revno(self, revision_id):
402
"""Worker function for revision_id_to_revno."""
403
# Try the caches if they are loaded
404
result = self._partial_revision_id_to_revno_cache.get(revision_id)
405
if result is not None:
407
if self._revision_id_to_revno_cache:
408
result = self._revision_id_to_revno_cache.get(revision_id)
410
raise errors.NoSuchRevision(self, revision_id)
411
# Try the mainline as it's optimised
413
revno = self.revision_id_to_revno(revision_id)
415
except errors.NoSuchRevision:
416
# We need to load and use the full revno map after all
417
result = self.get_revision_id_to_revno_map().get(revision_id)
419
raise errors.NoSuchRevision(self, revision_id)
423
def get_revision_id_to_revno_map(self):
424
"""Return the revision_id => dotted revno map.
426
This will be regenerated on demand, but will be cached.
428
:return: A dictionary mapping revision_id => dotted revno.
429
This dictionary should not be modified by the caller.
431
if self._revision_id_to_revno_cache is not None:
432
mapping = self._revision_id_to_revno_cache
434
mapping = self._gen_revno_map()
435
self._cache_revision_id_to_revno(mapping)
436
# TODO: jam 20070417 Since this is being cached, should we be returning
438
# I would rather not, and instead just declare that users should not
439
# modify the return value.
442
def _gen_revno_map(self):
443
"""Create a new mapping from revision ids to dotted revnos.
445
Dotted revnos are generated based on the current tip in the revision
447
This is the worker function for get_revision_id_to_revno_map, which
448
just caches the return value.
450
:return: A dictionary mapping revision_id => dotted revno.
452
revision_id_to_revno = dict((rev_id, revno)
453
for rev_id, depth, revno, end_of_merge
454
in self.iter_merge_sorted_revisions())
455
return revision_id_to_revno
458
def iter_merge_sorted_revisions(self, start_revision_id=None,
459
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
460
"""Walk the revisions for a branch in merge sorted order.
462
Merge sorted order is the output from a merge-aware,
463
topological sort, i.e. all parents come before their
464
children going forward; the opposite for reverse.
466
:param start_revision_id: the revision_id to begin walking from.
467
If None, the branch tip is used.
468
:param stop_revision_id: the revision_id to terminate the walk
469
after. If None, the rest of history is included.
470
:param stop_rule: if stop_revision_id is not None, the precise rule
471
to use for termination:
473
* 'exclude' - leave the stop revision out of the result (default)
474
* 'include' - the stop revision is the last item in the result
475
* 'with-merges' - include the stop revision and all of its
476
merged revisions in the result
477
* 'with-merges-without-common-ancestry' - filter out revisions
478
that are in both ancestries
479
:param direction: either 'reverse' or 'forward':
481
* reverse means return the start_revision_id first, i.e.
482
start at the most recent revision and go backwards in history
483
* forward returns tuples in the opposite order to reverse.
484
Note in particular that forward does *not* do any intelligent
485
ordering w.r.t. depth as some clients of this API may like.
486
(If required, that ought to be done at higher layers.)
488
:return: an iterator over (revision_id, depth, revno, end_of_merge)
491
* revision_id: the unique id of the revision
492
* depth: How many levels of merging deep this node has been
494
* revno_sequence: This field provides a sequence of
495
revision numbers for all revisions. The format is:
496
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
497
branch that the revno is on. From left to right the REVNO numbers
498
are the sequence numbers within that branch of the revision.
499
* end_of_merge: When True the next node (earlier in history) is
500
part of a different merge.
502
# Note: depth and revno values are in the context of the branch so
503
# we need the full graph to get stable numbers, regardless of the
505
if self._merge_sorted_revisions_cache is None:
506
last_revision = self.last_revision()
507
known_graph = self.repository.get_known_graph_ancestry(
509
self._merge_sorted_revisions_cache = known_graph.merge_sort(
511
filtered = self._filter_merge_sorted_revisions(
512
self._merge_sorted_revisions_cache, start_revision_id,
513
stop_revision_id, stop_rule)
514
# Make sure we don't return revisions that are not part of the
515
# start_revision_id ancestry.
516
filtered = self._filter_start_non_ancestors(filtered)
517
if direction == 'reverse':
519
if direction == 'forward':
520
return reversed(list(filtered))
522
raise ValueError('invalid direction %r' % direction)
524
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
525
start_revision_id, stop_revision_id, stop_rule):
526
"""Iterate over an inclusive range of sorted revisions."""
527
rev_iter = iter(merge_sorted_revisions)
528
if start_revision_id is not None:
529
for node in rev_iter:
531
if rev_id != start_revision_id:
534
# The decision to include the start or not
535
# depends on the stop_rule if a stop is provided
536
# so pop this node back into the iterator
537
rev_iter = itertools.chain(iter([node]), rev_iter)
539
if stop_revision_id is None:
541
for node in rev_iter:
543
yield (rev_id, node.merge_depth, node.revno,
545
elif stop_rule == 'exclude':
546
for node in rev_iter:
548
if rev_id == stop_revision_id:
550
yield (rev_id, node.merge_depth, node.revno,
552
elif stop_rule == 'include':
553
for node in rev_iter:
555
yield (rev_id, node.merge_depth, node.revno,
557
if rev_id == stop_revision_id:
559
elif stop_rule == 'with-merges-without-common-ancestry':
560
# We want to exclude all revisions that are already part of the
561
# stop_revision_id ancestry.
562
graph = self.repository.get_graph()
563
ancestors = graph.find_unique_ancestors(start_revision_id,
565
for node in rev_iter:
567
if rev_id not in ancestors:
569
yield (rev_id, node.merge_depth, node.revno,
571
elif stop_rule == 'with-merges':
572
stop_rev = self.repository.get_revision(stop_revision_id)
573
if stop_rev.parent_ids:
574
left_parent = stop_rev.parent_ids[0]
576
left_parent = _mod_revision.NULL_REVISION
577
# left_parent is the actual revision we want to stop logging at,
578
# since we want to show the merged revisions after the stop_rev too
579
reached_stop_revision_id = False
580
revision_id_whitelist = []
581
for node in rev_iter:
583
if rev_id == left_parent:
584
# reached the left parent after the stop_revision
586
if (not reached_stop_revision_id or
587
rev_id in revision_id_whitelist):
588
yield (rev_id, node.merge_depth, node.revno,
590
if reached_stop_revision_id or rev_id == stop_revision_id:
591
# only do the merged revs of rev_id from now on
592
rev = self.repository.get_revision(rev_id)
594
reached_stop_revision_id = True
595
revision_id_whitelist.extend(rev.parent_ids)
597
raise ValueError('invalid stop_rule %r' % stop_rule)
599
def _filter_start_non_ancestors(self, rev_iter):
600
# If we started from a dotted revno, we want to consider it as a tip
601
# and don't want to yield revisions that are not part of its
602
# ancestry. Given the order guaranteed by the merge sort, we will see
603
# uninteresting descendants of the first parent of our tip before the
605
first = rev_iter.next()
606
(rev_id, merge_depth, revno, end_of_merge) = first
609
# We start at a mainline revision so by definition, all others
610
# revisions in rev_iter are ancestors
611
for node in rev_iter:
616
pmap = self.repository.get_parent_map([rev_id])
617
parents = pmap.get(rev_id, [])
619
whitelist.update(parents)
621
# If there is no parents, there is nothing of interest left
623
# FIXME: It's hard to test this scenario here as this code is never
624
# called in that case. -- vila 20100322
627
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
629
if rev_id in whitelist:
630
pmap = self.repository.get_parent_map([rev_id])
631
parents = pmap.get(rev_id, [])
632
whitelist.remove(rev_id)
633
whitelist.update(parents)
635
# We've reached the mainline, there is nothing left to
639
# A revision that is not part of the ancestry of our
642
yield (rev_id, merge_depth, revno, end_of_merge)
644
def leave_lock_in_place(self):
645
"""Tell this branch object not to release the physical lock when this
648
If lock_write doesn't return a token, then this method is not supported.
650
self.control_files.leave_in_place()
652
def dont_leave_lock_in_place(self):
653
"""Tell this branch object to release the physical lock when this
654
object is unlocked, even if it didn't originally acquire it.
656
If lock_write doesn't return a token, then this method is not supported.
658
self.control_files.dont_leave_in_place()
660
def bind(self, other):
661
"""Bind the local branch the other branch.
663
:param other: The branch to bind to
666
raise errors.UpgradeRequired(self.user_url)
668
def get_append_revisions_only(self):
669
"""Whether it is only possible to append revisions to the history.
671
if not self._format.supports_set_append_revisions_only():
673
return self.get_config_stack().get('append_revisions_only')
675
def set_append_revisions_only(self, enabled):
676
if not self._format.supports_set_append_revisions_only():
677
raise errors.UpgradeRequired(self.user_url)
678
self.get_config_stack().set('append_revisions_only', enabled)
680
def set_reference_info(self, file_id, tree_path, branch_location):
681
"""Set the branch location to use for a tree reference."""
682
raise errors.UnsupportedOperation(self.set_reference_info, self)
684
def get_reference_info(self, file_id):
685
"""Get the tree_path and branch_location for a tree reference."""
686
raise errors.UnsupportedOperation(self.get_reference_info, self)
689
def fetch(self, from_branch, last_revision=None, limit=None):
690
"""Copy revisions from from_branch into this branch.
692
:param from_branch: Where to copy from.
693
:param last_revision: What revision to stop at (None for at the end
695
:param limit: Optional rough limit of revisions to fetch
698
return InterBranch.get(from_branch, self).fetch(last_revision, limit=limit)
700
def get_bound_location(self):
701
"""Return the URL of the branch we are bound to.
703
Older format branches cannot bind, please be sure to use a metadir
708
def get_old_bound_location(self):
709
"""Return the URL of the branch we used to be bound to
711
raise errors.UpgradeRequired(self.user_url)
713
def get_commit_builder(self, parents, config_stack=None, timestamp=None,
714
timezone=None, committer=None, revprops=None,
715
revision_id=None, lossy=False):
716
"""Obtain a CommitBuilder for this branch.
718
:param parents: Revision ids of the parents of the new revision.
719
:param config: Optional configuration to use.
720
:param timestamp: Optional timestamp recorded for commit.
721
:param timezone: Optional timezone for timestamp.
722
:param committer: Optional committer to set for commit.
723
:param revprops: Optional dictionary of revision properties.
724
:param revision_id: Optional revision id.
725
:param lossy: Whether to discard data that can not be natively
726
represented, when pushing to a foreign VCS
729
if config_stack is None:
730
config_stack = self.get_config_stack()
732
return self.repository.get_commit_builder(self, parents, config_stack,
733
timestamp, timezone, committer, revprops, revision_id,
736
def get_master_branch(self, possible_transports=None):
737
"""Return the branch we are bound to.
739
:return: Either a Branch, or None
743
@deprecated_method(deprecated_in((2, 5, 0)))
744
def get_revision_delta(self, revno):
745
"""Return the delta for one revision.
747
The delta is relative to its mainline predecessor, or the
748
empty tree for revision 1.
751
revid = self.get_rev_id(revno)
752
except errors.NoSuchRevision:
753
raise errors.InvalidRevisionNumber(revno)
754
return self.repository.get_revision_delta(revid)
756
def get_stacked_on_url(self):
757
"""Get the URL this branch is stacked against.
759
:raises NotStacked: If the branch is not stacked.
760
:raises UnstackableBranchFormat: If the branch does not support
763
raise NotImplementedError(self.get_stacked_on_url)
765
def print_file(self, file, revision_id):
766
"""Print `file` to stdout."""
767
raise NotImplementedError(self.print_file)
769
@deprecated_method(deprecated_in((2, 4, 0)))
770
def set_revision_history(self, rev_history):
771
"""See Branch.set_revision_history."""
772
self._set_revision_history(rev_history)
775
def _set_revision_history(self, rev_history):
776
if len(rev_history) == 0:
777
revid = _mod_revision.NULL_REVISION
779
revid = rev_history[-1]
780
if rev_history != self._lefthand_history(revid):
781
raise errors.NotLefthandHistory(rev_history)
782
self.set_last_revision_info(len(rev_history), revid)
783
self._cache_revision_history(rev_history)
784
for hook in Branch.hooks['set_rh']:
785
hook(self, rev_history)
788
def set_last_revision_info(self, revno, revision_id):
789
"""Set the last revision of this branch.
791
The caller is responsible for checking that the revno is correct
792
for this revision id.
794
It may be possible to set the branch last revision to an id not
795
present in the repository. However, branches can also be
796
configured to check constraints on history, in which case this may not
799
raise NotImplementedError(self.set_last_revision_info)
802
def generate_revision_history(self, revision_id, last_rev=None,
804
"""See Branch.generate_revision_history"""
805
graph = self.repository.get_graph()
806
(last_revno, last_revid) = self.last_revision_info()
807
known_revision_ids = [
808
(last_revid, last_revno),
809
(_mod_revision.NULL_REVISION, 0),
811
if last_rev is not None:
812
if not graph.is_ancestor(last_rev, revision_id):
813
# our previous tip is not merged into stop_revision
814
raise errors.DivergedBranches(self, other_branch)
815
revno = graph.find_distance_to_null(revision_id, known_revision_ids)
816
self.set_last_revision_info(revno, revision_id)
819
def set_parent(self, url):
820
"""See Branch.set_parent."""
821
# TODO: Maybe delete old location files?
822
# URLs should never be unicode, even on the local fs,
823
# FIXUP this and get_parent in a future branch format bump:
824
# read and rewrite the file. RBC 20060125
826
if isinstance(url, unicode):
828
url = url.encode('ascii')
829
except UnicodeEncodeError:
830
raise errors.InvalidURL(url,
831
"Urls must be 7-bit ascii, "
832
"use bzrlib.urlutils.escape")
833
url = urlutils.relative_url(self.base, url)
834
self._set_parent_location(url)
837
def set_stacked_on_url(self, url):
838
"""Set the URL this branch is stacked against.
840
:raises UnstackableBranchFormat: If the branch does not support
842
:raises UnstackableRepositoryFormat: If the repository does not support
845
if not self._format.supports_stacking():
846
raise errors.UnstackableBranchFormat(self._format, self.user_url)
847
# XXX: Changing from one fallback repository to another does not check
848
# that all the data you need is present in the new fallback.
849
# Possibly it should.
850
self._check_stackable_repo()
853
old_url = self.get_stacked_on_url()
854
except (errors.NotStacked, errors.UnstackableBranchFormat,
855
errors.UnstackableRepositoryFormat):
859
self._activate_fallback_location(url,
860
possible_transports=[self.bzrdir.root_transport])
861
# write this out after the repository is stacked to avoid setting a
862
# stacked config that doesn't work.
863
self._set_config_location('stacked_on_location', url)
866
"""Change a branch to be unstacked, copying data as needed.
868
Don't call this directly, use set_stacked_on_url(None).
870
pb = ui.ui_factory.nested_progress_bar()
872
pb.update(gettext("Unstacking"))
873
# The basic approach here is to fetch the tip of the branch,
874
# including all available ghosts, from the existing stacked
875
# repository into a new repository object without the fallbacks.
877
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
878
# correct for CHKMap repostiories
879
old_repository = self.repository
880
if len(old_repository._fallback_repositories) != 1:
881
raise AssertionError("can't cope with fallback repositories "
882
"of %r (fallbacks: %r)" % (old_repository,
883
old_repository._fallback_repositories))
884
# Open the new repository object.
885
# Repositories don't offer an interface to remove fallback
886
# repositories today; take the conceptually simpler option and just
887
# reopen it. We reopen it starting from the URL so that we
888
# get a separate connection for RemoteRepositories and can
889
# stream from one of them to the other. This does mean doing
890
# separate SSH connection setup, but unstacking is not a
891
# common operation so it's tolerable.
892
new_bzrdir = controldir.ControlDir.open(
893
self.bzrdir.root_transport.base)
894
new_repository = new_bzrdir.find_repository()
895
if new_repository._fallback_repositories:
896
raise AssertionError("didn't expect %r to have "
897
"fallback_repositories"
898
% (self.repository,))
899
# Replace self.repository with the new repository.
900
# Do our best to transfer the lock state (i.e. lock-tokens and
901
# lock count) of self.repository to the new repository.
902
lock_token = old_repository.lock_write().repository_token
903
self.repository = new_repository
904
if isinstance(self, remote.RemoteBranch):
905
# Remote branches can have a second reference to the old
906
# repository that need to be replaced.
907
if self._real_branch is not None:
908
self._real_branch.repository = new_repository
909
self.repository.lock_write(token=lock_token)
910
if lock_token is not None:
911
old_repository.leave_lock_in_place()
912
old_repository.unlock()
913
if lock_token is not None:
914
# XXX: self.repository.leave_lock_in_place() before this
915
# function will not be preserved. Fortunately that doesn't
916
# affect the current default format (2a), and would be a
917
# corner-case anyway.
918
# - Andrew Bennetts, 2010/06/30
919
self.repository.dont_leave_lock_in_place()
923
old_repository.unlock()
924
except errors.LockNotHeld:
927
if old_lock_count == 0:
928
raise AssertionError(
929
'old_repository should have been locked at least once.')
930
for i in range(old_lock_count-1):
931
self.repository.lock_write()
932
# Fetch from the old repository into the new.
933
old_repository.lock_read()
935
# XXX: If you unstack a branch while it has a working tree
936
# with a pending merge, the pending-merged revisions will no
937
# longer be present. You can (probably) revert and remerge.
939
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
940
except errors.TagsNotSupported:
941
tags_to_fetch = set()
942
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
943
old_repository, required_ids=[self.last_revision()],
944
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
945
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
947
old_repository.unlock()
951
def _set_tags_bytes(self, bytes):
952
"""Mirror method for _get_tags_bytes.
954
:seealso: Branch._get_tags_bytes.
956
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked)
957
op.add_cleanup(self.lock_write().unlock)
958
return op.run_simple(bytes)
960
def _set_tags_bytes_locked(self, bytes):
961
self._tags_bytes = bytes
962
return self._transport.put_bytes('tags', bytes)
964
def _cache_revision_history(self, rev_history):
965
"""Set the cached revision history to rev_history.
967
The revision_history method will use this cache to avoid regenerating
968
the revision history.
970
This API is semi-public; it only for use by subclasses, all other code
971
should consider it to be private.
973
self._revision_history_cache = rev_history
975
def _cache_revision_id_to_revno(self, revision_id_to_revno):
976
"""Set the cached revision_id => revno map to revision_id_to_revno.
978
This API is semi-public; it only for use by subclasses, all other code
979
should consider it to be private.
981
self._revision_id_to_revno_cache = revision_id_to_revno
983
def _clear_cached_state(self):
984
"""Clear any cached data on this branch, e.g. cached revision history.
986
This means the next call to revision_history will need to call
987
_gen_revision_history.
989
This API is semi-public; it only for use by subclasses, all other code
990
should consider it to be private.
992
self._revision_history_cache = None
993
self._revision_id_to_revno_cache = None
994
self._last_revision_info_cache = None
995
self._master_branch_cache = None
996
self._merge_sorted_revisions_cache = None
997
self._partial_revision_history_cache = []
998
self._partial_revision_id_to_revno_cache = {}
999
self._tags_bytes = None
1001
def _gen_revision_history(self):
1002
"""Return sequence of revision hashes on to this branch.
1004
Unlike revision_history, this method always regenerates or rereads the
1005
revision history, i.e. it does not cache the result, so repeated calls
1008
Concrete subclasses should override this instead of revision_history so
1009
that subclasses do not need to deal with caching logic.
1011
This API is semi-public; it only for use by subclasses, all other code
1012
should consider it to be private.
1014
raise NotImplementedError(self._gen_revision_history)
1016
@deprecated_method(deprecated_in((2, 5, 0)))
1018
def revision_history(self):
1019
"""Return sequence of revision ids on this branch.
1021
This method will cache the revision history for as long as it is safe to
1024
return self._revision_history()
1026
def _revision_history(self):
1027
if 'evil' in debug.debug_flags:
1028
mutter_callsite(3, "revision_history scales with history.")
1029
if self._revision_history_cache is not None:
1030
history = self._revision_history_cache
1032
history = self._gen_revision_history()
1033
self._cache_revision_history(history)
1034
return list(history)
1037
"""Return current revision number for this branch.
1039
That is equivalent to the number of revisions committed to
1042
return self.last_revision_info()[0]
1045
"""Older format branches cannot bind or unbind."""
1046
raise errors.UpgradeRequired(self.user_url)
1048
def last_revision(self):
1049
"""Return last revision id, or NULL_REVISION."""
1050
return self.last_revision_info()[1]
1053
def last_revision_info(self):
1054
"""Return information about the last revision.
1056
:return: A tuple (revno, revision_id).
1058
if self._last_revision_info_cache is None:
1059
self._last_revision_info_cache = self._read_last_revision_info()
1060
return self._last_revision_info_cache
1062
def _read_last_revision_info(self):
1063
raise NotImplementedError(self._read_last_revision_info)
1065
@deprecated_method(deprecated_in((2, 4, 0)))
1066
def import_last_revision_info(self, source_repo, revno, revid):
1067
"""Set the last revision info, importing from another repo if necessary.
1069
:param source_repo: Source repository to optionally fetch from
1070
:param revno: Revision number of the new tip
1071
:param revid: Revision id of the new tip
1073
if not self.repository.has_same_location(source_repo):
1074
self.repository.fetch(source_repo, revision_id=revid)
1075
self.set_last_revision_info(revno, revid)
1077
def import_last_revision_info_and_tags(self, source, revno, revid,
1079
"""Set the last revision info, importing from another repo if necessary.
1081
This is used by the bound branch code to upload a revision to
1082
the master branch first before updating the tip of the local branch.
1083
Revisions referenced by source's tags are also transferred.
1085
:param source: Source branch to optionally fetch from
1086
:param revno: Revision number of the new tip
1087
:param revid: Revision id of the new tip
1088
:param lossy: Whether to discard metadata that can not be
1089
natively represented
1090
:return: Tuple with the new revision number and revision id
1091
(should only be different from the arguments when lossy=True)
1093
if not self.repository.has_same_location(source.repository):
1094
self.fetch(source, revid)
1095
self.set_last_revision_info(revno, revid)
1096
return (revno, revid)
1098
def revision_id_to_revno(self, revision_id):
1099
"""Given a revision id, return its revno"""
1100
if _mod_revision.is_null(revision_id):
1102
history = self._revision_history()
1104
return history.index(revision_id) + 1
1106
raise errors.NoSuchRevision(self, revision_id)
1109
def get_rev_id(self, revno, history=None):
1110
"""Find the revision id of the specified revno."""
1112
return _mod_revision.NULL_REVISION
1113
last_revno, last_revid = self.last_revision_info()
1114
if revno == last_revno:
1116
if revno <= 0 or revno > last_revno:
1117
raise errors.NoSuchRevision(self, revno)
1118
distance_from_last = last_revno - revno
1119
if len(self._partial_revision_history_cache) <= distance_from_last:
1120
self._extend_partial_history(distance_from_last)
1121
return self._partial_revision_history_cache[distance_from_last]
1123
def pull(self, source, overwrite=False, stop_revision=None,
1124
possible_transports=None, *args, **kwargs):
1125
"""Mirror source into this branch.
1127
This branch is considered to be 'local', having low latency.
1129
:returns: PullResult instance
1131
return InterBranch.get(source, self).pull(overwrite=overwrite,
1132
stop_revision=stop_revision,
1133
possible_transports=possible_transports, *args, **kwargs)
1135
def push(self, target, overwrite=False, stop_revision=None, lossy=False,
1137
"""Mirror this branch into target.
1139
This branch is considered to be 'local', having low latency.
1141
return InterBranch.get(self, target).push(overwrite, stop_revision,
1142
lossy, *args, **kwargs)
1144
def basis_tree(self):
1145
"""Return `Tree` object for last revision."""
1146
return self.repository.revision_tree(self.last_revision())
1148
def get_parent(self):
1149
"""Return the parent location of the branch.
1151
This is the default location for pull/missing. The usual
1152
pattern is that the user can override it by specifying a
1155
parent = self._get_parent_location()
1158
# This is an old-format absolute path to a local branch
1159
# turn it into a url
1160
if parent.startswith('/'):
1161
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1163
return urlutils.join(self.base[:-1], parent)
1164
except errors.InvalidURLJoin, e:
1165
raise errors.InaccessibleParent(parent, self.user_url)
1167
def _get_parent_location(self):
1168
raise NotImplementedError(self._get_parent_location)
1170
def _set_config_location(self, name, url, config=None,
1171
make_relative=False):
1173
config = self.get_config_stack()
1177
url = urlutils.relative_url(self.base, url)
1178
config.set(name, url)
1180
def _get_config_location(self, name, config=None):
1182
config = self.get_config_stack()
1183
location = config.get(name)
1188
def get_child_submit_format(self):
1189
"""Return the preferred format of submissions to this branch."""
1190
return self.get_config().get_user_option("child_submit_format")
1192
def get_submit_branch(self):
1193
"""Return the submit location of the branch.
1195
This is the default location for bundle. The usual
1196
pattern is that the user can override it by specifying a
1199
return self.get_config().get_user_option('submit_branch')
1201
def set_submit_branch(self, location):
1202
"""Return the submit location of the branch.
1204
This is the default location for bundle. The usual
1205
pattern is that the user can override it by specifying a
1208
self.get_config().set_user_option('submit_branch', location,
1211
def get_public_branch(self):
1212
"""Return the public location of the branch.
1214
This is used by merge directives.
1216
return self._get_config_location('public_branch')
1218
def set_public_branch(self, location):
1219
"""Return the submit location of the branch.
1221
This is the default location for bundle. The usual
1222
pattern is that the user can override it by specifying a
1225
self._set_config_location('public_branch', location)
1227
def get_push_location(self):
1228
"""Return the None or the location to push this branch to."""
1229
push_loc = self.get_config().get_user_option('push_location')
1232
def set_push_location(self, location):
1233
"""Set a new push location for this branch."""
1234
raise NotImplementedError(self.set_push_location)
1236
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1237
"""Run the post_change_branch_tip hooks."""
1238
hooks = Branch.hooks['post_change_branch_tip']
1241
new_revno, new_revid = self.last_revision_info()
1242
params = ChangeBranchTipParams(
1243
self, old_revno, new_revno, old_revid, new_revid)
1247
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1248
"""Run the pre_change_branch_tip hooks."""
1249
hooks = Branch.hooks['pre_change_branch_tip']
1252
old_revno, old_revid = self.last_revision_info()
1253
params = ChangeBranchTipParams(
1254
self, old_revno, new_revno, old_revid, new_revid)
1260
"""Synchronise this branch with the master branch if any.
1262
:return: None or the last_revision pivoted out during the update.
1266
def check_revno(self, revno):
1268
Check whether a revno corresponds to any revision.
1269
Zero (the NULL revision) is considered valid.
1272
self.check_real_revno(revno)
1274
def check_real_revno(self, revno):
1276
Check whether a revno corresponds to a real revision.
1277
Zero (the NULL revision) is considered invalid
1279
if revno < 1 or revno > self.revno():
1280
raise errors.InvalidRevisionNumber(revno)
1283
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
1284
"""Clone this branch into to_bzrdir preserving all semantic values.
1286
Most API users will want 'create_clone_on_transport', which creates a
1287
new bzrdir and branch on the fly.
1289
revision_id: if not None, the revision history in the new branch will
1290
be truncated to end with revision_id.
1292
result = to_bzrdir.create_branch()
1295
if repository_policy is not None:
1296
repository_policy.configure_branch(result)
1297
self.copy_content_into(result, revision_id=revision_id)
1303
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None,
1305
"""Create a new line of development from the branch, into to_bzrdir.
1307
to_bzrdir controls the branch format.
1309
revision_id: if not None, the revision history in the new branch will
1310
be truncated to end with revision_id.
1312
if (repository_policy is not None and
1313
repository_policy.requires_stacking()):
1314
to_bzrdir._format.require_stacking(_skip_repo=True)
1315
result = to_bzrdir.create_branch(repository=repository)
1318
if repository_policy is not None:
1319
repository_policy.configure_branch(result)
1320
self.copy_content_into(result, revision_id=revision_id)
1321
master_url = self.get_bound_location()
1322
if master_url is None:
1323
result.set_parent(self.bzrdir.root_transport.base)
1325
result.set_parent(master_url)
1330
def _synchronize_history(self, destination, revision_id):
1331
"""Synchronize last revision and revision history between branches.
1333
This version is most efficient when the destination is also a
1334
BzrBranch6, but works for BzrBranch5, as long as the destination's
1335
repository contains all the lefthand ancestors of the intended
1336
last_revision. If not, set_last_revision_info will fail.
1338
:param destination: The branch to copy the history into
1339
:param revision_id: The revision-id to truncate history at. May
1340
be None to copy complete history.
1342
source_revno, source_revision_id = self.last_revision_info()
1343
if revision_id is None:
1344
revno, revision_id = source_revno, source_revision_id
1346
graph = self.repository.get_graph()
1348
revno = graph.find_distance_to_null(revision_id,
1349
[(source_revision_id, source_revno)])
1350
except errors.GhostRevisionsHaveNoRevno:
1351
# Default to 1, if we can't find anything else
1353
destination.set_last_revision_info(revno, revision_id)
1355
def copy_content_into(self, destination, revision_id=None):
1356
"""Copy the content of self into destination.
1358
revision_id: if not None, the revision history in the new branch will
1359
be truncated to end with revision_id.
1361
return InterBranch.get(self, destination).copy_content_into(
1362
revision_id=revision_id)
1364
def update_references(self, target):
1365
if not getattr(self._format, 'supports_reference_locations', False):
1367
reference_dict = self._get_all_reference_info()
1368
if len(reference_dict) == 0:
1370
old_base = self.base
1371
new_base = target.base
1372
target_reference_dict = target._get_all_reference_info()
1373
for file_id, (tree_path, branch_location) in (
1374
reference_dict.items()):
1375
branch_location = urlutils.rebase_url(branch_location,
1377
target_reference_dict.setdefault(
1378
file_id, (tree_path, branch_location))
1379
target._set_all_reference_info(target_reference_dict)
1382
def check(self, refs):
1383
"""Check consistency of the branch.
1385
In particular this checks that revisions given in the revision-history
1386
do actually match up in the revision graph, and that they're all
1387
present in the repository.
1389
Callers will typically also want to check the repository.
1391
:param refs: Calculated refs for this branch as specified by
1392
branch._get_check_refs()
1393
:return: A BranchCheckResult.
1395
result = BranchCheckResult(self)
1396
last_revno, last_revision_id = self.last_revision_info()
1397
actual_revno = refs[('lefthand-distance', last_revision_id)]
1398
if actual_revno != last_revno:
1399
result.errors.append(errors.BzrCheckError(
1400
'revno does not match len(mainline) %s != %s' % (
1401
last_revno, actual_revno)))
1402
# TODO: We should probably also check that self.revision_history
1403
# matches the repository for older branch formats.
1404
# If looking for the code that cross-checks repository parents against
1405
# the Graph.iter_lefthand_ancestry output, that is now a repository
1409
def _get_checkout_format(self, lightweight=False):
1410
"""Return the most suitable metadir for a checkout of this branch.
1411
Weaves are used if this branch's repository uses weaves.
1413
format = self.repository.bzrdir.checkout_metadir()
1414
format.set_branch_format(self._format)
1417
def create_clone_on_transport(self, to_transport, revision_id=None,
1418
stacked_on=None, create_prefix=False, use_existing_dir=False,
1420
"""Create a clone of this branch and its bzrdir.
1422
:param to_transport: The transport to clone onto.
1423
:param revision_id: The revision id to use as tip in the new branch.
1424
If None the tip is obtained from this branch.
1425
:param stacked_on: An optional URL to stack the clone on.
1426
:param create_prefix: Create any missing directories leading up to
1428
:param use_existing_dir: Use an existing directory if one exists.
1430
# XXX: Fix the bzrdir API to allow getting the branch back from the
1431
# clone call. Or something. 20090224 RBC/spiv.
1432
# XXX: Should this perhaps clone colocated branches as well,
1433
# rather than just the default branch? 20100319 JRV
1434
if revision_id is None:
1435
revision_id = self.last_revision()
1436
dir_to = self.bzrdir.clone_on_transport(to_transport,
1437
revision_id=revision_id, stacked_on=stacked_on,
1438
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
1440
return dir_to.open_branch()
1442
def create_checkout(self, to_location, revision_id=None,
1443
lightweight=False, accelerator_tree=None,
1445
"""Create a checkout of a branch.
1447
:param to_location: The url to produce the checkout at
1448
:param revision_id: The revision to check out
1449
:param lightweight: If True, produce a lightweight checkout, otherwise,
1450
produce a bound branch (heavyweight checkout)
1451
:param accelerator_tree: A tree which can be used for retrieving file
1452
contents more quickly than the revision tree, i.e. a workingtree.
1453
The revision tree will be used for cases where accelerator_tree's
1454
content is different.
1455
:param hardlink: If true, hard-link files from accelerator_tree,
1457
:return: The tree of the created checkout
1459
t = transport.get_transport(to_location)
1461
format = self._get_checkout_format(lightweight=lightweight)
1463
checkout = format.initialize_on_transport(t)
1464
from_branch = BranchReferenceFormat().initialize(checkout,
1467
checkout_branch = controldir.ControlDir.create_branch_convenience(
1468
to_location, force_new_tree=False, format=format)
1469
checkout = checkout_branch.bzrdir
1470
checkout_branch.bind(self)
1471
# pull up to the specified revision_id to set the initial
1472
# branch tip correctly, and seed it with history.
1473
checkout_branch.pull(self, stop_revision=revision_id)
1475
tree = checkout.create_workingtree(revision_id,
1476
from_branch=from_branch,
1477
accelerator_tree=accelerator_tree,
1479
basis_tree = tree.basis_tree()
1480
basis_tree.lock_read()
1482
for path, file_id in basis_tree.iter_references():
1483
reference_parent = self.reference_parent(file_id, path)
1484
reference_parent.create_checkout(tree.abspath(path),
1485
basis_tree.get_reference_revision(file_id, path),
1492
def reconcile(self, thorough=True):
1493
"""Make sure the data stored in this branch is consistent."""
1494
from bzrlib.reconcile import BranchReconciler
1495
reconciler = BranchReconciler(self, thorough=thorough)
1496
reconciler.reconcile()
1499
def reference_parent(self, file_id, path, possible_transports=None):
1500
"""Return the parent branch for a tree-reference file_id
1502
:param file_id: The file_id of the tree reference
1503
:param path: The path of the file_id in the tree
1504
:return: A branch associated with the file_id
1506
# FIXME should provide multiple branches, based on config
1507
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1508
possible_transports=possible_transports)
1510
def supports_tags(self):
1511
return self._format.supports_tags()
1513
def automatic_tag_name(self, revision_id):
1514
"""Try to automatically find the tag name for a revision.
1516
:param revision_id: Revision id of the revision.
1517
:return: A tag name or None if no tag name could be determined.
1519
for hook in Branch.hooks['automatic_tag_name']:
1520
ret = hook(self, revision_id)
1525
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1527
"""Ensure that revision_b is a descendant of revision_a.
1529
This is a helper function for update_revisions.
1531
:raises: DivergedBranches if revision_b has diverged from revision_a.
1532
:returns: True if revision_b is a descendant of revision_a.
1534
relation = self._revision_relations(revision_a, revision_b, graph)
1535
if relation == 'b_descends_from_a':
1537
elif relation == 'diverged':
1538
raise errors.DivergedBranches(self, other_branch)
1539
elif relation == 'a_descends_from_b':
1542
raise AssertionError("invalid relation: %r" % (relation,))
1544
def _revision_relations(self, revision_a, revision_b, graph):
1545
"""Determine the relationship between two revisions.
1547
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1549
heads = graph.heads([revision_a, revision_b])
1550
if heads == set([revision_b]):
1551
return 'b_descends_from_a'
1552
elif heads == set([revision_a, revision_b]):
1553
# These branches have diverged
1555
elif heads == set([revision_a]):
1556
return 'a_descends_from_b'
1558
raise AssertionError("invalid heads: %r" % (heads,))
1560
def heads_to_fetch(self):
1561
"""Return the heads that must and that should be fetched to copy this
1562
branch into another repo.
1564
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
1565
set of heads that must be fetched. if_present_fetch is a set of
1566
heads that must be fetched if present, but no error is necessary if
1567
they are not present.
1569
# For bzr native formats must_fetch is just the tip, and if_present_fetch
1571
must_fetch = set([self.last_revision()])
1572
if_present_fetch = set()
1573
c = self.get_config()
1574
include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1578
if_present_fetch = set(self.tags.get_reverse_tag_dict())
1579
except errors.TagsNotSupported:
1581
must_fetch.discard(_mod_revision.NULL_REVISION)
1582
if_present_fetch.discard(_mod_revision.NULL_REVISION)
1583
return must_fetch, if_present_fetch
1586
class BranchFormat(controldir.ControlComponentFormat):
1587
"""An encapsulation of the initialization and open routines for a format.
1589
Formats provide three things:
1590
* An initialization routine,
1591
* a format description
1594
Formats are placed in an dict by their format string for reference
1595
during branch opening. It's not required that these be instances, they
1596
can be classes themselves with class methods - it simply depends on
1597
whether state is needed for a given format or not.
1599
Once a format is deprecated, just deprecate the initialize and open
1600
methods on the format class. Do not deprecate the object, as the
1601
object will be created every time regardless.
1604
def __eq__(self, other):
1605
return self.__class__ is other.__class__
1607
def __ne__(self, other):
1608
return not (self == other)
1611
@deprecated_method(deprecated_in((2, 4, 0)))
1612
def get_default_format(klass):
1613
"""Return the current default format."""
1614
return format_registry.get_default()
1617
@deprecated_method(deprecated_in((2, 4, 0)))
1618
def get_formats(klass):
1619
"""Get all the known formats.
1621
Warning: This triggers a load of all lazy registered formats: do not
1622
use except when that is desireed.
1624
return format_registry._get_all()
1626
def get_reference(self, controldir, name=None):
1627
"""Get the target reference of the branch in controldir.
1629
format probing must have been completed before calling
1630
this method - it is assumed that the format of the branch
1631
in controldir is correct.
1633
:param controldir: The controldir to get the branch data from.
1634
:param name: Name of the colocated branch to fetch
1635
:return: None if the branch is not a reference branch.
1640
def set_reference(self, controldir, name, to_branch):
1641
"""Set the target reference of the branch in controldir.
1643
format probing must have been completed before calling
1644
this method - it is assumed that the format of the branch
1645
in controldir is correct.
1647
:param controldir: The controldir to set the branch reference for.
1648
:param name: Name of colocated branch to set, None for default
1649
:param to_branch: branch that the checkout is to reference
1651
raise NotImplementedError(self.set_reference)
1653
def get_format_description(self):
1654
"""Return the short format description for this format."""
1655
raise NotImplementedError(self.get_format_description)
1657
def _run_post_branch_init_hooks(self, controldir, name, branch):
1658
hooks = Branch.hooks['post_branch_init']
1661
params = BranchInitHookParams(self, controldir, name, branch)
1665
def initialize(self, controldir, name=None, repository=None,
1666
append_revisions_only=None):
1667
"""Create a branch of this format in controldir.
1669
:param name: Name of the colocated branch to create.
1671
raise NotImplementedError(self.initialize)
1673
def is_supported(self):
1674
"""Is this format supported?
1676
Supported formats can be initialized and opened.
1677
Unsupported formats may not support initialization or committing or
1678
some other features depending on the reason for not being supported.
1682
def make_tags(self, branch):
1683
"""Create a tags object for branch.
1685
This method is on BranchFormat, because BranchFormats are reflected
1686
over the wire via network_name(), whereas full Branch instances require
1687
multiple VFS method calls to operate at all.
1689
The default implementation returns a disabled-tags instance.
1691
Note that it is normal for branch to be a RemoteBranch when using tags
1694
return _mod_tag.DisabledTags(branch)
1696
def network_name(self):
1697
"""A simple byte string uniquely identifying this format for RPC calls.
1699
MetaDir branch formats use their disk format string to identify the
1700
repository over the wire. All in one formats such as bzr < 0.8, and
1701
foreign formats like svn/git and hg should use some marker which is
1702
unique and immutable.
1704
raise NotImplementedError(self.network_name)
1706
def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
1707
found_repository=None, possible_transports=None):
1708
"""Return the branch object for controldir.
1710
:param controldir: A ControlDir that contains a branch.
1711
:param name: Name of colocated branch to open
1712
:param _found: a private parameter, do not use it. It is used to
1713
indicate if format probing has already be done.
1714
:param ignore_fallbacks: when set, no fallback branches will be opened
1715
(if there are any). Default is to open fallbacks.
1717
raise NotImplementedError(self.open)
1720
@deprecated_method(deprecated_in((2, 4, 0)))
1721
def register_format(klass, format):
1722
"""Register a metadir format.
1724
See MetaDirBranchFormatFactory for the ability to register a format
1725
without loading the code the format needs until it is actually used.
1727
format_registry.register(format)
1730
@deprecated_method(deprecated_in((2, 4, 0)))
1731
def set_default_format(klass, format):
1732
format_registry.set_default(format)
1734
def supports_set_append_revisions_only(self):
1735
"""True if this format supports set_append_revisions_only."""
1738
def supports_stacking(self):
1739
"""True if this format records a stacked-on branch."""
1742
def supports_leaving_lock(self):
1743
"""True if this format supports leaving locks in place."""
1744
return False # by default
1747
@deprecated_method(deprecated_in((2, 4, 0)))
1748
def unregister_format(klass, format):
1749
format_registry.remove(format)
1752
return self.get_format_description().rstrip()
1754
def supports_tags(self):
1755
"""True if this format supports tags stored in the branch"""
1756
return False # by default
1758
def tags_are_versioned(self):
1759
"""Whether the tag container for this branch versions tags."""
1762
def supports_tags_referencing_ghosts(self):
1763
"""True if tags can reference ghost revisions."""
1767
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
1768
"""A factory for a BranchFormat object, permitting simple lazy registration.
1770
While none of the built in BranchFormats are lazy registered yet,
1771
bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1772
use it, and the bzr-loom plugin uses it as well (see
1773
bzrlib.plugins.loom.formats).
1776
def __init__(self, format_string, module_name, member_name):
1777
"""Create a MetaDirBranchFormatFactory.
1779
:param format_string: The format string the format has.
1780
:param module_name: Module to load the format class from.
1781
:param member_name: Attribute name within the module for the format class.
1783
registry._LazyObjectGetter.__init__(self, module_name, member_name)
1784
self._format_string = format_string
1786
def get_format_string(self):
1787
"""See BranchFormat.get_format_string."""
1788
return self._format_string
1791
"""Used for network_format_registry support."""
1792
return self.get_obj()()
1795
class BranchHooks(Hooks):
1796
"""A dictionary mapping hook name to a list of callables for branch hooks.
1798
e.g. ['set_rh'] Is the list of items to be called when the
1799
set_revision_history function is invoked.
1803
"""Create the default hooks.
1805
These are all empty initially, because by default nothing should get
1808
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1809
self.add_hook('set_rh',
1810
"Invoked whenever the revision history has been set via "
1811
"set_revision_history. The api signature is (branch, "
1812
"revision_history), and the branch will be write-locked. "
1813
"The set_rh hook can be expensive for bzr to trigger, a better "
1814
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1815
self.add_hook('open',
1816
"Called with the Branch object that has been opened after a "
1817
"branch is opened.", (1, 8))
1818
self.add_hook('post_push',
1819
"Called after a push operation completes. post_push is called "
1820
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1821
"bzr client.", (0, 15))
1822
self.add_hook('post_pull',
1823
"Called after a pull operation completes. post_pull is called "
1824
"with a bzrlib.branch.PullResult object and only runs in the "
1825
"bzr client.", (0, 15))
1826
self.add_hook('pre_commit',
1827
"Called after a commit is calculated but before it is "
1828
"completed. pre_commit is called with (local, master, old_revno, "
1829
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1830
"). old_revid is NULL_REVISION for the first commit to a branch, "
1831
"tree_delta is a TreeDelta object describing changes from the "
1832
"basis revision. hooks MUST NOT modify this delta. "
1833
" future_tree is an in-memory tree obtained from "
1834
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1836
self.add_hook('post_commit',
1837
"Called in the bzr client after a commit has completed. "
1838
"post_commit is called with (local, master, old_revno, old_revid, "
1839
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1840
"commit to a branch.", (0, 15))
1841
self.add_hook('post_uncommit',
1842
"Called in the bzr client after an uncommit completes. "
1843
"post_uncommit is called with (local, master, old_revno, "
1844
"old_revid, new_revno, new_revid) where local is the local branch "
1845
"or None, master is the target branch, and an empty branch "
1846
"receives new_revno of 0, new_revid of None.", (0, 15))
1847
self.add_hook('pre_change_branch_tip',
1848
"Called in bzr client and server before a change to the tip of a "
1849
"branch is made. pre_change_branch_tip is called with a "
1850
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1851
"commit, uncommit will all trigger this hook.", (1, 6))
1852
self.add_hook('post_change_branch_tip',
1853
"Called in bzr client and server after a change to the tip of a "
1854
"branch is made. post_change_branch_tip is called with a "
1855
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1856
"commit, uncommit will all trigger this hook.", (1, 4))
1857
self.add_hook('transform_fallback_location',
1858
"Called when a stacked branch is activating its fallback "
1859
"locations. transform_fallback_location is called with (branch, "
1860
"url), and should return a new url. Returning the same url "
1861
"allows it to be used as-is, returning a different one can be "
1862
"used to cause the branch to stack on a closer copy of that "
1863
"fallback_location. Note that the branch cannot have history "
1864
"accessing methods called on it during this hook because the "
1865
"fallback locations have not been activated. When there are "
1866
"multiple hooks installed for transform_fallback_location, "
1867
"all are called with the url returned from the previous hook."
1868
"The order is however undefined.", (1, 9))
1869
self.add_hook('automatic_tag_name',
1870
"Called to determine an automatic tag name for a revision. "
1871
"automatic_tag_name is called with (branch, revision_id) and "
1872
"should return a tag name or None if no tag name could be "
1873
"determined. The first non-None tag name returned will be used.",
1875
self.add_hook('post_branch_init',
1876
"Called after new branch initialization completes. "
1877
"post_branch_init is called with a "
1878
"bzrlib.branch.BranchInitHookParams. "
1879
"Note that init, branch and checkout (both heavyweight and "
1880
"lightweight) will all trigger this hook.", (2, 2))
1881
self.add_hook('post_switch',
1882
"Called after a checkout switches branch. "
1883
"post_switch is called with a "
1884
"bzrlib.branch.SwitchHookParams.", (2, 2))
1888
# install the default hooks into the Branch class.
1889
Branch.hooks = BranchHooks()
1892
class ChangeBranchTipParams(object):
1893
"""Object holding parameters passed to `*_change_branch_tip` hooks.
1895
There are 5 fields that hooks may wish to access:
1897
:ivar branch: the branch being changed
1898
:ivar old_revno: revision number before the change
1899
:ivar new_revno: revision number after the change
1900
:ivar old_revid: revision id before the change
1901
:ivar new_revid: revision id after the change
1903
The revid fields are strings. The revno fields are integers.
1906
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1907
"""Create a group of ChangeBranchTip parameters.
1909
:param branch: The branch being changed.
1910
:param old_revno: Revision number before the change.
1911
:param new_revno: Revision number after the change.
1912
:param old_revid: Tip revision id before the change.
1913
:param new_revid: Tip revision id after the change.
1915
self.branch = branch
1916
self.old_revno = old_revno
1917
self.new_revno = new_revno
1918
self.old_revid = old_revid
1919
self.new_revid = new_revid
1921
def __eq__(self, other):
1922
return self.__dict__ == other.__dict__
1925
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1926
self.__class__.__name__, self.branch,
1927
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1930
class BranchInitHookParams(object):
1931
"""Object holding parameters passed to `*_branch_init` hooks.
1933
There are 4 fields that hooks may wish to access:
1935
:ivar format: the branch format
1936
:ivar bzrdir: the ControlDir where the branch will be/has been initialized
1937
:ivar name: name of colocated branch, if any (or None)
1938
:ivar branch: the branch created
1940
Note that for lightweight checkouts, the bzrdir and format fields refer to
1941
the checkout, hence they are different from the corresponding fields in
1942
branch, which refer to the original branch.
1945
def __init__(self, format, controldir, name, branch):
1946
"""Create a group of BranchInitHook parameters.
1948
:param format: the branch format
1949
:param controldir: the ControlDir where the branch will be/has been
1951
:param name: name of colocated branch, if any (or None)
1952
:param branch: the branch created
1954
Note that for lightweight checkouts, the bzrdir and format fields refer
1955
to the checkout, hence they are different from the corresponding fields
1956
in branch, which refer to the original branch.
1958
self.format = format
1959
self.bzrdir = controldir
1961
self.branch = branch
1963
def __eq__(self, other):
1964
return self.__dict__ == other.__dict__
1967
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1970
class SwitchHookParams(object):
1971
"""Object holding parameters passed to `*_switch` hooks.
1973
There are 4 fields that hooks may wish to access:
1975
:ivar control_dir: ControlDir of the checkout to change
1976
:ivar to_branch: branch that the checkout is to reference
1977
:ivar force: skip the check for local commits in a heavy checkout
1978
:ivar revision_id: revision ID to switch to (or None)
1981
def __init__(self, control_dir, to_branch, force, revision_id):
1982
"""Create a group of SwitchHook parameters.
1984
:param control_dir: ControlDir of the checkout to change
1985
:param to_branch: branch that the checkout is to reference
1986
:param force: skip the check for local commits in a heavy checkout
1987
:param revision_id: revision ID to switch to (or None)
1989
self.control_dir = control_dir
1990
self.to_branch = to_branch
1992
self.revision_id = revision_id
1994
def __eq__(self, other):
1995
return self.__dict__ == other.__dict__
1998
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1999
self.control_dir, self.to_branch,
2003
class BranchFormatMetadir(bzrdir.BzrFormat, BranchFormat):
2004
"""Base class for branch formats that live in meta directories.
2008
BranchFormat.__init__(self)
2009
bzrdir.BzrFormat.__init__(self)
2012
def find_format(klass, controldir, name=None):
2013
"""Return the format for the branch object in controldir."""
2015
transport = controldir.get_branch_transport(None, name=name)
2016
except errors.NoSuchFile:
2017
raise errors.NotBranchError(path=name, bzrdir=controldir)
2019
format_string = transport.get_bytes("format")
2020
except errors.NoSuchFile:
2021
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
2022
return klass._find_format(format_registry, 'branch', format_string)
2024
def _branch_class(self):
2025
"""What class to instantiate on open calls."""
2026
raise NotImplementedError(self._branch_class)
2028
def _get_initial_config(self, append_revisions_only=None):
2029
if append_revisions_only:
2030
return "append_revisions_only = True\n"
2032
# Avoid writing anything if append_revisions_only is disabled,
2033
# as that is the default.
2036
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
2038
"""Initialize a branch in a bzrdir, with specified files
2040
:param a_bzrdir: The bzrdir to initialize the branch in
2041
:param utf8_files: The files to create as a list of
2042
(filename, content) tuples
2043
:param name: Name of colocated branch to create, if any
2044
:return: a branch in this format
2046
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2047
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2048
control_files = lockable_files.LockableFiles(branch_transport,
2049
'lock', lockdir.LockDir)
2050
control_files.create_lock()
2051
control_files.lock_write()
2053
utf8_files += [('format', self.as_string())]
2054
for (filename, content) in utf8_files:
2055
branch_transport.put_bytes(
2057
mode=a_bzrdir._get_file_mode())
2059
control_files.unlock()
2060
branch = self.open(a_bzrdir, name, _found=True,
2061
found_repository=repository)
2062
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2065
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2066
found_repository=None, possible_transports=None):
2067
"""See BranchFormat.open()."""
2069
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2070
if format.__class__ != self.__class__:
2071
raise AssertionError("wrong format %r found for %r" %
2073
transport = a_bzrdir.get_branch_transport(None, name=name)
2075
control_files = lockable_files.LockableFiles(transport, 'lock',
2077
if found_repository is None:
2078
found_repository = a_bzrdir.find_repository()
2079
return self._branch_class()(_format=self,
2080
_control_files=control_files,
2083
_repository=found_repository,
2084
ignore_fallbacks=ignore_fallbacks,
2085
possible_transports=possible_transports)
2086
except errors.NoSuchFile:
2087
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
2090
def _matchingbzrdir(self):
2091
ret = bzrdir.BzrDirMetaFormat1()
2092
ret.set_branch_format(self)
2095
def supports_tags(self):
2098
def supports_leaving_lock(self):
2101
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
2103
BranchFormat.check_support_status(self,
2104
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
2106
bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
2107
recommend_upgrade=recommend_upgrade, basedir=basedir)
2110
class BzrBranchFormat5(BranchFormatMetadir):
2111
"""Bzr branch format 5.
2114
- a revision-history file.
2116
- a lock dir guarding the branch itself
2117
- all of this stored in a branch/ subdirectory
2118
- works with shared repositories.
2120
This format is new in bzr 0.8.
2123
def _branch_class(self):
2127
def get_format_string(cls):
2128
"""See BranchFormat.get_format_string()."""
2129
return "Bazaar-NG branch format 5\n"
2131
def get_format_description(self):
2132
"""See BranchFormat.get_format_description()."""
2133
return "Branch format 5"
2135
def initialize(self, a_bzrdir, name=None, repository=None,
2136
append_revisions_only=None):
2137
"""Create a branch of this format in a_bzrdir."""
2138
if append_revisions_only:
2139
raise errors.UpgradeRequired(a_bzrdir.user_url)
2140
utf8_files = [('revision-history', ''),
2141
('branch-name', ''),
2143
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2145
def supports_tags(self):
2149
class BzrBranchFormat6(BranchFormatMetadir):
2150
"""Branch format with last-revision and tags.
2152
Unlike previous formats, this has no explicit revision history. Instead,
2153
this just stores the last-revision, and the left-hand history leading
2154
up to there is the history.
2156
This format was introduced in bzr 0.15
2157
and became the default in 0.91.
2160
def _branch_class(self):
2164
def get_format_string(cls):
2165
"""See BranchFormat.get_format_string()."""
2166
return "Bazaar Branch Format 6 (bzr 0.15)\n"
2168
def get_format_description(self):
2169
"""See BranchFormat.get_format_description()."""
2170
return "Branch format 6"
2172
def initialize(self, a_bzrdir, name=None, repository=None,
2173
append_revisions_only=None):
2174
"""Create a branch of this format in a_bzrdir."""
2175
utf8_files = [('last-revision', '0 null:\n'),
2177
self._get_initial_config(append_revisions_only)),
2180
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2182
def make_tags(self, branch):
2183
"""See bzrlib.branch.BranchFormat.make_tags()."""
2184
return _mod_tag.BasicTags(branch)
2186
def supports_set_append_revisions_only(self):
2190
class BzrBranchFormat8(BranchFormatMetadir):
2191
"""Metadir format supporting storing locations of subtree branches."""
2193
def _branch_class(self):
2197
def get_format_string(cls):
2198
"""See BranchFormat.get_format_string()."""
2199
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2201
def get_format_description(self):
2202
"""See BranchFormat.get_format_description()."""
2203
return "Branch format 8"
2205
def initialize(self, a_bzrdir, name=None, repository=None,
2206
append_revisions_only=None):
2207
"""Create a branch of this format in a_bzrdir."""
2208
utf8_files = [('last-revision', '0 null:\n'),
2210
self._get_initial_config(append_revisions_only)),
2214
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2216
def make_tags(self, branch):
2217
"""See bzrlib.branch.BranchFormat.make_tags()."""
2218
return _mod_tag.BasicTags(branch)
2220
def supports_set_append_revisions_only(self):
2223
def supports_stacking(self):
2226
supports_reference_locations = True
2229
class BzrBranchFormat7(BranchFormatMetadir):
2230
"""Branch format with last-revision, tags, and a stacked location pointer.
2232
The stacked location pointer is passed down to the repository and requires
2233
a repository format with supports_external_lookups = True.
2235
This format was introduced in bzr 1.6.
2238
def initialize(self, a_bzrdir, name=None, repository=None,
2239
append_revisions_only=None):
2240
"""Create a branch of this format in a_bzrdir."""
2241
utf8_files = [('last-revision', '0 null:\n'),
2243
self._get_initial_config(append_revisions_only)),
2246
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2248
def _branch_class(self):
2252
def get_format_string(cls):
2253
"""See BranchFormat.get_format_string()."""
2254
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
2256
def get_format_description(self):
2257
"""See BranchFormat.get_format_description()."""
2258
return "Branch format 7"
2260
def supports_set_append_revisions_only(self):
2263
def supports_stacking(self):
2266
def make_tags(self, branch):
2267
"""See bzrlib.branch.BranchFormat.make_tags()."""
2268
return _mod_tag.BasicTags(branch)
2270
supports_reference_locations = False
2273
class BranchReferenceFormat(BranchFormatMetadir):
2274
"""Bzr branch reference format.
2276
Branch references are used in implementing checkouts, they
2277
act as an alias to the real branch which is at some other url.
2285
def get_format_string(cls):
2286
"""See BranchFormat.get_format_string()."""
2287
return "Bazaar-NG Branch Reference Format 1\n"
2289
def get_format_description(self):
2290
"""See BranchFormat.get_format_description()."""
2291
return "Checkout reference format 1"
2293
def get_reference(self, a_bzrdir, name=None):
2294
"""See BranchFormat.get_reference()."""
2295
transport = a_bzrdir.get_branch_transport(None, name=name)
2296
return transport.get_bytes('location')
2298
def set_reference(self, a_bzrdir, name, to_branch):
2299
"""See BranchFormat.set_reference()."""
2300
transport = a_bzrdir.get_branch_transport(None, name=name)
2301
location = transport.put_bytes('location', to_branch.base)
2303
def initialize(self, a_bzrdir, name=None, target_branch=None,
2304
repository=None, append_revisions_only=None):
2305
"""Create a branch of this format in a_bzrdir."""
2306
if target_branch is None:
2307
# this format does not implement branch itself, thus the implicit
2308
# creation contract must see it as uninitializable
2309
raise errors.UninitializableFormat(self)
2310
mutter('creating branch reference in %s', a_bzrdir.user_url)
2311
if a_bzrdir._format.fixed_components:
2312
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2313
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2314
branch_transport.put_bytes('location',
2315
target_branch.user_url)
2316
branch_transport.put_bytes('format', self.as_string())
2318
a_bzrdir, name, _found=True,
2319
possible_transports=[target_branch.bzrdir.root_transport])
2320
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2323
def _make_reference_clone_function(format, a_branch):
2324
"""Create a clone() routine for a branch dynamically."""
2325
def clone(to_bzrdir, revision_id=None,
2326
repository_policy=None):
2327
"""See Branch.clone()."""
2328
return format.initialize(to_bzrdir, target_branch=a_branch)
2329
# cannot obey revision_id limits when cloning a reference ...
2330
# FIXME RBC 20060210 either nuke revision_id for clone, or
2331
# emit some sort of warning/error to the caller ?!
2334
def open(self, a_bzrdir, name=None, _found=False, location=None,
2335
possible_transports=None, ignore_fallbacks=False,
2336
found_repository=None):
2337
"""Return the branch that the branch reference in a_bzrdir points at.
2339
:param a_bzrdir: A BzrDir that contains a branch.
2340
:param name: Name of colocated branch to open, if any
2341
:param _found: a private parameter, do not use it. It is used to
2342
indicate if format probing has already be done.
2343
:param ignore_fallbacks: when set, no fallback branches will be opened
2344
(if there are any). Default is to open fallbacks.
2345
:param location: The location of the referenced branch. If
2346
unspecified, this will be determined from the branch reference in
2348
:param possible_transports: An optional reusable transports list.
2351
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2352
if format.__class__ != self.__class__:
2353
raise AssertionError("wrong format %r found for %r" %
2355
if location is None:
2356
location = self.get_reference(a_bzrdir, name)
2357
real_bzrdir = controldir.ControlDir.open(
2358
location, possible_transports=possible_transports)
2359
result = real_bzrdir.open_branch(name=name,
2360
ignore_fallbacks=ignore_fallbacks,
2361
possible_transports=possible_transports)
2362
# this changes the behaviour of result.clone to create a new reference
2363
# rather than a copy of the content of the branch.
2364
# I did not use a proxy object because that needs much more extensive
2365
# testing, and we are only changing one behaviour at the moment.
2366
# If we decide to alter more behaviours - i.e. the implicit nickname
2367
# then this should be refactored to introduce a tested proxy branch
2368
# and a subclass of that for use in overriding clone() and ....
2370
result.clone = self._make_reference_clone_function(result)
2374
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
2375
"""Branch format registry."""
2377
def __init__(self, other_registry=None):
2378
super(BranchFormatRegistry, self).__init__(other_registry)
2379
self._default_format = None
2381
def set_default(self, format):
2382
self._default_format = format
2384
def get_default(self):
2385
return self._default_format
2388
network_format_registry = registry.FormatRegistry()
2389
"""Registry of formats indexed by their network name.
2391
The network name for a branch format is an identifier that can be used when
2392
referring to formats with smart server operations. See
2393
BranchFormat.network_name() for more detail.
2396
format_registry = BranchFormatRegistry(network_format_registry)
2399
# formats which have no format string are not discoverable
2400
# and not independently creatable, so are not registered.
2401
__format5 = BzrBranchFormat5()
2402
__format6 = BzrBranchFormat6()
2403
__format7 = BzrBranchFormat7()
2404
__format8 = BzrBranchFormat8()
2405
format_registry.register(__format5)
2406
format_registry.register(BranchReferenceFormat())
2407
format_registry.register(__format6)
2408
format_registry.register(__format7)
2409
format_registry.register(__format8)
2410
format_registry.set_default(__format7)
2413
class BranchWriteLockResult(LogicalLockResult):
2414
"""The result of write locking a branch.
2416
:ivar branch_token: The token obtained from the underlying branch lock, or
2418
:ivar unlock: A callable which will unlock the lock.
2421
def __init__(self, unlock, branch_token):
2422
LogicalLockResult.__init__(self, unlock)
2423
self.branch_token = branch_token
2426
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2430
class BzrBranch(Branch, _RelockDebugMixin):
2431
"""A branch stored in the actual filesystem.
2433
Note that it's "local" in the context of the filesystem; it doesn't
2434
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2435
it's writable, and can be accessed via the normal filesystem API.
2437
:ivar _transport: Transport for file operations on this branch's
2438
control files, typically pointing to the .bzr/branch directory.
2439
:ivar repository: Repository for this branch.
2440
:ivar base: The url of the base directory for this branch; the one
2441
containing the .bzr directory.
2442
:ivar name: Optional colocated branch name as it exists in the control
2446
def __init__(self, _format=None,
2447
_control_files=None, a_bzrdir=None, name=None,
2448
_repository=None, ignore_fallbacks=False,
2449
possible_transports=None):
2450
"""Create new branch object at a particular location."""
2451
if a_bzrdir is None:
2452
raise ValueError('a_bzrdir must be supplied')
2454
self.bzrdir = a_bzrdir
2455
self._user_transport = self.bzrdir.transport.clone('..')
2456
if name is not None:
2457
self._user_transport.set_segment_parameter(
2458
"branch", urlutils.escape(name))
2459
self._base = self._user_transport.base
2461
self._format = _format
2462
if _control_files is None:
2463
raise ValueError('BzrBranch _control_files is None')
2464
self.control_files = _control_files
2465
self._transport = _control_files._transport
2466
self.repository = _repository
2467
Branch.__init__(self, possible_transports)
2470
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2474
def _get_base(self):
2475
"""Returns the directory containing the control directory."""
2478
base = property(_get_base, doc="The URL for the root of this branch.")
2481
def user_transport(self):
2482
return self._user_transport
2484
def _get_config(self):
2485
return _mod_config.TransportConfig(self._transport, 'branch.conf')
2487
def _get_config_store(self):
2488
return _mod_config.BranchStore(self)
2490
def is_locked(self):
2491
return self.control_files.is_locked()
2493
def lock_write(self, token=None):
2494
"""Lock the branch for write operations.
2496
:param token: A token to permit reacquiring a previously held and
2498
:return: A BranchWriteLockResult.
2500
if not self.is_locked():
2501
self._note_lock('w')
2502
# All-in-one needs to always unlock/lock.
2503
repo_control = getattr(self.repository, 'control_files', None)
2504
if self.control_files == repo_control or not self.is_locked():
2505
self.repository._warn_if_deprecated(self)
2506
self.repository.lock_write()
2511
return BranchWriteLockResult(self.unlock,
2512
self.control_files.lock_write(token=token))
2515
self.repository.unlock()
2518
def lock_read(self):
2519
"""Lock the branch for read operations.
2521
:return: A bzrlib.lock.LogicalLockResult.
2523
if not self.is_locked():
2524
self._note_lock('r')
2525
# All-in-one needs to always unlock/lock.
2526
repo_control = getattr(self.repository, 'control_files', None)
2527
if self.control_files == repo_control or not self.is_locked():
2528
self.repository._warn_if_deprecated(self)
2529
self.repository.lock_read()
2534
self.control_files.lock_read()
2535
return LogicalLockResult(self.unlock)
2538
self.repository.unlock()
2541
@only_raises(errors.LockNotHeld, errors.LockBroken)
2544
self.control_files.unlock()
2546
# All-in-one needs to always unlock/lock.
2547
repo_control = getattr(self.repository, 'control_files', None)
2548
if (self.control_files == repo_control or
2549
not self.control_files.is_locked()):
2550
self.repository.unlock()
2551
if not self.control_files.is_locked():
2552
# we just released the lock
2553
self._clear_cached_state()
2555
def peek_lock_mode(self):
2556
if self.control_files._lock_count == 0:
2559
return self.control_files._lock_mode
2561
def get_physical_lock_status(self):
2562
return self.control_files.get_physical_lock_status()
2565
def print_file(self, file, revision_id):
2566
"""See Branch.print_file."""
2567
return self.repository.print_file(file, revision_id)
2570
def set_last_revision_info(self, revno, revision_id):
2571
if not revision_id or not isinstance(revision_id, basestring):
2572
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2573
revision_id = _mod_revision.ensure_null(revision_id)
2574
old_revno, old_revid = self.last_revision_info()
2575
if self.get_append_revisions_only():
2576
self._check_history_violation(revision_id)
2577
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2578
self._write_last_revision_info(revno, revision_id)
2579
self._clear_cached_state()
2580
self._last_revision_info_cache = revno, revision_id
2581
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2583
def basis_tree(self):
2584
"""See Branch.basis_tree."""
2585
return self.repository.revision_tree(self.last_revision())
2587
def _get_parent_location(self):
2588
_locs = ['parent', 'pull', 'x-pull']
2591
return self._transport.get_bytes(l).strip('\n')
2592
except errors.NoSuchFile:
2596
def get_stacked_on_url(self):
2597
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2599
def set_push_location(self, location):
2600
"""See Branch.set_push_location."""
2601
self.get_config().set_user_option(
2602
'push_location', location,
2603
store=_mod_config.STORE_LOCATION_NORECURSE)
2605
def _set_parent_location(self, url):
2607
self._transport.delete('parent')
2609
self._transport.put_bytes('parent', url + '\n',
2610
mode=self.bzrdir._get_file_mode())
2614
"""If bound, unbind"""
2615
return self.set_bound_location(None)
2618
def bind(self, other):
2619
"""Bind this branch to the branch other.
2621
This does not push or pull data between the branches, though it does
2622
check for divergence to raise an error when the branches are not
2623
either the same, or one a prefix of the other. That behaviour may not
2624
be useful, so that check may be removed in future.
2626
:param other: The branch to bind to
2629
# TODO: jam 20051230 Consider checking if the target is bound
2630
# It is debatable whether you should be able to bind to
2631
# a branch which is itself bound.
2632
# Committing is obviously forbidden,
2633
# but binding itself may not be.
2634
# Since we *have* to check at commit time, we don't
2635
# *need* to check here
2637
# we want to raise diverged if:
2638
# last_rev is not in the other_last_rev history, AND
2639
# other_last_rev is not in our history, and do it without pulling
2641
self.set_bound_location(other.base)
2643
def get_bound_location(self):
2645
return self._transport.get_bytes('bound')[:-1]
2646
except errors.NoSuchFile:
2650
def get_master_branch(self, possible_transports=None):
2651
"""Return the branch we are bound to.
2653
:return: Either a Branch, or None
2655
if self._master_branch_cache is None:
2656
self._master_branch_cache = self._get_master_branch(
2657
possible_transports)
2658
return self._master_branch_cache
2660
def _get_master_branch(self, possible_transports):
2661
bound_loc = self.get_bound_location()
2665
return Branch.open(bound_loc,
2666
possible_transports=possible_transports)
2667
except (errors.NotBranchError, errors.ConnectionError), e:
2668
raise errors.BoundBranchConnectionFailure(
2672
def set_bound_location(self, location):
2673
"""Set the target where this branch is bound to.
2675
:param location: URL to the target branch
2677
self._master_branch_cache = None
2679
self._transport.put_bytes('bound', location+'\n',
2680
mode=self.bzrdir._get_file_mode())
2683
self._transport.delete('bound')
2684
except errors.NoSuchFile:
2689
def update(self, possible_transports=None):
2690
"""Synchronise this branch with the master branch if any.
2692
:return: None or the last_revision that was pivoted out during the
2695
master = self.get_master_branch(possible_transports)
2696
if master is not None:
2697
old_tip = _mod_revision.ensure_null(self.last_revision())
2698
self.pull(master, overwrite=True)
2699
if self.repository.get_graph().is_ancestor(old_tip,
2700
_mod_revision.ensure_null(self.last_revision())):
2705
def _read_last_revision_info(self):
2706
revision_string = self._transport.get_bytes('last-revision')
2707
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2708
revision_id = cache_utf8.get_cached_utf8(revision_id)
2710
return revno, revision_id
2712
def _write_last_revision_info(self, revno, revision_id):
2713
"""Simply write out the revision id, with no checks.
2715
Use set_last_revision_info to perform this safely.
2717
Does not update the revision_history cache.
2719
revision_id = _mod_revision.ensure_null(revision_id)
2720
out_string = '%d %s\n' % (revno, revision_id)
2721
self._transport.put_bytes('last-revision', out_string,
2722
mode=self.bzrdir._get_file_mode())
2725
class FullHistoryBzrBranch(BzrBranch):
2726
"""Bzr branch which contains the full revision history."""
2729
def set_last_revision_info(self, revno, revision_id):
2730
if not revision_id or not isinstance(revision_id, basestring):
2731
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2732
revision_id = _mod_revision.ensure_null(revision_id)
2733
# this old format stores the full history, but this api doesn't
2734
# provide it, so we must generate, and might as well check it's
2736
history = self._lefthand_history(revision_id)
2737
if len(history) != revno:
2738
raise AssertionError('%d != %d' % (len(history), revno))
2739
self._set_revision_history(history)
2741
def _read_last_revision_info(self):
2742
rh = self._revision_history()
2745
return (revno, rh[-1])
2747
return (0, _mod_revision.NULL_REVISION)
2749
@deprecated_method(deprecated_in((2, 4, 0)))
2751
def set_revision_history(self, rev_history):
2752
"""See Branch.set_revision_history."""
2753
self._set_revision_history(rev_history)
2755
def _set_revision_history(self, rev_history):
2756
if 'evil' in debug.debug_flags:
2757
mutter_callsite(3, "set_revision_history scales with history.")
2758
check_not_reserved_id = _mod_revision.check_not_reserved_id
2759
for rev_id in rev_history:
2760
check_not_reserved_id(rev_id)
2761
if Branch.hooks['post_change_branch_tip']:
2762
# Don't calculate the last_revision_info() if there are no hooks
2764
old_revno, old_revid = self.last_revision_info()
2765
if len(rev_history) == 0:
2766
revid = _mod_revision.NULL_REVISION
2768
revid = rev_history[-1]
2769
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2770
self._write_revision_history(rev_history)
2771
self._clear_cached_state()
2772
self._cache_revision_history(rev_history)
2773
for hook in Branch.hooks['set_rh']:
2774
hook(self, rev_history)
2775
if Branch.hooks['post_change_branch_tip']:
2776
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2778
def _write_revision_history(self, history):
2779
"""Factored out of set_revision_history.
2781
This performs the actual writing to disk.
2782
It is intended to be called by set_revision_history."""
2783
self._transport.put_bytes(
2784
'revision-history', '\n'.join(history),
2785
mode=self.bzrdir._get_file_mode())
2787
def _gen_revision_history(self):
2788
history = self._transport.get_bytes('revision-history').split('\n')
2789
if history[-1:] == ['']:
2790
# There shouldn't be a trailing newline, but just in case.
2794
def _synchronize_history(self, destination, revision_id):
2795
if not isinstance(destination, FullHistoryBzrBranch):
2796
super(BzrBranch, self)._synchronize_history(
2797
destination, revision_id)
2799
if revision_id == _mod_revision.NULL_REVISION:
2802
new_history = self._revision_history()
2803
if revision_id is not None and new_history != []:
2805
new_history = new_history[:new_history.index(revision_id) + 1]
2807
rev = self.repository.get_revision(revision_id)
2808
new_history = rev.get_history(self.repository)[1:]
2809
destination._set_revision_history(new_history)
2812
def generate_revision_history(self, revision_id, last_rev=None,
2814
"""Create a new revision history that will finish with revision_id.
2816
:param revision_id: the new tip to use.
2817
:param last_rev: The previous last_revision. If not None, then this
2818
must be a ancestory of revision_id, or DivergedBranches is raised.
2819
:param other_branch: The other branch that DivergedBranches should
2820
raise with respect to.
2822
self._set_revision_history(self._lefthand_history(revision_id,
2823
last_rev, other_branch))
2826
class BzrBranch5(FullHistoryBzrBranch):
2827
"""A format 5 branch. This supports new features over plain branches.
2829
It has support for a master_branch which is the data for bound branches.
2833
class BzrBranch8(BzrBranch):
2834
"""A branch that stores tree-reference locations."""
2836
def _open_hook(self, possible_transports=None):
2837
if self._ignore_fallbacks:
2839
if possible_transports is None:
2840
possible_transports = [self.bzrdir.root_transport]
2842
url = self.get_stacked_on_url()
2843
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2844
errors.UnstackableBranchFormat):
2847
for hook in Branch.hooks['transform_fallback_location']:
2848
url = hook(self, url)
2850
hook_name = Branch.hooks.get_hook_name(hook)
2851
raise AssertionError(
2852
"'transform_fallback_location' hook %s returned "
2853
"None, not a URL." % hook_name)
2854
self._activate_fallback_location(url,
2855
possible_transports=possible_transports)
2857
def __init__(self, *args, **kwargs):
2858
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2859
super(BzrBranch8, self).__init__(*args, **kwargs)
2860
self._last_revision_info_cache = None
2861
self._reference_info = None
2863
def _clear_cached_state(self):
2864
super(BzrBranch8, self)._clear_cached_state()
2865
self._last_revision_info_cache = None
2866
self._reference_info = None
2868
def _check_history_violation(self, revision_id):
2869
current_revid = self.last_revision()
2870
last_revision = _mod_revision.ensure_null(current_revid)
2871
if _mod_revision.is_null(last_revision):
2873
graph = self.repository.get_graph()
2874
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2875
if lh_ancestor == current_revid:
2877
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2879
def _gen_revision_history(self):
2880
"""Generate the revision history from last revision
2882
last_revno, last_revision = self.last_revision_info()
2883
self._extend_partial_history(stop_index=last_revno-1)
2884
return list(reversed(self._partial_revision_history_cache))
2887
def _set_parent_location(self, url):
2888
"""Set the parent branch"""
2889
self._set_config_location('parent_location', url, make_relative=True)
2892
def _get_parent_location(self):
2893
"""Set the parent branch"""
2894
return self._get_config_location('parent_location')
2897
def _set_all_reference_info(self, info_dict):
2898
"""Replace all reference info stored in a branch.
2900
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2903
writer = rio.RioWriter(s)
2904
for key, (tree_path, branch_location) in info_dict.iteritems():
2905
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2906
branch_location=branch_location)
2907
writer.write_stanza(stanza)
2908
self._transport.put_bytes('references', s.getvalue())
2909
self._reference_info = info_dict
2912
def _get_all_reference_info(self):
2913
"""Return all the reference info stored in a branch.
2915
:return: A dict of {file_id: (tree_path, branch_location)}
2917
if self._reference_info is not None:
2918
return self._reference_info
2919
rio_file = self._transport.get('references')
2921
stanzas = rio.read_stanzas(rio_file)
2922
info_dict = dict((s['file_id'], (s['tree_path'],
2923
s['branch_location'])) for s in stanzas)
2926
self._reference_info = info_dict
2929
def set_reference_info(self, file_id, tree_path, branch_location):
2930
"""Set the branch location to use for a tree reference.
2932
:param file_id: The file-id of the tree reference.
2933
:param tree_path: The path of the tree reference in the tree.
2934
:param branch_location: The location of the branch to retrieve tree
2937
info_dict = self._get_all_reference_info()
2938
info_dict[file_id] = (tree_path, branch_location)
2939
if None in (tree_path, branch_location):
2940
if tree_path is not None:
2941
raise ValueError('tree_path must be None when branch_location'
2943
if branch_location is not None:
2944
raise ValueError('branch_location must be None when tree_path'
2946
del info_dict[file_id]
2947
self._set_all_reference_info(info_dict)
2949
def get_reference_info(self, file_id):
2950
"""Get the tree_path and branch_location for a tree reference.
2952
:return: a tuple of (tree_path, branch_location)
2954
return self._get_all_reference_info().get(file_id, (None, None))
2956
def reference_parent(self, file_id, path, possible_transports=None):
2957
"""Return the parent branch for a tree-reference file_id.
2959
:param file_id: The file_id of the tree reference
2960
:param path: The path of the file_id in the tree
2961
:return: A branch associated with the file_id
2963
branch_location = self.get_reference_info(file_id)[1]
2964
if branch_location is None:
2965
return Branch.reference_parent(self, file_id, path,
2966
possible_transports)
2967
branch_location = urlutils.join(self.user_url, branch_location)
2968
return Branch.open(branch_location,
2969
possible_transports=possible_transports)
2971
def set_push_location(self, location):
2972
"""See Branch.set_push_location."""
2973
self._set_config_location('push_location', location)
2975
def set_bound_location(self, location):
2976
"""See Branch.set_push_location."""
2977
self._master_branch_cache = None
2979
conf = self.get_config_stack()
2980
if location is None:
2981
if not conf.get('bound'):
2984
conf.set('bound', 'False')
2987
self._set_config_location('bound_location', location,
2989
conf.set('bound', 'True')
2992
def _get_bound_location(self, bound):
2993
"""Return the bound location in the config file.
2995
Return None if the bound parameter does not match"""
2996
conf = self.get_config_stack()
2997
if conf.get('bound') != bound:
2999
return self._get_config_location('bound_location', config=conf)
3001
def get_bound_location(self):
3002
"""See Branch.set_push_location."""
3003
return self._get_bound_location(True)
3005
def get_old_bound_location(self):
3006
"""See Branch.get_old_bound_location"""
3007
return self._get_bound_location(False)
3009
def get_stacked_on_url(self):
3010
# you can always ask for the URL; but you might not be able to use it
3011
# if the repo can't support stacking.
3012
## self._check_stackable_repo()
3013
# stacked_on_location is only ever defined in branch.conf, so don't
3014
# waste effort reading the whole stack of config files.
3015
conf = _mod_config.BranchOnlyStack(self)
3016
stacked_url = self._get_config_location('stacked_on_location',
3018
if stacked_url is None:
3019
raise errors.NotStacked(self)
3023
def get_rev_id(self, revno, history=None):
3024
"""Find the revision id of the specified revno."""
3026
return _mod_revision.NULL_REVISION
3028
last_revno, last_revision_id = self.last_revision_info()
3029
if revno <= 0 or revno > last_revno:
3030
raise errors.NoSuchRevision(self, revno)
3032
if history is not None:
3033
return history[revno - 1]
3035
index = last_revno - revno
3036
if len(self._partial_revision_history_cache) <= index:
3037
self._extend_partial_history(stop_index=index)
3038
if len(self._partial_revision_history_cache) > index:
3039
return self._partial_revision_history_cache[index]
3041
raise errors.NoSuchRevision(self, revno)
3044
def revision_id_to_revno(self, revision_id):
3045
"""Given a revision id, return its revno"""
3046
if _mod_revision.is_null(revision_id):
3049
index = self._partial_revision_history_cache.index(revision_id)
3052
self._extend_partial_history(stop_revision=revision_id)
3053
except errors.RevisionNotPresent, e:
3054
raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3055
index = len(self._partial_revision_history_cache) - 1
3057
raise errors.NoSuchRevision(self, revision_id)
3058
if self._partial_revision_history_cache[index] != revision_id:
3059
raise errors.NoSuchRevision(self, revision_id)
3060
return self.revno() - index
3063
class BzrBranch7(BzrBranch8):
3064
"""A branch with support for a fallback repository."""
3066
def set_reference_info(self, file_id, tree_path, branch_location):
3067
Branch.set_reference_info(self, file_id, tree_path, branch_location)
3069
def get_reference_info(self, file_id):
3070
Branch.get_reference_info(self, file_id)
3072
def reference_parent(self, file_id, path, possible_transports=None):
3073
return Branch.reference_parent(self, file_id, path,
3074
possible_transports)
3077
class BzrBranch6(BzrBranch7):
3078
"""See BzrBranchFormat6 for the capabilities of this branch.
3080
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
3084
def get_stacked_on_url(self):
3085
raise errors.UnstackableBranchFormat(self._format, self.user_url)
3088
######################################################################
3089
# results of operations
3092
class _Result(object):
3094
def _show_tag_conficts(self, to_file):
3095
if not getattr(self, 'tag_conflicts', None):
3097
to_file.write('Conflicting tags:\n')
3098
for name, value1, value2 in self.tag_conflicts:
3099
to_file.write(' %s\n' % (name, ))
3102
class PullResult(_Result):
3103
"""Result of a Branch.pull operation.
3105
:ivar old_revno: Revision number before pull.
3106
:ivar new_revno: Revision number after pull.
3107
:ivar old_revid: Tip revision id before pull.
3108
:ivar new_revid: Tip revision id after pull.
3109
:ivar source_branch: Source (local) branch object. (read locked)
3110
:ivar master_branch: Master branch of the target, or the target if no
3112
:ivar local_branch: target branch if there is a Master, else None
3113
:ivar target_branch: Target/destination branch object. (write locked)
3114
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3115
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
3118
@deprecated_method(deprecated_in((2, 3, 0)))
3120
"""Return the relative change in revno.
3122
:deprecated: Use `new_revno` and `old_revno` instead.
3124
return self.new_revno - self.old_revno
3126
def report(self, to_file):
3127
tag_conflicts = getattr(self, "tag_conflicts", None)
3128
tag_updates = getattr(self, "tag_updates", None)
3130
if self.old_revid != self.new_revid:
3131
to_file.write('Now on revision %d.\n' % self.new_revno)
3133
to_file.write('%d tag(s) updated.\n' % len(tag_updates))
3134
if self.old_revid == self.new_revid and not tag_updates:
3135
if not tag_conflicts:
3136
to_file.write('No revisions or tags to pull.\n')
3138
to_file.write('No revisions to pull.\n')
3139
self._show_tag_conficts(to_file)
3142
class BranchPushResult(_Result):
3143
"""Result of a Branch.push operation.
3145
:ivar old_revno: Revision number (eg 10) of the target before push.
3146
:ivar new_revno: Revision number (eg 12) of the target after push.
3147
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3149
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3151
:ivar source_branch: Source branch object that the push was from. This is
3152
read locked, and generally is a local (and thus low latency) branch.
3153
:ivar master_branch: If target is a bound branch, the master branch of
3154
target, or target itself. Always write locked.
3155
:ivar target_branch: The direct Branch where data is being sent (write
3157
:ivar local_branch: If the target is a bound branch this will be the
3158
target, otherwise it will be None.
3161
@deprecated_method(deprecated_in((2, 3, 0)))
3163
"""Return the relative change in revno.
3165
:deprecated: Use `new_revno` and `old_revno` instead.
3167
return self.new_revno - self.old_revno
3169
def report(self, to_file):
3170
# TODO: This function gets passed a to_file, but then
3171
# ignores it and calls note() instead. This is also
3172
# inconsistent with PullResult(), which writes to stdout.
3173
# -- JRV20110901, bug #838853
3174
tag_conflicts = getattr(self, "tag_conflicts", None)
3175
tag_updates = getattr(self, "tag_updates", None)
3177
if self.old_revid != self.new_revid:
3178
note(gettext('Pushed up to revision %d.') % self.new_revno)
3180
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
3181
if self.old_revid == self.new_revid and not tag_updates:
3182
if not tag_conflicts:
3183
note(gettext('No new revisions or tags to push.'))
3185
note(gettext('No new revisions to push.'))
3186
self._show_tag_conficts(to_file)
3189
class BranchCheckResult(object):
3190
"""Results of checking branch consistency.
3195
def __init__(self, branch):
3196
self.branch = branch
3199
def report_results(self, verbose):
3200
"""Report the check results via trace.note.
3202
:param verbose: Requests more detailed display of what was checked,
3205
note(gettext('checked branch {0} format {1}').format(
3206
self.branch.user_url, self.branch._format))
3207
for error in self.errors:
3208
note(gettext('found error:%s'), error)
3211
class Converter5to6(object):
3212
"""Perform an in-place upgrade of format 5 to format 6"""
3214
def convert(self, branch):
3215
# Data for 5 and 6 can peacefully coexist.
3216
format = BzrBranchFormat6()
3217
new_branch = format.open(branch.bzrdir, _found=True)
3219
# Copy source data into target
3220
new_branch._write_last_revision_info(*branch.last_revision_info())
3221
new_branch.set_parent(branch.get_parent())
3222
new_branch.set_bound_location(branch.get_bound_location())
3223
new_branch.set_push_location(branch.get_push_location())
3225
# New branch has no tags by default
3226
new_branch.tags._set_tag_dict({})
3228
# Copying done; now update target format
3229
new_branch._transport.put_bytes('format',
3231
mode=new_branch.bzrdir._get_file_mode())
3233
# Clean up old files
3234
new_branch._transport.delete('revision-history')
3236
branch.set_parent(None)
3237
except errors.NoSuchFile:
3239
branch.set_bound_location(None)
3242
class Converter6to7(object):
3243
"""Perform an in-place upgrade of format 6 to format 7"""
3245
def convert(self, branch):
3246
format = BzrBranchFormat7()
3247
branch._set_config_location('stacked_on_location', '')
3248
# update target format
3249
branch._transport.put_bytes('format', format.as_string())
3252
class Converter7to8(object):
3253
"""Perform an in-place upgrade of format 7 to format 8"""
3255
def convert(self, branch):
3256
format = BzrBranchFormat8()
3257
branch._transport.put_bytes('references', '')
3258
# update target format
3259
branch._transport.put_bytes('format', format.as_string())
3262
class InterBranch(InterObject):
3263
"""This class represents operations taking place between two branches.
3265
Its instances have methods like pull() and push() and contain
3266
references to the source and target repositories these operations
3267
can be carried out on.
3271
"""The available optimised InterBranch types."""
3274
def _get_branch_formats_to_test(klass):
3275
"""Return an iterable of format tuples for testing.
3277
:return: An iterable of (from_format, to_format) to use when testing
3278
this InterBranch class. Each InterBranch class should define this
3281
raise NotImplementedError(klass._get_branch_formats_to_test)
3284
def pull(self, overwrite=False, stop_revision=None,
3285
possible_transports=None, local=False):
3286
"""Mirror source into target branch.
3288
The target branch is considered to be 'local', having low latency.
3290
:returns: PullResult instance
3292
raise NotImplementedError(self.pull)
3295
def push(self, overwrite=False, stop_revision=None, lossy=False,
3296
_override_hook_source_branch=None):
3297
"""Mirror the source branch into the target branch.
3299
The source branch is considered to be 'local', having low latency.
3301
raise NotImplementedError(self.push)
3304
def copy_content_into(self, revision_id=None):
3305
"""Copy the content of source into target
3307
revision_id: if not None, the revision history in the new branch will
3308
be truncated to end with revision_id.
3310
raise NotImplementedError(self.copy_content_into)
3313
def fetch(self, stop_revision=None, limit=None):
3316
:param stop_revision: Last revision to fetch
3317
:param limit: Optional rough limit of revisions to fetch
3319
raise NotImplementedError(self.fetch)
3322
class GenericInterBranch(InterBranch):
3323
"""InterBranch implementation that uses public Branch functions."""
3326
def is_compatible(klass, source, target):
3327
# GenericBranch uses the public API, so always compatible
3331
def _get_branch_formats_to_test(klass):
3332
return [(format_registry.get_default(), format_registry.get_default())]
3335
def unwrap_format(klass, format):
3336
if isinstance(format, remote.RemoteBranchFormat):
3337
format._ensure_real()
3338
return format._custom_format
3342
def copy_content_into(self, revision_id=None):
3343
"""Copy the content of source into target
3345
revision_id: if not None, the revision history in the new branch will
3346
be truncated to end with revision_id.
3348
self.source.update_references(self.target)
3349
self.source._synchronize_history(self.target, revision_id)
3351
parent = self.source.get_parent()
3352
except errors.InaccessibleParent, e:
3353
mutter('parent was not accessible to copy: %s', e)
3356
self.target.set_parent(parent)
3357
if self.source._push_should_merge_tags():
3358
self.source.tags.merge_to(self.target.tags)
3361
def fetch(self, stop_revision=None, limit=None):
3362
if self.target.base == self.source.base:
3364
self.source.lock_read()
3366
fetch_spec_factory = fetch.FetchSpecFactory()
3367
fetch_spec_factory.source_branch = self.source
3368
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3369
fetch_spec_factory.source_repo = self.source.repository
3370
fetch_spec_factory.target_repo = self.target.repository
3371
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3372
fetch_spec_factory.limit = limit
3373
fetch_spec = fetch_spec_factory.make_fetch_spec()
3374
return self.target.repository.fetch(self.source.repository,
3375
fetch_spec=fetch_spec)
3377
self.source.unlock()
3380
def _update_revisions(self, stop_revision=None, overwrite=False,
3382
other_revno, other_last_revision = self.source.last_revision_info()
3383
stop_revno = None # unknown
3384
if stop_revision is None:
3385
stop_revision = other_last_revision
3386
if _mod_revision.is_null(stop_revision):
3387
# if there are no commits, we're done.
3389
stop_revno = other_revno
3391
# what's the current last revision, before we fetch [and change it
3393
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3394
# we fetch here so that we don't process data twice in the common
3395
# case of having something to pull, and so that the check for
3396
# already merged can operate on the just fetched graph, which will
3397
# be cached in memory.
3398
self.fetch(stop_revision=stop_revision)
3399
# Check to see if one is an ancestor of the other
3402
graph = self.target.repository.get_graph()
3403
if self.target._check_if_descendant_or_diverged(
3404
stop_revision, last_rev, graph, self.source):
3405
# stop_revision is a descendant of last_rev, but we aren't
3406
# overwriting, so we're done.
3408
if stop_revno is None:
3410
graph = self.target.repository.get_graph()
3411
this_revno, this_last_revision = \
3412
self.target.last_revision_info()
3413
stop_revno = graph.find_distance_to_null(stop_revision,
3414
[(other_last_revision, other_revno),
3415
(this_last_revision, this_revno)])
3416
self.target.set_last_revision_info(stop_revno, stop_revision)
3419
def pull(self, overwrite=False, stop_revision=None,
3420
possible_transports=None, run_hooks=True,
3421
_override_hook_target=None, local=False):
3422
"""Pull from source into self, updating my master if any.
3424
:param run_hooks: Private parameter - if false, this branch
3425
is being called because it's the master of the primary branch,
3426
so it should not run its hooks.
3428
bound_location = self.target.get_bound_location()
3429
if local and not bound_location:
3430
raise errors.LocalRequiresBoundBranch()
3431
master_branch = None
3432
source_is_master = False
3434
# bound_location comes from a config file, some care has to be
3435
# taken to relate it to source.user_url
3436
normalized = urlutils.normalize_url(bound_location)
3438
relpath = self.source.user_transport.relpath(normalized)
3439
source_is_master = (relpath == '')
3440
except (errors.PathNotChild, errors.InvalidURL):
3441
source_is_master = False
3442
if not local and bound_location and not source_is_master:
3443
# not pulling from master, so we need to update master.
3444
master_branch = self.target.get_master_branch(possible_transports)
3445
master_branch.lock_write()
3448
# pull from source into master.
3449
master_branch.pull(self.source, overwrite, stop_revision,
3451
return self._pull(overwrite,
3452
stop_revision, _hook_master=master_branch,
3453
run_hooks=run_hooks,
3454
_override_hook_target=_override_hook_target,
3455
merge_tags_to_master=not source_is_master)
3458
master_branch.unlock()
3460
def push(self, overwrite=False, stop_revision=None, lossy=False,
3461
_override_hook_source_branch=None):
3462
"""See InterBranch.push.
3464
This is the basic concrete implementation of push()
3466
:param _override_hook_source_branch: If specified, run the hooks
3467
passing this Branch as the source, rather than self. This is for
3468
use of RemoteBranch, where push is delegated to the underlying
3472
raise errors.LossyPushToSameVCS(self.source, self.target)
3473
# TODO: Public option to disable running hooks - should be trivial but
3476
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3477
op.add_cleanup(self.source.lock_read().unlock)
3478
op.add_cleanup(self.target.lock_write().unlock)
3479
return op.run(overwrite, stop_revision,
3480
_override_hook_source_branch=_override_hook_source_branch)
3482
def _basic_push(self, overwrite, stop_revision):
3483
"""Basic implementation of push without bound branches or hooks.
3485
Must be called with source read locked and target write locked.
3487
result = BranchPushResult()
3488
result.source_branch = self.source
3489
result.target_branch = self.target
3490
result.old_revno, result.old_revid = self.target.last_revision_info()
3491
self.source.update_references(self.target)
3492
if result.old_revid != stop_revision:
3493
# We assume that during 'push' this repository is closer than
3495
graph = self.source.repository.get_graph(self.target.repository)
3496
self._update_revisions(stop_revision, overwrite=overwrite,
3498
if self.source._push_should_merge_tags():
3499
result.tag_updates, result.tag_conflicts = (
3500
self.source.tags.merge_to(self.target.tags, overwrite))
3501
result.new_revno, result.new_revid = self.target.last_revision_info()
3504
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3505
_override_hook_source_branch=None):
3506
"""Push from source into target, and into target's master if any.
3509
if _override_hook_source_branch:
3510
result.source_branch = _override_hook_source_branch
3511
for hook in Branch.hooks['post_push']:
3514
bound_location = self.target.get_bound_location()
3515
if bound_location and self.target.base != bound_location:
3516
# there is a master branch.
3518
# XXX: Why the second check? Is it even supported for a branch to
3519
# be bound to itself? -- mbp 20070507
3520
master_branch = self.target.get_master_branch()
3521
master_branch.lock_write()
3522
operation.add_cleanup(master_branch.unlock)
3523
# push into the master from the source branch.
3524
master_inter = InterBranch.get(self.source, master_branch)
3525
master_inter._basic_push(overwrite, stop_revision)
3526
# and push into the target branch from the source. Note that
3527
# we push from the source branch again, because it's considered
3528
# the highest bandwidth repository.
3529
result = self._basic_push(overwrite, stop_revision)
3530
result.master_branch = master_branch
3531
result.local_branch = self.target
3533
master_branch = None
3535
result = self._basic_push(overwrite, stop_revision)
3536
# TODO: Why set master_branch and local_branch if there's no
3537
# binding? Maybe cleaner to just leave them unset? -- mbp
3539
result.master_branch = self.target
3540
result.local_branch = None
3544
def _pull(self, overwrite=False, stop_revision=None,
3545
possible_transports=None, _hook_master=None, run_hooks=True,
3546
_override_hook_target=None, local=False,
3547
merge_tags_to_master=True):
3550
This function is the core worker, used by GenericInterBranch.pull to
3551
avoid duplication when pulling source->master and source->local.
3553
:param _hook_master: Private parameter - set the branch to
3554
be supplied as the master to pull hooks.
3555
:param run_hooks: Private parameter - if false, this branch
3556
is being called because it's the master of the primary branch,
3557
so it should not run its hooks.
3558
is being called because it's the master of the primary branch,
3559
so it should not run its hooks.
3560
:param _override_hook_target: Private parameter - set the branch to be
3561
supplied as the target_branch to pull hooks.
3562
:param local: Only update the local branch, and not the bound branch.
3564
# This type of branch can't be bound.
3566
raise errors.LocalRequiresBoundBranch()
3567
result = PullResult()
3568
result.source_branch = self.source
3569
if _override_hook_target is None:
3570
result.target_branch = self.target
3572
result.target_branch = _override_hook_target
3573
self.source.lock_read()
3575
# We assume that during 'pull' the target repository is closer than
3577
self.source.update_references(self.target)
3578
graph = self.target.repository.get_graph(self.source.repository)
3579
# TODO: Branch formats should have a flag that indicates
3580
# that revno's are expensive, and pull() should honor that flag.
3582
result.old_revno, result.old_revid = \
3583
self.target.last_revision_info()
3584
self._update_revisions(stop_revision, overwrite=overwrite,
3586
# TODO: The old revid should be specified when merging tags,
3587
# so a tags implementation that versions tags can only
3588
# pull in the most recent changes. -- JRV20090506
3589
result.tag_updates, result.tag_conflicts = (
3590
self.source.tags.merge_to(self.target.tags, overwrite,
3591
ignore_master=not merge_tags_to_master))
3592
result.new_revno, result.new_revid = self.target.last_revision_info()
3594
result.master_branch = _hook_master
3595
result.local_branch = result.target_branch
3597
result.master_branch = result.target_branch
3598
result.local_branch = None
3600
for hook in Branch.hooks['post_pull']:
3603
self.source.unlock()
3607
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
