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
21
23
from bzrlib.lazy_import import lazy_import
22
24
lazy_import(globals(), """
23
from itertools import chain
24
26
from bzrlib import (
28
config as _mod_config,
37
revision as _mod_revision,
43
from bzrlib.config import BranchConfig, TransportConfig
44
from bzrlib.tag import (
31
config as _mod_config,
40
revision as _mod_revision,
49
from bzrlib.i18n import gettext, ngettext
52
# Explicitly import bzrlib.bzrdir so that the BzrProber
53
# is guaranteed to be registered.
50
56
from bzrlib import (
53
60
from bzrlib.decorators import (
98
105
self._last_revision_info_cache = None
99
106
self._master_branch_cache = None
100
107
self._merge_sorted_revisions_cache = None
108
self._open_hook(possible_transports)
102
109
hooks = Branch.hooks['open']
103
110
for hook in hooks:
106
def _open_hook(self):
113
def _open_hook(self, possible_transports):
107
114
"""Called by init to allow simpler extension of the base class."""
109
def _activate_fallback_location(self, url):
116
def _activate_fallback_location(self, url, possible_transports):
110
117
"""Activate the branch/repository from url as a fallback repository."""
111
118
for existing_fallback_repo in self.repository._fallback_repositories:
112
119
if existing_fallback_repo.user_url == url:
113
120
# This fallback is already configured. This probably only
114
# happens because BzrDir.sprout is a horrible mess. To avoid
121
# happens because ControlDir.sprout is a horrible mess. To avoid
115
122
# confusing _unstack we don't add this a second time.
116
123
mutter('duplicate activation of fallback %r on %r', url, self)
118
repo = self._get_fallback_repository(url)
125
repo = self._get_fallback_repository(url, possible_transports)
119
126
if repo.has_same_location(self.repository):
120
127
raise errors.UnstackableLocationError(self.user_url, url)
121
128
self.repository.add_fallback_repository(repo)
175
182
For instance, if the branch is at URL/.bzr/branch,
176
183
Branch.open(URL) -> a Branch instance.
178
control = bzrdir.BzrDir.open(base, _unsupported,
179
possible_transports=possible_transports)
180
return control.open_branch(unsupported=_unsupported)
185
control = controldir.ControlDir.open(base,
186
possible_transports=possible_transports, _unsupported=_unsupported)
187
return control.open_branch(unsupported=_unsupported,
188
possible_transports=possible_transports)
183
def open_from_transport(transport, name=None, _unsupported=False):
191
def open_from_transport(transport, name=None, _unsupported=False,
192
possible_transports=None):
184
193
"""Open the branch rooted at transport"""
185
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
186
return control.open_branch(name=name, unsupported=_unsupported)
194
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
195
return control.open_branch(name=name, unsupported=_unsupported,
196
possible_transports=possible_transports)
189
199
def open_containing(url, possible_transports=None):
232
253
raise NotImplementedError(self._get_config)
234
def _get_fallback_repository(self, url):
255
def store_uncommitted(self, creator):
256
"""Store uncommitted changes from a ShelfCreator.
258
:param creator: The ShelfCreator containing uncommitted changes, or
259
None to delete any stored changes.
260
:raises: ChangesAlreadyStored if the branch already has changes.
262
raise NotImplementedError(self.store_uncommitted)
264
def get_unshelver(self, tree):
265
"""Return a shelf.Unshelver for this branch and tree.
267
:param tree: The tree to use to construct the Unshelver.
268
:return: an Unshelver or None if no changes are stored.
270
raise NotImplementedError(self.get_unshelver)
272
def _get_fallback_repository(self, url, possible_transports):
235
273
"""Get the repository we fallback to at url."""
236
274
url = urlutils.join(self.base, url)
237
a_branch = Branch.open(url,
238
possible_transports=[self.bzrdir.root_transport])
275
a_branch = Branch.open(url, possible_transports=possible_transports)
239
276
return a_branch.repository
743
784
"""Print `file` to stdout."""
744
785
raise NotImplementedError(self.print_file)
746
@deprecated_method(deprecated_in((2, 4, 0)))
747
def set_revision_history(self, rev_history):
748
"""See Branch.set_revision_history."""
749
self._set_revision_history(rev_history)
752
def _set_revision_history(self, rev_history):
753
if len(rev_history) == 0:
754
revid = _mod_revision.NULL_REVISION
756
revid = rev_history[-1]
757
if rev_history != self._lefthand_history(revid):
758
raise errors.NotLefthandHistory(rev_history)
759
self.set_last_revision_info(len(rev_history), revid)
760
self._cache_revision_history(rev_history)
761
for hook in Branch.hooks['set_rh']:
762
hook(self, rev_history)
764
787
@needs_write_lock
765
788
def set_last_revision_info(self, revno, revision_id):
766
789
"""Set the last revision of this branch.
1033
1052
def _read_last_revision_info(self):
1034
1053
raise NotImplementedError(self._read_last_revision_info)
1036
@deprecated_method(deprecated_in((2, 4, 0)))
1037
def import_last_revision_info(self, source_repo, revno, revid):
1038
"""Set the last revision info, importing from another repo if necessary.
1040
:param source_repo: Source repository to optionally fetch from
1041
:param revno: Revision number of the new tip
1042
:param revid: Revision id of the new tip
1044
if not self.repository.has_same_location(source_repo):
1045
self.repository.fetch(source_repo, revision_id=revid)
1046
self.set_last_revision_info(revno, revid)
1048
1055
def import_last_revision_info_and_tags(self, source, revno, revid,
1050
1057
"""Set the last revision info, importing from another repo if necessary.
1141
1148
def _set_config_location(self, name, url, config=None,
1142
1149
make_relative=False):
1143
1150
if config is None:
1144
config = self.get_config()
1151
config = self.get_config_stack()
1145
1152
if url is None:
1147
1154
elif make_relative:
1148
1155
url = urlutils.relative_url(self.base, url)
1149
config.set_user_option(name, url, warn_masked=True)
1156
config.set(name, url)
1151
1158
def _get_config_location(self, name, config=None):
1152
1159
if config is None:
1153
config = self.get_config()
1154
location = config.get_user_option(name)
1160
config = self.get_config_stack()
1161
location = config.get(name)
1155
1162
if location == '':
1156
1163
location = None
1157
1164
return location
1159
1166
def get_child_submit_format(self):
1160
1167
"""Return the preferred format of submissions to this branch."""
1161
return self.get_config().get_user_option("child_submit_format")
1168
return self.get_config_stack().get('child_submit_format')
1163
1170
def get_submit_branch(self):
1164
1171
"""Return the submit location of the branch.
1430
1435
t = transport.get_transport(to_location)
1431
1436
t.ensure_base()
1437
format = self._get_checkout_format(lightweight=lightweight)
1439
checkout = format.initialize_on_transport(t)
1440
except errors.AlreadyControlDirError:
1441
# It's fine if the control directory already exists,
1442
# as long as there is no existing branch and working tree.
1443
checkout = controldir.ControlDir.open_from_transport(t)
1445
checkout.open_branch()
1446
except errors.NotBranchError:
1449
raise errors.AlreadyControlDirError(t.base)
1450
if checkout.control_transport.base == self.bzrdir.control_transport.base:
1451
# When checking out to the same control directory,
1452
# always create a lightweight checkout
1432
1455
if lightweight:
1433
format = self._get_checkout_format()
1434
checkout = format.initialize_on_transport(t)
1435
from_branch = BranchReferenceFormat().initialize(checkout,
1456
from_branch = checkout.set_branch_reference(target_branch=self)
1438
format = self._get_checkout_format()
1439
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1440
to_location, force_new_tree=False, format=format)
1441
checkout = checkout_branch.bzrdir
1458
policy = checkout.determine_repository_policy()
1459
repo = policy.acquire_repository()[0]
1460
checkout_branch = checkout.create_branch()
1442
1461
checkout_branch.bind(self)
1443
1462
# pull up to the specified revision_id to set the initial
1444
1463
# branch tip correctly, and seed it with history.
1445
1464
checkout_branch.pull(self, stop_revision=revision_id)
1447
1466
tree = checkout.create_workingtree(revision_id,
1448
1467
from_branch=from_branch,
1449
1468
accelerator_tree=accelerator_tree,
1573
1589
object will be created every time regardless.
1576
can_set_append_revisions_only = True
1578
1592
def __eq__(self, other):
1579
1593
return self.__class__ is other.__class__
1581
1595
def __ne__(self, other):
1582
1596
return not (self == other)
1585
def find_format(klass, a_bzrdir, name=None):
1586
"""Return the format for the branch object in a_bzrdir."""
1588
transport = a_bzrdir.get_branch_transport(None, name=name)
1589
format_string = transport.get_bytes("format")
1590
return format_registry.get(format_string)
1591
except errors.NoSuchFile:
1592
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1594
raise errors.UnknownFormatError(format=format_string, kind='branch')
1597
@deprecated_method(deprecated_in((2, 4, 0)))
1598
def get_default_format(klass):
1599
"""Return the current default format."""
1600
return format_registry.get_default()
1603
@deprecated_method(deprecated_in((2, 4, 0)))
1604
def get_formats(klass):
1605
"""Get all the known formats.
1607
Warning: This triggers a load of all lazy registered formats: do not
1608
use except when that is desireed.
1610
return format_registry._get_all()
1612
def get_reference(self, a_bzrdir, name=None):
1613
"""Get the target reference of the branch in a_bzrdir.
1598
def get_reference(self, controldir, name=None):
1599
"""Get the target reference of the branch in controldir.
1615
1601
format probing must have been completed before calling
1616
1602
this method - it is assumed that the format of the branch
1617
in a_bzrdir is correct.
1603
in controldir is correct.
1619
:param a_bzrdir: The bzrdir to get the branch data from.
1605
:param controldir: The controldir to get the branch data from.
1620
1606
:param name: Name of the colocated branch to fetch
1621
1607
:return: None if the branch is not a reference branch.
1626
def set_reference(self, a_bzrdir, name, to_branch):
1627
"""Set the target reference of the branch in a_bzrdir.
1612
def set_reference(self, controldir, name, to_branch):
1613
"""Set the target reference of the branch in controldir.
1629
1615
format probing must have been completed before calling
1630
1616
this method - it is assumed that the format of the branch
1631
in a_bzrdir is correct.
1617
in controldir is correct.
1633
:param a_bzrdir: The bzrdir to set the branch reference for.
1619
:param controldir: The controldir to set the branch reference for.
1634
1620
:param name: Name of colocated branch to set, None for default
1635
1621
:param to_branch: branch that the checkout is to reference
1637
1623
raise NotImplementedError(self.set_reference)
1639
def get_format_string(self):
1640
"""Return the ASCII format string that identifies this format."""
1641
raise NotImplementedError(self.get_format_string)
1643
1625
def get_format_description(self):
1644
1626
"""Return the short format description for this format."""
1645
1627
raise NotImplementedError(self.get_format_description)
1647
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1629
def _run_post_branch_init_hooks(self, controldir, name, branch):
1648
1630
hooks = Branch.hooks['post_branch_init']
1651
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1633
params = BranchInitHookParams(self, controldir, name, branch)
1652
1634
for hook in hooks:
1655
def initialize(self, a_bzrdir, name=None, repository=None):
1656
"""Create a branch of this format in a_bzrdir.
1637
def initialize(self, controldir, name=None, repository=None,
1638
append_revisions_only=None):
1639
"""Create a branch of this format in controldir.
1658
1641
:param name: Name of the colocated branch to create.
1660
1643
raise NotImplementedError(self.initialize)
1981
1946
self.revision_id)
1984
class BranchFormatMetadir(BranchFormat):
1985
"""Common logic for meta-dir based branch formats."""
1949
class BranchFormatMetadir(bzrdir.BzrFormat, BranchFormat):
1950
"""Base class for branch formats that live in meta directories.
1954
BranchFormat.__init__(self)
1955
bzrdir.BzrFormat.__init__(self)
1958
def find_format(klass, controldir, name=None):
1959
"""Return the format for the branch object in controldir."""
1961
transport = controldir.get_branch_transport(None, name=name)
1962
except errors.NoSuchFile:
1963
raise errors.NotBranchError(path=name, bzrdir=controldir)
1965
format_string = transport.get_bytes("format")
1966
except errors.NoSuchFile:
1967
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1968
return klass._find_format(format_registry, 'branch', format_string)
1987
1970
def _branch_class(self):
1988
1971
"""What class to instantiate on open calls."""
1989
1972
raise NotImplementedError(self._branch_class)
1974
def _get_initial_config(self, append_revisions_only=None):
1975
if append_revisions_only:
1976
return "append_revisions_only = True\n"
1978
# Avoid writing anything if append_revisions_only is disabled,
1979
# as that is the default.
1991
1982
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1992
1983
repository=None):
1993
"""Initialize a branch in a bzrdir, with specified files
1984
"""Initialize a branch in a control dir, with specified files
1995
1986
:param a_bzrdir: The bzrdir to initialize the branch in
1996
1987
:param utf8_files: The files to create as a list of
2058
2048
def supports_leaving_lock(self):
2062
class BzrBranchFormat5(BranchFormatMetadir):
2063
"""Bzr branch format 5.
2066
- a revision-history file.
2068
- a lock dir guarding the branch itself
2069
- all of this stored in a branch/ subdirectory
2070
- works with shared repositories.
2072
This format is new in bzr 0.8.
2075
def _branch_class(self):
2078
def get_format_string(self):
2079
"""See BranchFormat.get_format_string()."""
2080
return "Bazaar-NG branch format 5\n"
2082
def get_format_description(self):
2083
"""See BranchFormat.get_format_description()."""
2084
return "Branch format 5"
2086
def initialize(self, a_bzrdir, name=None, repository=None):
2087
"""Create a branch of this format in a_bzrdir."""
2088
utf8_files = [('revision-history', ''),
2089
('branch-name', ''),
2091
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2093
def supports_tags(self):
2051
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
2053
BranchFormat.check_support_status(self,
2054
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
2056
bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
2057
recommend_upgrade=recommend_upgrade, basedir=basedir)
2097
2060
class BzrBranchFormat6(BranchFormatMetadir):
2116
2080
"""See BranchFormat.get_format_description()."""
2117
2081
return "Branch format 6"
2119
def initialize(self, a_bzrdir, name=None, repository=None):
2083
def initialize(self, a_bzrdir, name=None, repository=None,
2084
append_revisions_only=None):
2120
2085
"""Create a branch of this format in a_bzrdir."""
2121
2086
utf8_files = [('last-revision', '0 null:\n'),
2122
('branch.conf', ''),
2088
self._get_initial_config(append_revisions_only)),
2125
2091
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2127
2093
def make_tags(self, branch):
2128
2094
"""See bzrlib.branch.BranchFormat.make_tags()."""
2129
return BasicTags(branch)
2095
return _mod_tag.BasicTags(branch)
2131
2097
def supports_set_append_revisions_only(self):
2239
2212
location = transport.put_bytes('location', to_branch.base)
2241
2214
def initialize(self, a_bzrdir, name=None, target_branch=None,
2215
repository=None, append_revisions_only=None):
2243
2216
"""Create a branch of this format in a_bzrdir."""
2244
2217
if target_branch is None:
2245
2218
# this format does not implement branch itself, thus the implicit
2246
2219
# creation contract must see it as uninitializable
2247
2220
raise errors.UninitializableFormat(self)
2248
2221
mutter('creating branch reference in %s', a_bzrdir.user_url)
2222
if a_bzrdir._format.fixed_components:
2223
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2225
name = a_bzrdir._get_selected_branch()
2249
2226
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2250
2227
branch_transport.put_bytes('location',
2251
target_branch.bzrdir.user_url)
2252
branch_transport.put_bytes('format', self.get_format_string())
2254
a_bzrdir, name, _found=True,
2228
target_branch.user_url)
2229
branch_transport.put_bytes('format', self.as_string())
2230
branch = self.open(a_bzrdir, name, _found=True,
2255
2231
possible_transports=[target_branch.bzrdir.root_transport])
2256
2232
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2260
super(BranchReferenceFormat, self).__init__()
2261
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2262
self._matchingbzrdir.set_branch_format(self)
2264
2235
def _make_reference_clone_function(format, a_branch):
2265
2236
"""Create a clone() routine for a branch dynamically."""
2266
2237
def clone(to_bzrdir, revision_id=None,
2289
2260
:param possible_transports: An optional reusable transports list.
2263
name = a_bzrdir._get_selected_branch()
2292
format = BranchFormat.find_format(a_bzrdir, name=name)
2265
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2293
2266
if format.__class__ != self.__class__:
2294
2267
raise AssertionError("wrong format %r found for %r" %
2295
2268
(format, self))
2296
2269
if location is None:
2297
2270
location = self.get_reference(a_bzrdir, name)
2298
real_bzrdir = bzrdir.BzrDir.open(
2271
real_bzrdir = controldir.ControlDir.open(
2299
2272
location, possible_transports=possible_transports)
2300
result = real_bzrdir.open_branch(name=name,
2301
ignore_fallbacks=ignore_fallbacks)
2273
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks,
2274
possible_transports=possible_transports)
2302
2275
# this changes the behaviour of result.clone to create a new reference
2303
2276
# rather than a copy of the content of the branch.
2304
2277
# I did not use a proxy object because that needs much more extensive
2386
2359
def __init__(self, _format=None,
2387
2360
_control_files=None, a_bzrdir=None, name=None,
2388
_repository=None, ignore_fallbacks=False):
2361
_repository=None, ignore_fallbacks=False,
2362
possible_transports=None):
2389
2363
"""Create new branch object at a particular location."""
2390
2364
if a_bzrdir is None:
2391
2365
raise ValueError('a_bzrdir must be supplied')
2393
self.bzrdir = a_bzrdir
2394
self._base = self.bzrdir.transport.clone('..').base
2367
raise ValueError('name must be supplied')
2368
self.bzrdir = a_bzrdir
2369
self._user_transport = self.bzrdir.transport.clone('..')
2371
self._user_transport.set_segment_parameter(
2372
"branch", urlutils.escape(name))
2373
self._base = self._user_transport.base
2395
2374
self.name = name
2396
# XXX: We should be able to just do
2397
# self.base = self.bzrdir.root_transport.base
2398
# but this does not quite work yet -- mbp 20080522
2399
2375
self._format = _format
2400
2376
if _control_files is None:
2401
2377
raise ValueError('BzrBranch _control_files is None')
2402
2378
self.control_files = _control_files
2403
2379
self._transport = _control_files._transport
2404
2380
self.repository = _repository
2405
Branch.__init__(self)
2381
self.conf_store = None
2382
Branch.__init__(self, possible_transports)
2407
2384
def __str__(self):
2408
if self.name is None:
2409
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2411
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2385
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2414
2387
__repr__ = __str__
2420
2393
base = property(_get_base, doc="The URL for the root of this branch.")
2396
def user_transport(self):
2397
return self._user_transport
2422
2399
def _get_config(self):
2423
return TransportConfig(self._transport, 'branch.conf')
2400
return _mod_config.TransportConfig(self._transport, 'branch.conf')
2402
def _get_config_store(self):
2403
if self.conf_store is None:
2404
self.conf_store = _mod_config.BranchStore(self)
2405
return self.conf_store
2407
def _uncommitted_branch(self):
2408
"""Return the branch that may contain uncommitted changes."""
2409
master = self.get_master_branch()
2410
if master is not None:
2415
def store_uncommitted(self, creator):
2416
"""Store uncommitted changes from a ShelfCreator.
2418
:param creator: The ShelfCreator containing uncommitted changes, or
2419
None to delete any stored changes.
2420
:raises: ChangesAlreadyStored if the branch already has changes.
2422
branch = self._uncommitted_branch()
2424
branch._transport.delete('stored-transform')
2426
if branch._transport.has('stored-transform'):
2427
raise errors.ChangesAlreadyStored
2428
transform = StringIO()
2429
creator.write_shelf(transform)
2431
branch._transport.put_file('stored-transform', transform)
2433
def get_unshelver(self, tree):
2434
"""Return a shelf.Unshelver for this branch and tree.
2436
:param tree: The tree to use to construct the Unshelver.
2437
:return: an Unshelver or None if no changes are stored.
2439
branch = self._uncommitted_branch()
2441
transform = branch._transport.get('stored-transform')
2442
except errors.NoSuchFile:
2444
return shelf.Unshelver.from_tree_and_shelf(tree, transform)
2425
2446
def is_locked(self):
2426
2447
return self.control_files.is_locked()
2656
2669
self._transport.put_bytes('last-revision', out_string,
2657
2670
mode=self.bzrdir._get_file_mode())
2660
class FullHistoryBzrBranch(BzrBranch):
2661
"""Bzr branch which contains the full revision history."""
2664
def set_last_revision_info(self, revno, revision_id):
2665
if not revision_id or not isinstance(revision_id, basestring):
2666
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2667
revision_id = _mod_revision.ensure_null(revision_id)
2668
# this old format stores the full history, but this api doesn't
2669
# provide it, so we must generate, and might as well check it's
2671
history = self._lefthand_history(revision_id)
2672
if len(history) != revno:
2673
raise AssertionError('%d != %d' % (len(history), revno))
2674
self._set_revision_history(history)
2676
def _read_last_revision_info(self):
2677
rh = self.revision_history()
2680
return (revno, rh[-1])
2682
return (0, _mod_revision.NULL_REVISION)
2684
@deprecated_method(deprecated_in((2, 4, 0)))
2686
def set_revision_history(self, rev_history):
2687
"""See Branch.set_revision_history."""
2688
self._set_revision_history(rev_history)
2690
def _set_revision_history(self, rev_history):
2691
if 'evil' in debug.debug_flags:
2692
mutter_callsite(3, "set_revision_history scales with history.")
2693
check_not_reserved_id = _mod_revision.check_not_reserved_id
2694
for rev_id in rev_history:
2695
check_not_reserved_id(rev_id)
2696
if Branch.hooks['post_change_branch_tip']:
2697
# Don't calculate the last_revision_info() if there are no hooks
2699
old_revno, old_revid = self.last_revision_info()
2700
if len(rev_history) == 0:
2701
revid = _mod_revision.NULL_REVISION
2703
revid = rev_history[-1]
2704
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2705
self._write_revision_history(rev_history)
2706
self._clear_cached_state()
2707
self._cache_revision_history(rev_history)
2708
for hook in Branch.hooks['set_rh']:
2709
hook(self, rev_history)
2710
if Branch.hooks['post_change_branch_tip']:
2711
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2713
def _write_revision_history(self, history):
2714
"""Factored out of set_revision_history.
2716
This performs the actual writing to disk.
2717
It is intended to be called by set_revision_history."""
2718
self._transport.put_bytes(
2719
'revision-history', '\n'.join(history),
2720
mode=self.bzrdir._get_file_mode())
2722
def _gen_revision_history(self):
2723
history = self._transport.get_bytes('revision-history').split('\n')
2724
if history[-1:] == ['']:
2725
# There shouldn't be a trailing newline, but just in case.
2729
def _synchronize_history(self, destination, revision_id):
2730
if not isinstance(destination, FullHistoryBzrBranch):
2731
super(BzrBranch, self)._synchronize_history(
2732
destination, revision_id)
2734
if revision_id == _mod_revision.NULL_REVISION:
2737
new_history = self.revision_history()
2738
if revision_id is not None and new_history != []:
2740
new_history = new_history[:new_history.index(revision_id) + 1]
2742
rev = self.repository.get_revision(revision_id)
2743
new_history = rev.get_history(self.repository)[1:]
2744
destination._set_revision_history(new_history)
2747
def generate_revision_history(self, revision_id, last_rev=None,
2749
"""Create a new revision history that will finish with revision_id.
2751
:param revision_id: the new tip to use.
2752
:param last_rev: The previous last_revision. If not None, then this
2753
must be a ancestory of revision_id, or DivergedBranches is raised.
2754
:param other_branch: The other branch that DivergedBranches should
2755
raise with respect to.
2673
def update_feature_flags(self, updated_flags):
2674
"""Update the feature flags for this branch.
2676
:param updated_flags: Dictionary mapping feature names to necessities
2677
A necessity can be None to indicate the feature should be removed
2757
self._set_revision_history(self._lefthand_history(revision_id,
2758
last_rev, other_branch))
2761
class BzrBranch5(FullHistoryBzrBranch):
2762
"""A format 5 branch. This supports new features over plain branches.
2764
It has support for a master_branch which is the data for bound branches.
2679
self._format._update_feature_flags(updated_flags)
2680
self.control_transport.put_bytes('format', self._format.as_string())
2768
2683
class BzrBranch8(BzrBranch):
2769
2684
"""A branch that stores tree-reference locations."""
2771
def _open_hook(self):
2686
def _open_hook(self, possible_transports=None):
2772
2687
if self._ignore_fallbacks:
2689
if possible_transports is None:
2690
possible_transports = [self.bzrdir.root_transport]
2775
2692
url = self.get_stacked_on_url()
2776
2693
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2908
2826
"""See Branch.set_push_location."""
2909
2827
self._master_branch_cache = None
2911
config = self.get_config()
2829
conf = self.get_config_stack()
2912
2830
if location is None:
2913
if config.get_user_option('bound') != 'True':
2831
if not conf.get('bound'):
2916
config.set_user_option('bound', 'False', warn_masked=True)
2834
conf.set('bound', 'False')
2919
2837
self._set_config_location('bound_location', location,
2921
config.set_user_option('bound', 'True', warn_masked=True)
2839
conf.set('bound', 'True')
2924
2842
def _get_bound_location(self, bound):
2925
2843
"""Return the bound location in the config file.
2927
2845
Return None if the bound parameter does not match"""
2928
config = self.get_config()
2929
config_bound = (config.get_user_option('bound') == 'True')
2930
if config_bound != bound:
2846
conf = self.get_config_stack()
2847
if conf.get('bound') != bound:
2932
return self._get_config_location('bound_location', config=config)
2849
return self._get_config_location('bound_location', config=conf)
2934
2851
def get_bound_location(self):
2935
"""See Branch.set_push_location."""
2852
"""See Branch.get_bound_location."""
2936
2853
return self._get_bound_location(True)
2938
2855
def get_old_bound_location(self):
3047
2962
:ivar local_branch: target branch if there is a Master, else None
3048
2963
:ivar target_branch: Target/destination branch object. (write locked)
3049
2964
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2965
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
3052
@deprecated_method(deprecated_in((2, 3, 0)))
3054
"""Return the relative change in revno.
3056
:deprecated: Use `new_revno` and `old_revno` instead.
3058
return self.new_revno - self.old_revno
3060
2968
def report(self, to_file):
2969
tag_conflicts = getattr(self, "tag_conflicts", None)
2970
tag_updates = getattr(self, "tag_updates", None)
3061
2971
if not is_quiet():
3062
if self.old_revid == self.new_revid:
3063
to_file.write('No revisions to pull.\n')
2972
if self.old_revid != self.new_revid:
3065
2973
to_file.write('Now on revision %d.\n' % self.new_revno)
2975
to_file.write('%d tag(s) updated.\n' % len(tag_updates))
2976
if self.old_revid == self.new_revid and not tag_updates:
2977
if not tag_conflicts:
2978
to_file.write('No revisions or tags to pull.\n')
2980
to_file.write('No revisions to pull.\n')
3066
2981
self._show_tag_conficts(to_file)
3085
3000
target, otherwise it will be None.
3088
@deprecated_method(deprecated_in((2, 3, 0)))
3090
"""Return the relative change in revno.
3092
:deprecated: Use `new_revno` and `old_revno` instead.
3094
return self.new_revno - self.old_revno
3096
3003
def report(self, to_file):
3097
"""Write a human-readable description of the result."""
3098
if self.old_revid == self.new_revid:
3099
note('No new revisions to push.')
3101
note('Pushed up to revision %d.' % self.new_revno)
3004
# TODO: This function gets passed a to_file, but then
3005
# ignores it and calls note() instead. This is also
3006
# inconsistent with PullResult(), which writes to stdout.
3007
# -- JRV20110901, bug #838853
3008
tag_conflicts = getattr(self, "tag_conflicts", None)
3009
tag_updates = getattr(self, "tag_updates", None)
3011
if self.old_revid != self.new_revid:
3012
note(gettext('Pushed up to revision %d.') % self.new_revno)
3014
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
3015
if self.old_revid == self.new_revid and not tag_updates:
3016
if not tag_conflicts:
3017
note(gettext('No new revisions or tags to push.'))
3019
note(gettext('No new revisions to push.'))
3102
3020
self._show_tag_conficts(to_file)
3135
3053
# Copy source data into target
3136
3054
new_branch._write_last_revision_info(*branch.last_revision_info())
3137
new_branch.set_parent(branch.get_parent())
3138
new_branch.set_bound_location(branch.get_bound_location())
3139
new_branch.set_push_location(branch.get_push_location())
3055
new_branch.lock_write()
3057
new_branch.set_parent(branch.get_parent())
3058
new_branch.set_bound_location(branch.get_bound_location())
3059
new_branch.set_push_location(branch.get_push_location())
3141
3063
# New branch has no tags by default
3142
3064
new_branch.tags._set_tag_dict({})
3144
3066
# Copying done; now update target format
3145
3067
new_branch._transport.put_bytes('format',
3146
format.get_format_string(),
3147
3069
mode=new_branch.bzrdir._get_file_mode())
3149
3071
# Clean up old files
3150
3072
new_branch._transport.delete('revision-history')
3152
branch.set_parent(None)
3153
except errors.NoSuchFile:
3155
branch.set_bound_location(None)
3076
branch.set_parent(None)
3077
except errors.NoSuchFile:
3079
branch.set_bound_location(None)
3158
3084
class Converter6to7(object):
3405
3340
result.target_branch = self.target
3406
3341
result.old_revno, result.old_revid = self.target.last_revision_info()
3407
3342
self.source.update_references(self.target)
3343
overwrite = _fix_overwrite_type(overwrite)
3408
3344
if result.old_revid != stop_revision:
3409
3345
# We assume that during 'push' this repository is closer than
3411
3347
graph = self.source.repository.get_graph(self.target.repository)
3412
self._update_revisions(stop_revision, overwrite=overwrite,
3348
self._update_revisions(stop_revision,
3349
overwrite=("history" in overwrite),
3414
3351
if self.source._push_should_merge_tags():
3415
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3352
result.tag_updates, result.tag_conflicts = (
3353
self.source.tags.merge_to(
3354
self.target.tags, "tags" in overwrite))
3417
3355
result.new_revno, result.new_revid = self.target.last_revision_info()
3497
3435
# -- JRV20090506
3498
3436
result.old_revno, result.old_revid = \
3499
3437
self.target.last_revision_info()
3500
self._update_revisions(stop_revision, overwrite=overwrite,
3438
overwrite = _fix_overwrite_type(overwrite)
3439
self._update_revisions(stop_revision,
3440
overwrite=("history" in overwrite),
3502
3442
# TODO: The old revid should be specified when merging tags,
3503
3443
# so a tags implementation that versions tags can only
3504
3444
# pull in the most recent changes. -- JRV20090506
3505
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3506
overwrite, ignore_master=not merge_tags_to_master)
3445
result.tag_updates, result.tag_conflicts = (
3446
self.source.tags.merge_to(self.target.tags,
3447
"tags" in overwrite,
3448
ignore_master=not merge_tags_to_master))
3507
3449
result.new_revno, result.new_revid = self.target.last_revision_info()
3508
3450
if _hook_master:
3509
3451
result.master_branch = _hook_master
added
removed
bzrlib/branch.py
