478
406
"""Iterate over an inclusive range of sorted revisions."""
479
407
rev_iter = iter(merge_sorted_revisions)
480
408
if start_revision_id is not None:
481
for node in rev_iter:
482
rev_id = node.key[-1]
409
for rev_id, depth, revno, end_of_merge in rev_iter:
483
410
if rev_id != start_revision_id:
486
413
# The decision to include the start or not
487
414
# depends on the stop_rule if a stop is provided
488
# so pop this node back into the iterator
489
rev_iter = chain(iter([node]), rev_iter)
416
iter([(rev_id, depth, revno, end_of_merge)]),
491
419
if stop_revision_id is None:
493
for node in rev_iter:
494
rev_id = node.key[-1]
495
yield (rev_id, node.merge_depth, node.revno,
420
for rev_id, depth, revno, end_of_merge in rev_iter:
421
yield rev_id, depth, revno, end_of_merge
497
422
elif stop_rule == 'exclude':
498
for node in rev_iter:
499
rev_id = node.key[-1]
423
for rev_id, depth, revno, end_of_merge in rev_iter:
500
424
if rev_id == stop_revision_id:
502
yield (rev_id, node.merge_depth, node.revno,
426
yield rev_id, depth, revno, end_of_merge
504
427
elif stop_rule == 'include':
505
for node in rev_iter:
506
rev_id = node.key[-1]
507
yield (rev_id, node.merge_depth, node.revno,
428
for rev_id, depth, revno, end_of_merge in rev_iter:
429
yield rev_id, depth, revno, end_of_merge
509
430
if rev_id == stop_revision_id:
511
elif stop_rule == 'with-merges-without-common-ancestry':
512
# We want to exclude all revisions that are already part of the
513
# stop_revision_id ancestry.
514
graph = self.repository.get_graph()
515
ancestors = graph.find_unique_ancestors(start_revision_id,
517
for node in rev_iter:
518
rev_id = node.key[-1]
519
if rev_id not in ancestors:
521
yield (rev_id, node.merge_depth, node.revno,
523
432
elif stop_rule == 'with-merges':
524
433
stop_rev = self.repository.get_revision(stop_revision_id)
525
434
if stop_rev.parent_ids:
526
435
left_parent = stop_rev.parent_ids[0]
528
437
left_parent = _mod_revision.NULL_REVISION
529
# left_parent is the actual revision we want to stop logging at,
530
# since we want to show the merged revisions after the stop_rev too
531
reached_stop_revision_id = False
532
revision_id_whitelist = []
533
for node in rev_iter:
534
rev_id = node.key[-1]
438
for rev_id, depth, revno, end_of_merge in rev_iter:
535
439
if rev_id == left_parent:
536
# reached the left parent after the stop_revision
538
if (not reached_stop_revision_id or
539
rev_id in revision_id_whitelist):
540
yield (rev_id, node.merge_depth, node.revno,
542
if reached_stop_revision_id or rev_id == stop_revision_id:
543
# only do the merged revs of rev_id from now on
544
rev = self.repository.get_revision(rev_id)
546
reached_stop_revision_id = True
547
revision_id_whitelist.extend(rev.parent_ids)
441
yield rev_id, depth, revno, end_of_merge
549
443
raise ValueError('invalid stop_rule %r' % stop_rule)
551
def _filter_start_non_ancestors(self, rev_iter):
552
# If we started from a dotted revno, we want to consider it as a tip
553
# and don't want to yield revisions that are not part of its
554
# ancestry. Given the order guaranteed by the merge sort, we will see
555
# uninteresting descendants of the first parent of our tip before the
557
first = rev_iter.next()
558
(rev_id, merge_depth, revno, end_of_merge) = first
561
# We start at a mainline revision so by definition, all others
562
# revisions in rev_iter are ancestors
563
for node in rev_iter:
568
pmap = self.repository.get_parent_map([rev_id])
569
parents = pmap.get(rev_id, [])
571
whitelist.update(parents)
573
# If there is no parents, there is nothing of interest left
575
# FIXME: It's hard to test this scenario here as this code is never
576
# called in that case. -- vila 20100322
579
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
581
if rev_id in whitelist:
582
pmap = self.repository.get_parent_map([rev_id])
583
parents = pmap.get(rev_id, [])
584
whitelist.remove(rev_id)
585
whitelist.update(parents)
587
# We've reached the mainline, there is nothing left to
591
# A revision that is not part of the ancestry of our
594
yield (rev_id, merge_depth, revno, end_of_merge)
596
445
def leave_lock_in_place(self):
597
446
"""Tell this branch object not to release the physical lock when this
598
447
object is unlocked.
756
573
:raises UnstackableRepositoryFormat: If the repository does not support
759
if not self._format.supports_stacking():
760
raise errors.UnstackableBranchFormat(self._format, self.user_url)
761
# XXX: Changing from one fallback repository to another does not check
762
# that all the data you need is present in the new fallback.
763
# Possibly it should.
764
self._check_stackable_repo()
767
old_url = self.get_stacked_on_url()
768
except (errors.NotStacked, errors.UnstackableBranchFormat,
769
errors.UnstackableRepositoryFormat):
773
self._activate_fallback_location(url)
774
# write this out after the repository is stacked to avoid setting a
775
# stacked config that doesn't work.
776
self._set_config_location('stacked_on_location', url)
779
"""Change a branch to be unstacked, copying data as needed.
781
Don't call this directly, use set_stacked_on_url(None).
783
pb = ui.ui_factory.nested_progress_bar()
785
pb.update("Unstacking")
786
# The basic approach here is to fetch the tip of the branch,
787
# including all available ghosts, from the existing stacked
788
# repository into a new repository object without the fallbacks.
790
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
791
# correct for CHKMap repostiories
792
old_repository = self.repository
793
if len(old_repository._fallback_repositories) != 1:
794
raise AssertionError("can't cope with fallback repositories "
795
"of %r" % (self.repository,))
796
# unlock it, including unlocking the fallback
797
old_repository.unlock()
798
old_repository.lock_read()
800
# Repositories don't offer an interface to remove fallback
801
# repositories today; take the conceptually simpler option and just
802
# reopen it. We reopen it starting from the URL so that we
803
# get a separate connection for RemoteRepositories and can
804
# stream from one of them to the other. This does mean doing
805
# separate SSH connection setup, but unstacking is not a
806
# common operation so it's tolerable.
807
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
808
new_repository = new_bzrdir.find_repository()
809
self.repository = new_repository
810
if self.repository._fallback_repositories:
811
raise AssertionError("didn't expect %r to have "
812
"fallback_repositories"
813
% (self.repository,))
814
# this is not paired with an unlock because it's just restoring
815
# the previous state; the lock's released when set_stacked_on_url
817
self.repository.lock_write()
818
# XXX: If you unstack a branch while it has a working tree
819
# with a pending merge, the pending-merged revisions will no
820
# longer be present. You can (probably) revert and remerge.
822
# XXX: This only fetches up to the tip of the repository; it
823
# doesn't bring across any tags. That's fairly consistent
824
# with how branch works, but perhaps not ideal.
825
self.repository.fetch(old_repository,
826
revision_id=self.last_revision(),
829
old_repository.unlock()
576
raise NotImplementedError(self.set_stacked_on_url)
833
578
def _set_tags_bytes(self, bytes):
834
579
"""Mirror method for _get_tags_bytes.
1001
748
except ValueError:
1002
749
raise errors.NoSuchRevision(self, revision_id)
1005
751
def get_rev_id(self, revno, history=None):
1006
752
"""Find the revision id of the specified revno."""
1008
754
return _mod_revision.NULL_REVISION
1009
last_revno, last_revid = self.last_revision_info()
1010
if revno == last_revno:
1012
if revno <= 0 or revno > last_revno:
756
history = self.revision_history()
757
if revno <= 0 or revno > len(history):
1013
758
raise errors.NoSuchRevision(self, revno)
1014
distance_from_last = last_revno - revno
1015
if len(self._partial_revision_history_cache) <= distance_from_last:
1016
self._extend_partial_history(distance_from_last)
1017
return self._partial_revision_history_cache[distance_from_last]
759
return history[revno - 1]
1020
761
def pull(self, source, overwrite=False, stop_revision=None,
1021
possible_transports=None, *args, **kwargs):
762
possible_transports=None, _override_hook_target=None):
1022
763
"""Mirror source into this branch.
1024
765
This branch is considered to be 'local', having low latency.
1026
767
:returns: PullResult instance
1028
return InterBranch.get(source, self).pull(overwrite=overwrite,
1029
stop_revision=stop_revision,
1030
possible_transports=possible_transports, *args, **kwargs)
769
raise NotImplementedError(self.pull)
1032
def push(self, target, overwrite=False, stop_revision=None, *args,
771
def push(self, target, overwrite=False, stop_revision=None):
1034
772
"""Mirror this branch into target.
1036
774
This branch is considered to be 'local', having low latency.
1038
return InterBranch.get(self, target).push(overwrite, stop_revision,
1041
def lossy_push(self, target, stop_revision=None):
1042
"""Push deltas into another branch.
1044
:note: This does not, like push, retain the revision ids from
1045
the source branch and will, rather than adding bzr-specific
1046
metadata, push only those semantics of the revision that can be
1047
natively represented by this branch' VCS.
1049
:param target: Target branch
1050
:param stop_revision: Revision to push, defaults to last revision.
1051
:return: BranchPushResult with an extra member revidmap:
1052
A dictionary mapping revision ids from the target branch
1053
to new revision ids in the target branch, for each
1054
revision that was pushed.
1056
inter = InterBranch.get(self, target)
1057
lossy_push = getattr(inter, "lossy_push", None)
1058
if lossy_push is None:
1059
raise errors.LossyPushToSameVCS(self, target)
1060
return lossy_push(stop_revision)
776
raise NotImplementedError(self.push)
1062
778
def basis_tree(self):
1063
779
"""Return `Tree` object for last revision."""
1312
1010
Callers will typically also want to check the repository.
1314
:param refs: Calculated refs for this branch as specified by
1315
branch._get_check_refs()
1316
1012
:return: A BranchCheckResult.
1318
result = BranchCheckResult(self)
1014
mainline_parent_id = None
1319
1015
last_revno, last_revision_id = self.last_revision_info()
1320
actual_revno = refs[('lefthand-distance', last_revision_id)]
1321
if actual_revno != last_revno:
1322
result.errors.append(errors.BzrCheckError(
1323
'revno does not match len(mainline) %s != %s' % (
1324
last_revno, actual_revno)))
1325
# TODO: We should probably also check that self.revision_history
1326
# matches the repository for older branch formats.
1327
# If looking for the code that cross-checks repository parents against
1328
# the iter_reverse_revision_history output, that is now a repository
1016
real_rev_history = list(self.repository.iter_reverse_revision_history(
1018
real_rev_history.reverse()
1019
if len(real_rev_history) != last_revno:
1020
raise errors.BzrCheckError('revno does not match len(mainline)'
1021
' %s != %s' % (last_revno, len(real_rev_history)))
1022
# TODO: We should probably also check that real_rev_history actually
1023
# matches self.revision_history()
1024
for revision_id in real_rev_history:
1026
revision = self.repository.get_revision(revision_id)
1027
except errors.NoSuchRevision, e:
1028
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1030
# In general the first entry on the revision history has no parents.
1031
# But it's not illegal for it to have parents listed; this can happen
1032
# in imports from Arch when the parents weren't reachable.
1033
if mainline_parent_id is not None:
1034
if mainline_parent_id not in revision.parent_ids:
1035
raise errors.BzrCheckError("previous revision {%s} not listed among "
1037
% (mainline_parent_id, revision_id))
1038
mainline_parent_id = revision_id
1039
return BranchCheckResult(self)
1332
1041
def _get_checkout_format(self):
1333
1042
"""Return the most suitable metadir for a checkout of this branch.
1564
1251
"""Return the short format description for this format."""
1565
1252
raise NotImplementedError(self.get_format_description)
1567
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1568
hooks = Branch.hooks['post_branch_init']
1571
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1575
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1576
lock_type='metadir', set_format=True):
1254
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1577
1256
"""Initialize a branch in a bzrdir, with specified files
1579
1258
:param a_bzrdir: The bzrdir to initialize the branch in
1580
1259
:param utf8_files: The files to create as a list of
1581
1260
(filename, content) tuples
1582
:param name: Name of colocated branch to create, if any
1583
1261
:param set_format: If True, set the format with
1584
1262
self.get_format_string. (BzrBranch4 has its format set
1586
1264
:return: a branch in this format
1588
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1589
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1266
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1267
branch_transport = a_bzrdir.get_branch_transport(self)
1591
1269
'metadir': ('lock', lockdir.LockDir),
1592
1270
'branch4': ('branch-lock', lockable_files.TransportLock),
1717
1374
Hooks.__init__(self)
1718
self.create_hook(HookPoint('set_rh',
1719
"Invoked whenever the revision history has been set via "
1720
"set_revision_history. The api signature is (branch, "
1721
"revision_history), and the branch will be write-locked. "
1722
"The set_rh hook can be expensive for bzr to trigger, a better "
1723
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1724
self.create_hook(HookPoint('open',
1725
"Called with the Branch object that has been opened after a "
1726
"branch is opened.", (1, 8), None))
1727
self.create_hook(HookPoint('post_push',
1728
"Called after a push operation completes. post_push is called "
1729
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1730
"bzr client.", (0, 15), None))
1731
self.create_hook(HookPoint('post_pull',
1732
"Called after a pull operation completes. post_pull is called "
1733
"with a bzrlib.branch.PullResult object and only runs in the "
1734
"bzr client.", (0, 15), None))
1735
self.create_hook(HookPoint('pre_commit',
1736
"Called after a commit is calculated but before it is is "
1737
"completed. pre_commit is called with (local, master, old_revno, "
1738
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1739
"). old_revid is NULL_REVISION for the first commit to a branch, "
1740
"tree_delta is a TreeDelta object describing changes from the "
1741
"basis revision. hooks MUST NOT modify this delta. "
1742
" future_tree is an in-memory tree obtained from "
1743
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1744
"tree.", (0,91), None))
1745
self.create_hook(HookPoint('post_commit',
1746
"Called in the bzr client after a commit has completed. "
1747
"post_commit is called with (local, master, old_revno, old_revid, "
1748
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1749
"commit to a branch.", (0, 15), None))
1750
self.create_hook(HookPoint('post_uncommit',
1751
"Called in the bzr client after an uncommit completes. "
1752
"post_uncommit is called with (local, master, old_revno, "
1753
"old_revid, new_revno, new_revid) where local is the local branch "
1754
"or None, master is the target branch, and an empty branch "
1755
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1756
self.create_hook(HookPoint('pre_change_branch_tip',
1757
"Called in bzr client and server before a change to the tip of a "
1758
"branch is made. pre_change_branch_tip is called with a "
1759
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1760
"commit, uncommit will all trigger this hook.", (1, 6), None))
1761
self.create_hook(HookPoint('post_change_branch_tip',
1762
"Called in bzr client and server after a change to the tip of a "
1763
"branch is made. post_change_branch_tip is called with a "
1764
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1765
"commit, uncommit will all trigger this hook.", (1, 4), None))
1766
self.create_hook(HookPoint('transform_fallback_location',
1767
"Called when a stacked branch is activating its fallback "
1768
"locations. transform_fallback_location is called with (branch, "
1769
"url), and should return a new url. Returning the same url "
1770
"allows it to be used as-is, returning a different one can be "
1771
"used to cause the branch to stack on a closer copy of that "
1772
"fallback_location. Note that the branch cannot have history "
1773
"accessing methods called on it during this hook because the "
1774
"fallback locations have not been activated. When there are "
1775
"multiple hooks installed for transform_fallback_location, "
1776
"all are called with the url returned from the previous hook."
1777
"The order is however undefined.", (1, 9), None))
1778
self.create_hook(HookPoint('automatic_tag_name',
1779
"Called to determine an automatic tag name for a revision."
1780
"automatic_tag_name is called with (branch, revision_id) and "
1781
"should return a tag name or None if no tag name could be "
1782
"determined. The first non-None tag name returned will be used.",
1784
self.create_hook(HookPoint('post_branch_init',
1785
"Called after new branch initialization completes. "
1786
"post_branch_init is called with a "
1787
"bzrlib.branch.BranchInitHookParams. "
1788
"Note that init, branch and checkout (both heavyweight and "
1789
"lightweight) will all trigger this hook.", (2, 2), None))
1790
self.create_hook(HookPoint('post_switch',
1791
"Called after a checkout switches branch. "
1792
"post_switch is called with a "
1793
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1375
# Introduced in 0.15:
1376
# invoked whenever the revision history has been set
1377
# with set_revision_history. The api signature is
1378
# (branch, revision_history), and the branch will
1381
# Invoked after a branch is opened. The api signature is (branch).
1383
# invoked after a push operation completes.
1384
# the api signature is
1386
# containing the members
1387
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1388
# where local is the local target branch or None, master is the target
1389
# master branch, and the rest should be self explanatory. The source
1390
# is read locked and the target branches write locked. Source will
1391
# be the local low-latency branch.
1392
self['post_push'] = []
1393
# invoked after a pull operation completes.
1394
# the api signature is
1396
# containing the members
1397
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1398
# where local is the local branch or None, master is the target
1399
# master branch, and the rest should be self explanatory. The source
1400
# is read locked and the target branches write locked. The local
1401
# branch is the low-latency branch.
1402
self['post_pull'] = []
1403
# invoked before a commit operation takes place.
1404
# the api signature is
1405
# (local, master, old_revno, old_revid, future_revno, future_revid,
1406
# tree_delta, future_tree).
1407
# old_revid is NULL_REVISION for the first commit to a branch
1408
# tree_delta is a TreeDelta object describing changes from the basis
1409
# revision, hooks MUST NOT modify this delta
1410
# future_tree is an in-memory tree obtained from
1411
# CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
1412
self['pre_commit'] = []
1413
# invoked after a commit operation completes.
1414
# the api signature is
1415
# (local, master, old_revno, old_revid, new_revno, new_revid)
1416
# old_revid is NULL_REVISION for the first commit to a branch.
1417
self['post_commit'] = []
1418
# invoked after a uncommit operation completes.
1419
# the api signature is
1420
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1421
# local is the local branch or None, master is the target branch,
1422
# and an empty branch recieves new_revno of 0, new_revid of None.
1423
self['post_uncommit'] = []
1425
# Invoked before the tip of a branch changes.
1426
# the api signature is
1427
# (params) where params is a ChangeBranchTipParams with the members
1428
# (branch, old_revno, new_revno, old_revid, new_revid)
1429
self['pre_change_branch_tip'] = []
1431
# Invoked after the tip of a branch changes.
1432
# the api signature is
1433
# (params) where params is a ChangeBranchTipParams with the members
1434
# (branch, old_revno, new_revno, old_revid, new_revid)
1435
self['post_change_branch_tip'] = []
1437
# Invoked when a stacked branch activates its fallback locations and
1438
# allows the transformation of the url of said location.
1439
# the api signature is
1440
# (branch, url) where branch is the branch having its fallback
1441
# location activated and url is the url for the fallback location.
1442
# The hook should return a url.
1443
self['transform_fallback_location'] = []
1797
1446
# install the default hooks into the Branch class.
1836
1485
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1839
class BranchInitHookParams(object):
1840
"""Object holding parameters passed to *_branch_init hooks.
1842
There are 4 fields that hooks may wish to access:
1844
:ivar format: the branch format
1845
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1846
:ivar name: name of colocated branch, if any (or None)
1847
:ivar branch: the branch created
1849
Note that for lightweight checkouts, the bzrdir and format fields refer to
1850
the checkout, hence they are different from the corresponding fields in
1851
branch, which refer to the original branch.
1854
def __init__(self, format, a_bzrdir, name, branch):
1855
"""Create a group of BranchInitHook parameters.
1857
:param format: the branch format
1858
:param a_bzrdir: the BzrDir where the branch will be/has been
1860
:param name: name of colocated branch, if any (or None)
1861
:param branch: the branch created
1863
Note that for lightweight checkouts, the bzrdir and format fields refer
1864
to the checkout, hence they are different from the corresponding fields
1865
in branch, which refer to the original branch.
1867
self.format = format
1868
self.bzrdir = a_bzrdir
1870
self.branch = branch
1872
def __eq__(self, other):
1873
return self.__dict__ == other.__dict__
1877
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1879
return "<%s of format:%s bzrdir:%s>" % (
1880
self.__class__.__name__, self.branch,
1881
self.format, self.bzrdir)
1884
class SwitchHookParams(object):
1885
"""Object holding parameters passed to *_switch hooks.
1887
There are 4 fields that hooks may wish to access:
1889
:ivar control_dir: BzrDir of the checkout to change
1890
:ivar to_branch: branch that the checkout is to reference
1891
:ivar force: skip the check for local commits in a heavy checkout
1892
:ivar revision_id: revision ID to switch to (or None)
1895
def __init__(self, control_dir, to_branch, force, revision_id):
1896
"""Create a group of SwitchHook parameters.
1898
:param control_dir: BzrDir of the checkout to change
1899
:param to_branch: branch that the checkout is to reference
1900
:param force: skip the check for local commits in a heavy checkout
1901
:param revision_id: revision ID to switch to (or None)
1903
self.control_dir = control_dir
1904
self.to_branch = to_branch
1906
self.revision_id = revision_id
1908
def __eq__(self, other):
1909
return self.__dict__ == other.__dict__
1912
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1913
self.control_dir, self.to_branch,
1917
1488
class BzrBranchFormat4(BranchFormat):
1918
1489
"""Bzr branch format 4.
2057
1633
"""See BranchFormat.get_format_description()."""
2058
1634
return "Branch format 6"
2060
def initialize(self, a_bzrdir, name=None):
2061
"""Create a branch of this format in a_bzrdir."""
2062
utf8_files = [('last-revision', '0 null:\n'),
2063
('branch.conf', ''),
2066
return self._initialize_helper(a_bzrdir, utf8_files, name)
2068
def make_tags(self, branch):
2069
"""See bzrlib.branch.BranchFormat.make_tags()."""
2070
return BasicTags(branch)
2072
def supports_set_append_revisions_only(self):
2076
class BzrBranchFormat8(BranchFormatMetadir):
2077
"""Metadir format supporting storing locations of subtree branches."""
2079
def _branch_class(self):
2082
def get_format_string(self):
2083
"""See BranchFormat.get_format_string()."""
2084
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2086
def get_format_description(self):
2087
"""See BranchFormat.get_format_description()."""
2088
return "Branch format 8"
2090
def initialize(self, a_bzrdir, name=None):
2091
"""Create a branch of this format in a_bzrdir."""
2092
utf8_files = [('last-revision', '0 null:\n'),
2093
('branch.conf', ''),
2097
return self._initialize_helper(a_bzrdir, utf8_files, name)
2100
super(BzrBranchFormat8, self).__init__()
2101
self._matchingbzrdir.repository_format = \
2102
RepositoryFormatKnitPack5RichRoot()
2104
def make_tags(self, branch):
2105
"""See bzrlib.branch.BranchFormat.make_tags()."""
2106
return BasicTags(branch)
2108
def supports_set_append_revisions_only(self):
2111
def supports_stacking(self):
2114
supports_reference_locations = True
2117
class BzrBranchFormat7(BzrBranchFormat8):
1636
def initialize(self, a_bzrdir):
1637
"""Create a branch of this format in a_bzrdir."""
1638
utf8_files = [('last-revision', '0 null:\n'),
1639
('branch.conf', ''),
1642
return self._initialize_helper(a_bzrdir, utf8_files)
1644
def make_tags(self, branch):
1645
"""See bzrlib.branch.BranchFormat.make_tags()."""
1646
return BasicTags(branch)
1650
class BzrBranchFormat7(BranchFormatMetadir):
2118
1651
"""Branch format with last-revision, tags, and a stacked location pointer.
2120
1653
The stacked location pointer is passed down to the repository and requires
2170
1710
def get_reference(self, a_bzrdir):
2171
1711
"""See BranchFormat.get_reference()."""
2172
1712
transport = a_bzrdir.get_branch_transport(None)
2173
return transport.get_bytes('location')
1713
return transport.get('location').read()
2175
1715
def set_reference(self, a_bzrdir, to_branch):
2176
1716
"""See BranchFormat.set_reference()."""
2177
1717
transport = a_bzrdir.get_branch_transport(None)
2178
1718
location = transport.put_bytes('location', to_branch.base)
2180
def initialize(self, a_bzrdir, name=None, target_branch=None):
1720
def initialize(self, a_bzrdir, target_branch=None):
2181
1721
"""Create a branch of this format in a_bzrdir."""
2182
1722
if target_branch is None:
2183
1723
# this format does not implement branch itself, thus the implicit
2184
1724
# creation contract must see it as uninitializable
2185
1725
raise errors.UninitializableFormat(self)
2186
mutter('creating branch reference in %s', a_bzrdir.user_url)
2187
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1726
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1727
branch_transport = a_bzrdir.get_branch_transport(self)
2188
1728
branch_transport.put_bytes('location',
2189
target_branch.bzrdir.user_url)
1729
target_branch.bzrdir.root_transport.base)
2190
1730
branch_transport.put_bytes('format', self.get_format_string())
2192
a_bzrdir, name, _found=True,
1732
a_bzrdir, _found=True,
2193
1733
possible_transports=[target_branch.bzrdir.root_transport])
2194
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2197
1735
def __init__(self):
2198
1736
super(BranchReferenceFormat, self).__init__()
2204
1742
def clone(to_bzrdir, revision_id=None,
2205
1743
repository_policy=None):
2206
1744
"""See Branch.clone()."""
2207
return format.initialize(to_bzrdir, target_branch=a_branch)
1745
return format.initialize(to_bzrdir, a_branch)
2208
1746
# cannot obey revision_id limits when cloning a reference ...
2209
1747
# FIXME RBC 20060210 either nuke revision_id for clone, or
2210
1748
# emit some sort of warning/error to the caller ?!
2213
def open(self, a_bzrdir, name=None, _found=False, location=None,
2214
possible_transports=None, ignore_fallbacks=False):
1751
def open(self, a_bzrdir, _found=False, location=None,
1752
possible_transports=None):
2215
1753
"""Return the branch that the branch reference in a_bzrdir points at.
2217
:param a_bzrdir: A BzrDir that contains a branch.
2218
:param name: Name of colocated branch to open, if any
2219
:param _found: a private parameter, do not use it. It is used to
2220
indicate if format probing has already be done.
2221
:param ignore_fallbacks: when set, no fallback branches will be opened
2222
(if there are any). Default is to open fallbacks.
2223
:param location: The location of the referenced branch. If
2224
unspecified, this will be determined from the branch reference in
2226
:param possible_transports: An optional reusable transports list.
1755
_found is a private parameter, do not use it. It is used to indicate
1756
if format probing has already be done.
2229
format = BranchFormat.find_format(a_bzrdir, name=name)
1759
format = BranchFormat.find_format(a_bzrdir)
2230
1760
if format.__class__ != self.__class__:
2231
1761
raise AssertionError("wrong format %r found for %r" %
2232
1762
(format, self))
2345
1847
base = property(_get_base, doc="The URL for the root of this branch.")
2347
def _get_config(self):
2348
return TransportConfig(self._transport, 'branch.conf')
2350
1849
def is_locked(self):
2351
1850
return self.control_files.is_locked()
2353
1852
def lock_write(self, token=None):
2354
"""Lock the branch for write operations.
2356
:param token: A token to permit reacquiring a previously held and
2358
:return: A BranchWriteLockResult.
2360
if not self.is_locked():
2361
self._note_lock('w')
2362
# All-in-one needs to always unlock/lock.
2363
repo_control = getattr(self.repository, 'control_files', None)
2364
if self.control_files == repo_control or not self.is_locked():
2365
self.repository._warn_if_deprecated(self)
2366
self.repository.lock_write()
1853
repo_token = self.repository.lock_write()
2371
return BranchWriteLockResult(self.unlock,
2372
self.control_files.lock_write(token=token))
1855
token = self.control_files.lock_write(token=token)
2375
self.repository.unlock()
1857
self.repository.unlock()
2378
1861
def lock_read(self):
2379
"""Lock the branch for read operations.
2381
:return: A bzrlib.lock.LogicalLockResult.
2383
if not self.is_locked():
2384
self._note_lock('r')
2385
# All-in-one needs to always unlock/lock.
2386
repo_control = getattr(self.repository, 'control_files', None)
2387
if self.control_files == repo_control or not self.is_locked():
2388
self.repository._warn_if_deprecated(self)
2389
self.repository.lock_read()
1862
self.repository.lock_read()
2394
1864
self.control_files.lock_read()
2395
return LogicalLockResult(self.unlock)
2398
self.repository.unlock()
1866
self.repository.unlock()
2401
@only_raises(errors.LockNotHeld, errors.LockBroken)
2402
1869
def unlock(self):
1870
# TODO: test for failed two phase locks. This is known broken.
2404
1872
self.control_files.unlock()
2406
# All-in-one needs to always unlock/lock.
2407
repo_control = getattr(self.repository, 'control_files', None)
2408
if (self.control_files == repo_control or
2409
not self.control_files.is_locked()):
2410
self.repository.unlock()
2411
if not self.control_files.is_locked():
2412
# we just released the lock
2413
self._clear_cached_state()
1874
self.repository.unlock()
1875
if not self.control_files.is_locked():
1876
# we just released the lock
1877
self._clear_cached_state()
2415
1879
def peek_lock_mode(self):
2416
1880
if self.control_files._lock_count == 0:
2535
1999
"""See Branch.basis_tree."""
2536
2000
return self.repository.revision_tree(self.last_revision())
2003
def pull(self, source, overwrite=False, stop_revision=None,
2004
_hook_master=None, run_hooks=True, possible_transports=None,
2005
_override_hook_target=None):
2008
:param _hook_master: Private parameter - set the branch to
2009
be supplied as the master to pull hooks.
2010
:param run_hooks: Private parameter - if false, this branch
2011
is being called because it's the master of the primary branch,
2012
so it should not run its hooks.
2013
:param _override_hook_target: Private parameter - set the branch to be
2014
supplied as the target_branch to pull hooks.
2016
result = PullResult()
2017
result.source_branch = source
2018
if _override_hook_target is None:
2019
result.target_branch = self
2021
result.target_branch = _override_hook_target
2024
# We assume that during 'pull' the local repository is closer than
2026
graph = self.repository.get_graph(source.repository)
2027
result.old_revno, result.old_revid = self.last_revision_info()
2028
self.update_revisions(source, stop_revision, overwrite=overwrite,
2030
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2031
result.new_revno, result.new_revid = self.last_revision_info()
2033
result.master_branch = _hook_master
2034
result.local_branch = result.target_branch
2036
result.master_branch = result.target_branch
2037
result.local_branch = None
2039
for hook in Branch.hooks['post_pull']:
2538
2045
def _get_parent_location(self):
2539
2046
_locs = ['parent', 'pull', 'x-pull']
2540
2047
for l in _locs:
2055
def push(self, target, overwrite=False, stop_revision=None,
2056
_override_hook_source_branch=None):
2059
This is the basic concrete implementation of push()
2061
:param _override_hook_source_branch: If specified, run
2062
the hooks passing this Branch as the source, rather than self.
2063
This is for use of RemoteBranch, where push is delegated to the
2064
underlying vfs-based Branch.
2066
# TODO: Public option to disable running hooks - should be trivial but
2068
return _run_with_write_locked_target(
2069
target, self._push_with_bound_branches, target, overwrite,
2071
_override_hook_source_branch=_override_hook_source_branch)
2073
def _push_with_bound_branches(self, target, overwrite,
2075
_override_hook_source_branch=None):
2076
"""Push from self into target, and into target's master if any.
2078
This is on the base BzrBranch class even though it doesn't support
2079
bound branches because the *target* might be bound.
2082
if _override_hook_source_branch:
2083
result.source_branch = _override_hook_source_branch
2084
for hook in Branch.hooks['post_push']:
2087
bound_location = target.get_bound_location()
2088
if bound_location and target.base != bound_location:
2089
# there is a master branch.
2091
# XXX: Why the second check? Is it even supported for a branch to
2092
# be bound to itself? -- mbp 20070507
2093
master_branch = target.get_master_branch()
2094
master_branch.lock_write()
2096
# push into the master from this branch.
2097
self._basic_push(master_branch, overwrite, stop_revision)
2098
# and push into the target branch from this. Note that we push from
2099
# this branch again, because its considered the highest bandwidth
2101
result = self._basic_push(target, overwrite, stop_revision)
2102
result.master_branch = master_branch
2103
result.local_branch = target
2107
master_branch.unlock()
2110
result = self._basic_push(target, overwrite, stop_revision)
2111
# TODO: Why set master_branch and local_branch if there's no
2112
# binding? Maybe cleaner to just leave them unset? -- mbp
2114
result.master_branch = target
2115
result.local_branch = None
2547
2119
def _basic_push(self, target, overwrite, stop_revision):
2548
2120
"""Basic implementation of push without bound branches or hooks.
2550
Must be called with source read locked and target write locked.
2122
Must be called with self read locked and target write locked.
2552
result = BranchPushResult()
2124
result = PushResult()
2553
2125
result.source_branch = self
2554
2126
result.target_branch = target
2555
2127
result.old_revno, result.old_revid = target.last_revision_info()
2556
self.update_references(target)
2557
2128
if result.old_revid != self.last_revision():
2558
2129
# We assume that during 'push' this repository is closer than
2560
2131
graph = self.repository.get_graph(target.repository)
2561
target.update_revisions(self, stop_revision,
2562
overwrite=overwrite, graph=graph)
2132
target.update_revisions(self, stop_revision, overwrite=overwrite,
2563
2134
if self._push_should_merge_tags():
2564
result.tag_conflicts = self.tags.merge_to(target.tags,
2135
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2566
2136
result.new_revno, result.new_revid = target.last_revision_info()
2569
2139
def get_stacked_on_url(self):
2570
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2140
raise errors.UnstackableBranchFormat(self._format, self.base)
2572
2142
def set_push_location(self, location):
2573
2143
"""See Branch.set_push_location."""
2798
2461
"""Set the parent branch"""
2799
2462
return self._get_config_location('parent_location')
2802
def _set_all_reference_info(self, info_dict):
2803
"""Replace all reference info stored in a branch.
2805
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2808
writer = rio.RioWriter(s)
2809
for key, (tree_path, branch_location) in info_dict.iteritems():
2810
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2811
branch_location=branch_location)
2812
writer.write_stanza(stanza)
2813
self._transport.put_bytes('references', s.getvalue())
2814
self._reference_info = info_dict
2817
def _get_all_reference_info(self):
2818
"""Return all the reference info stored in a branch.
2820
:return: A dict of {file_id: (tree_path, branch_location)}
2822
if self._reference_info is not None:
2823
return self._reference_info
2824
rio_file = self._transport.get('references')
2826
stanzas = rio.read_stanzas(rio_file)
2827
info_dict = dict((s['file_id'], (s['tree_path'],
2828
s['branch_location'])) for s in stanzas)
2831
self._reference_info = info_dict
2834
def set_reference_info(self, file_id, tree_path, branch_location):
2835
"""Set the branch location to use for a tree reference.
2837
:param file_id: The file-id of the tree reference.
2838
:param tree_path: The path of the tree reference in the tree.
2839
:param branch_location: The location of the branch to retrieve tree
2842
info_dict = self._get_all_reference_info()
2843
info_dict[file_id] = (tree_path, branch_location)
2844
if None in (tree_path, branch_location):
2845
if tree_path is not None:
2846
raise ValueError('tree_path must be None when branch_location'
2848
if branch_location is not None:
2849
raise ValueError('branch_location must be None when tree_path'
2851
del info_dict[file_id]
2852
self._set_all_reference_info(info_dict)
2854
def get_reference_info(self, file_id):
2855
"""Get the tree_path and branch_location for a tree reference.
2857
:return: a tuple of (tree_path, branch_location)
2859
return self._get_all_reference_info().get(file_id, (None, None))
2861
def reference_parent(self, file_id, path, possible_transports=None):
2862
"""Return the parent branch for a tree-reference file_id.
2864
:param file_id: The file_id of the tree reference
2865
:param path: The path of the file_id in the tree
2866
:return: A branch associated with the file_id
2868
branch_location = self.get_reference_info(file_id)[1]
2869
if branch_location is None:
2870
return Branch.reference_parent(self, file_id, path,
2871
possible_transports)
2872
branch_location = urlutils.join(self.user_url, branch_location)
2873
return Branch.open(branch_location,
2874
possible_transports=possible_transports)
2876
2464
def set_push_location(self, location):
2877
2465
"""See Branch.set_push_location."""
2878
2466
self._set_config_location('push_location', location)
3273
2848
self.source.unlock()
3275
def pull(self, overwrite=False, stop_revision=None,
3276
possible_transports=None, _hook_master=None, run_hooks=True,
3277
_override_hook_target=None, local=False):
3280
:param _hook_master: Private parameter - set the branch to
3281
be supplied as the master to pull hooks.
3282
:param run_hooks: Private parameter - if false, this branch
3283
is being called because it's the master of the primary branch,
3284
so it should not run its hooks.
3285
:param _override_hook_target: Private parameter - set the branch to be
3286
supplied as the target_branch to pull hooks.
3287
:param local: Only update the local branch, and not the bound branch.
3289
# This type of branch can't be bound.
3291
raise errors.LocalRequiresBoundBranch()
3292
result = PullResult()
3293
result.source_branch = self.source
3294
if _override_hook_target is None:
3295
result.target_branch = self.target
3297
result.target_branch = _override_hook_target
3298
self.source.lock_read()
3300
# We assume that during 'pull' the target repository is closer than
3302
self.source.update_references(self.target)
3303
graph = self.target.repository.get_graph(self.source.repository)
3304
# TODO: Branch formats should have a flag that indicates
3305
# that revno's are expensive, and pull() should honor that flag.
3307
result.old_revno, result.old_revid = \
3308
self.target.last_revision_info()
3309
self.target.update_revisions(self.source, stop_revision,
3310
overwrite=overwrite, graph=graph)
3311
# TODO: The old revid should be specified when merging tags,
3312
# so a tags implementation that versions tags can only
3313
# pull in the most recent changes. -- JRV20090506
3314
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3316
result.new_revno, result.new_revid = self.target.last_revision_info()
3318
result.master_branch = _hook_master
3319
result.local_branch = result.target_branch
3321
result.master_branch = result.target_branch
3322
result.local_branch = None
3324
for hook in Branch.hooks['post_pull']:
3327
self.source.unlock()
3330
def push(self, overwrite=False, stop_revision=None,
3331
_override_hook_source_branch=None):
3332
"""See InterBranch.push.
3334
This is the basic concrete implementation of push()
3336
:param _override_hook_source_branch: If specified, run
3337
the hooks passing this Branch as the source, rather than self.
3338
This is for use of RemoteBranch, where push is delegated to the
3339
underlying vfs-based Branch.
3341
# TODO: Public option to disable running hooks - should be trivial but
3343
self.source.lock_read()
3345
return _run_with_write_locked_target(
3346
self.target, self._push_with_bound_branches, overwrite,
3348
_override_hook_source_branch=_override_hook_source_branch)
3350
self.source.unlock()
3352
def _push_with_bound_branches(self, overwrite, stop_revision,
3353
_override_hook_source_branch=None):
3354
"""Push from source into target, and into target's master if any.
3357
if _override_hook_source_branch:
3358
result.source_branch = _override_hook_source_branch
3359
for hook in Branch.hooks['post_push']:
3362
bound_location = self.target.get_bound_location()
3363
if bound_location and self.target.base != bound_location:
3364
# there is a master branch.
3366
# XXX: Why the second check? Is it even supported for a branch to
3367
# be bound to itself? -- mbp 20070507
3368
master_branch = self.target.get_master_branch()
3369
master_branch.lock_write()
3371
# push into the master from the source branch.
3372
self.source._basic_push(master_branch, overwrite, stop_revision)
3373
# and push into the target branch from the source. Note that we
3374
# push from the source branch again, because its considered the
3375
# highest bandwidth repository.
3376
result = self.source._basic_push(self.target, overwrite,
3378
result.master_branch = master_branch
3379
result.local_branch = self.target
3383
master_branch.unlock()
3386
result = self.source._basic_push(self.target, overwrite,
3388
# TODO: Why set master_branch and local_branch if there's no
3389
# binding? Maybe cleaner to just leave them unset? -- mbp
3391
result.master_branch = self.target
3392
result.local_branch = None
3397
2851
def is_compatible(self, source, target):
3398
2852
# GenericBranch uses the public API, so always compatible
3402
class InterToBranch5(GenericInterBranch):
3405
def _get_branch_formats_to_test():
3406
return BranchFormat._default_format, BzrBranchFormat5()
3408
def pull(self, overwrite=False, stop_revision=None,
3409
possible_transports=None, run_hooks=True,
3410
_override_hook_target=None, local=False):
3411
"""Pull from source into self, updating my master if any.
3413
:param run_hooks: Private parameter - if false, this branch
3414
is being called because it's the master of the primary branch,
3415
so it should not run its hooks.
3417
bound_location = self.target.get_bound_location()
3418
if local and not bound_location:
3419
raise errors.LocalRequiresBoundBranch()
3420
master_branch = None
3421
if not local and bound_location and self.source.user_url != bound_location:
3422
# not pulling from master, so we need to update master.
3423
master_branch = self.target.get_master_branch(possible_transports)
3424
master_branch.lock_write()
3427
# pull from source into master.
3428
master_branch.pull(self.source, overwrite, stop_revision,
3430
return super(InterToBranch5, self).pull(overwrite,
3431
stop_revision, _hook_master=master_branch,
3432
run_hooks=run_hooks,
3433
_override_hook_target=_override_hook_target)
3436
master_branch.unlock()
3439
2856
InterBranch.register_optimiser(GenericInterBranch)
3440
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
