126
125
raise errors.UnstackableRepositoryFormat(self.repository._format,
127
126
self.repository.base)
129
def _extend_partial_history(self, stop_index=None, stop_revision=None):
130
"""Extend the partial history to include a given index
132
If a stop_index is supplied, stop when that index has been reached.
133
If a stop_revision is supplied, stop when that revision is
134
encountered. Otherwise, stop when the beginning of history is
137
:param stop_index: The index which should be present. When it is
138
present, history extension will stop.
139
:param stop_revision: The revision id which should be present. When
140
it is encountered, history extension will stop.
142
if len(self._partial_revision_history_cache) == 0:
143
self._partial_revision_history_cache = [self.last_revision()]
144
repository._iter_for_revno(
145
self.repository, self._partial_revision_history_cache,
146
stop_index=stop_index, stop_revision=stop_revision)
147
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
148
self._partial_revision_history_cache.pop()
150
def _get_check_refs(self):
151
"""Get the references needed for check().
155
revid = self.last_revision()
156
return [('revision-existence', revid), ('lefthand-distance', revid)]
159
129
def open(base, _unsupported=False, possible_transports=None):
160
130
"""Open the branch rooted at base.
446
414
# start_revision_id.
447
415
if self._merge_sorted_revisions_cache is None:
448
416
last_revision = self.last_revision()
449
known_graph = self.repository.get_known_graph_ancestry(
451
self._merge_sorted_revisions_cache = known_graph.merge_sort(
417
graph = self.repository.get_graph()
418
parent_map = dict(((key, value) for key, value in
419
graph.iter_ancestry([last_revision]) if value is not None))
420
revision_graph = repository._strip_NULL_ghosts(parent_map)
421
revs = tsort.merge_sort(revision_graph, last_revision, None,
423
# Drop the sequence # before caching
424
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
453
426
filtered = self._filter_merge_sorted_revisions(
454
427
self._merge_sorted_revisions_cache, start_revision_id,
455
428
stop_revision_id, stop_rule)
456
# Make sure we don't return revisions that are not part of the
457
# start_revision_id ancestry.
458
filtered = self._filter_start_non_ancestors(filtered)
459
429
if direction == 'reverse':
461
431
if direction == 'forward':
468
438
"""Iterate over an inclusive range of sorted revisions."""
469
439
rev_iter = iter(merge_sorted_revisions)
470
440
if start_revision_id is not None:
471
for node in rev_iter:
472
rev_id = node.key[-1]
441
for rev_id, depth, revno, end_of_merge in rev_iter:
473
442
if rev_id != start_revision_id:
476
445
# The decision to include the start or not
477
446
# depends on the stop_rule if a stop is provided
478
# so pop this node back into the iterator
479
rev_iter = chain(iter([node]), rev_iter)
448
iter([(rev_id, depth, revno, end_of_merge)]),
481
451
if stop_revision_id is None:
483
for node in rev_iter:
484
rev_id = node.key[-1]
485
yield (rev_id, node.merge_depth, node.revno,
452
for rev_id, depth, revno, end_of_merge in rev_iter:
453
yield rev_id, depth, revno, end_of_merge
487
454
elif stop_rule == 'exclude':
488
for node in rev_iter:
489
rev_id = node.key[-1]
455
for rev_id, depth, revno, end_of_merge in rev_iter:
490
456
if rev_id == stop_revision_id:
492
yield (rev_id, node.merge_depth, node.revno,
458
yield rev_id, depth, revno, end_of_merge
494
459
elif stop_rule == 'include':
495
for node in rev_iter:
496
rev_id = node.key[-1]
497
yield (rev_id, node.merge_depth, node.revno,
460
for rev_id, depth, revno, end_of_merge in rev_iter:
461
yield rev_id, depth, revno, end_of_merge
499
462
if rev_id == stop_revision_id:
501
elif stop_rule == 'with-merges-without-common-ancestry':
502
# We want to exclude all revisions that are already part of the
503
# stop_revision_id ancestry.
504
graph = self.repository.get_graph()
505
ancestors = graph.find_unique_ancestors(start_revision_id,
507
for node in rev_iter:
508
rev_id = node.key[-1]
509
if rev_id not in ancestors:
511
yield (rev_id, node.merge_depth, node.revno,
513
464
elif stop_rule == 'with-merges':
514
465
stop_rev = self.repository.get_revision(stop_revision_id)
515
466
if stop_rev.parent_ids:
516
467
left_parent = stop_rev.parent_ids[0]
518
469
left_parent = _mod_revision.NULL_REVISION
519
# left_parent is the actual revision we want to stop logging at,
520
# since we want to show the merged revisions after the stop_rev too
521
reached_stop_revision_id = False
522
revision_id_whitelist = []
523
for node in rev_iter:
524
rev_id = node.key[-1]
470
for rev_id, depth, revno, end_of_merge in rev_iter:
525
471
if rev_id == left_parent:
526
# reached the left parent after the stop_revision
528
if (not reached_stop_revision_id or
529
rev_id in revision_id_whitelist):
530
yield (rev_id, node.merge_depth, node.revno,
532
if reached_stop_revision_id or rev_id == stop_revision_id:
533
# only do the merged revs of rev_id from now on
534
rev = self.repository.get_revision(rev_id)
536
reached_stop_revision_id = True
537
revision_id_whitelist.extend(rev.parent_ids)
473
yield rev_id, depth, revno, end_of_merge
539
475
raise ValueError('invalid stop_rule %r' % stop_rule)
541
def _filter_start_non_ancestors(self, rev_iter):
542
# If we started from a dotted revno, we want to consider it as a tip
543
# and don't want to yield revisions that are not part of its
544
# ancestry. Given the order guaranteed by the merge sort, we will see
545
# uninteresting descendants of the first parent of our tip before the
547
first = rev_iter.next()
548
(rev_id, merge_depth, revno, end_of_merge) = first
551
# We start at a mainline revision so by definition, all others
552
# revisions in rev_iter are ancestors
553
for node in rev_iter:
558
pmap = self.repository.get_parent_map([rev_id])
559
parents = pmap.get(rev_id, [])
561
whitelist.update(parents)
563
# If there is no parents, there is nothing of interest left
565
# FIXME: It's hard to test this scenario here as this code is never
566
# called in that case. -- vila 20100322
569
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
571
if rev_id in whitelist:
572
pmap = self.repository.get_parent_map([rev_id])
573
parents = pmap.get(rev_id, [])
574
whitelist.remove(rev_id)
575
whitelist.update(parents)
577
# We've reached the mainline, there is nothing left to
581
# A revision that is not part of the ancestry of our
584
yield (rev_id, merge_depth, revno, end_of_merge)
586
477
def leave_lock_in_place(self):
587
478
"""Tell this branch object not to release the physical lock when this
588
479
object is unlocked.
758
617
except (errors.NotStacked, errors.UnstackableBranchFormat,
759
618
errors.UnstackableRepositoryFormat):
621
# repositories don't offer an interface to remove fallback
622
# repositories today; take the conceptually simpler option and just
624
self.repository = self.bzrdir.find_repository()
625
# for every revision reference the branch has, ensure it is pulled
627
source_repository = self._get_fallback_repository(old_url)
628
for revision_id in chain([self.last_revision()],
629
self.tags.get_reverse_tag_dict()):
630
self.repository.fetch(source_repository, revision_id,
763
633
self._activate_fallback_location(url)
764
634
# write this out after the repository is stacked to avoid setting a
765
635
# stacked config that doesn't work.
766
636
self._set_config_location('stacked_on_location', url)
769
"""Change a branch to be unstacked, copying data as needed.
771
Don't call this directly, use set_stacked_on_url(None).
773
pb = ui.ui_factory.nested_progress_bar()
775
pb.update("Unstacking")
776
# The basic approach here is to fetch the tip of the branch,
777
# including all available ghosts, from the existing stacked
778
# repository into a new repository object without the fallbacks.
780
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
781
# correct for CHKMap repostiories
782
old_repository = self.repository
783
if len(old_repository._fallback_repositories) != 1:
784
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
787
old_repository.unlock()
788
old_repository.lock_read()
790
# Repositories don't offer an interface to remove fallback
791
# repositories today; take the conceptually simpler option and just
792
# reopen it. We reopen it starting from the URL so that we
793
# get a separate connection for RemoteRepositories and can
794
# stream from one of them to the other. This does mean doing
795
# separate SSH connection setup, but unstacking is not a
796
# common operation so it's tolerable.
797
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
798
new_repository = new_bzrdir.find_repository()
799
self.repository = new_repository
800
if self.repository._fallback_repositories:
801
raise AssertionError("didn't expect %r to have "
802
"fallback_repositories"
803
% (self.repository,))
804
# this is not paired with an unlock because it's just restoring
805
# the previous state; the lock's released when set_stacked_on_url
807
self.repository.lock_write()
808
# XXX: If you unstack a branch while it has a working tree
809
# with a pending merge, the pending-merged revisions will no
810
# longer be present. You can (probably) revert and remerge.
812
# XXX: This only fetches up to the tip of the repository; it
813
# doesn't bring across any tags. That's fairly consistent
814
# with how branch works, but perhaps not ideal.
815
self.repository.fetch(old_repository,
816
revision_id=self.last_revision(),
819
old_repository.unlock()
823
639
def _set_tags_bytes(self, bytes):
824
640
"""Mirror method for _get_tags_bytes.
991
809
except ValueError:
992
810
raise errors.NoSuchRevision(self, revision_id)
995
812
def get_rev_id(self, revno, history=None):
996
813
"""Find the revision id of the specified revno."""
998
815
return _mod_revision.NULL_REVISION
999
last_revno, last_revid = self.last_revision_info()
1000
if revno == last_revno:
1002
if revno <= 0 or revno > last_revno:
817
history = self.revision_history()
818
if revno <= 0 or revno > len(history):
1003
819
raise errors.NoSuchRevision(self, revno)
1004
distance_from_last = last_revno - revno
1005
if len(self._partial_revision_history_cache) <= distance_from_last:
1006
self._extend_partial_history(distance_from_last)
1007
return self._partial_revision_history_cache[distance_from_last]
820
return history[revno - 1]
1010
822
def pull(self, source, overwrite=False, stop_revision=None,
1011
possible_transports=None, *args, **kwargs):
823
possible_transports=None, _override_hook_target=None):
1012
824
"""Mirror source into this branch.
1014
826
This branch is considered to be 'local', having low latency.
1016
828
:returns: PullResult instance
1018
return InterBranch.get(source, self).pull(overwrite=overwrite,
1019
stop_revision=stop_revision,
1020
possible_transports=possible_transports, *args, **kwargs)
830
raise NotImplementedError(self.pull)
1022
def push(self, target, overwrite=False, stop_revision=None, *args,
832
def push(self, target, overwrite=False, stop_revision=None):
1024
833
"""Mirror this branch into target.
1026
835
This branch is considered to be 'local', having low latency.
1028
return InterBranch.get(self, target).push(overwrite, stop_revision,
1031
def lossy_push(self, target, stop_revision=None):
1032
"""Push deltas into another branch.
1034
:note: This does not, like push, retain the revision ids from
1035
the source branch and will, rather than adding bzr-specific
1036
metadata, push only those semantics of the revision that can be
1037
natively represented by this branch' VCS.
1039
:param target: Target branch
1040
:param stop_revision: Revision to push, defaults to last revision.
1041
:return: BranchPushResult with an extra member revidmap:
1042
A dictionary mapping revision ids from the target branch
1043
to new revision ids in the target branch, for each
1044
revision that was pushed.
1046
inter = InterBranch.get(self, target)
1047
lossy_push = getattr(inter, "lossy_push", None)
1048
if lossy_push is None:
1049
raise errors.LossyPushToSameVCS(self, target)
1050
return lossy_push(stop_revision)
837
raise NotImplementedError(self.push)
1052
839
def basis_tree(self):
1053
840
"""Return `Tree` object for last revision."""
1245
1028
source_revno, source_revision_id = self.last_revision_info()
1246
1029
if revision_id is None:
1247
1030
revno, revision_id = source_revno, source_revision_id
1031
elif source_revision_id == revision_id:
1032
# we know the revno without needing to walk all of history
1033
revno = source_revno
1249
graph = self.repository.get_graph()
1251
revno = graph.find_distance_to_null(revision_id,
1252
[(source_revision_id, source_revno)])
1253
except errors.GhostRevisionsHaveNoRevno:
1254
# Default to 1, if we can't find anything else
1035
# To figure out the revno for a random revision, we need to build
1036
# the revision history, and count its length.
1037
# We don't care about the order, just how long it is.
1038
# Alternatively, we could start at the current location, and count
1039
# backwards. But there is no guarantee that we will find it since
1040
# it may be a merged revision.
1041
revno = len(list(self.repository.iter_reverse_revision_history(
1256
1043
destination.set_last_revision_info(revno, revision_id)
1258
1045
@needs_read_lock
1302
1089
Callers will typically also want to check the repository.
1304
:param refs: Calculated refs for this branch as specified by
1305
branch._get_check_refs()
1306
1091
:return: A BranchCheckResult.
1308
result = BranchCheckResult(self)
1093
mainline_parent_id = None
1309
1094
last_revno, last_revision_id = self.last_revision_info()
1310
actual_revno = refs[('lefthand-distance', last_revision_id)]
1311
if actual_revno != last_revno:
1312
result.errors.append(errors.BzrCheckError(
1313
'revno does not match len(mainline) %s != %s' % (
1314
last_revno, actual_revno)))
1315
# TODO: We should probably also check that self.revision_history
1316
# matches the repository for older branch formats.
1317
# If looking for the code that cross-checks repository parents against
1318
# the iter_reverse_revision_history output, that is now a repository
1095
real_rev_history = list(self.repository.iter_reverse_revision_history(
1097
real_rev_history.reverse()
1098
if len(real_rev_history) != last_revno:
1099
raise errors.BzrCheckError('revno does not match len(mainline)'
1100
' %s != %s' % (last_revno, len(real_rev_history)))
1101
# TODO: We should probably also check that real_rev_history actually
1102
# matches self.revision_history()
1103
for revision_id in real_rev_history:
1105
revision = self.repository.get_revision(revision_id)
1106
except errors.NoSuchRevision, e:
1107
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1109
# In general the first entry on the revision history has no parents.
1110
# But it's not illegal for it to have parents listed; this can happen
1111
# in imports from Arch when the parents weren't reachable.
1112
if mainline_parent_id is not None:
1113
if mainline_parent_id not in revision.parent_ids:
1114
raise errors.BzrCheckError("previous revision {%s} not listed among "
1116
% (mainline_parent_id, revision_id))
1117
mainline_parent_id = revision_id
1118
return BranchCheckResult(self)
1322
1120
def _get_checkout_format(self):
1323
1121
"""Return the most suitable metadir for a checkout of this branch.
1335
1133
def create_clone_on_transport(self, to_transport, revision_id=None,
1336
stacked_on=None, create_prefix=False, use_existing_dir=False):
1337
1135
"""Create a clone of this branch and its bzrdir.
1339
1137
:param to_transport: The transport to clone onto.
1340
1138
:param revision_id: The revision id to use as tip in the new branch.
1341
1139
If None the tip is obtained from this branch.
1342
1140
:param stacked_on: An optional URL to stack the clone on.
1343
:param create_prefix: Create any missing directories leading up to
1345
:param use_existing_dir: Use an existing directory if one exists.
1347
1142
# XXX: Fix the bzrdir API to allow getting the branch back from the
1348
1143
# clone call. Or something. 20090224 RBC/spiv.
1349
if revision_id is None:
1350
revision_id = self.last_revision()
1351
1144
dir_to = self.bzrdir.clone_on_transport(to_transport,
1352
revision_id=revision_id, stacked_on=stacked_on,
1353
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1145
revision_id=revision_id, stacked_on=stacked_on)
1354
1146
return dir_to.open_branch()
1356
1148
def create_checkout(self, to_location, revision_id=None,
1554
1331
"""Return the short format description for this format."""
1555
1332
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1558
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1565
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1566
lock_type='metadir', set_format=True):
1334
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1567
1336
"""Initialize a branch in a bzrdir, with specified files
1569
1338
:param a_bzrdir: The bzrdir to initialize the branch in
1570
1339
:param utf8_files: The files to create as a list of
1571
1340
(filename, content) tuples
1572
:param name: Name of colocated branch to create, if any
1573
1341
:param set_format: If True, set the format with
1574
1342
self.get_format_string. (BzrBranch4 has its format set
1576
1344
:return: a branch in this format
1578
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1579
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1346
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1347
branch_transport = a_bzrdir.get_branch_transport(self)
1581
1349
'metadir': ('lock', lockdir.LockDir),
1582
1350
'branch4': ('branch-lock', lockable_files.TransportLock),
1765
1515
"multiple hooks installed for transform_fallback_location, "
1766
1516
"all are called with the url returned from the previous hook."
1767
1517
"The order is however undefined.", (1, 9), None))
1768
self.create_hook(HookPoint('automatic_tag_name',
1769
"Called to determine an automatic tag name for a revision."
1770
"automatic_tag_name is called with (branch, revision_id) and "
1771
"should return a tag name or None if no tag name could be "
1772
"determined. The first non-None tag name returned will be used.",
1774
self.create_hook(HookPoint('post_branch_init',
1775
"Called after new branch initialization completes. "
1776
"post_branch_init is called with a "
1777
"bzrlib.branch.BranchInitHookParams. "
1778
"Note that init, branch and checkout (both heavyweight and "
1779
"lightweight) will all trigger this hook.", (2, 2), None))
1780
self.create_hook(HookPoint('post_switch',
1781
"Called after a checkout switches branch. "
1782
"post_switch is called with a "
1783
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1787
1520
# install the default hooks into the Branch class.
1826
1559
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1829
class BranchInitHookParams(object):
1830
"""Object holding parameters passed to *_branch_init hooks.
1832
There are 4 fields that hooks may wish to access:
1834
:ivar format: the branch format
1835
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1836
:ivar name: name of colocated branch, if any (or None)
1837
:ivar branch: the branch created
1839
Note that for lightweight checkouts, the bzrdir and format fields refer to
1840
the checkout, hence they are different from the corresponding fields in
1841
branch, which refer to the original branch.
1844
def __init__(self, format, a_bzrdir, name, branch):
1845
"""Create a group of BranchInitHook parameters.
1847
:param format: the branch format
1848
:param a_bzrdir: the BzrDir where the branch will be/has been
1850
:param name: name of colocated branch, if any (or None)
1851
:param branch: the branch created
1853
Note that for lightweight checkouts, the bzrdir and format fields refer
1854
to the checkout, hence they are different from the corresponding fields
1855
in branch, which refer to the original branch.
1857
self.format = format
1858
self.bzrdir = a_bzrdir
1860
self.branch = branch
1862
def __eq__(self, other):
1863
return self.__dict__ == other.__dict__
1867
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1869
return "<%s of format:%s bzrdir:%s>" % (
1870
self.__class__.__name__, self.branch,
1871
self.format, self.bzrdir)
1874
class SwitchHookParams(object):
1875
"""Object holding parameters passed to *_switch hooks.
1877
There are 4 fields that hooks may wish to access:
1879
:ivar control_dir: BzrDir of the checkout to change
1880
:ivar to_branch: branch that the checkout is to reference
1881
:ivar force: skip the check for local commits in a heavy checkout
1882
:ivar revision_id: revision ID to switch to (or None)
1885
def __init__(self, control_dir, to_branch, force, revision_id):
1886
"""Create a group of SwitchHook parameters.
1888
:param control_dir: BzrDir of the checkout to change
1889
:param to_branch: branch that the checkout is to reference
1890
:param force: skip the check for local commits in a heavy checkout
1891
:param revision_id: revision ID to switch to (or None)
1893
self.control_dir = control_dir
1894
self.to_branch = to_branch
1896
self.revision_id = revision_id
1898
def __eq__(self, other):
1899
return self.__dict__ == other.__dict__
1902
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1903
self.control_dir, self.to_branch,
1907
1562
class BzrBranchFormat4(BranchFormat):
1908
1563
"""Bzr branch format 4.
1962
1616
return self.get_format_string()
1964
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1618
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1965
1619
"""See BranchFormat.open()."""
1967
format = BranchFormat.find_format(a_bzrdir, name=name)
1621
format = BranchFormat.find_format(a_bzrdir)
1968
1622
if format.__class__ != self.__class__:
1969
1623
raise AssertionError("wrong format %r found for %r" %
1970
1624
(format, self))
1971
transport = a_bzrdir.get_branch_transport(None, name=name)
1626
transport = a_bzrdir.get_branch_transport(None)
1973
1627
control_files = lockable_files.LockableFiles(transport, 'lock',
1974
1628
lockdir.LockDir)
1975
1629
return self._branch_class()(_format=self,
1976
1630
_control_files=control_files,
1978
1631
a_bzrdir=a_bzrdir,
1979
1632
_repository=a_bzrdir.find_repository(),
1980
1633
ignore_fallbacks=ignore_fallbacks)
1981
1634
except errors.NoSuchFile:
1982
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1635
raise errors.NotBranchError(path=transport.base)
1984
1637
def __init__(self):
1985
1638
super(BranchFormatMetadir, self).__init__()
2160
1805
def get_reference(self, a_bzrdir):
2161
1806
"""See BranchFormat.get_reference()."""
2162
1807
transport = a_bzrdir.get_branch_transport(None)
2163
return transport.get_bytes('location')
1808
return transport.get('location').read()
2165
1810
def set_reference(self, a_bzrdir, to_branch):
2166
1811
"""See BranchFormat.set_reference()."""
2167
1812
transport = a_bzrdir.get_branch_transport(None)
2168
1813
location = transport.put_bytes('location', to_branch.base)
2170
def initialize(self, a_bzrdir, name=None, target_branch=None):
1815
def initialize(self, a_bzrdir, target_branch=None):
2171
1816
"""Create a branch of this format in a_bzrdir."""
2172
1817
if target_branch is None:
2173
1818
# this format does not implement branch itself, thus the implicit
2174
1819
# creation contract must see it as uninitializable
2175
1820
raise errors.UninitializableFormat(self)
2176
mutter('creating branch reference in %s', a_bzrdir.user_url)
2177
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1821
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1822
branch_transport = a_bzrdir.get_branch_transport(self)
2178
1823
branch_transport.put_bytes('location',
2179
target_branch.bzrdir.user_url)
1824
target_branch.bzrdir.root_transport.base)
2180
1825
branch_transport.put_bytes('format', self.get_format_string())
2182
a_bzrdir, name, _found=True,
1827
a_bzrdir, _found=True,
2183
1828
possible_transports=[target_branch.bzrdir.root_transport])
2184
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2187
1830
def __init__(self):
2188
1831
super(BranchReferenceFormat, self).__init__()
2194
1837
def clone(to_bzrdir, revision_id=None,
2195
1838
repository_policy=None):
2196
1839
"""See Branch.clone()."""
2197
return format.initialize(to_bzrdir, target_branch=a_branch)
1840
return format.initialize(to_bzrdir, a_branch)
2198
1841
# cannot obey revision_id limits when cloning a reference ...
2199
1842
# FIXME RBC 20060210 either nuke revision_id for clone, or
2200
1843
# emit some sort of warning/error to the caller ?!
2203
def open(self, a_bzrdir, name=None, _found=False, location=None,
1846
def open(self, a_bzrdir, _found=False, location=None,
2204
1847
possible_transports=None, ignore_fallbacks=False):
2205
1848
"""Return the branch that the branch reference in a_bzrdir points at.
2207
1850
:param a_bzrdir: A BzrDir that contains a branch.
2208
:param name: Name of colocated branch to open, if any
2209
1851
:param _found: a private parameter, do not use it. It is used to
2210
1852
indicate if format probing has already be done.
2211
1853
:param ignore_fallbacks: when set, no fallback branches will be opened
2324
1958
return self.control_files.is_locked()
2326
1960
def lock_write(self, token=None):
2327
if not self.is_locked():
2328
self._note_lock('w')
2329
# All-in-one needs to always unlock/lock.
2330
repo_control = getattr(self.repository, 'control_files', None)
2331
if self.control_files == repo_control or not self.is_locked():
2332
self.repository._warn_if_deprecated(self)
2333
self.repository.lock_write()
1961
repo_token = self.repository.lock_write()
2338
return self.control_files.lock_write(token=token)
1963
token = self.control_files.lock_write(token=token)
2341
self.repository.unlock()
1965
self.repository.unlock()
2344
1969
def lock_read(self):
2345
if not self.is_locked():
2346
self._note_lock('r')
2347
# All-in-one needs to always unlock/lock.
2348
repo_control = getattr(self.repository, 'control_files', None)
2349
if self.control_files == repo_control or not self.is_locked():
2350
self.repository._warn_if_deprecated(self)
2351
self.repository.lock_read()
1970
self.repository.lock_read()
2356
1972
self.control_files.lock_read()
2359
self.repository.unlock()
1974
self.repository.unlock()
2362
@only_raises(errors.LockNotHeld, errors.LockBroken)
2363
1977
def unlock(self):
1978
# TODO: test for failed two phase locks. This is known broken.
2365
1980
self.control_files.unlock()
2367
# All-in-one needs to always unlock/lock.
2368
repo_control = getattr(self.repository, 'control_files', None)
2369
if (self.control_files == repo_control or
2370
not self.control_files.is_locked()):
2371
self.repository.unlock()
2372
if not self.control_files.is_locked():
2373
# we just released the lock
2374
self._clear_cached_state()
1982
self.repository.unlock()
1983
if not self.control_files.is_locked():
1984
# we just released the lock
1985
self._clear_cached_state()
2376
1987
def peek_lock_mode(self):
2377
1988
if self.control_files._lock_count == 0:
2496
2107
"""See Branch.basis_tree."""
2497
2108
return self.repository.revision_tree(self.last_revision())
2111
def pull(self, source, overwrite=False, stop_revision=None,
2112
_hook_master=None, run_hooks=True, possible_transports=None,
2113
_override_hook_target=None):
2116
:param _hook_master: Private parameter - set the branch to
2117
be supplied as the master to pull hooks.
2118
:param run_hooks: Private parameter - if false, this branch
2119
is being called because it's the master of the primary branch,
2120
so it should not run its hooks.
2121
:param _override_hook_target: Private parameter - set the branch to be
2122
supplied as the target_branch to pull hooks.
2124
result = PullResult()
2125
result.source_branch = source
2126
if _override_hook_target is None:
2127
result.target_branch = self
2129
result.target_branch = _override_hook_target
2132
# We assume that during 'pull' the local repository is closer than
2134
source.update_references(self)
2135
graph = self.repository.get_graph(source.repository)
2136
result.old_revno, result.old_revid = self.last_revision_info()
2137
self.update_revisions(source, stop_revision, overwrite=overwrite,
2139
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2140
result.new_revno, result.new_revid = self.last_revision_info()
2142
result.master_branch = _hook_master
2143
result.local_branch = result.target_branch
2145
result.master_branch = result.target_branch
2146
result.local_branch = None
2148
for hook in Branch.hooks['post_pull']:
2499
2154
def _get_parent_location(self):
2500
2155
_locs = ['parent', 'pull', 'x-pull']
2501
2156
for l in _locs:
2164
def push(self, target, overwrite=False, stop_revision=None,
2165
_override_hook_source_branch=None):
2168
This is the basic concrete implementation of push()
2170
:param _override_hook_source_branch: If specified, run
2171
the hooks passing this Branch as the source, rather than self.
2172
This is for use of RemoteBranch, where push is delegated to the
2173
underlying vfs-based Branch.
2175
# TODO: Public option to disable running hooks - should be trivial but
2177
return _run_with_write_locked_target(
2178
target, self._push_with_bound_branches, target, overwrite,
2180
_override_hook_source_branch=_override_hook_source_branch)
2182
def _push_with_bound_branches(self, target, overwrite,
2184
_override_hook_source_branch=None):
2185
"""Push from self into target, and into target's master if any.
2187
This is on the base BzrBranch class even though it doesn't support
2188
bound branches because the *target* might be bound.
2191
if _override_hook_source_branch:
2192
result.source_branch = _override_hook_source_branch
2193
for hook in Branch.hooks['post_push']:
2196
bound_location = target.get_bound_location()
2197
if bound_location and target.base != bound_location:
2198
# there is a master branch.
2200
# XXX: Why the second check? Is it even supported for a branch to
2201
# be bound to itself? -- mbp 20070507
2202
master_branch = target.get_master_branch()
2203
master_branch.lock_write()
2205
# push into the master from this branch.
2206
self._basic_push(master_branch, overwrite, stop_revision)
2207
# and push into the target branch from this. Note that we push from
2208
# this branch again, because its considered the highest bandwidth
2210
result = self._basic_push(target, overwrite, stop_revision)
2211
result.master_branch = master_branch
2212
result.local_branch = target
2216
master_branch.unlock()
2219
result = self._basic_push(target, overwrite, stop_revision)
2220
# TODO: Why set master_branch and local_branch if there's no
2221
# binding? Maybe cleaner to just leave them unset? -- mbp
2223
result.master_branch = target
2224
result.local_branch = None
2508
2228
def _basic_push(self, target, overwrite, stop_revision):
2509
2229
"""Basic implementation of push without bound branches or hooks.
2511
Must be called with source read locked and target write locked.
2231
Must be called with self read locked and target write locked.
2513
2233
result = BranchPushResult()
2514
2234
result.source_branch = self
2550
2287
It has support for a master_branch which is the data for bound branches.
2291
def pull(self, source, overwrite=False, stop_revision=None,
2292
run_hooks=True, possible_transports=None,
2293
_override_hook_target=None):
2294
"""Pull from source into self, updating my master if any.
2296
:param run_hooks: Private parameter - if false, this branch
2297
is being called because it's the master of the primary branch,
2298
so it should not run its hooks.
2300
bound_location = self.get_bound_location()
2301
master_branch = None
2302
if bound_location and source.base != bound_location:
2303
# not pulling from master, so we need to update master.
2304
master_branch = self.get_master_branch(possible_transports)
2305
master_branch.lock_write()
2308
# pull from source into master.
2309
master_branch.pull(source, overwrite, stop_revision,
2311
return super(BzrBranch5, self).pull(source, overwrite,
2312
stop_revision, _hook_master=master_branch,
2313
run_hooks=run_hooks,
2314
_override_hook_target=_override_hook_target)
2317
master_branch.unlock()
2553
2319
def get_bound_location(self):
2555
2321
return self._transport.get_bytes('bound')[:-1]
2733
2499
self._extend_partial_history(stop_index=last_revno-1)
2734
2500
return list(reversed(self._partial_revision_history_cache))
2502
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2503
"""Extend the partial history to include a given index
2505
If a stop_index is supplied, stop when that index has been reached.
2506
If a stop_revision is supplied, stop when that revision is
2507
encountered. Otherwise, stop when the beginning of history is
2510
:param stop_index: The index which should be present. When it is
2511
present, history extension will stop.
2512
:param revision_id: The revision id which should be present. When
2513
it is encountered, history extension will stop.
2515
repo = self.repository
2516
if len(self._partial_revision_history_cache) == 0:
2517
iterator = repo.iter_reverse_revision_history(self.last_revision())
2519
start_revision = self._partial_revision_history_cache[-1]
2520
iterator = repo.iter_reverse_revision_history(start_revision)
2521
#skip the last revision in the list
2522
next_revision = iterator.next()
2523
for revision_id in iterator:
2524
self._partial_revision_history_cache.append(revision_id)
2525
if (stop_index is not None and
2526
len(self._partial_revision_history_cache) > stop_index):
2528
if revision_id == stop_revision:
2736
2531
def _write_revision_history(self, history):
2737
2532
"""Factored out of set_revision_history.
3234
3011
self.source.unlock()
3236
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3241
:param _hook_master: Private parameter - set the branch to
3242
be supplied as the master to pull hooks.
3243
:param run_hooks: Private parameter - if false, this branch
3244
is being called because it's the master of the primary branch,
3245
so it should not run its hooks.
3246
:param _override_hook_target: Private parameter - set the branch to be
3247
supplied as the target_branch to pull hooks.
3248
:param local: Only update the local branch, and not the bound branch.
3250
# This type of branch can't be bound.
3252
raise errors.LocalRequiresBoundBranch()
3253
result = PullResult()
3254
result.source_branch = self.source
3255
if _override_hook_target is None:
3256
result.target_branch = self.target
3258
result.target_branch = _override_hook_target
3259
self.source.lock_read()
3261
# We assume that during 'pull' the target repository is closer than
3263
self.source.update_references(self.target)
3264
graph = self.target.repository.get_graph(self.source.repository)
3265
# TODO: Branch formats should have a flag that indicates
3266
# that revno's are expensive, and pull() should honor that flag.
3268
result.old_revno, result.old_revid = \
3269
self.target.last_revision_info()
3270
self.target.update_revisions(self.source, stop_revision,
3271
overwrite=overwrite, graph=graph)
3272
# TODO: The old revid should be specified when merging tags,
3273
# so a tags implementation that versions tags can only
3274
# pull in the most recent changes. -- JRV20090506
3275
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3277
result.new_revno, result.new_revid = self.target.last_revision_info()
3279
result.master_branch = _hook_master
3280
result.local_branch = result.target_branch
3282
result.master_branch = result.target_branch
3283
result.local_branch = None
3285
for hook in Branch.hooks['post_pull']:
3288
self.source.unlock()
3291
def push(self, overwrite=False, stop_revision=None,
3292
_override_hook_source_branch=None):
3293
"""See InterBranch.push.
3295
This is the basic concrete implementation of push()
3297
:param _override_hook_source_branch: If specified, run
3298
the hooks passing this Branch as the source, rather than self.
3299
This is for use of RemoteBranch, where push is delegated to the
3300
underlying vfs-based Branch.
3302
# TODO: Public option to disable running hooks - should be trivial but
3304
self.source.lock_read()
3306
return _run_with_write_locked_target(
3307
self.target, self._push_with_bound_branches, overwrite,
3309
_override_hook_source_branch=_override_hook_source_branch)
3311
self.source.unlock()
3313
def _push_with_bound_branches(self, overwrite, stop_revision,
3314
_override_hook_source_branch=None):
3315
"""Push from source into target, and into target's master if any.
3318
if _override_hook_source_branch:
3319
result.source_branch = _override_hook_source_branch
3320
for hook in Branch.hooks['post_push']:
3323
bound_location = self.target.get_bound_location()
3324
if bound_location and self.target.base != bound_location:
3325
# there is a master branch.
3327
# XXX: Why the second check? Is it even supported for a branch to
3328
# be bound to itself? -- mbp 20070507
3329
master_branch = self.target.get_master_branch()
3330
master_branch.lock_write()
3332
# push into the master from the source branch.
3333
self.source._basic_push(master_branch, overwrite, stop_revision)
3334
# and push into the target branch from the source. Note that we
3335
# push from the source branch again, because its considered the
3336
# highest bandwidth repository.
3337
result = self.source._basic_push(self.target, overwrite,
3339
result.master_branch = master_branch
3340
result.local_branch = self.target
3344
master_branch.unlock()
3347
result = self.source._basic_push(self.target, overwrite,
3349
# TODO: Why set master_branch and local_branch if there's no
3350
# binding? Maybe cleaner to just leave them unset? -- mbp
3352
result.master_branch = self.target
3353
result.local_branch = None
3358
3014
def is_compatible(self, source, target):
3359
3015
# GenericBranch uses the public API, so always compatible
3363
class InterToBranch5(GenericInterBranch):
3366
def _get_branch_formats_to_test():
3367
return BranchFormat._default_format, BzrBranchFormat5()
3369
def pull(self, overwrite=False, stop_revision=None,
3370
possible_transports=None, run_hooks=True,
3371
_override_hook_target=None, local=False):
3372
"""Pull from source into self, updating my master if any.
3374
:param run_hooks: Private parameter - if false, this branch
3375
is being called because it's the master of the primary branch,
3376
so it should not run its hooks.
3378
bound_location = self.target.get_bound_location()
3379
if local and not bound_location:
3380
raise errors.LocalRequiresBoundBranch()
3381
master_branch = None
3382
if not local and bound_location and self.source.user_url != bound_location:
3383
# not pulling from master, so we need to update master.
3384
master_branch = self.target.get_master_branch(possible_transports)
3385
master_branch.lock_write()
3388
# pull from source into master.
3389
master_branch.pull(self.source, overwrite, stop_revision,
3391
return super(InterToBranch5, self).pull(overwrite,
3392
stop_revision, _hook_master=master_branch,
3393
run_hooks=run_hooks,
3394
_override_hook_target=_override_hook_target)
3397
master_branch.unlock()
3400
3019
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
