479
396
"""Iterate over an inclusive range of sorted revisions."""
480
397
rev_iter = iter(merge_sorted_revisions)
481
398
if start_revision_id is not None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
399
for rev_id, depth, revno, end_of_merge in rev_iter:
484
400
if rev_id != start_revision_id:
487
403
# The decision to include the start or not
488
404
# depends on the stop_rule if a stop is provided
489
# so pop this node back into the iterator
490
rev_iter = chain(iter([node]), rev_iter)
406
iter([(rev_id, depth, revno, end_of_merge)]),
492
409
if stop_revision_id is None:
494
for node in rev_iter:
495
rev_id = node.key[-1]
496
yield (rev_id, node.merge_depth, node.revno,
410
for rev_id, depth, revno, end_of_merge in rev_iter:
411
yield rev_id, depth, revno, end_of_merge
498
412
elif stop_rule == 'exclude':
499
for node in rev_iter:
500
rev_id = node.key[-1]
413
for rev_id, depth, revno, end_of_merge in rev_iter:
501
414
if rev_id == stop_revision_id:
503
yield (rev_id, node.merge_depth, node.revno,
416
yield rev_id, depth, revno, end_of_merge
505
417
elif stop_rule == 'include':
506
for node in rev_iter:
507
rev_id = node.key[-1]
508
yield (rev_id, node.merge_depth, node.revno,
418
for rev_id, depth, revno, end_of_merge in rev_iter:
419
yield rev_id, depth, revno, end_of_merge
510
420
if rev_id == stop_revision_id:
512
elif stop_rule == 'with-merges-without-common-ancestry':
513
# We want to exclude all revisions that are already part of the
514
# stop_revision_id ancestry.
515
graph = self.repository.get_graph()
516
ancestors = graph.find_unique_ancestors(start_revision_id,
518
for node in rev_iter:
519
rev_id = node.key[-1]
520
if rev_id not in ancestors:
522
yield (rev_id, node.merge_depth, node.revno,
524
422
elif stop_rule == 'with-merges':
525
423
stop_rev = self.repository.get_revision(stop_revision_id)
526
424
if stop_rev.parent_ids:
527
425
left_parent = stop_rev.parent_ids[0]
529
427
left_parent = _mod_revision.NULL_REVISION
530
# left_parent is the actual revision we want to stop logging at,
531
# since we want to show the merged revisions after the stop_rev too
532
reached_stop_revision_id = False
533
revision_id_whitelist = []
534
for node in rev_iter:
535
rev_id = node.key[-1]
428
for rev_id, depth, revno, end_of_merge in rev_iter:
536
429
if rev_id == left_parent:
537
# reached the left parent after the stop_revision
539
if (not reached_stop_revision_id or
540
rev_id in revision_id_whitelist):
541
yield (rev_id, node.merge_depth, node.revno,
543
if reached_stop_revision_id or rev_id == stop_revision_id:
544
# only do the merged revs of rev_id from now on
545
rev = self.repository.get_revision(rev_id)
547
reached_stop_revision_id = True
548
revision_id_whitelist.extend(rev.parent_ids)
431
yield rev_id, depth, revno, end_of_merge
550
433
raise ValueError('invalid stop_rule %r' % stop_rule)
552
def _filter_start_non_ancestors(self, rev_iter):
553
# If we started from a dotted revno, we want to consider it as a tip
554
# and don't want to yield revisions that are not part of its
555
# ancestry. Given the order guaranteed by the merge sort, we will see
556
# uninteresting descendants of the first parent of our tip before the
558
first = rev_iter.next()
559
(rev_id, merge_depth, revno, end_of_merge) = first
562
# We start at a mainline revision so by definition, all others
563
# revisions in rev_iter are ancestors
564
for node in rev_iter:
569
pmap = self.repository.get_parent_map([rev_id])
570
parents = pmap.get(rev_id, [])
572
whitelist.update(parents)
574
# If there is no parents, there is nothing of interest left
576
# FIXME: It's hard to test this scenario here as this code is never
577
# called in that case. -- vila 20100322
580
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
582
if rev_id in whitelist:
583
pmap = self.repository.get_parent_map([rev_id])
584
parents = pmap.get(rev_id, [])
585
whitelist.remove(rev_id)
586
whitelist.update(parents)
588
# We've reached the mainline, there is nothing left to
592
# A revision that is not part of the ancestry of our
595
yield (rev_id, merge_depth, revno, end_of_merge)
597
435
def leave_lock_in_place(self):
598
436
"""Tell this branch object not to release the physical lock when this
599
437
object is unlocked.
757
563
:raises UnstackableRepositoryFormat: If the repository does not support
760
if not self._format.supports_stacking():
761
raise errors.UnstackableBranchFormat(self._format, self.user_url)
762
# XXX: Changing from one fallback repository to another does not check
763
# that all the data you need is present in the new fallback.
764
# Possibly it should.
765
self._check_stackable_repo()
768
old_url = self.get_stacked_on_url()
769
except (errors.NotStacked, errors.UnstackableBranchFormat,
770
errors.UnstackableRepositoryFormat):
774
self._activate_fallback_location(url)
775
# write this out after the repository is stacked to avoid setting a
776
# stacked config that doesn't work.
777
self._set_config_location('stacked_on_location', url)
780
"""Change a branch to be unstacked, copying data as needed.
782
Don't call this directly, use set_stacked_on_url(None).
784
pb = ui.ui_factory.nested_progress_bar()
786
pb.update("Unstacking")
787
# The basic approach here is to fetch the tip of the branch,
788
# including all available ghosts, from the existing stacked
789
# repository into a new repository object without the fallbacks.
791
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
792
# correct for CHKMap repostiories
793
old_repository = self.repository
794
if len(old_repository._fallback_repositories) != 1:
795
raise AssertionError("can't cope with fallback repositories "
796
"of %r" % (self.repository,))
797
# unlock it, including unlocking the fallback
798
old_repository.unlock()
799
old_repository.lock_read()
801
# Repositories don't offer an interface to remove fallback
802
# repositories today; take the conceptually simpler option and just
803
# reopen it. We reopen it starting from the URL so that we
804
# get a separate connection for RemoteRepositories and can
805
# stream from one of them to the other. This does mean doing
806
# separate SSH connection setup, but unstacking is not a
807
# common operation so it's tolerable.
808
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
809
new_repository = new_bzrdir.find_repository()
810
self.repository = new_repository
811
if self.repository._fallback_repositories:
812
raise AssertionError("didn't expect %r to have "
813
"fallback_repositories"
814
% (self.repository,))
815
# this is not paired with an unlock because it's just restoring
816
# the previous state; the lock's released when set_stacked_on_url
818
self.repository.lock_write()
819
# XXX: If you unstack a branch while it has a working tree
820
# with a pending merge, the pending-merged revisions will no
821
# longer be present. You can (probably) revert and remerge.
823
# XXX: This only fetches up to the tip of the repository; it
824
# doesn't bring across any tags. That's fairly consistent
825
# with how branch works, but perhaps not ideal.
826
self.repository.fetch(old_repository,
827
revision_id=self.last_revision(),
830
old_repository.unlock()
834
def _set_tags_bytes(self, bytes):
835
"""Mirror method for _get_tags_bytes.
837
:seealso: Branch._get_tags_bytes.
839
return _run_with_write_locked_target(self, self._transport.put_bytes,
566
raise NotImplementedError(self.set_stacked_on_url)
842
568
def _cache_revision_history(self, rev_history):
843
569
"""Set the cached revision history to rev_history.
1002
716
except ValueError:
1003
717
raise errors.NoSuchRevision(self, revision_id)
1006
719
def get_rev_id(self, revno, history=None):
1007
720
"""Find the revision id of the specified revno."""
1009
722
return _mod_revision.NULL_REVISION
1010
last_revno, last_revid = self.last_revision_info()
1011
if revno == last_revno:
1013
if revno <= 0 or revno > last_revno:
724
history = self.revision_history()
725
if revno <= 0 or revno > len(history):
1014
726
raise errors.NoSuchRevision(self, revno)
1015
distance_from_last = last_revno - revno
1016
if len(self._partial_revision_history_cache) <= distance_from_last:
1017
self._extend_partial_history(distance_from_last)
1018
return self._partial_revision_history_cache[distance_from_last]
727
return history[revno - 1]
1021
729
def pull(self, source, overwrite=False, stop_revision=None,
1022
possible_transports=None, *args, **kwargs):
730
possible_transports=None, _override_hook_target=None):
1023
731
"""Mirror source into this branch.
1025
733
This branch is considered to be 'local', having low latency.
1027
735
:returns: PullResult instance
1029
return InterBranch.get(source, self).pull(overwrite=overwrite,
1030
stop_revision=stop_revision,
1031
possible_transports=possible_transports, *args, **kwargs)
737
raise NotImplementedError(self.pull)
1033
def push(self, target, overwrite=False, stop_revision=None, *args,
739
def push(self, target, overwrite=False, stop_revision=None):
1035
740
"""Mirror this branch into target.
1037
742
This branch is considered to be 'local', having low latency.
1039
return InterBranch.get(self, target).push(overwrite, stop_revision,
1042
def lossy_push(self, target, stop_revision=None):
1043
"""Push deltas into another branch.
1045
:note: This does not, like push, retain the revision ids from
1046
the source branch and will, rather than adding bzr-specific
1047
metadata, push only those semantics of the revision that can be
1048
natively represented by this branch' VCS.
1050
:param target: Target branch
1051
:param stop_revision: Revision to push, defaults to last revision.
1052
:return: BranchPushResult with an extra member revidmap:
1053
A dictionary mapping revision ids from the target branch
1054
to new revision ids in the target branch, for each
1055
revision that was pushed.
1057
inter = InterBranch.get(self, target)
1058
lossy_push = getattr(inter, "lossy_push", None)
1059
if lossy_push is None:
1060
raise errors.LossyPushToSameVCS(self, target)
1061
return lossy_push(stop_revision)
744
raise NotImplementedError(self.push)
1063
746
def basis_tree(self):
1064
747
"""Return `Tree` object for last revision."""
1313
963
Callers will typically also want to check the repository.
1315
:param refs: Calculated refs for this branch as specified by
1316
branch._get_check_refs()
1317
965
:return: A BranchCheckResult.
1319
result = BranchCheckResult(self)
967
mainline_parent_id = None
1320
968
last_revno, last_revision_id = self.last_revision_info()
1321
actual_revno = refs[('lefthand-distance', last_revision_id)]
1322
if actual_revno != last_revno:
1323
result.errors.append(errors.BzrCheckError(
1324
'revno does not match len(mainline) %s != %s' % (
1325
last_revno, actual_revno)))
1326
# TODO: We should probably also check that self.revision_history
1327
# matches the repository for older branch formats.
1328
# If looking for the code that cross-checks repository parents against
1329
# the iter_reverse_revision_history output, that is now a repository
969
real_rev_history = list(self.repository.iter_reverse_revision_history(
971
real_rev_history.reverse()
972
if len(real_rev_history) != last_revno:
973
raise errors.BzrCheckError('revno does not match len(mainline)'
974
' %s != %s' % (last_revno, len(real_rev_history)))
975
# TODO: We should probably also check that real_rev_history actually
976
# matches self.revision_history()
977
for revision_id in real_rev_history:
979
revision = self.repository.get_revision(revision_id)
980
except errors.NoSuchRevision, e:
981
raise errors.BzrCheckError("mainline revision {%s} not in repository"
983
# In general the first entry on the revision history has no parents.
984
# But it's not illegal for it to have parents listed; this can happen
985
# in imports from Arch when the parents weren't reachable.
986
if mainline_parent_id is not None:
987
if mainline_parent_id not in revision.parent_ids:
988
raise errors.BzrCheckError("previous revision {%s} not listed among "
990
% (mainline_parent_id, revision_id))
991
mainline_parent_id = revision_id
992
return BranchCheckResult(self)
1333
994
def _get_checkout_format(self):
1334
995
"""Return the most suitable metadir for a checkout of this branch.
1565
1204
"""Return the short format description for this format."""
1566
1205
raise NotImplementedError(self.get_format_description)
1568
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1569
hooks = Branch.hooks['post_branch_init']
1572
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1576
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1577
lock_type='metadir', set_format=True):
1207
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1578
1209
"""Initialize a branch in a bzrdir, with specified files
1580
1211
:param a_bzrdir: The bzrdir to initialize the branch in
1581
1212
:param utf8_files: The files to create as a list of
1582
1213
(filename, content) tuples
1583
:param name: Name of colocated branch to create, if any
1584
1214
:param set_format: If True, set the format with
1585
1215
self.get_format_string. (BzrBranch4 has its format set
1587
1217
:return: a branch in this format
1589
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1590
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1219
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1220
branch_transport = a_bzrdir.get_branch_transport(self)
1592
1222
'metadir': ('lock', lockdir.LockDir),
1593
1223
'branch4': ('branch-lock', lockable_files.TransportLock),
1718
1312
Hooks.__init__(self)
1719
self.create_hook(HookPoint('set_rh',
1720
"Invoked whenever the revision history has been set via "
1721
"set_revision_history. The api signature is (branch, "
1722
"revision_history), and the branch will be write-locked. "
1723
"The set_rh hook can be expensive for bzr to trigger, a better "
1724
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1725
self.create_hook(HookPoint('open',
1726
"Called with the Branch object that has been opened after a "
1727
"branch is opened.", (1, 8), None))
1728
self.create_hook(HookPoint('post_push',
1729
"Called after a push operation completes. post_push is called "
1730
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1731
"bzr client.", (0, 15), None))
1732
self.create_hook(HookPoint('post_pull',
1733
"Called after a pull operation completes. post_pull is called "
1734
"with a bzrlib.branch.PullResult object and only runs in the "
1735
"bzr client.", (0, 15), None))
1736
self.create_hook(HookPoint('pre_commit',
1737
"Called after a commit is calculated but before it is is "
1738
"completed. pre_commit is called with (local, master, old_revno, "
1739
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1740
"). old_revid is NULL_REVISION for the first commit to a branch, "
1741
"tree_delta is a TreeDelta object describing changes from the "
1742
"basis revision. hooks MUST NOT modify this delta. "
1743
" future_tree is an in-memory tree obtained from "
1744
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1745
"tree.", (0,91), None))
1746
self.create_hook(HookPoint('post_commit',
1747
"Called in the bzr client after a commit has completed. "
1748
"post_commit is called with (local, master, old_revno, old_revid, "
1749
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1750
"commit to a branch.", (0, 15), None))
1751
self.create_hook(HookPoint('post_uncommit',
1752
"Called in the bzr client after an uncommit completes. "
1753
"post_uncommit is called with (local, master, old_revno, "
1754
"old_revid, new_revno, new_revid) where local is the local branch "
1755
"or None, master is the target branch, and an empty branch "
1756
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1757
self.create_hook(HookPoint('pre_change_branch_tip',
1758
"Called in bzr client and server before a change to the tip of a "
1759
"branch is made. pre_change_branch_tip is called with a "
1760
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1761
"commit, uncommit will all trigger this hook.", (1, 6), None))
1762
self.create_hook(HookPoint('post_change_branch_tip',
1763
"Called in bzr client and server after a change to the tip of a "
1764
"branch is made. post_change_branch_tip is called with a "
1765
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1766
"commit, uncommit will all trigger this hook.", (1, 4), None))
1767
self.create_hook(HookPoint('transform_fallback_location',
1768
"Called when a stacked branch is activating its fallback "
1769
"locations. transform_fallback_location is called with (branch, "
1770
"url), and should return a new url. Returning the same url "
1771
"allows it to be used as-is, returning a different one can be "
1772
"used to cause the branch to stack on a closer copy of that "
1773
"fallback_location. Note that the branch cannot have history "
1774
"accessing methods called on it during this hook because the "
1775
"fallback locations have not been activated. When there are "
1776
"multiple hooks installed for transform_fallback_location, "
1777
"all are called with the url returned from the previous hook."
1778
"The order is however undefined.", (1, 9), None))
1779
self.create_hook(HookPoint('automatic_tag_name',
1780
"Called to determine an automatic tag name for a revision."
1781
"automatic_tag_name is called with (branch, revision_id) and "
1782
"should return a tag name or None if no tag name could be "
1783
"determined. The first non-None tag name returned will be used.",
1785
self.create_hook(HookPoint('post_branch_init',
1786
"Called after new branch initialization completes. "
1787
"post_branch_init is called with a "
1788
"bzrlib.branch.BranchInitHookParams. "
1789
"Note that init, branch and checkout (both heavyweight and "
1790
"lightweight) will all trigger this hook.", (2, 2), None))
1791
self.create_hook(HookPoint('post_switch',
1792
"Called after a checkout switches branch. "
1793
"post_switch is called with a "
1794
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1313
# Introduced in 0.15:
1314
# invoked whenever the revision history has been set
1315
# with set_revision_history. The api signature is
1316
# (branch, revision_history), and the branch will
1319
# Invoked after a branch is opened. The api signature is (branch).
1321
# invoked after a push operation completes.
1322
# the api signature is
1324
# containing the members
1325
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1326
# where local is the local target branch or None, master is the target
1327
# master branch, and the rest should be self explanatory. The source
1328
# is read locked and the target branches write locked. Source will
1329
# be the local low-latency branch.
1330
self['post_push'] = []
1331
# invoked after a pull operation completes.
1332
# the api signature is
1334
# containing the members
1335
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1336
# where local is the local branch or None, master is the target
1337
# master branch, and the rest should be self explanatory. The source
1338
# is read locked and the target branches write locked. The local
1339
# branch is the low-latency branch.
1340
self['post_pull'] = []
1341
# invoked before a commit operation takes place.
1342
# the api signature is
1343
# (local, master, old_revno, old_revid, future_revno, future_revid,
1344
# tree_delta, future_tree).
1345
# old_revid is NULL_REVISION for the first commit to a branch
1346
# tree_delta is a TreeDelta object describing changes from the basis
1347
# revision, hooks MUST NOT modify this delta
1348
# future_tree is an in-memory tree obtained from
1349
# CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
1350
self['pre_commit'] = []
1351
# invoked after a commit operation completes.
1352
# the api signature is
1353
# (local, master, old_revno, old_revid, new_revno, new_revid)
1354
# old_revid is NULL_REVISION for the first commit to a branch.
1355
self['post_commit'] = []
1356
# invoked after a uncommit operation completes.
1357
# the api signature is
1358
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1359
# local is the local branch or None, master is the target branch,
1360
# and an empty branch recieves new_revno of 0, new_revid of None.
1361
self['post_uncommit'] = []
1363
# Invoked before the tip of a branch changes.
1364
# the api signature is
1365
# (params) where params is a ChangeBranchTipParams with the members
1366
# (branch, old_revno, new_revno, old_revid, new_revid)
1367
self['pre_change_branch_tip'] = []
1369
# Invoked after the tip of a branch changes.
1370
# the api signature is
1371
# (params) where params is a ChangeBranchTipParams with the members
1372
# (branch, old_revno, new_revno, old_revid, new_revid)
1373
self['post_change_branch_tip'] = []
1375
# Invoked when a stacked branch activates its fallback locations and
1376
# allows the transformation of the url of said location.
1377
# the api signature is
1378
# (branch, url) where branch is the branch having its fallback
1379
# location activated and url is the url for the fallback location.
1380
# The hook should return a url.
1381
self['transform_fallback_location'] = []
1798
1384
# install the default hooks into the Branch class.
1837
1423
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1840
class BranchInitHookParams(object):
1841
"""Object holding parameters passed to *_branch_init hooks.
1843
There are 4 fields that hooks may wish to access:
1845
:ivar format: the branch format
1846
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1847
:ivar name: name of colocated branch, if any (or None)
1848
:ivar branch: the branch created
1850
Note that for lightweight checkouts, the bzrdir and format fields refer to
1851
the checkout, hence they are different from the corresponding fields in
1852
branch, which refer to the original branch.
1855
def __init__(self, format, a_bzrdir, name, branch):
1856
"""Create a group of BranchInitHook parameters.
1858
:param format: the branch format
1859
:param a_bzrdir: the BzrDir where the branch will be/has been
1861
:param name: name of colocated branch, if any (or None)
1862
:param branch: the branch created
1864
Note that for lightweight checkouts, the bzrdir and format fields refer
1865
to the checkout, hence they are different from the corresponding fields
1866
in branch, which refer to the original branch.
1868
self.format = format
1869
self.bzrdir = a_bzrdir
1871
self.branch = branch
1873
def __eq__(self, other):
1874
return self.__dict__ == other.__dict__
1878
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1880
return "<%s of format:%s bzrdir:%s>" % (
1881
self.__class__.__name__, self.branch,
1882
self.format, self.bzrdir)
1885
class SwitchHookParams(object):
1886
"""Object holding parameters passed to *_switch hooks.
1888
There are 4 fields that hooks may wish to access:
1890
:ivar control_dir: BzrDir of the checkout to change
1891
:ivar to_branch: branch that the checkout is to reference
1892
:ivar force: skip the check for local commits in a heavy checkout
1893
:ivar revision_id: revision ID to switch to (or None)
1896
def __init__(self, control_dir, to_branch, force, revision_id):
1897
"""Create a group of SwitchHook parameters.
1899
:param control_dir: BzrDir of the checkout to change
1900
:param to_branch: branch that the checkout is to reference
1901
:param force: skip the check for local commits in a heavy checkout
1902
:param revision_id: revision ID to switch to (or None)
1904
self.control_dir = control_dir
1905
self.to_branch = to_branch
1907
self.revision_id = revision_id
1909
def __eq__(self, other):
1910
return self.__dict__ == other.__dict__
1913
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1914
self.control_dir, self.to_branch,
1918
1426
class BzrBranchFormat4(BranchFormat):
1919
1427
"""Bzr branch format 4.
2058
1571
"""See BranchFormat.get_format_description()."""
2059
1572
return "Branch format 6"
2061
def initialize(self, a_bzrdir, name=None):
2062
"""Create a branch of this format in a_bzrdir."""
2063
utf8_files = [('last-revision', '0 null:\n'),
2064
('branch.conf', ''),
2067
return self._initialize_helper(a_bzrdir, utf8_files, name)
2069
def make_tags(self, branch):
2070
"""See bzrlib.branch.BranchFormat.make_tags()."""
2071
return BasicTags(branch)
2073
def supports_set_append_revisions_only(self):
2077
class BzrBranchFormat8(BranchFormatMetadir):
2078
"""Metadir format supporting storing locations of subtree branches."""
2080
def _branch_class(self):
2083
def get_format_string(self):
2084
"""See BranchFormat.get_format_string()."""
2085
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2087
def get_format_description(self):
2088
"""See BranchFormat.get_format_description()."""
2089
return "Branch format 8"
2091
def initialize(self, a_bzrdir, name=None):
2092
"""Create a branch of this format in a_bzrdir."""
2093
utf8_files = [('last-revision', '0 null:\n'),
2094
('branch.conf', ''),
2098
return self._initialize_helper(a_bzrdir, utf8_files, name)
2101
super(BzrBranchFormat8, self).__init__()
2102
self._matchingbzrdir.repository_format = \
2103
RepositoryFormatKnitPack5RichRoot()
2105
def make_tags(self, branch):
2106
"""See bzrlib.branch.BranchFormat.make_tags()."""
2107
return BasicTags(branch)
2109
def supports_set_append_revisions_only(self):
2112
def supports_stacking(self):
2115
supports_reference_locations = True
2118
class BzrBranchFormat7(BzrBranchFormat8):
1574
def initialize(self, a_bzrdir):
1575
"""Create a branch of this format in a_bzrdir."""
1576
utf8_files = [('last-revision', '0 null:\n'),
1577
('branch.conf', ''),
1580
return self._initialize_helper(a_bzrdir, utf8_files)
1583
class BzrBranchFormat7(BranchFormatMetadir):
2119
1584
"""Branch format with last-revision, tags, and a stacked location pointer.
2121
1586
The stacked location pointer is passed down to the repository and requires
2171
1639
def get_reference(self, a_bzrdir):
2172
1640
"""See BranchFormat.get_reference()."""
2173
1641
transport = a_bzrdir.get_branch_transport(None)
2174
return transport.get_bytes('location')
1642
return transport.get('location').read()
2176
1644
def set_reference(self, a_bzrdir, to_branch):
2177
1645
"""See BranchFormat.set_reference()."""
2178
1646
transport = a_bzrdir.get_branch_transport(None)
2179
1647
location = transport.put_bytes('location', to_branch.base)
2181
def initialize(self, a_bzrdir, name=None, target_branch=None):
1649
def initialize(self, a_bzrdir, target_branch=None):
2182
1650
"""Create a branch of this format in a_bzrdir."""
2183
1651
if target_branch is None:
2184
1652
# this format does not implement branch itself, thus the implicit
2185
1653
# creation contract must see it as uninitializable
2186
1654
raise errors.UninitializableFormat(self)
2187
mutter('creating branch reference in %s', a_bzrdir.user_url)
2188
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1655
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1656
branch_transport = a_bzrdir.get_branch_transport(self)
2189
1657
branch_transport.put_bytes('location',
2190
target_branch.bzrdir.user_url)
1658
target_branch.bzrdir.root_transport.base)
2191
1659
branch_transport.put_bytes('format', self.get_format_string())
2193
a_bzrdir, name, _found=True,
1661
a_bzrdir, _found=True,
2194
1662
possible_transports=[target_branch.bzrdir.root_transport])
2195
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2198
1664
def __init__(self):
2199
1665
super(BranchReferenceFormat, self).__init__()
2205
1671
def clone(to_bzrdir, revision_id=None,
2206
1672
repository_policy=None):
2207
1673
"""See Branch.clone()."""
2208
return format.initialize(to_bzrdir, target_branch=a_branch)
1674
return format.initialize(to_bzrdir, a_branch)
2209
1675
# cannot obey revision_id limits when cloning a reference ...
2210
1676
# FIXME RBC 20060210 either nuke revision_id for clone, or
2211
1677
# emit some sort of warning/error to the caller ?!
2214
def open(self, a_bzrdir, name=None, _found=False, location=None,
2215
possible_transports=None, ignore_fallbacks=False):
1680
def open(self, a_bzrdir, _found=False, location=None,
1681
possible_transports=None):
2216
1682
"""Return the branch that the branch reference in a_bzrdir points at.
2218
:param a_bzrdir: A BzrDir that contains a branch.
2219
:param name: Name of colocated branch to open, if any
2220
:param _found: a private parameter, do not use it. It is used to
2221
indicate if format probing has already be done.
2222
:param ignore_fallbacks: when set, no fallback branches will be opened
2223
(if there are any). Default is to open fallbacks.
2224
:param location: The location of the referenced branch. If
2225
unspecified, this will be determined from the branch reference in
2227
:param possible_transports: An optional reusable transports list.
1684
_found is a private parameter, do not use it. It is used to indicate
1685
if format probing has already be done.
2230
format = BranchFormat.find_format(a_bzrdir, name=name)
1688
format = BranchFormat.find_format(a_bzrdir)
2231
1689
if format.__class__ != self.__class__:
2232
1690
raise AssertionError("wrong format %r found for %r" %
2233
1691
(format, self))
2346
1776
base = property(_get_base, doc="The URL for the root of this branch.")
2348
def _get_config(self):
2349
return TransportConfig(self._transport, 'branch.conf')
2351
1778
def is_locked(self):
2352
1779
return self.control_files.is_locked()
2354
1781
def lock_write(self, token=None):
2355
"""Lock the branch for write operations.
2357
:param token: A token to permit reacquiring a previously held and
2359
:return: A BranchWriteLockResult.
2361
if not self.is_locked():
2362
self._note_lock('w')
2363
# All-in-one needs to always unlock/lock.
2364
repo_control = getattr(self.repository, 'control_files', None)
2365
if self.control_files == repo_control or not self.is_locked():
2366
self.repository._warn_if_deprecated(self)
2367
self.repository.lock_write()
1782
repo_token = self.repository.lock_write()
2372
return BranchWriteLockResult(self.unlock,
2373
self.control_files.lock_write(token=token))
1784
token = self.control_files.lock_write(token=token)
2376
self.repository.unlock()
1786
self.repository.unlock()
2379
1790
def lock_read(self):
2380
"""Lock the branch for read operations.
2382
:return: An object with an unlock method which will release the lock
2385
if not self.is_locked():
2386
self._note_lock('r')
2387
# All-in-one needs to always unlock/lock.
2388
repo_control = getattr(self.repository, 'control_files', None)
2389
if self.control_files == repo_control or not self.is_locked():
2390
self.repository._warn_if_deprecated(self)
2391
self.repository.lock_read()
1791
self.repository.lock_read()
2396
1793
self.control_files.lock_read()
2400
self.repository.unlock()
1795
self.repository.unlock()
2403
@only_raises(errors.LockNotHeld, errors.LockBroken)
2404
1798
def unlock(self):
1799
# TODO: test for failed two phase locks. This is known broken.
2406
1801
self.control_files.unlock()
2408
# All-in-one needs to always unlock/lock.
2409
repo_control = getattr(self.repository, 'control_files', None)
2410
if (self.control_files == repo_control or
2411
not self.control_files.is_locked()):
2412
self.repository.unlock()
2413
if not self.control_files.is_locked():
2414
# we just released the lock
2415
self._clear_cached_state()
1803
self.repository.unlock()
1804
if not self.control_files.is_locked():
1805
# we just released the lock
1806
self._clear_cached_state()
2417
1808
def peek_lock_mode(self):
2418
1809
if self.control_files._lock_count == 0:
2537
1928
"""See Branch.basis_tree."""
2538
1929
return self.repository.revision_tree(self.last_revision())
1932
def pull(self, source, overwrite=False, stop_revision=None,
1933
_hook_master=None, run_hooks=True, possible_transports=None,
1934
_override_hook_target=None):
1937
:param _hook_master: Private parameter - set the branch to
1938
be supplied as the master to pull hooks.
1939
:param run_hooks: Private parameter - if false, this branch
1940
is being called because it's the master of the primary branch,
1941
so it should not run its hooks.
1942
:param _override_hook_target: Private parameter - set the branch to be
1943
supplied as the target_branch to pull hooks.
1945
result = PullResult()
1946
result.source_branch = source
1947
if _override_hook_target is None:
1948
result.target_branch = self
1950
result.target_branch = _override_hook_target
1953
# We assume that during 'pull' the local repository is closer than
1955
graph = self.repository.get_graph(source.repository)
1956
result.old_revno, result.old_revid = self.last_revision_info()
1957
self.update_revisions(source, stop_revision, overwrite=overwrite,
1959
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
1960
result.new_revno, result.new_revid = self.last_revision_info()
1962
result.master_branch = _hook_master
1963
result.local_branch = result.target_branch
1965
result.master_branch = result.target_branch
1966
result.local_branch = None
1968
for hook in Branch.hooks['post_pull']:
2540
1974
def _get_parent_location(self):
2541
1975
_locs = ['parent', 'pull', 'x-pull']
2542
1976
for l in _locs:
1984
def push(self, target, overwrite=False, stop_revision=None,
1985
_override_hook_source_branch=None):
1988
This is the basic concrete implementation of push()
1990
:param _override_hook_source_branch: If specified, run
1991
the hooks passing this Branch as the source, rather than self.
1992
This is for use of RemoteBranch, where push is delegated to the
1993
underlying vfs-based Branch.
1995
# TODO: Public option to disable running hooks - should be trivial but
1997
return _run_with_write_locked_target(
1998
target, self._push_with_bound_branches, target, overwrite,
2000
_override_hook_source_branch=_override_hook_source_branch)
2002
def _push_with_bound_branches(self, target, overwrite,
2004
_override_hook_source_branch=None):
2005
"""Push from self into target, and into target's master if any.
2007
This is on the base BzrBranch class even though it doesn't support
2008
bound branches because the *target* might be bound.
2011
if _override_hook_source_branch:
2012
result.source_branch = _override_hook_source_branch
2013
for hook in Branch.hooks['post_push']:
2016
bound_location = target.get_bound_location()
2017
if bound_location and target.base != bound_location:
2018
# there is a master branch.
2020
# XXX: Why the second check? Is it even supported for a branch to
2021
# be bound to itself? -- mbp 20070507
2022
master_branch = target.get_master_branch()
2023
master_branch.lock_write()
2025
# push into the master from this branch.
2026
self._basic_push(master_branch, overwrite, stop_revision)
2027
# and push into the target branch from this. Note that we push from
2028
# this branch again, because its considered the highest bandwidth
2030
result = self._basic_push(target, overwrite, stop_revision)
2031
result.master_branch = master_branch
2032
result.local_branch = target
2036
master_branch.unlock()
2039
result = self._basic_push(target, overwrite, stop_revision)
2040
# TODO: Why set master_branch and local_branch if there's no
2041
# binding? Maybe cleaner to just leave them unset? -- mbp
2043
result.master_branch = target
2044
result.local_branch = None
2549
2048
def _basic_push(self, target, overwrite, stop_revision):
2550
2049
"""Basic implementation of push without bound branches or hooks.
2552
Must be called with source read locked and target write locked.
2051
Must be called with self read locked and target write locked.
2554
result = BranchPushResult()
2053
result = PushResult()
2555
2054
result.source_branch = self
2556
2055
result.target_branch = target
2557
2056
result.old_revno, result.old_revid = target.last_revision_info()
2558
self.update_references(target)
2559
2057
if result.old_revid != self.last_revision():
2560
2058
# We assume that during 'push' this repository is closer than
2562
2060
graph = self.repository.get_graph(target.repository)
2563
target.update_revisions(self, stop_revision,
2564
overwrite=overwrite, graph=graph)
2061
target.update_revisions(self, stop_revision, overwrite=overwrite,
2565
2063
if self._push_should_merge_tags():
2566
result.tag_conflicts = self.tags.merge_to(target.tags,
2064
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2568
2065
result.new_revno, result.new_revid = target.last_revision_info()
2068
def get_parent(self):
2069
"""See Branch.get_parent."""
2070
parent = self._get_parent_location()
2073
# This is an old-format absolute path to a local branch
2074
# turn it into a url
2075
if parent.startswith('/'):
2076
parent = urlutils.local_path_to_url(parent.decode('utf8'))
2078
return urlutils.join(self.base[:-1], parent)
2079
except errors.InvalidURLJoin, e:
2080
raise errors.InaccessibleParent(parent, self.base)
2571
2082
def get_stacked_on_url(self):
2572
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2083
raise errors.UnstackableBranchFormat(self._format, self.base)
2574
2085
def set_push_location(self, location):
2575
2086
"""See Branch.set_push_location."""
2800
2404
"""Set the parent branch"""
2801
2405
return self._get_config_location('parent_location')
2804
def _set_all_reference_info(self, info_dict):
2805
"""Replace all reference info stored in a branch.
2807
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2810
writer = rio.RioWriter(s)
2811
for key, (tree_path, branch_location) in info_dict.iteritems():
2812
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2813
branch_location=branch_location)
2814
writer.write_stanza(stanza)
2815
self._transport.put_bytes('references', s.getvalue())
2816
self._reference_info = info_dict
2819
def _get_all_reference_info(self):
2820
"""Return all the reference info stored in a branch.
2822
:return: A dict of {file_id: (tree_path, branch_location)}
2824
if self._reference_info is not None:
2825
return self._reference_info
2826
rio_file = self._transport.get('references')
2828
stanzas = rio.read_stanzas(rio_file)
2829
info_dict = dict((s['file_id'], (s['tree_path'],
2830
s['branch_location'])) for s in stanzas)
2833
self._reference_info = info_dict
2836
def set_reference_info(self, file_id, tree_path, branch_location):
2837
"""Set the branch location to use for a tree reference.
2839
:param file_id: The file-id of the tree reference.
2840
:param tree_path: The path of the tree reference in the tree.
2841
:param branch_location: The location of the branch to retrieve tree
2844
info_dict = self._get_all_reference_info()
2845
info_dict[file_id] = (tree_path, branch_location)
2846
if None in (tree_path, branch_location):
2847
if tree_path is not None:
2848
raise ValueError('tree_path must be None when branch_location'
2850
if branch_location is not None:
2851
raise ValueError('branch_location must be None when tree_path'
2853
del info_dict[file_id]
2854
self._set_all_reference_info(info_dict)
2856
def get_reference_info(self, file_id):
2857
"""Get the tree_path and branch_location for a tree reference.
2859
:return: a tuple of (tree_path, branch_location)
2861
return self._get_all_reference_info().get(file_id, (None, None))
2863
def reference_parent(self, file_id, path, possible_transports=None):
2864
"""Return the parent branch for a tree-reference file_id.
2866
:param file_id: The file_id of the tree reference
2867
:param path: The path of the file_id in the tree
2868
:return: A branch associated with the file_id
2870
branch_location = self.get_reference_info(file_id)[1]
2871
if branch_location is None:
2872
return Branch.reference_parent(self, file_id, path,
2873
possible_transports)
2874
branch_location = urlutils.join(self.user_url, branch_location)
2875
return Branch.open(branch_location,
2876
possible_transports=possible_transports)
2878
2407
def set_push_location(self, location):
2879
2408
"""See Branch.set_push_location."""
2880
2409
self._set_config_location('push_location', location)
3275
2794
self.source.unlock()
3277
def pull(self, overwrite=False, stop_revision=None,
3278
possible_transports=None, _hook_master=None, run_hooks=True,
3279
_override_hook_target=None, local=False):
3282
:param _hook_master: Private parameter - set the branch to
3283
be supplied as the master to pull hooks.
3284
:param run_hooks: Private parameter - if false, this branch
3285
is being called because it's the master of the primary branch,
3286
so it should not run its hooks.
3287
:param _override_hook_target: Private parameter - set the branch to be
3288
supplied as the target_branch to pull hooks.
3289
:param local: Only update the local branch, and not the bound branch.
3291
# This type of branch can't be bound.
3293
raise errors.LocalRequiresBoundBranch()
3294
result = PullResult()
3295
result.source_branch = self.source
3296
if _override_hook_target is None:
3297
result.target_branch = self.target
3299
result.target_branch = _override_hook_target
3300
self.source.lock_read()
3302
# We assume that during 'pull' the target repository is closer than
3304
self.source.update_references(self.target)
3305
graph = self.target.repository.get_graph(self.source.repository)
3306
# TODO: Branch formats should have a flag that indicates
3307
# that revno's are expensive, and pull() should honor that flag.
3309
result.old_revno, result.old_revid = \
3310
self.target.last_revision_info()
3311
self.target.update_revisions(self.source, stop_revision,
3312
overwrite=overwrite, graph=graph)
3313
# TODO: The old revid should be specified when merging tags,
3314
# so a tags implementation that versions tags can only
3315
# pull in the most recent changes. -- JRV20090506
3316
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3318
result.new_revno, result.new_revid = self.target.last_revision_info()
3320
result.master_branch = _hook_master
3321
result.local_branch = result.target_branch
3323
result.master_branch = result.target_branch
3324
result.local_branch = None
3326
for hook in Branch.hooks['post_pull']:
3329
self.source.unlock()
3332
def push(self, overwrite=False, stop_revision=None,
3333
_override_hook_source_branch=None):
3334
"""See InterBranch.push.
3336
This is the basic concrete implementation of push()
3338
:param _override_hook_source_branch: If specified, run
3339
the hooks passing this Branch as the source, rather than self.
3340
This is for use of RemoteBranch, where push is delegated to the
3341
underlying vfs-based Branch.
3343
# TODO: Public option to disable running hooks - should be trivial but
3345
self.source.lock_read()
3347
return _run_with_write_locked_target(
3348
self.target, self._push_with_bound_branches, overwrite,
3350
_override_hook_source_branch=_override_hook_source_branch)
3352
self.source.unlock()
3354
def _push_with_bound_branches(self, overwrite, stop_revision,
3355
_override_hook_source_branch=None):
3356
"""Push from source into target, and into target's master if any.
3359
if _override_hook_source_branch:
3360
result.source_branch = _override_hook_source_branch
3361
for hook in Branch.hooks['post_push']:
3364
bound_location = self.target.get_bound_location()
3365
if bound_location and self.target.base != bound_location:
3366
# there is a master branch.
3368
# XXX: Why the second check? Is it even supported for a branch to
3369
# be bound to itself? -- mbp 20070507
3370
master_branch = self.target.get_master_branch()
3371
master_branch.lock_write()
3373
# push into the master from the source branch.
3374
self.source._basic_push(master_branch, overwrite, stop_revision)
3375
# and push into the target branch from the source. Note that we
3376
# push from the source branch again, because its considered the
3377
# highest bandwidth repository.
3378
result = self.source._basic_push(self.target, overwrite,
3380
result.master_branch = master_branch
3381
result.local_branch = self.target
3385
master_branch.unlock()
3388
result = self.source._basic_push(self.target, overwrite,
3390
# TODO: Why set master_branch and local_branch if there's no
3391
# binding? Maybe cleaner to just leave them unset? -- mbp
3393
result.master_branch = self.target
3394
result.local_branch = None
3399
2797
def is_compatible(self, source, target):
3400
2798
# GenericBranch uses the public API, so always compatible
3404
class InterToBranch5(GenericInterBranch):
3407
def _get_branch_formats_to_test():
3408
return BranchFormat._default_format, BzrBranchFormat5()
3410
def pull(self, overwrite=False, stop_revision=None,
3411
possible_transports=None, run_hooks=True,
3412
_override_hook_target=None, local=False):
3413
"""Pull from source into self, updating my master if any.
3415
:param run_hooks: Private parameter - if false, this branch
3416
is being called because it's the master of the primary branch,
3417
so it should not run its hooks.
3419
bound_location = self.target.get_bound_location()
3420
if local and not bound_location:
3421
raise errors.LocalRequiresBoundBranch()
3422
master_branch = None
3423
if not local and bound_location and self.source.user_url != bound_location:
3424
# not pulling from master, so we need to update master.
3425
master_branch = self.target.get_master_branch(possible_transports)
3426
master_branch.lock_write()
3429
# pull from source into master.
3430
master_branch.pull(self.source, overwrite, stop_revision,
3432
return super(InterToBranch5, self).pull(overwrite,
3433
stop_revision, _hook_master=master_branch,
3434
run_hooks=run_hooks,
3435
_override_hook_target=_override_hook_target)
3438
master_branch.unlock()
3441
2802
InterBranch.register_optimiser(GenericInterBranch)
3442
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
