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
17
from __future__ import absolute_import
18
21
from cStringIO import StringIO
20
23
from bzrlib.lazy_import import lazy_import
21
24
lazy_import(globals(), """
22
from itertools import chain
23
26
from bzrlib import (
27
config as _mod_config,
36
revision as _mod_revision,
42
from bzrlib.config import BranchConfig, TransportConfig
43
from bzrlib.tag import (
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.
49
55
from bzrlib import (
52
59
from bzrlib.decorators import (
87
94
def user_transport(self):
88
95
return self.bzrdir.user_transport
90
def __init__(self, *ignored, **ignored_too):
97
def __init__(self, possible_transports=None):
91
98
self.tags = self._format.make_tags(self)
92
99
self._revision_history_cache = None
93
100
self._revision_id_to_revno_cache = None
97
104
self._last_revision_info_cache = None
98
105
self._master_branch_cache = None
99
106
self._merge_sorted_revisions_cache = None
107
self._open_hook(possible_transports)
101
108
hooks = Branch.hooks['open']
102
109
for hook in hooks:
105
def _open_hook(self):
112
def _open_hook(self, possible_transports):
106
113
"""Called by init to allow simpler extension of the base class."""
108
def _activate_fallback_location(self, url):
115
def _activate_fallback_location(self, url, possible_transports):
109
116
"""Activate the branch/repository from url as a fallback repository."""
110
117
for existing_fallback_repo in self.repository._fallback_repositories:
111
118
if existing_fallback_repo.user_url == url:
112
119
# This fallback is already configured. This probably only
113
# happens because BzrDir.sprout is a horrible mess. To avoid
120
# happens because ControlDir.sprout is a horrible mess. To avoid
114
121
# confusing _unstack we don't add this a second time.
115
122
mutter('duplicate activation of fallback %r on %r', url, self)
117
repo = self._get_fallback_repository(url)
124
repo = self._get_fallback_repository(url, possible_transports)
118
125
if repo.has_same_location(self.repository):
119
126
raise errors.UnstackableLocationError(self.user_url, url)
120
127
self.repository.add_fallback_repository(repo)
174
181
For instance, if the branch is at URL/.bzr/branch,
175
182
Branch.open(URL) -> a Branch instance.
177
control = bzrdir.BzrDir.open(base, _unsupported,
178
possible_transports=possible_transports)
179
return control.open_branch(unsupported=_unsupported)
184
control = controldir.ControlDir.open(base,
185
possible_transports=possible_transports, _unsupported=_unsupported)
186
return control.open_branch(unsupported=_unsupported,
187
possible_transports=possible_transports)
182
def open_from_transport(transport, name=None, _unsupported=False):
190
def open_from_transport(transport, name=None, _unsupported=False,
191
possible_transports=None):
183
192
"""Open the branch rooted at transport"""
184
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
185
return control.open_branch(name=name, unsupported=_unsupported)
193
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
194
return control.open_branch(name=name, unsupported=_unsupported,
195
possible_transports=possible_transports)
188
198
def open_containing(url, possible_transports=None):
196
206
format, UnknownFormatError or UnsupportedFormatError are raised.
197
207
If there is one, it is returned, along with the unused portion of url.
199
control, relpath = bzrdir.BzrDir.open_containing(url,
209
control, relpath = controldir.ControlDir.open_containing(url,
200
210
possible_transports)
201
return control.open_branch(), relpath
211
branch = control.open_branch(possible_transports=possible_transports)
212
return (branch, relpath)
203
214
def _push_should_merge_tags(self):
204
215
"""Should _basic_push merge this branch's tags into the target?
217
228
:return: A bzrlib.config.BranchConfig.
219
return BranchConfig(self)
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)
221
242
def _get_config(self):
222
243
"""Get the concrete config for just the config in this branch.
231
252
raise NotImplementedError(self._get_config)
233
def _get_fallback_repository(self, url):
254
def _get_fallback_repository(self, url, possible_transports):
234
255
"""Get the repository we fallback to at url."""
235
256
url = urlutils.join(self.base, url)
236
a_branch = Branch.open(url,
237
possible_transports=[self.bzrdir.root_transport])
257
a_branch = Branch.open(url, possible_transports=possible_transports)
238
258
return a_branch.repository
646
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')
648
675
def set_append_revisions_only(self, enabled):
649
676
if not self._format.supports_set_append_revisions_only():
650
677
raise errors.UpgradeRequired(self.user_url)
655
self.get_config().set_user_option('append_revisions_only', value,
678
self.get_config_stack().set('append_revisions_only', enabled)
658
680
def set_reference_info(self, file_id, tree_path, branch_location):
659
681
"""Set the branch location to use for a tree reference."""
689
711
raise errors.UpgradeRequired(self.user_url)
691
def get_commit_builder(self, parents, config=None, timestamp=None,
713
def get_commit_builder(self, parents, config_stack=None, timestamp=None,
692
714
timezone=None, committer=None, revprops=None,
693
715
revision_id=None, lossy=False):
694
716
"""Obtain a CommitBuilder for this branch.
704
726
represented, when pushing to a foreign VCS
708
config = self.get_config()
729
if config_stack is None:
730
config_stack = self.get_config_stack()
710
return self.repository.get_commit_builder(self, parents, config,
732
return self.repository.get_commit_builder(self, parents, config_stack,
711
733
timestamp, timezone, committer, revprops, revision_id,
743
@deprecated_method(deprecated_in((2, 5, 0)))
721
744
def get_revision_delta(self, revno):
722
745
"""Return the delta for one revision.
724
747
The delta is relative to its mainline predecessor, or the
725
748
empty tree for revision 1.
727
rh = self.revision_history()
728
if not (1 <= revno <= len(rh)):
751
revid = self.get_rev_id(revno)
752
except errors.NoSuchRevision:
729
753
raise errors.InvalidRevisionNumber(revno)
730
return self.repository.get_revision_delta(rh[revno-1])
754
return self.repository.get_revision_delta(revid)
732
756
def get_stacked_on_url(self):
733
757
"""Get the URL this branch is stacked against.
864
889
# stream from one of them to the other. This does mean doing
865
890
# separate SSH connection setup, but unstacking is not a
866
891
# common operation so it's tolerable.
867
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
892
new_bzrdir = controldir.ControlDir.open(
893
self.bzrdir.root_transport.base)
868
894
new_repository = new_bzrdir.find_repository()
869
895
if new_repository._fallback_repositories:
870
896
raise AssertionError("didn't expect %r to have "
913
939
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
914
940
except errors.TagsNotSupported:
915
941
tags_to_fetch = set()
916
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
942
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
917
943
old_repository, required_ids=[self.last_revision()],
918
944
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
919
945
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
1140
1170
def _set_config_location(self, name, url, config=None,
1141
1171
make_relative=False):
1142
1172
if config is None:
1143
config = self.get_config()
1173
config = self.get_config_stack()
1144
1174
if url is None:
1146
1176
elif make_relative:
1147
1177
url = urlutils.relative_url(self.base, url)
1148
config.set_user_option(name, url, warn_masked=True)
1178
config.set(name, url)
1150
1180
def _get_config_location(self, name, config=None):
1151
1181
if config is None:
1152
config = self.get_config()
1153
location = config.get_user_option(name)
1182
config = self.get_config_stack()
1183
location = config.get(name)
1154
1184
if location == '':
1155
1185
location = None
1156
1186
return location
1158
1188
def get_child_submit_format(self):
1159
1189
"""Return the preferred format of submissions to this branch."""
1160
return self.get_config().get_user_option("child_submit_format")
1190
return self.get_config_stack().get('child_submit_format')
1162
1192
def get_submit_branch(self):
1163
1193
"""Return the submit location of the branch.
1195
1224
self._set_config_location('public_branch', location)
1197
1226
def get_push_location(self):
1198
"""Return the None or the location to push this branch to."""
1199
push_loc = self.get_config().get_user_option('push_location')
1227
"""Return None or the location to push this branch to."""
1228
return self.get_config_stack().get('push_location')
1202
1230
def set_push_location(self, location):
1203
1231
"""Set a new push location for this branch."""
1372
1400
# TODO: We should probably also check that self.revision_history
1373
1401
# matches the repository for older branch formats.
1374
1402
# If looking for the code that cross-checks repository parents against
1375
# the iter_reverse_revision_history output, that is now a repository
1403
# the Graph.iter_lefthand_ancestry output, that is now a repository
1376
1404
# specific check.
1379
def _get_checkout_format(self):
1407
def _get_checkout_format(self, lightweight=False):
1380
1408
"""Return the most suitable metadir for a checkout of this branch.
1381
1409
Weaves are used if this branch's repository uses weaves.
1429
1457
t = transport.get_transport(to_location)
1430
1458
t.ensure_base()
1459
format = self._get_checkout_format(lightweight=lightweight)
1461
checkout = format.initialize_on_transport(t)
1462
except errors.AlreadyControlDirError:
1463
# It's fine if the control directory already exists,
1464
# as long as there is no existing branch and working tree.
1465
checkout = controldir.ControlDir.open_from_transport(t)
1467
checkout.open_branch()
1468
except errors.NotBranchError:
1471
raise errors.AlreadyControlDirError(t.base)
1472
if checkout.control_transport.base == self.bzrdir.control_transport.base:
1473
# When checking out to the same control directory,
1474
# always create a lightweight checkout
1431
1477
if lightweight:
1432
format = self._get_checkout_format()
1433
checkout = format.initialize_on_transport(t)
1434
from_branch = BranchReferenceFormat().initialize(checkout,
1478
from_branch = checkout.set_branch_reference(target_branch=self)
1437
format = self._get_checkout_format()
1438
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1439
to_location, force_new_tree=False, format=format)
1440
checkout = checkout_branch.bzrdir
1480
policy = checkout.determine_repository_policy()
1481
repo = policy.acquire_repository()[0]
1482
checkout_branch = checkout.create_branch()
1441
1483
checkout_branch.bind(self)
1442
1484
# pull up to the specified revision_id to set the initial
1443
1485
# branch tip correctly, and seed it with history.
1444
1486
checkout_branch.pull(self, stop_revision=revision_id)
1446
1488
tree = checkout.create_workingtree(revision_id,
1447
1489
from_branch=from_branch,
1448
1490
accelerator_tree=accelerator_tree,
1537
1579
heads that must be fetched if present, but no error is necessary if
1538
1580
they are not present.
1540
# For bzr native formats must_fetch is just the tip, and if_present_fetch
1582
# For bzr native formats must_fetch is just the tip, and
1583
# if_present_fetch are the tags.
1542
1584
must_fetch = set([self.last_revision()])
1543
1585
if_present_fetch = set()
1544
c = self.get_config()
1545
include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1586
if self.get_config_stack().get('branch.fetch_tags'):
1549
1588
if_present_fetch = set(self.tags.get_reverse_tag_dict())
1550
1589
except errors.TagsNotSupported:
1581
1618
return not (self == other)
1584
def find_format(klass, a_bzrdir, name=None):
1585
"""Return the format for the branch object in a_bzrdir."""
1587
transport = a_bzrdir.get_branch_transport(None, name=name)
1588
format_string = transport.get_bytes("format")
1589
return format_registry.get(format_string)
1590
except errors.NoSuchFile:
1591
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1593
raise errors.UnknownFormatError(format=format_string, kind='branch')
1596
1621
@deprecated_method(deprecated_in((2, 4, 0)))
1597
1622
def get_default_format(klass):
1598
1623
"""Return the current default format."""
1609
1634
return format_registry._get_all()
1611
def get_reference(self, a_bzrdir, name=None):
1612
"""Get the target reference of the branch in a_bzrdir.
1636
def get_reference(self, controldir, name=None):
1637
"""Get the target reference of the branch in controldir.
1614
1639
format probing must have been completed before calling
1615
1640
this method - it is assumed that the format of the branch
1616
in a_bzrdir is correct.
1641
in controldir is correct.
1618
:param a_bzrdir: The bzrdir to get the branch data from.
1643
:param controldir: The controldir to get the branch data from.
1619
1644
:param name: Name of the colocated branch to fetch
1620
1645
:return: None if the branch is not a reference branch.
1625
def set_reference(self, a_bzrdir, name, to_branch):
1626
"""Set the target reference of the branch in a_bzrdir.
1650
def set_reference(self, controldir, name, to_branch):
1651
"""Set the target reference of the branch in controldir.
1628
1653
format probing must have been completed before calling
1629
1654
this method - it is assumed that the format of the branch
1630
in a_bzrdir is correct.
1655
in controldir is correct.
1632
:param a_bzrdir: The bzrdir to set the branch reference for.
1657
:param controldir: The controldir to set the branch reference for.
1633
1658
:param name: Name of colocated branch to set, None for default
1634
1659
:param to_branch: branch that the checkout is to reference
1636
1661
raise NotImplementedError(self.set_reference)
1638
def get_format_string(self):
1639
"""Return the ASCII format string that identifies this format."""
1640
raise NotImplementedError(self.get_format_string)
1642
1663
def get_format_description(self):
1643
1664
"""Return the short format description for this format."""
1644
1665
raise NotImplementedError(self.get_format_description)
1646
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1667
def _run_post_branch_init_hooks(self, controldir, name, branch):
1647
1668
hooks = Branch.hooks['post_branch_init']
1650
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1671
params = BranchInitHookParams(self, controldir, name, branch)
1651
1672
for hook in hooks:
1654
def initialize(self, a_bzrdir, name=None, repository=None):
1655
"""Create a branch of this format in a_bzrdir.
1675
def initialize(self, controldir, name=None, repository=None,
1676
append_revisions_only=None):
1677
"""Create a branch of this format in controldir.
1657
1679
:param name: Name of the colocated branch to create.
1659
1681
raise NotImplementedError(self.initialize)
1692
1714
raise NotImplementedError(self.network_name)
1694
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
1695
found_repository=None):
1696
"""Return the branch object for a_bzrdir
1716
def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
1717
found_repository=None, possible_transports=None):
1718
"""Return the branch object for controldir.
1698
:param a_bzrdir: A BzrDir that contains a branch.
1720
:param controldir: A ControlDir that contains a branch.
1699
1721
:param name: Name of colocated branch to open
1700
1722
:param _found: a private parameter, do not use it. It is used to
1701
1723
indicate if format probing has already be done.
1743
1765
"""True if this format supports tags stored in the branch"""
1744
1766
return False # by default
1768
def tags_are_versioned(self):
1769
"""Whether the tag container for this branch versions tags."""
1772
def supports_tags_referencing_ghosts(self):
1773
"""True if tags can reference ghost revisions."""
1747
1777
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
1748
1778
"""A factory for a BranchFormat object, permitting simple lazy registration.
1922
1952
branch, which refer to the original branch.
1925
def __init__(self, format, a_bzrdir, name, branch):
1955
def __init__(self, format, controldir, name, branch):
1926
1956
"""Create a group of BranchInitHook parameters.
1928
1958
:param format: the branch format
1929
:param a_bzrdir: the BzrDir where the branch will be/has been
1959
:param controldir: the ControlDir where the branch will be/has been
1931
1961
:param name: name of colocated branch, if any (or None)
1932
1962
:param branch: the branch created
1961
1991
def __init__(self, control_dir, to_branch, force, revision_id):
1962
1992
"""Create a group of SwitchHook parameters.
1964
:param control_dir: BzrDir of the checkout to change
1994
:param control_dir: ControlDir of the checkout to change
1965
1995
:param to_branch: branch that the checkout is to reference
1966
1996
:param force: skip the check for local commits in a heavy checkout
1967
1997
:param revision_id: revision ID to switch to (or None)
1980
2010
self.revision_id)
1983
class BranchFormatMetadir(BranchFormat):
1984
"""Common logic for meta-dir based branch formats."""
2013
class BranchFormatMetadir(bzrdir.BzrFormat, BranchFormat):
2014
"""Base class for branch formats that live in meta directories.
2018
BranchFormat.__init__(self)
2019
bzrdir.BzrFormat.__init__(self)
2022
def find_format(klass, controldir, name=None):
2023
"""Return the format for the branch object in controldir."""
2025
transport = controldir.get_branch_transport(None, name=name)
2026
except errors.NoSuchFile:
2027
raise errors.NotBranchError(path=name, bzrdir=controldir)
2029
format_string = transport.get_bytes("format")
2030
except errors.NoSuchFile:
2031
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
2032
return klass._find_format(format_registry, 'branch', format_string)
1986
2034
def _branch_class(self):
1987
2035
"""What class to instantiate on open calls."""
1988
2036
raise NotImplementedError(self._branch_class)
2038
def _get_initial_config(self, append_revisions_only=None):
2039
if append_revisions_only:
2040
return "append_revisions_only = True\n"
2042
# Avoid writing anything if append_revisions_only is disabled,
2043
# as that is the default.
1990
2046
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1991
2047
repository=None):
1992
2048
"""Initialize a branch in a bzrdir, with specified files
1997
2053
:param name: Name of colocated branch to create, if any
1998
2054
:return: a branch in this format
2057
name = a_bzrdir._get_selected_branch()
2000
2058
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2001
2059
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2002
2060
control_files = lockable_files.LockableFiles(branch_transport,
2016
2074
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2019
def network_name(self):
2020
"""A simple byte string uniquely identifying this format for RPC calls.
2022
Metadir branch formats use their format string.
2024
return self.get_format_string()
2026
2077
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2027
found_repository=None):
2078
found_repository=None, possible_transports=None):
2028
2079
"""See BranchFormat.open()."""
2081
name = a_bzrdir._get_selected_branch()
2030
format = BranchFormat.find_format(a_bzrdir, name=name)
2083
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2031
2084
if format.__class__ != self.__class__:
2032
2085
raise AssertionError("wrong format %r found for %r" %
2033
2086
(format, self))
2043
2096
a_bzrdir=a_bzrdir,
2044
2097
_repository=found_repository,
2045
ignore_fallbacks=ignore_fallbacks)
2098
ignore_fallbacks=ignore_fallbacks,
2099
possible_transports=possible_transports)
2046
2100
except errors.NoSuchFile:
2047
2101
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
2050
super(BranchFormatMetadir, self).__init__()
2051
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2052
self._matchingbzrdir.set_branch_format(self)
2104
def _matchingbzrdir(self):
2105
ret = bzrdir.BzrDirMetaFormat1()
2106
ret.set_branch_format(self)
2054
2109
def supports_tags(self):
2057
2112
def supports_leaving_lock(self):
2115
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
2117
BranchFormat.check_support_status(self,
2118
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
2120
bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
2121
recommend_upgrade=recommend_upgrade, basedir=basedir)
2061
2124
class BzrBranchFormat5(BranchFormatMetadir):
2062
2125
"""Bzr branch format 5.
2082
2146
"""See BranchFormat.get_format_description()."""
2083
2147
return "Branch format 5"
2085
def initialize(self, a_bzrdir, name=None, repository=None):
2149
def initialize(self, a_bzrdir, name=None, repository=None,
2150
append_revisions_only=None):
2086
2151
"""Create a branch of this format in a_bzrdir."""
2152
if append_revisions_only:
2153
raise errors.UpgradeRequired(a_bzrdir.user_url)
2087
2154
utf8_files = [('revision-history', ''),
2088
2155
('branch-name', ''),
2115
2183
"""See BranchFormat.get_format_description()."""
2116
2184
return "Branch format 6"
2118
def initialize(self, a_bzrdir, name=None, repository=None):
2186
def initialize(self, a_bzrdir, name=None, repository=None,
2187
append_revisions_only=None):
2119
2188
"""Create a branch of this format in a_bzrdir."""
2120
2189
utf8_files = [('last-revision', '0 null:\n'),
2121
('branch.conf', ''),
2191
self._get_initial_config(append_revisions_only)),
2124
2194
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2126
2196
def make_tags(self, branch):
2127
2197
"""See bzrlib.branch.BranchFormat.make_tags()."""
2128
return BasicTags(branch)
2198
return _mod_tag.BasicTags(branch)
2130
2200
def supports_set_append_revisions_only(self):
2145
2216
"""See BranchFormat.get_format_description()."""
2146
2217
return "Branch format 8"
2148
def initialize(self, a_bzrdir, name=None, repository=None):
2219
def initialize(self, a_bzrdir, name=None, repository=None,
2220
append_revisions_only=None):
2149
2221
"""Create a branch of this format in a_bzrdir."""
2150
2222
utf8_files = [('last-revision', '0 null:\n'),
2151
('branch.conf', ''),
2224
self._get_initial_config(append_revisions_only)),
2153
2226
('references', '')
2176
2249
This format was introduced in bzr 1.6.
2179
def initialize(self, a_bzrdir, name=None, repository=None):
2252
def initialize(self, a_bzrdir, name=None, repository=None,
2253
append_revisions_only=None):
2180
2254
"""Create a branch of this format in a_bzrdir."""
2181
2255
utf8_files = [('last-revision', '0 null:\n'),
2182
('branch.conf', ''),
2257
self._get_initial_config(append_revisions_only)),
2185
2260
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2204
2280
def make_tags(self, branch):
2205
2281
"""See bzrlib.branch.BranchFormat.make_tags()."""
2206
return BasicTags(branch)
2282
return _mod_tag.BasicTags(branch)
2208
2284
supports_reference_locations = False
2211
class BranchReferenceFormat(BranchFormat):
2287
class BranchReferenceFormat(BranchFormatMetadir):
2212
2288
"""Bzr branch reference format.
2214
2290
Branch references are used in implementing checkouts, they
2238
2315
location = transport.put_bytes('location', to_branch.base)
2240
2317
def initialize(self, a_bzrdir, name=None, target_branch=None,
2318
repository=None, append_revisions_only=None):
2242
2319
"""Create a branch of this format in a_bzrdir."""
2243
2320
if target_branch is None:
2244
2321
# this format does not implement branch itself, thus the implicit
2247
2324
mutter('creating branch reference in %s', a_bzrdir.user_url)
2248
2325
if a_bzrdir._format.fixed_components:
2249
2326
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2328
name = a_bzrdir._get_selected_branch()
2250
2329
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2251
2330
branch_transport.put_bytes('location',
2252
target_branch.bzrdir.user_url)
2253
branch_transport.put_bytes('format', self.get_format_string())
2255
a_bzrdir, name, _found=True,
2331
target_branch.user_url)
2332
branch_transport.put_bytes('format', self.as_string())
2333
branch = self.open(a_bzrdir, name, _found=True,
2256
2334
possible_transports=[target_branch.bzrdir.root_transport])
2257
2335
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2261
super(BranchReferenceFormat, self).__init__()
2262
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2263
self._matchingbzrdir.set_branch_format(self)
2265
2338
def _make_reference_clone_function(format, a_branch):
2266
2339
"""Create a clone() routine for a branch dynamically."""
2267
2340
def clone(to_bzrdir, revision_id=None,
2290
2363
:param possible_transports: An optional reusable transports list.
2366
name = a_bzrdir._get_selected_branch()
2293
format = BranchFormat.find_format(a_bzrdir, name=name)
2368
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2294
2369
if format.__class__ != self.__class__:
2295
2370
raise AssertionError("wrong format %r found for %r" %
2296
2371
(format, self))
2297
2372
if location is None:
2298
2373
location = self.get_reference(a_bzrdir, name)
2299
real_bzrdir = bzrdir.BzrDir.open(
2374
real_bzrdir = controldir.ControlDir.open(
2300
2375
location, possible_transports=possible_transports)
2301
result = real_bzrdir.open_branch(name=name,
2302
ignore_fallbacks=ignore_fallbacks)
2376
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks,
2377
possible_transports=possible_transports)
2303
2378
# this changes the behaviour of result.clone to create a new reference
2304
2379
# rather than a copy of the content of the branch.
2305
2380
# I did not use a proxy object because that needs much more extensive
2387
2462
def __init__(self, _format=None,
2388
2463
_control_files=None, a_bzrdir=None, name=None,
2389
_repository=None, ignore_fallbacks=False):
2464
_repository=None, ignore_fallbacks=False,
2465
possible_transports=None):
2390
2466
"""Create new branch object at a particular location."""
2391
2467
if a_bzrdir is None:
2392
2468
raise ValueError('a_bzrdir must be supplied')
2394
self.bzrdir = a_bzrdir
2395
self._base = self.bzrdir.transport.clone('..').base
2470
raise ValueError('name must be supplied')
2471
self.bzrdir = a_bzrdir
2472
self._user_transport = self.bzrdir.transport.clone('..')
2474
self._user_transport.set_segment_parameter(
2475
"branch", urlutils.escape(name))
2476
self._base = self._user_transport.base
2396
2477
self.name = name
2397
# XXX: We should be able to just do
2398
# self.base = self.bzrdir.root_transport.base
2399
# but this does not quite work yet -- mbp 20080522
2400
2478
self._format = _format
2401
2479
if _control_files is None:
2402
2480
raise ValueError('BzrBranch _control_files is None')
2403
2481
self.control_files = _control_files
2404
2482
self._transport = _control_files._transport
2405
2483
self.repository = _repository
2406
Branch.__init__(self)
2484
Branch.__init__(self, possible_transports)
2408
2486
def __str__(self):
2409
if self.name is None:
2410
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2412
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2487
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2415
2489
__repr__ = __str__
2421
2495
base = property(_get_base, doc="The URL for the root of this branch.")
2498
def user_transport(self):
2499
return self._user_transport
2423
2501
def _get_config(self):
2424
return TransportConfig(self._transport, 'branch.conf')
2502
return _mod_config.TransportConfig(self._transport, 'branch.conf')
2504
def _get_config_store(self):
2505
return _mod_config.BranchStore(self)
2426
2507
def is_locked(self):
2427
2508
return self.control_files.is_locked()
2508
2589
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2509
2590
revision_id = _mod_revision.ensure_null(revision_id)
2510
2591
old_revno, old_revid = self.last_revision_info()
2511
if self._get_append_revisions_only():
2592
if self.get_append_revisions_only():
2512
2593
self._check_history_violation(revision_id)
2513
2594
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2514
2595
self._write_last_revision_info(revno, revision_id)
2657
2738
self._transport.put_bytes('last-revision', out_string,
2658
2739
mode=self.bzrdir._get_file_mode())
2742
def update_feature_flags(self, updated_flags):
2743
"""Update the feature flags for this branch.
2745
:param updated_flags: Dictionary mapping feature names to necessities
2746
A necessity can be None to indicate the feature should be removed
2748
self._format._update_feature_flags(updated_flags)
2749
self.control_transport.put_bytes('format', self._format.as_string())
2661
2752
class FullHistoryBzrBranch(BzrBranch):
2662
2753
"""Bzr branch which contains the full revision history."""
2769
2860
class BzrBranch8(BzrBranch):
2770
2861
"""A branch that stores tree-reference locations."""
2772
def _open_hook(self):
2863
def _open_hook(self, possible_transports=None):
2773
2864
if self._ignore_fallbacks:
2866
if possible_transports is None:
2867
possible_transports = [self.bzrdir.root_transport]
2776
2869
url = self.get_stacked_on_url()
2777
2870
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2785
2878
raise AssertionError(
2786
2879
"'transform_fallback_location' hook %s returned "
2787
2880
"None, not a URL." % hook_name)
2788
self._activate_fallback_location(url)
2881
self._activate_fallback_location(url,
2882
possible_transports=possible_transports)
2790
2884
def __init__(self, *args, **kwargs):
2791
2885
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2909
3003
"""See Branch.set_push_location."""
2910
3004
self._master_branch_cache = None
2912
config = self.get_config()
3006
conf = self.get_config_stack()
2913
3007
if location is None:
2914
if config.get_user_option('bound') != 'True':
3008
if not conf.get('bound'):
2917
config.set_user_option('bound', 'False', warn_masked=True)
3011
conf.set('bound', 'False')
2920
3014
self._set_config_location('bound_location', location,
2922
config.set_user_option('bound', 'True', warn_masked=True)
3016
conf.set('bound', 'True')
2925
3019
def _get_bound_location(self, bound):
2926
3020
"""Return the bound location in the config file.
2928
3022
Return None if the bound parameter does not match"""
2929
config = self.get_config()
2930
config_bound = (config.get_user_option('bound') == 'True')
2931
if config_bound != bound:
3023
conf = self.get_config_stack()
3024
if conf.get('bound') != bound:
2933
return self._get_config_location('bound_location', config=config)
3026
return self._get_config_location('bound_location', config=conf)
2935
3028
def get_bound_location(self):
2936
"""See Branch.set_push_location."""
3029
"""See Branch.get_bound_location."""
2937
3030
return self._get_bound_location(True)
2939
3032
def get_old_bound_location(self):
2946
3039
## self._check_stackable_repo()
2947
3040
# stacked_on_location is only ever defined in branch.conf, so don't
2948
3041
# waste effort reading the whole stack of config files.
2949
config = self.get_config()._get_branch_data_config()
3042
conf = _mod_config.BranchOnlyStack(self)
2950
3043
stacked_url = self._get_config_location('stacked_on_location',
2952
3045
if stacked_url is None:
2953
3046
raise errors.NotStacked(self)
2956
def _get_append_revisions_only(self):
2957
return self.get_config(
2958
).get_user_option_as_bool('append_revisions_only')
3047
return stacked_url.encode('utf-8')
2960
3049
@needs_read_lock
2961
3050
def get_rev_id(self, revno, history=None):
2991
3080
except errors.RevisionNotPresent, e:
2992
3081
raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
2993
3082
index = len(self._partial_revision_history_cache) - 1
3084
raise errors.NoSuchRevision(self, revision_id)
2994
3085
if self._partial_revision_history_cache[index] != revision_id:
2995
3086
raise errors.NoSuchRevision(self, revision_id)
2996
3087
return self.revno() - index
3059
3151
return self.new_revno - self.old_revno
3061
3153
def report(self, to_file):
3154
tag_conflicts = getattr(self, "tag_conflicts", None)
3155
tag_updates = getattr(self, "tag_updates", None)
3062
3156
if not is_quiet():
3063
if self.old_revid == self.new_revid:
3064
to_file.write('No revisions to pull.\n')
3157
if self.old_revid != self.new_revid:
3066
3158
to_file.write('Now on revision %d.\n' % self.new_revno)
3160
to_file.write('%d tag(s) updated.\n' % len(tag_updates))
3161
if self.old_revid == self.new_revid and not tag_updates:
3162
if not tag_conflicts:
3163
to_file.write('No revisions or tags to pull.\n')
3165
to_file.write('No revisions to pull.\n')
3067
3166
self._show_tag_conficts(to_file)
3095
3194
return self.new_revno - self.old_revno
3097
3196
def report(self, to_file):
3098
"""Write a human-readable description of the result."""
3099
if self.old_revid == self.new_revid:
3100
note('No new revisions to push.')
3102
note('Pushed up to revision %d.' % self.new_revno)
3197
# TODO: This function gets passed a to_file, but then
3198
# ignores it and calls note() instead. This is also
3199
# inconsistent with PullResult(), which writes to stdout.
3200
# -- JRV20110901, bug #838853
3201
tag_conflicts = getattr(self, "tag_conflicts", None)
3202
tag_updates = getattr(self, "tag_updates", None)
3204
if self.old_revid != self.new_revid:
3205
note(gettext('Pushed up to revision %d.') % self.new_revno)
3207
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
3208
if self.old_revid == self.new_revid and not tag_updates:
3209
if not tag_conflicts:
3210
note(gettext('No new revisions or tags to push.'))
3212
note(gettext('No new revisions to push.'))
3103
3213
self._show_tag_conficts(to_file)
3119
3229
:param verbose: Requests more detailed display of what was checked,
3122
note('checked branch %s format %s', self.branch.user_url,
3123
self.branch._format)
3232
note(gettext('checked branch {0} format {1}').format(
3233
self.branch.user_url, self.branch._format))
3124
3234
for error in self.errors:
3125
note('found error:%s', error)
3235
note(gettext('found error:%s'), error)
3128
3238
class Converter5to6(object):
3413
3523
self._update_revisions(stop_revision, overwrite=overwrite,
3415
3525
if self.source._push_should_merge_tags():
3416
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3526
result.tag_updates, result.tag_conflicts = (
3527
self.source.tags.merge_to(self.target.tags, overwrite))
3418
3528
result.new_revno, result.new_revid = self.target.last_revision_info()
3503
3613
# TODO: The old revid should be specified when merging tags,
3504
3614
# so a tags implementation that versions tags can only
3505
3615
# pull in the most recent changes. -- JRV20090506
3506
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3507
overwrite, ignore_master=not merge_tags_to_master)
3616
result.tag_updates, result.tag_conflicts = (
3617
self.source.tags.merge_to(self.target.tags, overwrite,
3618
ignore_master=not merge_tags_to_master))
3508
3619
result.new_revno, result.new_revid = self.target.last_revision_info()
3509
3620
if _hook_master:
3510
3621
result.master_branch = _hook_master