14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
from cStringIO import StringIO
21
from bzrlib.lazy_import import lazy_import
17
from __future__ import absolute_import
21
from .lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
from itertools import chain
27
config as _mod_config,
33
revision as _mod_revision,
41
from bzrlib.config import BranchConfig, TransportConfig
42
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack5RichRoot
43
from bzrlib.tag import (
29
config as _mod_config,
38
revision as _mod_revision,
47
from breezy.i18n import gettext, ngettext
49
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
50
from bzrlib.hooks import HookPoint, Hooks
51
from bzrlib.inter import InterObject
52
from bzrlib.lock import _RelockDebugMixin
53
from bzrlib import registry
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
61
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
62
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
63
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
66
class Branch(bzrdir.ControlComponent):
50
# Explicitly import breezy.bzrdir so that the BzrProber
51
# is guaranteed to be registered.
59
from .decorators import (
64
from .hooks import Hooks
65
from .inter import InterObject
66
from .lock import _RelockDebugMixin, LogicalLockResult
71
from .trace import mutter, mutter_callsite, note, is_quiet
74
class Branch(controldir.ControlComponent):
67
75
"""Branch holding a history of revisions.
70
78
Base directory/url of the branch; using control_url and
71
79
control_transport is more standardized.
73
hooks: An instance of BranchHooks.
80
:ivar hooks: An instance of BranchHooks.
81
:ivar _master_branch_cache: cached result of get_master_branch, see
75
84
# this is really an instance variable - FIXME move it there
782
864
old_repository = self.repository
783
865
if len(old_repository._fallback_repositories) != 1:
784
866
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
867
"of %r (fallbacks: %r)" % (old_repository,
868
old_repository._fallback_repositories))
869
# Open the new repository object.
870
# Repositories don't offer an interface to remove fallback
871
# repositories today; take the conceptually simpler option and just
872
# reopen it. We reopen it starting from the URL so that we
873
# get a separate connection for RemoteRepositories and can
874
# stream from one of them to the other. This does mean doing
875
# separate SSH connection setup, but unstacking is not a
876
# common operation so it's tolerable.
877
new_bzrdir = controldir.ControlDir.open(
878
self.bzrdir.root_transport.base)
879
new_repository = new_bzrdir.find_repository()
880
if new_repository._fallback_repositories:
881
raise AssertionError("didn't expect %r to have "
882
"fallback_repositories"
883
% (self.repository,))
884
# Replace self.repository with the new repository.
885
# Do our best to transfer the lock state (i.e. lock-tokens and
886
# lock count) of self.repository to the new repository.
887
lock_token = old_repository.lock_write().repository_token
888
self.repository = new_repository
889
if isinstance(self, remote.RemoteBranch):
890
# Remote branches can have a second reference to the old
891
# repository that need to be replaced.
892
if self._real_branch is not None:
893
self._real_branch.repository = new_repository
894
self.repository.lock_write(token=lock_token)
895
if lock_token is not None:
896
old_repository.leave_lock_in_place()
787
897
old_repository.unlock()
898
if lock_token is not None:
899
# XXX: self.repository.leave_lock_in_place() before this
900
# function will not be preserved. Fortunately that doesn't
901
# affect the current default format (2a), and would be a
902
# corner-case anyway.
903
# - Andrew Bennetts, 2010/06/30
904
self.repository.dont_leave_lock_in_place()
908
old_repository.unlock()
909
except errors.LockNotHeld:
912
if old_lock_count == 0:
913
raise AssertionError(
914
'old_repository should have been locked at least once.')
915
for i in range(old_lock_count-1):
916
self.repository.lock_write()
917
# Fetch from the old repository into the new.
788
918
old_repository.lock_read()
790
# Repositories don't offer an interface to remove fallback
791
# repositories today; take the conceptually simpler option and just
792
# reopen it. We reopen it starting from the URL so that we
793
# get a separate connection for RemoteRepositories and can
794
# stream from one of them to the other. This does mean doing
795
# separate SSH connection setup, but unstacking is not a
796
# common operation so it's tolerable.
797
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
798
new_repository = new_bzrdir.find_repository()
799
self.repository = new_repository
800
if self.repository._fallback_repositories:
801
raise AssertionError("didn't expect %r to have "
802
"fallback_repositories"
803
% (self.repository,))
804
# this is not paired with an unlock because it's just restoring
805
# the previous state; the lock's released when set_stacked_on_url
807
self.repository.lock_write()
808
920
# XXX: If you unstack a branch while it has a working tree
809
921
# with a pending merge, the pending-merged revisions will no
810
922
# longer be present. You can (probably) revert and remerge.
812
# XXX: This only fetches up to the tip of the repository; it
813
# doesn't bring across any tags. That's fairly consistent
814
# with how branch works, but perhaps not ideal.
815
self.repository.fetch(old_repository,
816
revision_id=self.last_revision(),
924
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
925
except errors.TagsNotSupported:
926
tags_to_fetch = set()
927
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
928
old_repository, required_ids=[self.last_revision()],
929
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
930
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
932
old_repository.unlock()
917
1031
:return: A tuple (revno, revision_id).
919
1033
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1034
self._last_revision_info_cache = self._read_last_revision_info()
921
1035
return self._last_revision_info_cache
923
def _last_revision_info(self):
924
rh = self.revision_history()
927
return (revno, rh[-1])
929
return (0, _mod_revision.NULL_REVISION)
931
@deprecated_method(deprecated_in((1, 6, 0)))
932
def missing_revisions(self, other, stop_revision=None):
933
"""Return a list of new revisions that would perfectly fit.
935
If self and other have not diverged, return a list of the revisions
936
present in other, but missing from self.
938
self_history = self.revision_history()
939
self_len = len(self_history)
940
other_history = other.revision_history()
941
other_len = len(other_history)
942
common_index = min(self_len, other_len) -1
943
if common_index >= 0 and \
944
self_history[common_index] != other_history[common_index]:
945
raise errors.DivergedBranches(self, other)
947
if stop_revision is None:
948
stop_revision = other_len
950
if stop_revision > other_len:
951
raise errors.NoSuchRevision(self, stop_revision)
952
return other_history[self_len:stop_revision]
955
def update_revisions(self, other, stop_revision=None, overwrite=False,
957
"""Pull in new perfect-fit revisions.
959
:param other: Another Branch to pull from
960
:param stop_revision: Updated until the given revision
961
:param overwrite: Always set the branch pointer, rather than checking
962
to see if it is a proper descendant.
963
:param graph: A Graph object that can be used to query history
964
information. This can be None.
967
return InterBranch.get(other, self).update_revisions(stop_revision,
970
def import_last_revision_info(self, source_repo, revno, revid):
1037
def _read_last_revision_info(self):
1038
raise NotImplementedError(self._read_last_revision_info)
1040
def import_last_revision_info_and_tags(self, source, revno, revid,
971
1042
"""Set the last revision info, importing from another repo if necessary.
973
1044
This is used by the bound branch code to upload a revision to
974
1045
the master branch first before updating the tip of the local branch.
1046
Revisions referenced by source's tags are also transferred.
976
:param source_repo: Source repository to optionally fetch from
1048
:param source: Source branch to optionally fetch from
977
1049
:param revno: Revision number of the new tip
978
1050
:param revid: Revision id of the new tip
1051
:param lossy: Whether to discard metadata that can not be
1052
natively represented
1053
:return: Tuple with the new revision number and revision id
1054
(should only be different from the arguments when lossy=True)
980
if not self.repository.has_same_location(source_repo):
981
self.repository.fetch(source_repo, revision_id=revid)
1056
if not self.repository.has_same_location(source.repository):
1057
self.fetch(source, revid)
982
1058
self.set_last_revision_info(revno, revid)
1059
return (revno, revid)
984
1061
def revision_id_to_revno(self, revision_id):
985
1062
"""Given a revision id, return its revno"""
986
1063
if _mod_revision.is_null(revision_id):
988
history = self.revision_history()
1065
history = self._revision_history()
990
1067
return history.index(revision_id) + 1
991
1068
except ValueError:
1490
1573
object will be created every time regardless.
1493
_default_format = None
1494
"""The default format used for new branches."""
1497
"""The known formats."""
1499
can_set_append_revisions_only = True
1501
1576
def __eq__(self, other):
1502
1577
return self.__class__ is other.__class__
1504
1579
def __ne__(self, other):
1505
1580
return not (self == other)
1508
def find_format(klass, a_bzrdir, name=None):
1509
"""Return the format for the branch object in a_bzrdir."""
1511
transport = a_bzrdir.get_branch_transport(None, name=name)
1512
format_string = transport.get_bytes("format")
1513
return klass._formats[format_string]
1514
except errors.NoSuchFile:
1515
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1517
raise errors.UnknownFormatError(format=format_string, kind='branch')
1520
def get_default_format(klass):
1521
"""Return the current default format."""
1522
return klass._default_format
1524
def get_reference(self, a_bzrdir):
1525
"""Get the target reference of the branch in a_bzrdir.
1582
def get_reference(self, controldir, name=None):
1583
"""Get the target reference of the branch in controldir.
1527
1585
format probing must have been completed before calling
1528
1586
this method - it is assumed that the format of the branch
1529
in a_bzrdir is correct.
1587
in controldir is correct.
1531
:param a_bzrdir: The bzrdir to get the branch data from.
1589
:param controldir: The controldir to get the branch data from.
1590
:param name: Name of the colocated branch to fetch
1532
1591
:return: None if the branch is not a reference branch.
1537
def set_reference(self, a_bzrdir, to_branch):
1538
"""Set the target reference of the branch in a_bzrdir.
1596
def set_reference(self, controldir, name, to_branch):
1597
"""Set the target reference of the branch in controldir.
1540
1599
format probing must have been completed before calling
1541
1600
this method - it is assumed that the format of the branch
1542
in a_bzrdir is correct.
1601
in controldir is correct.
1544
:param a_bzrdir: The bzrdir to set the branch reference for.
1603
:param controldir: The controldir to set the branch reference for.
1604
:param name: Name of colocated branch to set, None for default
1545
1605
:param to_branch: branch that the checkout is to reference
1547
1607
raise NotImplementedError(self.set_reference)
1549
def get_format_string(self):
1550
"""Return the ASCII format string that identifies this format."""
1551
raise NotImplementedError(self.get_format_string)
1553
1609
def get_format_description(self):
1554
1610
"""Return the short format description for this format."""
1555
1611
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1613
def _run_post_branch_init_hooks(self, controldir, name, branch):
1558
1614
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1617
params = BranchInitHookParams(self, controldir, name, branch)
1562
1618
for hook in hooks:
1565
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1566
lock_type='metadir', set_format=True):
1567
"""Initialize a branch in a bzrdir, with specified files
1569
:param a_bzrdir: The bzrdir to initialize the branch in
1570
:param utf8_files: The files to create as a list of
1571
(filename, content) tuples
1572
:param name: Name of colocated branch to create, if any
1573
:param set_format: If True, set the format with
1574
self.get_format_string. (BzrBranch4 has its format set
1576
:return: a branch in this format
1578
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1579
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1581
'metadir': ('lock', lockdir.LockDir),
1582
'branch4': ('branch-lock', lockable_files.TransportLock),
1584
lock_name, lock_class = lock_map[lock_type]
1585
control_files = lockable_files.LockableFiles(branch_transport,
1586
lock_name, lock_class)
1587
control_files.create_lock()
1589
control_files.lock_write()
1590
except errors.LockContention:
1591
if lock_type != 'branch4':
1597
utf8_files += [('format', self.get_format_string())]
1599
for (filename, content) in utf8_files:
1600
branch_transport.put_bytes(
1602
mode=a_bzrdir._get_file_mode())
1605
control_files.unlock()
1606
branch = self.open(a_bzrdir, name, _found=True)
1607
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1610
def initialize(self, a_bzrdir, name=None):
1611
"""Create a branch of this format in a_bzrdir.
1621
def initialize(self, controldir, name=None, repository=None,
1622
append_revisions_only=None):
1623
"""Create a branch of this format in controldir.
1613
1625
:param name: Name of the colocated branch to create.
1615
1627
raise NotImplementedError(self.initialize)
1731
1762
"basis revision. hooks MUST NOT modify this delta. "
1732
1763
" future_tree is an in-memory tree obtained from "
1733
1764
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1766
self.add_hook('post_commit',
1736
1767
"Called in the bzr client after a commit has completed. "
1737
1768
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1769
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1739
"commit to a branch.", (0, 15), None))
1740
self.create_hook(HookPoint('post_uncommit',
1770
"commit to a branch.", (0, 15))
1771
self.add_hook('post_uncommit',
1741
1772
"Called in the bzr client after an uncommit completes. "
1742
1773
"post_uncommit is called with (local, master, old_revno, "
1743
1774
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1775
"or None, master is the target branch, and an empty branch "
1745
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1746
self.create_hook(HookPoint('pre_change_branch_tip',
1776
"receives new_revno of 0, new_revid of None.", (0, 15))
1777
self.add_hook('pre_change_branch_tip',
1747
1778
"Called in bzr client and server before a change to the tip of a "
1748
1779
"branch is made. pre_change_branch_tip is called with a "
1749
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1750
"commit, uncommit will all trigger this hook.", (1, 6), None))
1751
self.create_hook(HookPoint('post_change_branch_tip',
1780
"breezy.branch.ChangeBranchTipParams. Note that push, pull, "
1781
"commit, uncommit will all trigger this hook.", (1, 6))
1782
self.add_hook('post_change_branch_tip',
1752
1783
"Called in bzr client and server after a change to the tip of a "
1753
1784
"branch is made. post_change_branch_tip is called with a "
1754
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1755
"commit, uncommit will all trigger this hook.", (1, 4), None))
1756
self.create_hook(HookPoint('transform_fallback_location',
1785
"breezy.branch.ChangeBranchTipParams. Note that push, pull, "
1786
"commit, uncommit will all trigger this hook.", (1, 4))
1787
self.add_hook('transform_fallback_location',
1757
1788
"Called when a stacked branch is activating its fallback "
1758
1789
"locations. transform_fallback_location is called with (branch, "
1759
1790
"url), and should return a new url. Returning the same url "
1904
1930
self.revision_id)
1907
class BzrBranchFormat4(BranchFormat):
1908
"""Bzr branch format 4.
1911
- a revision-history file.
1912
- a branch-lock lock file [ to be shared with the bzrdir ]
1933
class BranchFormatMetadir(bzrdir.BzrFormat, BranchFormat):
1934
"""Base class for branch formats that live in meta directories.
1915
def get_format_description(self):
1916
"""See BranchFormat.get_format_description()."""
1917
return "Branch format 4"
1919
def initialize(self, a_bzrdir, name=None):
1920
"""Create a branch of this format in a_bzrdir."""
1921
utf8_files = [('revision-history', ''),
1922
('branch-name', ''),
1924
return self._initialize_helper(a_bzrdir, utf8_files, name=name,
1925
lock_type='branch4', set_format=False)
1927
1937
def __init__(self):
1928
super(BzrBranchFormat4, self).__init__()
1929
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1931
def network_name(self):
1932
"""The network name for this format is the control dirs disk label."""
1933
return self._matchingbzrdir.get_format_string()
1935
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1936
"""See BranchFormat.open()."""
1938
# we are being called directly and must probe.
1939
raise NotImplementedError
1940
return BzrBranch(_format=self,
1941
_control_files=a_bzrdir._control_files,
1944
_repository=a_bzrdir.open_repository())
1947
return "Bazaar-NG branch format 4"
1950
class BranchFormatMetadir(BranchFormat):
1951
"""Common logic for meta-dir based branch formats."""
1938
BranchFormat.__init__(self)
1939
bzrdir.BzrFormat.__init__(self)
1942
def find_format(klass, controldir, name=None):
1943
"""Return the format for the branch object in controldir."""
1945
transport = controldir.get_branch_transport(None, name=name)
1946
except errors.NoSuchFile:
1947
raise errors.NotBranchError(path=name, bzrdir=controldir)
1949
format_string = transport.get_bytes("format")
1950
except errors.NoSuchFile:
1951
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1952
return klass._find_format(format_registry, 'branch', format_string)
1953
1954
def _branch_class(self):
1954
1955
"""What class to instantiate on open calls."""
1955
1956
raise NotImplementedError(self._branch_class)
1957
def network_name(self):
1958
"""A simple byte string uniquely identifying this format for RPC calls.
1960
Metadir branch formats use their format string.
1958
def _get_initial_config(self, append_revisions_only=None):
1959
if append_revisions_only:
1960
return "append_revisions_only = True\n"
1962
# Avoid writing anything if append_revisions_only is disabled,
1963
# as that is the default.
1966
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1968
"""Initialize a branch in a control dir, with specified files
1970
:param a_bzrdir: The bzrdir to initialize the branch in
1971
:param utf8_files: The files to create as a list of
1972
(filename, content) tuples
1973
:param name: Name of colocated branch to create, if any
1974
:return: a branch in this format
1962
return self.get_format_string()
1977
name = a_bzrdir._get_selected_branch()
1978
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1979
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1980
control_files = lockable_files.LockableFiles(branch_transport,
1981
'lock', lockdir.LockDir)
1982
control_files.create_lock()
1983
control_files.lock_write()
1985
utf8_files += [('format', self.as_string())]
1986
for (filename, content) in utf8_files:
1987
branch_transport.put_bytes(
1989
mode=a_bzrdir._get_file_mode())
1991
control_files.unlock()
1992
branch = self.open(a_bzrdir, name, _found=True,
1993
found_repository=repository)
1994
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1964
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1997
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
1998
found_repository=None, possible_transports=None):
1965
1999
"""See BranchFormat.open()."""
2001
name = a_bzrdir._get_selected_branch()
1967
format = BranchFormat.find_format(a_bzrdir, name=name)
2003
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
1968
2004
if format.__class__ != self.__class__:
1969
2005
raise AssertionError("wrong format %r found for %r" %
1970
2006
(format, self))
1973
2009
control_files = lockable_files.LockableFiles(transport, 'lock',
1974
2010
lockdir.LockDir)
2011
if found_repository is None:
2012
found_repository = a_bzrdir.find_repository()
1975
2013
return self._branch_class()(_format=self,
1976
2014
_control_files=control_files,
1978
2016
a_bzrdir=a_bzrdir,
1979
_repository=a_bzrdir.find_repository(),
1980
ignore_fallbacks=ignore_fallbacks)
2017
_repository=found_repository,
2018
ignore_fallbacks=ignore_fallbacks,
2019
possible_transports=possible_transports)
1981
2020
except errors.NoSuchFile:
1982
2021
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1985
super(BranchFormatMetadir, self).__init__()
1986
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1987
self._matchingbzrdir.set_branch_format(self)
1989
def supports_tags(self):
1993
class BzrBranchFormat5(BranchFormatMetadir):
1994
"""Bzr branch format 5.
1997
- a revision-history file.
1999
- a lock dir guarding the branch itself
2000
- all of this stored in a branch/ subdirectory
2001
- works with shared repositories.
2003
This format is new in bzr 0.8.
2006
def _branch_class(self):
2009
def get_format_string(self):
2010
"""See BranchFormat.get_format_string()."""
2011
return "Bazaar-NG branch format 5\n"
2013
def get_format_description(self):
2014
"""See BranchFormat.get_format_description()."""
2015
return "Branch format 5"
2017
def initialize(self, a_bzrdir, name=None):
2018
"""Create a branch of this format in a_bzrdir."""
2019
utf8_files = [('revision-history', ''),
2020
('branch-name', ''),
2022
return self._initialize_helper(a_bzrdir, utf8_files, name)
2024
def supports_tags(self):
2024
def _matchingbzrdir(self):
2025
ret = bzrdir.BzrDirMetaFormat1()
2026
ret.set_branch_format(self)
2029
def supports_tags(self):
2032
def supports_leaving_lock(self):
2035
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
2037
BranchFormat.check_support_status(self,
2038
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
2040
bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
2041
recommend_upgrade=recommend_upgrade, basedir=basedir)
2028
2044
class BzrBranchFormat6(BranchFormatMetadir):
2157
2185
"""See BranchFormat.get_format_description()."""
2158
2186
return "Checkout reference format 1"
2160
def get_reference(self, a_bzrdir):
2188
def get_reference(self, a_bzrdir, name=None):
2161
2189
"""See BranchFormat.get_reference()."""
2162
transport = a_bzrdir.get_branch_transport(None)
2190
transport = a_bzrdir.get_branch_transport(None, name=name)
2163
2191
return transport.get_bytes('location')
2165
def set_reference(self, a_bzrdir, to_branch):
2193
def set_reference(self, a_bzrdir, name, to_branch):
2166
2194
"""See BranchFormat.set_reference()."""
2167
transport = a_bzrdir.get_branch_transport(None)
2195
transport = a_bzrdir.get_branch_transport(None, name=name)
2168
2196
location = transport.put_bytes('location', to_branch.base)
2170
def initialize(self, a_bzrdir, name=None, target_branch=None):
2198
def initialize(self, a_bzrdir, name=None, target_branch=None,
2199
repository=None, append_revisions_only=None):
2171
2200
"""Create a branch of this format in a_bzrdir."""
2172
2201
if target_branch is None:
2173
2202
# this format does not implement branch itself, thus the implicit
2174
2203
# creation contract must see it as uninitializable
2175
2204
raise errors.UninitializableFormat(self)
2176
2205
mutter('creating branch reference in %s', a_bzrdir.user_url)
2206
if a_bzrdir._format.fixed_components:
2207
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2209
name = a_bzrdir._get_selected_branch()
2177
2210
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2178
2211
branch_transport.put_bytes('location',
2179
target_branch.bzrdir.user_url)
2180
branch_transport.put_bytes('format', self.get_format_string())
2182
a_bzrdir, name, _found=True,
2212
target_branch.user_url)
2213
branch_transport.put_bytes('format', self.as_string())
2214
branch = self.open(a_bzrdir, name, _found=True,
2183
2215
possible_transports=[target_branch.bzrdir.root_transport])
2184
2216
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2188
super(BranchReferenceFormat, self).__init__()
2189
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2190
self._matchingbzrdir.set_branch_format(self)
2192
2219
def _make_reference_clone_function(format, a_branch):
2193
2220
"""Create a clone() routine for a branch dynamically."""
2194
2221
def clone(to_bzrdir, revision_id=None,
2318
2377
base = property(_get_base, doc="The URL for the root of this branch.")
2380
def user_transport(self):
2381
return self._user_transport
2320
2383
def _get_config(self):
2321
return TransportConfig(self._transport, 'branch.conf')
2384
return _mod_config.TransportConfig(self._transport, 'branch.conf')
2386
def _get_config_store(self):
2387
if self.conf_store is None:
2388
self.conf_store = _mod_config.BranchStore(self)
2389
return self.conf_store
2391
def _uncommitted_branch(self):
2392
"""Return the branch that may contain uncommitted changes."""
2393
master = self.get_master_branch()
2394
if master is not None:
2399
def store_uncommitted(self, creator):
2400
"""Store uncommitted changes from a ShelfCreator.
2402
:param creator: The ShelfCreator containing uncommitted changes, or
2403
None to delete any stored changes.
2404
:raises: ChangesAlreadyStored if the branch already has changes.
2406
branch = self._uncommitted_branch()
2408
branch._transport.delete('stored-transform')
2410
if branch._transport.has('stored-transform'):
2411
raise errors.ChangesAlreadyStored
2412
transform = BytesIO()
2413
creator.write_shelf(transform)
2415
branch._transport.put_file('stored-transform', transform)
2417
def get_unshelver(self, tree):
2418
"""Return a shelf.Unshelver for this branch and tree.
2420
:param tree: The tree to use to construct the Unshelver.
2421
:return: an Unshelver or None if no changes are stored.
2423
branch = self._uncommitted_branch()
2425
transform = branch._transport.get('stored-transform')
2426
except errors.NoSuchFile:
2428
return shelf.Unshelver.from_tree_and_shelf(tree, transform)
2323
2430
def is_locked(self):
2324
2431
return self.control_files.is_locked()
2326
2433
def lock_write(self, token=None):
2434
"""Lock the branch for write operations.
2436
:param token: A token to permit reacquiring a previously held and
2438
:return: A BranchWriteLockResult.
2327
2440
if not self.is_locked():
2328
2441
self._note_lock('w')
2329
# All-in-one needs to always unlock/lock.
2330
repo_control = getattr(self.repository, 'control_files', None)
2331
if self.control_files == repo_control or not self.is_locked():
2332
2442
self.repository._warn_if_deprecated(self)
2333
2443
self.repository.lock_write()
2334
2444
took_lock = True
2336
2446
took_lock = False
2338
return self.control_files.lock_write(token=token)
2448
return BranchWriteLockResult(self.unlock,
2449
self.control_files.lock_write(token=token))
2341
2452
self.repository.unlock()
2344
2455
def lock_read(self):
2456
"""Lock the branch for read operations.
2458
:return: A breezy.lock.LogicalLockResult.
2345
2460
if not self.is_locked():
2346
2461
self._note_lock('r')
2347
# All-in-one needs to always unlock/lock.
2348
repo_control = getattr(self.repository, 'control_files', None)
2349
if self.control_files == repo_control or not self.is_locked():
2350
2462
self.repository._warn_if_deprecated(self)
2351
2463
self.repository.lock_read()
2352
2464
took_lock = True
2387
2498
"""See Branch.print_file."""
2388
2499
return self.repository.print_file(file, revision_id)
2390
def _write_revision_history(self, history):
2391
"""Factored out of set_revision_history.
2393
This performs the actual writing to disk.
2394
It is intended to be called by BzrBranch5.set_revision_history."""
2395
self._transport.put_bytes(
2396
'revision-history', '\n'.join(history),
2397
mode=self.bzrdir._get_file_mode())
2400
def set_revision_history(self, rev_history):
2401
"""See Branch.set_revision_history."""
2402
if 'evil' in debug.debug_flags:
2403
mutter_callsite(3, "set_revision_history scales with history.")
2404
check_not_reserved_id = _mod_revision.check_not_reserved_id
2405
for rev_id in rev_history:
2406
check_not_reserved_id(rev_id)
2407
if Branch.hooks['post_change_branch_tip']:
2408
# Don't calculate the last_revision_info() if there are no hooks
2410
old_revno, old_revid = self.last_revision_info()
2411
if len(rev_history) == 0:
2412
revid = _mod_revision.NULL_REVISION
2414
revid = rev_history[-1]
2415
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2416
self._write_revision_history(rev_history)
2417
self._clear_cached_state()
2418
self._cache_revision_history(rev_history)
2419
for hook in Branch.hooks['set_rh']:
2420
hook(self, rev_history)
2421
if Branch.hooks['post_change_branch_tip']:
2422
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2424
def _synchronize_history(self, destination, revision_id):
2425
"""Synchronize last revision and revision history between branches.
2427
This version is most efficient when the destination is also a
2428
BzrBranch5, but works for BzrBranch6 as long as the revision
2429
history is the true lefthand parent history, and all of the revisions
2430
are in the destination's repository. If not, set_revision_history
2433
:param destination: The branch to copy the history into
2434
:param revision_id: The revision-id to truncate history at. May
2435
be None to copy complete history.
2437
if not isinstance(destination._format, BzrBranchFormat5):
2438
super(BzrBranch, self)._synchronize_history(
2439
destination, revision_id)
2441
if revision_id == _mod_revision.NULL_REVISION:
2444
new_history = self.revision_history()
2445
if revision_id is not None and new_history != []:
2447
new_history = new_history[:new_history.index(revision_id) + 1]
2449
rev = self.repository.get_revision(revision_id)
2450
new_history = rev.get_history(self.repository)[1:]
2451
destination.set_revision_history(new_history)
2453
2501
@needs_write_lock
2454
2502
def set_last_revision_info(self, revno, revision_id):
2455
"""Set the last revision of this branch.
2457
The caller is responsible for checking that the revno is correct
2458
for this revision id.
2460
It may be possible to set the branch last revision to an id not
2461
present in the repository. However, branches can also be
2462
configured to check constraints on history, in which case this may not
2503
if not revision_id or not isinstance(revision_id, basestring):
2504
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2505
revision_id = _mod_revision.ensure_null(revision_id)
2466
# this old format stores the full history, but this api doesn't
2467
# provide it, so we must generate, and might as well check it's
2469
history = self._lefthand_history(revision_id)
2470
if len(history) != revno:
2471
raise AssertionError('%d != %d' % (len(history), revno))
2472
self.set_revision_history(history)
2474
def _gen_revision_history(self):
2475
history = self._transport.get_bytes('revision-history').split('\n')
2476
if history[-1:] == ['']:
2477
# There shouldn't be a trailing newline, but just in case.
2482
def generate_revision_history(self, revision_id, last_rev=None,
2484
"""Create a new revision history that will finish with revision_id.
2486
:param revision_id: the new tip to use.
2487
:param last_rev: The previous last_revision. If not None, then this
2488
must be a ancestory of revision_id, or DivergedBranches is raised.
2489
:param other_branch: The other branch that DivergedBranches should
2490
raise with respect to.
2492
self.set_revision_history(self._lefthand_history(revision_id,
2493
last_rev, other_branch))
2506
old_revno, old_revid = self.last_revision_info()
2507
if self.get_append_revisions_only():
2508
self._check_history_violation(revision_id)
2509
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2510
self._write_last_revision_info(revno, revision_id)
2511
self._clear_cached_state()
2512
self._last_revision_info_cache = revno, revision_id
2513
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2515
def basis_tree(self):
2496
2516
"""See Branch.basis_tree."""
2674
2699
self._last_revision_info_cache = None
2675
2700
self._reference_info = None
2677
def _last_revision_info(self):
2678
revision_string = self._transport.get_bytes('last-revision')
2679
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2680
revision_id = cache_utf8.get_cached_utf8(revision_id)
2682
return revno, revision_id
2684
def _write_last_revision_info(self, revno, revision_id):
2685
"""Simply write out the revision id, with no checks.
2687
Use set_last_revision_info to perform this safely.
2689
Does not update the revision_history cache.
2690
Intended to be called by set_last_revision_info and
2691
_write_revision_history.
2693
revision_id = _mod_revision.ensure_null(revision_id)
2694
out_string = '%d %s\n' % (revno, revision_id)
2695
self._transport.put_bytes('last-revision', out_string,
2696
mode=self.bzrdir._get_file_mode())
2699
def set_last_revision_info(self, revno, revision_id):
2700
revision_id = _mod_revision.ensure_null(revision_id)
2701
old_revno, old_revid = self.last_revision_info()
2702
if self._get_append_revisions_only():
2703
self._check_history_violation(revision_id)
2704
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2705
self._write_last_revision_info(revno, revision_id)
2706
self._clear_cached_state()
2707
self._last_revision_info_cache = revno, revision_id
2708
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2710
def _synchronize_history(self, destination, revision_id):
2711
"""Synchronize last revision and revision history between branches.
2713
:see: Branch._synchronize_history
2715
# XXX: The base Branch has a fast implementation of this method based
2716
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2717
# that uses set_revision_history. This class inherits from BzrBranch5,
2718
# but wants the fast implementation, so it calls
2719
# Branch._synchronize_history directly.
2720
Branch._synchronize_history(self, destination, revision_id)
2722
2702
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2703
current_revid = self.last_revision()
2704
last_revision = _mod_revision.ensure_null(current_revid)
2724
2705
if _mod_revision.is_null(last_revision):
2726
if last_revision not in self._lefthand_history(revision_id):
2727
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2707
graph = self.repository.get_graph()
2708
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2709
if lh_ancestor == current_revid:
2711
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2713
def _gen_revision_history(self):
2730
2714
"""Generate the revision history from last revision
3182
3127
raise NotImplementedError(self.push)
3130
def copy_content_into(self, revision_id=None):
3131
"""Copy the content of source into target
3133
revision_id: if not None, the revision history in the new branch will
3134
be truncated to end with revision_id.
3136
raise NotImplementedError(self.copy_content_into)
3139
def fetch(self, stop_revision=None, limit=None):
3142
:param stop_revision: Last revision to fetch
3143
:param limit: Optional rough limit of revisions to fetch
3145
raise NotImplementedError(self.fetch)
3148
def _fix_overwrite_type(overwrite):
3149
if isinstance(overwrite, bool):
3151
return ["history", "tags"]
3185
3157
class GenericInterBranch(InterBranch):
3186
"""InterBranch implementation that uses public Branch functions.
3190
def _get_branch_formats_to_test():
3191
return BranchFormat._default_format, BranchFormat._default_format
3193
def update_revisions(self, stop_revision=None, overwrite=False,
3195
"""See InterBranch.update_revisions()."""
3158
"""InterBranch implementation that uses public Branch functions."""
3161
def is_compatible(klass, source, target):
3162
# GenericBranch uses the public API, so always compatible
3166
def _get_branch_formats_to_test(klass):
3167
return [(format_registry.get_default(), format_registry.get_default())]
3170
def unwrap_format(klass, format):
3171
if isinstance(format, remote.RemoteBranchFormat):
3172
format._ensure_real()
3173
return format._custom_format
3177
def copy_content_into(self, revision_id=None):
3178
"""Copy the content of source into target
3180
revision_id: if not None, the revision history in the new branch will
3181
be truncated to end with revision_id.
3183
self.source.update_references(self.target)
3184
self.source._synchronize_history(self.target, revision_id)
3186
parent = self.source.get_parent()
3187
except errors.InaccessibleParent as e:
3188
mutter('parent was not accessible to copy: %s', e)
3191
self.target.set_parent(parent)
3192
if self.source._push_should_merge_tags():
3193
self.source.tags.merge_to(self.target.tags)
3196
def fetch(self, stop_revision=None, limit=None):
3197
if self.target.base == self.source.base:
3196
3199
self.source.lock_read()
3198
other_revno, other_last_revision = self.source.last_revision_info()
3199
stop_revno = None # unknown
3200
if stop_revision is None:
3201
stop_revision = other_last_revision
3202
if _mod_revision.is_null(stop_revision):
3203
# if there are no commits, we're done.
3205
stop_revno = other_revno
3207
# what's the current last revision, before we fetch [and change it
3209
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3210
# we fetch here so that we don't process data twice in the common
3211
# case of having something to pull, and so that the check for
3212
# already merged can operate on the just fetched graph, which will
3213
# be cached in memory.
3214
self.target.fetch(self.source, stop_revision)
3215
# Check to see if one is an ancestor of the other
3218
graph = self.target.repository.get_graph()
3219
if self.target._check_if_descendant_or_diverged(
3220
stop_revision, last_rev, graph, self.source):
3221
# stop_revision is a descendant of last_rev, but we aren't
3222
# overwriting, so we're done.
3224
if stop_revno is None:
3226
graph = self.target.repository.get_graph()
3227
this_revno, this_last_revision = \
3228
self.target.last_revision_info()
3229
stop_revno = graph.find_distance_to_null(stop_revision,
3230
[(other_last_revision, other_revno),
3231
(this_last_revision, this_revno)])
3232
self.target.set_last_revision_info(stop_revno, stop_revision)
3201
fetch_spec_factory = fetch.FetchSpecFactory()
3202
fetch_spec_factory.source_branch = self.source
3203
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3204
fetch_spec_factory.source_repo = self.source.repository
3205
fetch_spec_factory.target_repo = self.target.repository
3206
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3207
fetch_spec_factory.limit = limit
3208
fetch_spec = fetch_spec_factory.make_fetch_spec()
3209
return self.target.repository.fetch(self.source.repository,
3210
fetch_spec=fetch_spec)
3234
3212
self.source.unlock()
3215
def _update_revisions(self, stop_revision=None, overwrite=False,
3217
other_revno, other_last_revision = self.source.last_revision_info()
3218
stop_revno = None # unknown
3219
if stop_revision is None:
3220
stop_revision = other_last_revision
3221
if _mod_revision.is_null(stop_revision):
3222
# if there are no commits, we're done.
3224
stop_revno = other_revno
3226
# what's the current last revision, before we fetch [and change it
3228
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3229
# we fetch here so that we don't process data twice in the common
3230
# case of having something to pull, and so that the check for
3231
# already merged can operate on the just fetched graph, which will
3232
# be cached in memory.
3233
self.fetch(stop_revision=stop_revision)
3234
# Check to see if one is an ancestor of the other
3237
graph = self.target.repository.get_graph()
3238
if self.target._check_if_descendant_or_diverged(
3239
stop_revision, last_rev, graph, self.source):
3240
# stop_revision is a descendant of last_rev, but we aren't
3241
# overwriting, so we're done.
3243
if stop_revno is None:
3245
graph = self.target.repository.get_graph()
3246
this_revno, this_last_revision = \
3247
self.target.last_revision_info()
3248
stop_revno = graph.find_distance_to_null(stop_revision,
3249
[(other_last_revision, other_revno),
3250
(this_last_revision, this_revno)])
3251
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3254
def pull(self, overwrite=False, stop_revision=None,
3255
possible_transports=None, run_hooks=True,
3256
_override_hook_target=None, local=False):
3257
"""Pull from source into self, updating my master if any.
3259
:param run_hooks: Private parameter - if false, this branch
3260
is being called because it's the master of the primary branch,
3261
so it should not run its hooks.
3263
bound_location = self.target.get_bound_location()
3264
if local and not bound_location:
3265
raise errors.LocalRequiresBoundBranch()
3266
master_branch = None
3267
source_is_master = False
3269
# bound_location comes from a config file, some care has to be
3270
# taken to relate it to source.user_url
3271
normalized = urlutils.normalize_url(bound_location)
3273
relpath = self.source.user_transport.relpath(normalized)
3274
source_is_master = (relpath == '')
3275
except (errors.PathNotChild, errors.InvalidURL):
3276
source_is_master = False
3277
if not local and bound_location and not source_is_master:
3278
# not pulling from master, so we need to update master.
3279
master_branch = self.target.get_master_branch(possible_transports)
3280
master_branch.lock_write()
3283
# pull from source into master.
3284
master_branch.pull(self.source, overwrite, stop_revision,
3286
return self._pull(overwrite,
3287
stop_revision, _hook_master=master_branch,
3288
run_hooks=run_hooks,
3289
_override_hook_target=_override_hook_target,
3290
merge_tags_to_master=not source_is_master)
3293
master_branch.unlock()
3295
def push(self, overwrite=False, stop_revision=None, lossy=False,
3296
_override_hook_source_branch=None):
3297
"""See InterBranch.push.
3299
This is the basic concrete implementation of push()
3301
:param _override_hook_source_branch: If specified, run the hooks
3302
passing this Branch as the source, rather than self. This is for
3303
use of RemoteBranch, where push is delegated to the underlying
3307
raise errors.LossyPushToSameVCS(self.source, self.target)
3308
# TODO: Public option to disable running hooks - should be trivial but
3311
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3312
op.add_cleanup(self.source.lock_read().unlock)
3313
op.add_cleanup(self.target.lock_write().unlock)
3314
return op.run(overwrite, stop_revision,
3315
_override_hook_source_branch=_override_hook_source_branch)
3317
def _basic_push(self, overwrite, stop_revision):
3318
"""Basic implementation of push without bound branches or hooks.
3320
Must be called with source read locked and target write locked.
3322
result = BranchPushResult()
3323
result.source_branch = self.source
3324
result.target_branch = self.target
3325
result.old_revno, result.old_revid = self.target.last_revision_info()
3326
self.source.update_references(self.target)
3327
overwrite = _fix_overwrite_type(overwrite)
3328
if result.old_revid != stop_revision:
3329
# We assume that during 'push' this repository is closer than
3331
graph = self.source.repository.get_graph(self.target.repository)
3332
self._update_revisions(stop_revision,
3333
overwrite=("history" in overwrite),
3335
if self.source._push_should_merge_tags():
3336
result.tag_updates, result.tag_conflicts = (
3337
self.source.tags.merge_to(
3338
self.target.tags, "tags" in overwrite))
3339
result.new_revno, result.new_revid = self.target.last_revision_info()
3342
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3343
_override_hook_source_branch=None):
3344
"""Push from source into target, and into target's master if any.
3347
if _override_hook_source_branch:
3348
result.source_branch = _override_hook_source_branch
3349
for hook in Branch.hooks['post_push']:
3352
bound_location = self.target.get_bound_location()
3353
if bound_location and self.target.base != bound_location:
3354
# there is a master branch.
3356
# XXX: Why the second check? Is it even supported for a branch to
3357
# be bound to itself? -- mbp 20070507
3358
master_branch = self.target.get_master_branch()
3359
master_branch.lock_write()
3360
operation.add_cleanup(master_branch.unlock)
3361
# push into the master from the source branch.
3362
master_inter = InterBranch.get(self.source, master_branch)
3363
master_inter._basic_push(overwrite, stop_revision)
3364
# and push into the target branch from the source. Note that
3365
# we push from the source branch again, because it's considered
3366
# the highest bandwidth repository.
3367
result = self._basic_push(overwrite, stop_revision)
3368
result.master_branch = master_branch
3369
result.local_branch = self.target
3371
master_branch = None
3373
result = self._basic_push(overwrite, stop_revision)
3374
# TODO: Why set master_branch and local_branch if there's no
3375
# binding? Maybe cleaner to just leave them unset? -- mbp
3377
result.master_branch = self.target
3378
result.local_branch = None
3382
def _pull(self, overwrite=False, stop_revision=None,
3237
3383
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3384
_override_hook_target=None, local=False,
3385
merge_tags_to_master=True):
3239
3386
"""See Branch.pull.
3388
This function is the core worker, used by GenericInterBranch.pull to
3389
avoid duplication when pulling source->master and source->local.
3241
3391
:param _hook_master: Private parameter - set the branch to
3242
3392
be supplied as the master to pull hooks.
3243
3393
:param run_hooks: Private parameter - if false, this branch
3244
3394
is being called because it's the master of the primary branch,
3245
3395
so it should not run its hooks.
3396
is being called because it's the master of the primary branch,
3397
so it should not run its hooks.
3246
3398
:param _override_hook_target: Private parameter - set the branch to be
3247
3399
supplied as the target_branch to pull hooks.
3248
3400
:param local: Only update the local branch, and not the bound branch.
3288
3444
self.source.unlock()
3291
def push(self, overwrite=False, stop_revision=None,
3292
_override_hook_source_branch=None):
3293
"""See InterBranch.push.
3295
This is the basic concrete implementation of push()
3297
:param _override_hook_source_branch: If specified, run
3298
the hooks passing this Branch as the source, rather than self.
3299
This is for use of RemoteBranch, where push is delegated to the
3300
underlying vfs-based Branch.
3302
# TODO: Public option to disable running hooks - should be trivial but
3304
self.source.lock_read()
3306
return _run_with_write_locked_target(
3307
self.target, self._push_with_bound_branches, overwrite,
3309
_override_hook_source_branch=_override_hook_source_branch)
3311
self.source.unlock()
3313
def _push_with_bound_branches(self, overwrite, stop_revision,
3314
_override_hook_source_branch=None):
3315
"""Push from source into target, and into target's master if any.
3318
if _override_hook_source_branch:
3319
result.source_branch = _override_hook_source_branch
3320
for hook in Branch.hooks['post_push']:
3323
bound_location = self.target.get_bound_location()
3324
if bound_location and self.target.base != bound_location:
3325
# there is a master branch.
3327
# XXX: Why the second check? Is it even supported for a branch to
3328
# be bound to itself? -- mbp 20070507
3329
master_branch = self.target.get_master_branch()
3330
master_branch.lock_write()
3332
# push into the master from the source branch.
3333
self.source._basic_push(master_branch, overwrite, stop_revision)
3334
# and push into the target branch from the source. Note that we
3335
# push from the source branch again, because its considered the
3336
# highest bandwidth repository.
3337
result = self.source._basic_push(self.target, overwrite,
3339
result.master_branch = master_branch
3340
result.local_branch = self.target
3344
master_branch.unlock()
3347
result = self.source._basic_push(self.target, overwrite,
3349
# TODO: Why set master_branch and local_branch if there's no
3350
# binding? Maybe cleaner to just leave them unset? -- mbp
3352
result.master_branch = self.target
3353
result.local_branch = None
3358
def is_compatible(self, source, target):
3359
# GenericBranch uses the public API, so always compatible
3363
class InterToBranch5(GenericInterBranch):
3366
def _get_branch_formats_to_test():
3367
return BranchFormat._default_format, BzrBranchFormat5()
3369
def pull(self, overwrite=False, stop_revision=None,
3370
possible_transports=None, run_hooks=True,
3371
_override_hook_target=None, local=False):
3372
"""Pull from source into self, updating my master if any.
3374
:param run_hooks: Private parameter - if false, this branch
3375
is being called because it's the master of the primary branch,
3376
so it should not run its hooks.
3378
bound_location = self.target.get_bound_location()
3379
if local and not bound_location:
3380
raise errors.LocalRequiresBoundBranch()
3381
master_branch = None
3382
if not local and bound_location and self.source.user_url != bound_location:
3383
# not pulling from master, so we need to update master.
3384
master_branch = self.target.get_master_branch(possible_transports)
3385
master_branch.lock_write()
3388
# pull from source into master.
3389
master_branch.pull(self.source, overwrite, stop_revision,
3391
return super(InterToBranch5, self).pull(overwrite,
3392
stop_revision, _hook_master=master_branch,
3393
run_hooks=run_hooks,
3394
_override_hook_target=_override_hook_target)
3397
master_branch.unlock()
3400
3448
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
breezy/branch.py
