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
21
18
from cStringIO import StringIO
23
21
from bzrlib.lazy_import import lazy_import
24
22
lazy_import(globals(), """
23
from itertools import chain
26
24
from bzrlib import (
31
config as _mod_config,
40
revision as _mod_revision,
27
config as _mod_config,
36
revision as _mod_revision,
42
from bzrlib.config import BranchConfig, TransportConfig
43
from bzrlib.tag import (
49
from bzrlib.i18n import gettext, ngettext
52
# Explicitly import bzrlib.bzrdir so that the BzrProber
53
# is guaranteed to be registered.
56
49
from bzrlib import (
60
52
from bzrlib.decorators import (
105
102
self._last_revision_info_cache = None
106
103
self._master_branch_cache = None
107
104
self._merge_sorted_revisions_cache = None
108
self._open_hook(possible_transports)
109
106
hooks = Branch.hooks['open']
110
107
for hook in hooks:
113
def _open_hook(self, possible_transports):
110
def _open_hook(self):
114
111
"""Called by init to allow simpler extension of the base class."""
116
def _activate_fallback_location(self, url, possible_transports):
113
def _activate_fallback_location(self, url):
117
114
"""Activate the branch/repository from url as a fallback repository."""
118
115
for existing_fallback_repo in self.repository._fallback_repositories:
119
116
if existing_fallback_repo.user_url == url:
120
117
# This fallback is already configured. This probably only
121
# happens because ControlDir.sprout is a horrible mess. To avoid
118
# happens because BzrDir.sprout is a horrible mess. To avoid
122
119
# confusing _unstack we don't add this a second time.
123
120
mutter('duplicate activation of fallback %r on %r', url, self)
125
repo = self._get_fallback_repository(url, possible_transports)
122
repo = self._get_fallback_repository(url)
126
123
if repo.has_same_location(self.repository):
127
124
raise errors.UnstackableLocationError(self.user_url, url)
128
125
self.repository.add_fallback_repository(repo)
182
179
For instance, if the branch is at URL/.bzr/branch,
183
180
Branch.open(URL) -> a Branch instance.
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)
182
control = bzrdir.BzrDir.open(base, _unsupported,
183
possible_transports=possible_transports)
184
return control.open_branch(unsupported=_unsupported)
191
def open_from_transport(transport, name=None, _unsupported=False,
192
possible_transports=None):
187
def open_from_transport(transport, name=None, _unsupported=False):
193
188
"""Open the branch rooted at transport"""
194
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
195
return control.open_branch(name=name, unsupported=_unsupported,
196
possible_transports=possible_transports)
189
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
190
return control.open_branch(name=name, unsupported=_unsupported)
199
193
def open_containing(url, possible_transports=None):
253
236
raise NotImplementedError(self._get_config)
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):
238
def _get_fallback_repository(self, url):
273
239
"""Get the repository we fallback to at url."""
274
240
url = urlutils.join(self.base, url)
275
a_branch = Branch.open(url, possible_transports=possible_transports)
241
a_branch = Branch.open(url,
242
possible_transports=[self.bzrdir.root_transport])
276
243
return a_branch.repository
545
510
rev_iter = iter(merge_sorted_revisions)
546
511
if start_revision_id is not None:
547
512
for node in rev_iter:
513
rev_id = node.key[-1]
549
514
if rev_id != start_revision_id:
552
517
# The decision to include the start or not
553
518
# depends on the stop_rule if a stop is provided
554
519
# so pop this node back into the iterator
555
rev_iter = itertools.chain(iter([node]), rev_iter)
520
rev_iter = chain(iter([node]), rev_iter)
557
522
if stop_revision_id is None:
558
523
# Yield everything
559
524
for node in rev_iter:
525
rev_id = node.key[-1]
561
526
yield (rev_id, node.merge_depth, node.revno,
562
527
node.end_of_merge)
563
528
elif stop_rule == 'exclude':
564
529
for node in rev_iter:
530
rev_id = node.key[-1]
566
531
if rev_id == stop_revision_id:
568
533
yield (rev_id, node.merge_depth, node.revno,
569
534
node.end_of_merge)
570
535
elif stop_rule == 'include':
571
536
for node in rev_iter:
537
rev_id = node.key[-1]
573
538
yield (rev_id, node.merge_depth, node.revno,
574
539
node.end_of_merge)
575
540
if rev_id == stop_revision_id:
784
744
"""Print `file` to stdout."""
785
745
raise NotImplementedError(self.print_file)
747
@deprecated_method(deprecated_in((2, 4, 0)))
748
def set_revision_history(self, rev_history):
749
"""See Branch.set_revision_history."""
750
self._set_revision_history(rev_history)
753
def _set_revision_history(self, rev_history):
754
if len(rev_history) == 0:
755
revid = _mod_revision.NULL_REVISION
757
revid = rev_history[-1]
758
if rev_history != self._lefthand_history(revid):
759
raise errors.NotLefthandHistory(rev_history)
760
self.set_last_revision_info(len(rev_history), revid)
761
self._cache_revision_history(rev_history)
762
for hook in Branch.hooks['set_rh']:
763
hook(self, rev_history)
787
765
@needs_write_lock
788
766
def set_last_revision_info(self, revno, revision_id):
789
767
"""Set the last revision of this branch.
1052
1032
def _read_last_revision_info(self):
1053
1033
raise NotImplementedError(self._read_last_revision_info)
1035
@deprecated_method(deprecated_in((2, 4, 0)))
1036
def import_last_revision_info(self, source_repo, revno, revid):
1037
"""Set the last revision info, importing from another repo if necessary.
1039
:param source_repo: Source repository to optionally fetch from
1040
:param revno: Revision number of the new tip
1041
:param revid: Revision id of the new tip
1043
if not self.repository.has_same_location(source_repo):
1044
self.repository.fetch(source_repo, revision_id=revid)
1045
self.set_last_revision_info(revno, revid)
1055
1047
def import_last_revision_info_and_tags(self, source, revno, revid,
1057
1049
"""Set the last revision info, importing from another repo if necessary.
1148
1140
def _set_config_location(self, name, url, config=None,
1149
1141
make_relative=False):
1150
1142
if config is None:
1151
config = self.get_config_stack()
1143
config = self.get_config()
1152
1144
if url is None:
1154
1146
elif make_relative:
1155
1147
url = urlutils.relative_url(self.base, url)
1156
config.set(name, url)
1148
config.set_user_option(name, url, warn_masked=True)
1158
1150
def _get_config_location(self, name, config=None):
1159
1151
if config is None:
1160
config = self.get_config_stack()
1161
location = config.get(name)
1152
config = self.get_config()
1153
location = config.get_user_option(name)
1162
1154
if location == '':
1163
1155
location = None
1164
1156
return location
1166
1158
def get_child_submit_format(self):
1167
1159
"""Return the preferred format of submissions to this branch."""
1168
return self.get_config_stack().get('child_submit_format')
1160
return self.get_config().get_user_option("child_submit_format")
1170
1162
def get_submit_branch(self):
1171
1163
"""Return the submit location of the branch.
1435
1429
t = transport.get_transport(to_location)
1436
1430
t.ensure_base()
1437
format = self._get_checkout_format(lightweight=lightweight)
1432
format = self._get_checkout_format()
1439
1433
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
1456
from_branch = checkout.set_branch_reference(target_branch=self)
1434
from_branch = BranchReferenceFormat().initialize(checkout,
1458
policy = checkout.determine_repository_policy()
1459
repo = policy.acquire_repository()[0]
1460
checkout_branch = checkout.create_branch()
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
1461
1441
checkout_branch.bind(self)
1462
1442
# pull up to the specified revision_id to set the initial
1463
1443
# branch tip correctly, and seed it with history.
1464
1444
checkout_branch.pull(self, stop_revision=revision_id)
1466
1446
tree = checkout.create_workingtree(revision_id,
1467
1447
from_branch=from_branch,
1468
1448
accelerator_tree=accelerator_tree,
1589
1566
object will be created every time regardless.
1569
can_set_append_revisions_only = True
1592
1571
def __eq__(self, other):
1593
1572
return self.__class__ is other.__class__
1595
1574
def __ne__(self, other):
1596
1575
return not (self == other)
1598
def get_reference(self, controldir, name=None):
1599
"""Get the target reference of the branch in controldir.
1578
def find_format(klass, a_bzrdir, name=None):
1579
"""Return the format for the branch object in a_bzrdir."""
1581
transport = a_bzrdir.get_branch_transport(None, name=name)
1582
format_string = transport.get_bytes("format")
1583
return format_registry.get(format_string)
1584
except errors.NoSuchFile:
1585
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1587
raise errors.UnknownFormatError(format=format_string, kind='branch')
1590
@deprecated_method(deprecated_in((2, 4, 0)))
1591
def get_default_format(klass):
1592
"""Return the current default format."""
1593
return format_registry.get_default()
1596
@deprecated_method(deprecated_in((2, 4, 0)))
1597
def get_formats(klass):
1598
"""Get all the known formats.
1600
Warning: This triggers a load of all lazy registered formats: do not
1601
use except when that is desireed.
1603
return format_registry._get_all()
1605
def get_reference(self, a_bzrdir, name=None):
1606
"""Get the target reference of the branch in a_bzrdir.
1601
1608
format probing must have been completed before calling
1602
1609
this method - it is assumed that the format of the branch
1603
in controldir is correct.
1610
in a_bzrdir is correct.
1605
:param controldir: The controldir to get the branch data from.
1612
:param a_bzrdir: The bzrdir to get the branch data from.
1606
1613
:param name: Name of the colocated branch to fetch
1607
1614
:return: None if the branch is not a reference branch.
1612
def set_reference(self, controldir, name, to_branch):
1613
"""Set the target reference of the branch in controldir.
1619
def set_reference(self, a_bzrdir, name, to_branch):
1620
"""Set the target reference of the branch in a_bzrdir.
1615
1622
format probing must have been completed before calling
1616
1623
this method - it is assumed that the format of the branch
1617
in controldir is correct.
1624
in a_bzrdir is correct.
1619
:param controldir: The controldir to set the branch reference for.
1626
:param a_bzrdir: The bzrdir to set the branch reference for.
1620
1627
:param name: Name of colocated branch to set, None for default
1621
1628
:param to_branch: branch that the checkout is to reference
1623
1630
raise NotImplementedError(self.set_reference)
1632
def get_format_string(self):
1633
"""Return the ASCII format string that identifies this format."""
1634
raise NotImplementedError(self.get_format_string)
1625
1636
def get_format_description(self):
1626
1637
"""Return the short format description for this format."""
1627
1638
raise NotImplementedError(self.get_format_description)
1629
def _run_post_branch_init_hooks(self, controldir, name, branch):
1640
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1630
1641
hooks = Branch.hooks['post_branch_init']
1633
params = BranchInitHookParams(self, controldir, name, branch)
1644
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1634
1645
for hook in hooks:
1637
def initialize(self, controldir, name=None, repository=None,
1638
append_revisions_only=None):
1639
"""Create a branch of this format in controldir.
1648
def initialize(self, a_bzrdir, name=None, repository=None):
1649
"""Create a branch of this format in a_bzrdir.
1641
1651
:param name: Name of the colocated branch to create.
1643
1653
raise NotImplementedError(self.initialize)
1946
1974
self.revision_id)
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)
1977
class BranchFormatMetadir(BranchFormat):
1978
"""Common logic for meta-dir based branch formats."""
1970
1980
def _branch_class(self):
1971
1981
"""What class to instantiate on open calls."""
1972
1982
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.
1982
1984
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1983
1985
repository=None):
1984
"""Initialize a branch in a control dir, with specified files
1986
"""Initialize a branch in a bzrdir, with specified files
1986
1988
:param a_bzrdir: The bzrdir to initialize the branch in
1987
1989
:param utf8_files: The files to create as a list of
2048
2051
def supports_leaving_lock(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)
2055
class BzrBranchFormat5(BranchFormatMetadir):
2056
"""Bzr branch format 5.
2059
- a revision-history file.
2061
- a lock dir guarding the branch itself
2062
- all of this stored in a branch/ subdirectory
2063
- works with shared repositories.
2065
This format is new in bzr 0.8.
2068
def _branch_class(self):
2071
def get_format_string(self):
2072
"""See BranchFormat.get_format_string()."""
2073
return "Bazaar-NG branch format 5\n"
2075
def get_format_description(self):
2076
"""See BranchFormat.get_format_description()."""
2077
return "Branch format 5"
2079
def initialize(self, a_bzrdir, name=None, repository=None):
2080
"""Create a branch of this format in a_bzrdir."""
2081
utf8_files = [('revision-history', ''),
2082
('branch-name', ''),
2084
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2086
def supports_tags(self):
2060
2090
class BzrBranchFormat6(BranchFormatMetadir):
2080
2109
"""See BranchFormat.get_format_description()."""
2081
2110
return "Branch format 6"
2083
def initialize(self, a_bzrdir, name=None, repository=None,
2084
append_revisions_only=None):
2112
def initialize(self, a_bzrdir, name=None, repository=None):
2085
2113
"""Create a branch of this format in a_bzrdir."""
2086
2114
utf8_files = [('last-revision', '0 null:\n'),
2088
self._get_initial_config(append_revisions_only)),
2115
('branch.conf', ''),
2091
2118
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2093
2120
def make_tags(self, branch):
2094
2121
"""See bzrlib.branch.BranchFormat.make_tags()."""
2095
return _mod_tag.BasicTags(branch)
2122
return BasicTags(branch)
2097
2124
def supports_set_append_revisions_only(self):
2212
2232
location = transport.put_bytes('location', to_branch.base)
2214
2234
def initialize(self, a_bzrdir, name=None, target_branch=None,
2215
repository=None, append_revisions_only=None):
2216
2236
"""Create a branch of this format in a_bzrdir."""
2217
2237
if target_branch is None:
2218
2238
# this format does not implement branch itself, thus the implicit
2219
2239
# creation contract must see it as uninitializable
2220
2240
raise errors.UninitializableFormat(self)
2221
2241
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()
2226
2242
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2227
2243
branch_transport.put_bytes('location',
2228
target_branch.user_url)
2229
branch_transport.put_bytes('format', self.as_string())
2230
branch = self.open(a_bzrdir, name, _found=True,
2244
target_branch.bzrdir.user_url)
2245
branch_transport.put_bytes('format', self.get_format_string())
2247
a_bzrdir, name, _found=True,
2231
2248
possible_transports=[target_branch.bzrdir.root_transport])
2232
2249
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2253
super(BranchReferenceFormat, self).__init__()
2254
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2255
self._matchingbzrdir.set_branch_format(self)
2235
2257
def _make_reference_clone_function(format, a_branch):
2236
2258
"""Create a clone() routine for a branch dynamically."""
2237
2259
def clone(to_bzrdir, revision_id=None,
2260
2282
:param possible_transports: An optional reusable transports list.
2263
name = a_bzrdir._get_selected_branch()
2265
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2285
format = BranchFormat.find_format(a_bzrdir, name=name)
2266
2286
if format.__class__ != self.__class__:
2267
2287
raise AssertionError("wrong format %r found for %r" %
2268
2288
(format, self))
2269
2289
if location is None:
2270
2290
location = self.get_reference(a_bzrdir, name)
2271
real_bzrdir = controldir.ControlDir.open(
2291
real_bzrdir = bzrdir.BzrDir.open(
2272
2292
location, possible_transports=possible_transports)
2273
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks,
2274
possible_transports=possible_transports)
2293
result = real_bzrdir.open_branch(name=name,
2294
ignore_fallbacks=ignore_fallbacks)
2275
2295
# this changes the behaviour of result.clone to create a new reference
2276
2296
# rather than a copy of the content of the branch.
2277
2297
# I did not use a proxy object because that needs much more extensive
2359
2379
def __init__(self, _format=None,
2360
2380
_control_files=None, a_bzrdir=None, name=None,
2361
_repository=None, ignore_fallbacks=False,
2362
possible_transports=None):
2381
_repository=None, ignore_fallbacks=False):
2363
2382
"""Create new branch object at a particular location."""
2364
2383
if a_bzrdir is None:
2365
2384
raise ValueError('a_bzrdir must be supplied')
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
2386
self.bzrdir = a_bzrdir
2387
self._base = self.bzrdir.transport.clone('..').base
2374
2388
self.name = name
2389
# XXX: We should be able to just do
2390
# self.base = self.bzrdir.root_transport.base
2391
# but this does not quite work yet -- mbp 20080522
2375
2392
self._format = _format
2376
2393
if _control_files is None:
2377
2394
raise ValueError('BzrBranch _control_files is None')
2378
2395
self.control_files = _control_files
2379
2396
self._transport = _control_files._transport
2380
2397
self.repository = _repository
2381
self.conf_store = None
2382
Branch.__init__(self, possible_transports)
2398
Branch.__init__(self)
2384
2400
def __str__(self):
2385
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2401
if self.name is None:
2402
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2404
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2387
2407
__repr__ = __str__
2393
2413
base = property(_get_base, doc="The URL for the root of this branch.")
2396
def user_transport(self):
2397
return self._user_transport
2399
2415
def _get_config(self):
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)
2416
return TransportConfig(self._transport, 'branch.conf')
2446
2418
def is_locked(self):
2447
2419
return self.control_files.is_locked()
2669
2649
self._transport.put_bytes('last-revision', out_string,
2670
2650
mode=self.bzrdir._get_file_mode())
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
2653
class FullHistoryBzrBranch(BzrBranch):
2654
"""Bzr branch which contains the full revision history."""
2657
def set_last_revision_info(self, revno, revision_id):
2658
if not revision_id or not isinstance(revision_id, basestring):
2659
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2660
revision_id = _mod_revision.ensure_null(revision_id)
2661
# this old format stores the full history, but this api doesn't
2662
# provide it, so we must generate, and might as well check it's
2664
history = self._lefthand_history(revision_id)
2665
if len(history) != revno:
2666
raise AssertionError('%d != %d' % (len(history), revno))
2667
self._set_revision_history(history)
2669
def _read_last_revision_info(self):
2670
rh = self.revision_history()
2673
return (revno, rh[-1])
2675
return (0, _mod_revision.NULL_REVISION)
2677
@deprecated_method(deprecated_in((2, 4, 0)))
2679
def set_revision_history(self, rev_history):
2680
"""See Branch.set_revision_history."""
2681
self._set_revision_history(rev_history)
2683
def _set_revision_history(self, rev_history):
2684
if 'evil' in debug.debug_flags:
2685
mutter_callsite(3, "set_revision_history scales with history.")
2686
check_not_reserved_id = _mod_revision.check_not_reserved_id
2687
for rev_id in rev_history:
2688
check_not_reserved_id(rev_id)
2689
if Branch.hooks['post_change_branch_tip']:
2690
# Don't calculate the last_revision_info() if there are no hooks
2692
old_revno, old_revid = self.last_revision_info()
2693
if len(rev_history) == 0:
2694
revid = _mod_revision.NULL_REVISION
2696
revid = rev_history[-1]
2697
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2698
self._write_revision_history(rev_history)
2699
self._clear_cached_state()
2700
self._cache_revision_history(rev_history)
2701
for hook in Branch.hooks['set_rh']:
2702
hook(self, rev_history)
2703
if Branch.hooks['post_change_branch_tip']:
2704
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2706
def _write_revision_history(self, history):
2707
"""Factored out of set_revision_history.
2709
This performs the actual writing to disk.
2710
It is intended to be called by set_revision_history."""
2711
self._transport.put_bytes(
2712
'revision-history', '\n'.join(history),
2713
mode=self.bzrdir._get_file_mode())
2715
def _gen_revision_history(self):
2716
history = self._transport.get_bytes('revision-history').split('\n')
2717
if history[-1:] == ['']:
2718
# There shouldn't be a trailing newline, but just in case.
2722
def _synchronize_history(self, destination, revision_id):
2723
if not isinstance(destination, FullHistoryBzrBranch):
2724
super(BzrBranch, self)._synchronize_history(
2725
destination, revision_id)
2727
if revision_id == _mod_revision.NULL_REVISION:
2730
new_history = self.revision_history()
2731
if revision_id is not None and new_history != []:
2733
new_history = new_history[:new_history.index(revision_id) + 1]
2735
rev = self.repository.get_revision(revision_id)
2736
new_history = rev.get_history(self.repository)[1:]
2737
destination._set_revision_history(new_history)
2740
def generate_revision_history(self, revision_id, last_rev=None,
2742
"""Create a new revision history that will finish with revision_id.
2744
:param revision_id: the new tip to use.
2745
:param last_rev: The previous last_revision. If not None, then this
2746
must be a ancestory of revision_id, or DivergedBranches is raised.
2747
:param other_branch: The other branch that DivergedBranches should
2748
raise with respect to.
2679
self._format._update_feature_flags(updated_flags)
2680
self.control_transport.put_bytes('format', self._format.as_string())
2750
self._set_revision_history(self._lefthand_history(revision_id,
2751
last_rev, other_branch))
2754
class BzrBranch5(FullHistoryBzrBranch):
2755
"""A format 5 branch. This supports new features over plain branches.
2757
It has support for a master_branch which is the data for bound branches.
2683
2761
class BzrBranch8(BzrBranch):
2684
2762
"""A branch that stores tree-reference locations."""
2686
def _open_hook(self, possible_transports=None):
2764
def _open_hook(self):
2687
2765
if self._ignore_fallbacks:
2689
if possible_transports is None:
2690
possible_transports = [self.bzrdir.root_transport]
2692
2768
url = self.get_stacked_on_url()
2693
2769
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2826
2901
"""See Branch.set_push_location."""
2827
2902
self._master_branch_cache = None
2829
conf = self.get_config_stack()
2904
config = self.get_config()
2830
2905
if location is None:
2831
if not conf.get('bound'):
2906
if config.get_user_option('bound') != 'True':
2834
conf.set('bound', 'False')
2909
config.set_user_option('bound', 'False', warn_masked=True)
2837
2912
self._set_config_location('bound_location', location,
2839
conf.set('bound', 'True')
2914
config.set_user_option('bound', 'True', warn_masked=True)
2842
2917
def _get_bound_location(self, bound):
2843
2918
"""Return the bound location in the config file.
2845
2920
Return None if the bound parameter does not match"""
2846
conf = self.get_config_stack()
2847
if conf.get('bound') != bound:
2921
config = self.get_config()
2922
config_bound = (config.get_user_option('bound') == 'True')
2923
if config_bound != bound:
2849
return self._get_config_location('bound_location', config=conf)
2925
return self._get_config_location('bound_location', config=config)
2851
2927
def get_bound_location(self):
2852
"""See Branch.get_bound_location."""
2928
"""See Branch.set_push_location."""
2853
2929
return self._get_bound_location(True)
2855
2931
def get_old_bound_location(self):
2962
3036
:ivar local_branch: target branch if there is a Master, else None
2963
3037
:ivar target_branch: Target/destination branch object. (write locked)
2964
3038
: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
3041
@deprecated_method(deprecated_in((2, 3, 0)))
3043
"""Return the relative change in revno.
3045
:deprecated: Use `new_revno` and `old_revno` instead.
3047
return self.new_revno - self.old_revno
2968
3049
def report(self, to_file):
2969
tag_conflicts = getattr(self, "tag_conflicts", None)
2970
tag_updates = getattr(self, "tag_updates", None)
2971
3050
if not is_quiet():
2972
if self.old_revid != self.new_revid:
3051
if self.old_revid == self.new_revid:
3052
to_file.write('No revisions to pull.\n')
2973
3054
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')
2981
3055
self._show_tag_conficts(to_file)
3000
3074
target, otherwise it will be None.
3077
@deprecated_method(deprecated_in((2, 3, 0)))
3079
"""Return the relative change in revno.
3081
:deprecated: Use `new_revno` and `old_revno` instead.
3083
return self.new_revno - self.old_revno
3003
3085
def report(self, to_file):
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.'))
3086
"""Write a human-readable description of the result."""
3087
if self.old_revid == self.new_revid:
3088
note('No new revisions to push.')
3090
note('Pushed up to revision %d.' % self.new_revno)
3020
3091
self._show_tag_conficts(to_file)
3053
3124
# Copy source data into target
3054
3125
new_branch._write_last_revision_info(*branch.last_revision_info())
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())
3126
new_branch.set_parent(branch.get_parent())
3127
new_branch.set_bound_location(branch.get_bound_location())
3128
new_branch.set_push_location(branch.get_push_location())
3063
3130
# New branch has no tags by default
3064
3131
new_branch.tags._set_tag_dict({})
3066
3133
# Copying done; now update target format
3067
3134
new_branch._transport.put_bytes('format',
3135
format.get_format_string(),
3069
3136
mode=new_branch.bzrdir._get_file_mode())
3071
3138
# Clean up old files
3072
3139
new_branch._transport.delete('revision-history')
3076
branch.set_parent(None)
3077
except errors.NoSuchFile:
3079
branch.set_bound_location(None)
3141
branch.set_parent(None)
3142
except errors.NoSuchFile:
3144
branch.set_bound_location(None)
3084
3147
class Converter6to7(object):
3088
3151
format = BzrBranchFormat7()
3089
3152
branch._set_config_location('stacked_on_location', '')
3090
3153
# update target format
3091
branch._transport.put_bytes('format', format.as_string())
3154
branch._transport.put_bytes('format', format.get_format_string())
3094
3157
class Converter7to8(object):
3095
"""Perform an in-place upgrade of format 7 to format 8"""
3158
"""Perform an in-place upgrade of format 6 to format 7"""
3097
3160
def convert(self, branch):
3098
3161
format = BzrBranchFormat8()
3099
3162
branch._transport.put_bytes('references', '')
3100
3163
# update target format
3101
branch._transport.put_bytes('format', format.as_string())
3164
branch._transport.put_bytes('format', format.get_format_string())
3167
def _run_with_write_locked_target(target, callable, *args, **kwargs):
3168
"""Run ``callable(*args, **kwargs)``, write-locking target for the
3171
_run_with_write_locked_target will attempt to release the lock it acquires.
3173
If an exception is raised by callable, then that exception *will* be
3174
propagated, even if the unlock attempt raises its own error. Thus
3175
_run_with_write_locked_target should be preferred to simply doing::
3179
return callable(*args, **kwargs)
3184
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
3185
# should share code?
3188
result = callable(*args, **kwargs)
3190
exc_info = sys.exc_info()
3194
raise exc_info[0], exc_info[1], exc_info[2]
3104
3200
class InterBranch(InterObject):
3315
3391
This is the basic concrete implementation of push()
3317
:param _override_hook_source_branch: If specified, run the hooks
3318
passing this Branch as the source, rather than self. This is for
3319
use of RemoteBranch, where push is delegated to the underlying
3393
:param _override_hook_source_branch: If specified, run
3394
the hooks passing this Branch as the source, rather than self.
3395
This is for use of RemoteBranch, where push is delegated to the
3396
underlying vfs-based Branch.
3323
3399
raise errors.LossyPushToSameVCS(self.source, self.target)
3324
3400
# TODO: Public option to disable running hooks - should be trivial but
3327
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3328
op.add_cleanup(self.source.lock_read().unlock)
3329
op.add_cleanup(self.target.lock_write().unlock)
3330
return op.run(overwrite, stop_revision,
3331
_override_hook_source_branch=_override_hook_source_branch)
3402
self.source.lock_read()
3404
return _run_with_write_locked_target(
3405
self.target, self._push_with_bound_branches, overwrite,
3407
_override_hook_source_branch=_override_hook_source_branch)
3409
self.source.unlock()
3333
3411
def _basic_push(self, overwrite, stop_revision):
3334
3412
"""Basic implementation of push without bound branches or hooks.
3340
3418
result.target_branch = self.target
3341
3419
result.old_revno, result.old_revid = self.target.last_revision_info()
3342
3420
self.source.update_references(self.target)
3343
overwrite = _fix_overwrite_type(overwrite)
3344
3421
if result.old_revid != stop_revision:
3345
3422
# We assume that during 'push' this repository is closer than
3347
3424
graph = self.source.repository.get_graph(self.target.repository)
3348
self._update_revisions(stop_revision,
3349
overwrite=("history" in overwrite),
3425
self._update_revisions(stop_revision, overwrite=overwrite,
3351
3427
if self.source._push_should_merge_tags():
3352
result.tag_updates, result.tag_conflicts = (
3353
self.source.tags.merge_to(
3354
self.target.tags, "tags" in overwrite))
3428
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3355
3430
result.new_revno, result.new_revid = self.target.last_revision_info()
3358
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3433
def _push_with_bound_branches(self, overwrite, stop_revision,
3359
3434
_override_hook_source_branch=None):
3360
3435
"""Push from source into target, and into target's master if any.
3373
3448
# be bound to itself? -- mbp 20070507
3374
3449
master_branch = self.target.get_master_branch()
3375
3450
master_branch.lock_write()
3376
operation.add_cleanup(master_branch.unlock)
3377
# push into the master from the source branch.
3378
master_inter = InterBranch.get(self.source, master_branch)
3379
master_inter._basic_push(overwrite, stop_revision)
3380
# and push into the target branch from the source. Note that
3381
# we push from the source branch again, because it's considered
3382
# the highest bandwidth repository.
3383
result = self._basic_push(overwrite, stop_revision)
3384
result.master_branch = master_branch
3385
result.local_branch = self.target
3452
# push into the master from the source branch.
3453
master_inter = InterBranch.get(self.source, master_branch)
3454
master_inter._basic_push(overwrite, stop_revision)
3455
# and push into the target branch from the source. Note that
3456
# we push from the source branch again, because it's considered
3457
# the highest bandwidth repository.
3458
result = self._basic_push(overwrite, stop_revision)
3459
result.master_branch = master_branch
3460
result.local_branch = self.target
3464
master_branch.unlock()
3387
master_branch = None
3388
3466
# no master branch
3389
3467
result = self._basic_push(overwrite, stop_revision)
3390
3468
# TODO: Why set master_branch and local_branch if there's no
3435
3513
# -- JRV20090506
3436
3514
result.old_revno, result.old_revid = \
3437
3515
self.target.last_revision_info()
3438
overwrite = _fix_overwrite_type(overwrite)
3439
self._update_revisions(stop_revision,
3440
overwrite=("history" in overwrite),
3516
self._update_revisions(stop_revision, overwrite=overwrite,
3442
3518
# TODO: The old revid should be specified when merging tags,
3443
3519
# so a tags implementation that versions tags can only
3444
3520
# pull in the most recent changes. -- JRV20090506
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))
3521
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3522
overwrite, ignore_master=not merge_tags_to_master)
3449
3523
result.new_revno, result.new_revid = self.target.last_revision_info()
3450
3524
if _hook_master:
3451
3525
result.master_branch = _hook_master
added
removed
bzrlib/branch.py
