126
129
raise errors.UnstackableRepositoryFormat(self.repository._format,
127
130
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
133
def open(base, _unsupported=False, possible_transports=None):
160
134
"""Open the branch rooted at base.
446
418
# start_revision_id.
447
419
if self._merge_sorted_revisions_cache is None:
448
420
last_revision = self.last_revision()
449
known_graph = self.repository.get_known_graph_ancestry(
451
self._merge_sorted_revisions_cache = known_graph.merge_sort(
421
graph = self.repository.get_graph()
422
parent_map = dict(((key, value) for key, value in
423
graph.iter_ancestry([last_revision]) if value is not None))
424
revision_graph = repository._strip_NULL_ghosts(parent_map)
425
revs = tsort.merge_sort(revision_graph, last_revision, None,
427
# Drop the sequence # before caching
428
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
453
430
filtered = self._filter_merge_sorted_revisions(
454
431
self._merge_sorted_revisions_cache, start_revision_id,
455
432
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
433
if direction == 'reverse':
461
435
if direction == 'forward':
468
442
"""Iterate over an inclusive range of sorted revisions."""
469
443
rev_iter = iter(merge_sorted_revisions)
470
444
if start_revision_id is not None:
471
for node in rev_iter:
472
rev_id = node.key[-1]
445
for rev_id, depth, revno, end_of_merge in rev_iter:
473
446
if rev_id != start_revision_id:
476
449
# The decision to include the start or not
477
450
# 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)
452
iter([(rev_id, depth, revno, end_of_merge)]),
481
455
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,
456
for rev_id, depth, revno, end_of_merge in rev_iter:
457
yield rev_id, depth, revno, end_of_merge
487
458
elif stop_rule == 'exclude':
488
for node in rev_iter:
489
rev_id = node.key[-1]
459
for rev_id, depth, revno, end_of_merge in rev_iter:
490
460
if rev_id == stop_revision_id:
492
yield (rev_id, node.merge_depth, node.revno,
462
yield rev_id, depth, revno, end_of_merge
494
463
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,
464
for rev_id, depth, revno, end_of_merge in rev_iter:
465
yield rev_id, depth, revno, end_of_merge
499
466
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
468
elif stop_rule == 'with-merges':
514
469
stop_rev = self.repository.get_revision(stop_revision_id)
515
470
if stop_rev.parent_ids:
516
471
left_parent = stop_rev.parent_ids[0]
518
473
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]
474
for rev_id, depth, revno, end_of_merge in rev_iter:
525
475
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)
477
yield rev_id, depth, revno, end_of_merge
539
479
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
481
def leave_lock_in_place(self):
587
482
"""Tell this branch object not to release the physical lock when this
588
483
object is unlocked.
758
640
except (errors.NotStacked, errors.UnstackableBranchFormat,
759
641
errors.UnstackableRepositoryFormat):
644
# XXX: Lock correctness - should unlock our old repo if we were
646
# repositories don't offer an interface to remove fallback
647
# repositories today; take the conceptually simpler option and just
649
self.repository = self.bzrdir.find_repository()
650
self.repository.lock_write()
651
# for every revision reference the branch has, ensure it is pulled
653
source_repository = self._get_fallback_repository(old_url)
654
for revision_id in chain([self.last_revision()],
655
self.tags.get_reverse_tag_dict()):
656
self.repository.fetch(source_repository, revision_id,
763
self._activate_fallback_location(url)
659
self._activate_fallback_location(url, 'write')
764
660
# write this out after the repository is stacked to avoid setting a
765
661
# stacked config that doesn't work.
766
662
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
665
def _set_tags_bytes(self, bytes):
824
666
"""Mirror method for _get_tags_bytes.
991
835
except ValueError:
992
836
raise errors.NoSuchRevision(self, revision_id)
995
838
def get_rev_id(self, revno, history=None):
996
839
"""Find the revision id of the specified revno."""
998
841
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:
843
history = self.revision_history()
844
if revno <= 0 or revno > len(history):
1003
845
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]
846
return history[revno - 1]
1010
848
def pull(self, source, overwrite=False, stop_revision=None,
1011
possible_transports=None, *args, **kwargs):
849
possible_transports=None, _override_hook_target=None):
1012
850
"""Mirror source into this branch.
1014
852
This branch is considered to be 'local', having low latency.
1016
854
:returns: PullResult instance
1018
return InterBranch.get(source, self).pull(overwrite=overwrite,
1019
stop_revision=stop_revision,
1020
possible_transports=possible_transports, *args, **kwargs)
856
raise NotImplementedError(self.pull)
1022
def push(self, target, overwrite=False, stop_revision=None, *args,
858
def push(self, target, overwrite=False, stop_revision=None):
1024
859
"""Mirror this branch into target.
1026
861
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)
863
raise NotImplementedError(self.push)
1052
865
def basis_tree(self):
1053
866
"""Return `Tree` object for last revision."""
1245
1059
source_revno, source_revision_id = self.last_revision_info()
1246
1060
if revision_id is None:
1247
1061
revno, revision_id = source_revno, source_revision_id
1062
elif source_revision_id == revision_id:
1063
# we know the revno without needing to walk all of history
1064
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
1066
# To figure out the revno for a random revision, we need to build
1067
# the revision history, and count its length.
1068
# We don't care about the order, just how long it is.
1069
# Alternatively, we could start at the current location, and count
1070
# backwards. But there is no guarantee that we will find it since
1071
# it may be a merged revision.
1072
revno = len(list(self.repository.iter_reverse_revision_history(
1256
1074
destination.set_last_revision_info(revno, revision_id)
1258
1076
@needs_read_lock
1302
1120
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
1122
:return: A BranchCheckResult.
1308
result = BranchCheckResult(self)
1124
mainline_parent_id = None
1309
1125
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
1126
real_rev_history = list(self.repository.iter_reverse_revision_history(
1128
real_rev_history.reverse()
1129
if len(real_rev_history) != last_revno:
1130
raise errors.BzrCheckError('revno does not match len(mainline)'
1131
' %s != %s' % (last_revno, len(real_rev_history)))
1132
# TODO: We should probably also check that real_rev_history actually
1133
# matches self.revision_history()
1134
for revision_id in real_rev_history:
1136
revision = self.repository.get_revision(revision_id)
1137
except errors.NoSuchRevision, e:
1138
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1140
# In general the first entry on the revision history has no parents.
1141
# But it's not illegal for it to have parents listed; this can happen
1142
# in imports from Arch when the parents weren't reachable.
1143
if mainline_parent_id is not None:
1144
if mainline_parent_id not in revision.parent_ids:
1145
raise errors.BzrCheckError("previous revision {%s} not listed among "
1147
% (mainline_parent_id, revision_id))
1148
mainline_parent_id = revision_id
1149
return BranchCheckResult(self)
1322
1151
def _get_checkout_format(self):
1323
1152
"""Return the most suitable metadir for a checkout of this branch.
1554
1375
"""Return the short format description for this format."""
1555
1376
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):
1378
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1567
1380
"""Initialize a branch in a bzrdir, with specified files
1569
1382
:param a_bzrdir: The bzrdir to initialize the branch in
1570
1383
:param utf8_files: The files to create as a list of
1571
1384
(filename, content) tuples
1572
:param name: Name of colocated branch to create, if any
1573
1385
:param set_format: If True, set the format with
1574
1386
self.get_format_string. (BzrBranch4 has its format set
1576
1388
: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)
1390
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1391
branch_transport = a_bzrdir.get_branch_transport(self)
1581
1393
'metadir': ('lock', lockdir.LockDir),
1582
1394
'branch4': ('branch-lock', lockable_files.TransportLock),
1765
1559
"multiple hooks installed for transform_fallback_location, "
1766
1560
"all are called with the url returned from the previous hook."
1767
1561
"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
1564
# install the default hooks into the Branch class.
1826
1603
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
1606
class BzrBranchFormat4(BranchFormat):
1908
1607
"""Bzr branch format 4.
1962
1660
return self.get_format_string()
1964
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1662
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1965
1663
"""See BranchFormat.open()."""
1967
format = BranchFormat.find_format(a_bzrdir, name=name)
1665
format = BranchFormat.find_format(a_bzrdir)
1968
1666
if format.__class__ != self.__class__:
1969
1667
raise AssertionError("wrong format %r found for %r" %
1970
1668
(format, self))
1971
transport = a_bzrdir.get_branch_transport(None, name=name)
1670
transport = a_bzrdir.get_branch_transport(None)
1973
1671
control_files = lockable_files.LockableFiles(transport, 'lock',
1974
1672
lockdir.LockDir)
1975
1673
return self._branch_class()(_format=self,
1976
1674
_control_files=control_files,
1978
1675
a_bzrdir=a_bzrdir,
1979
1676
_repository=a_bzrdir.find_repository(),
1980
1677
ignore_fallbacks=ignore_fallbacks)
1981
1678
except errors.NoSuchFile:
1982
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1679
raise errors.NotBranchError(path=transport.base)
1984
1681
def __init__(self):
1985
1682
super(BranchFormatMetadir, self).__init__()
2160
1849
def get_reference(self, a_bzrdir):
2161
1850
"""See BranchFormat.get_reference()."""
2162
1851
transport = a_bzrdir.get_branch_transport(None)
2163
return transport.get_bytes('location')
1852
return transport.get('location').read()
2165
1854
def set_reference(self, a_bzrdir, to_branch):
2166
1855
"""See BranchFormat.set_reference()."""
2167
1856
transport = a_bzrdir.get_branch_transport(None)
2168
1857
location = transport.put_bytes('location', to_branch.base)
2170
def initialize(self, a_bzrdir, name=None, target_branch=None):
1859
def initialize(self, a_bzrdir, target_branch=None):
2171
1860
"""Create a branch of this format in a_bzrdir."""
2172
1861
if target_branch is None:
2173
1862
# this format does not implement branch itself, thus the implicit
2174
1863
# creation contract must see it as uninitializable
2175
1864
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)
1865
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1866
branch_transport = a_bzrdir.get_branch_transport(self)
2178
1867
branch_transport.put_bytes('location',
2179
target_branch.bzrdir.user_url)
1868
target_branch.bzrdir.root_transport.base)
2180
1869
branch_transport.put_bytes('format', self.get_format_string())
2182
a_bzrdir, name, _found=True,
1871
a_bzrdir, _found=True,
2183
1872
possible_transports=[target_branch.bzrdir.root_transport])
2184
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2187
1874
def __init__(self):
2188
1875
super(BranchReferenceFormat, self).__init__()
2194
1881
def clone(to_bzrdir, revision_id=None,
2195
1882
repository_policy=None):
2196
1883
"""See Branch.clone()."""
2197
return format.initialize(to_bzrdir, target_branch=a_branch)
1884
return format.initialize(to_bzrdir, a_branch)
2198
1885
# cannot obey revision_id limits when cloning a reference ...
2199
1886
# FIXME RBC 20060210 either nuke revision_id for clone, or
2200
1887
# emit some sort of warning/error to the caller ?!
2203
def open(self, a_bzrdir, name=None, _found=False, location=None,
1890
def open(self, a_bzrdir, _found=False, location=None,
2204
1891
possible_transports=None, ignore_fallbacks=False):
2205
1892
"""Return the branch that the branch reference in a_bzrdir points at.
2207
1894
:param a_bzrdir: A BzrDir that contains a branch.
2208
:param name: Name of colocated branch to open, if any
2209
1895
:param _found: a private parameter, do not use it. It is used to
2210
1896
indicate if format probing has already be done.
2211
1897
:param ignore_fallbacks: when set, no fallback branches will be opened
2496
2167
"""See Branch.basis_tree."""
2497
2168
return self.repository.revision_tree(self.last_revision())
2171
def pull(self, source, overwrite=False, stop_revision=None,
2172
_hook_master=None, run_hooks=True, possible_transports=None,
2173
_override_hook_target=None):
2176
:param _hook_master: Private parameter - set the branch to
2177
be supplied as the master to pull hooks.
2178
:param run_hooks: Private parameter - if false, this branch
2179
is being called because it's the master of the primary branch,
2180
so it should not run its hooks.
2181
:param _override_hook_target: Private parameter - set the branch to be
2182
supplied as the target_branch to pull hooks.
2184
result = PullResult()
2185
result.source_branch = source
2186
if _override_hook_target is None:
2187
result.target_branch = self
2189
result.target_branch = _override_hook_target
2192
# We assume that during 'pull' the local repository is closer than
2194
source.update_references(self)
2195
graph = self.repository.get_graph(source.repository)
2196
result.old_revno, result.old_revid = self.last_revision_info()
2197
self.update_revisions(source, stop_revision, overwrite=overwrite,
2199
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2200
result.new_revno, result.new_revid = self.last_revision_info()
2202
result.master_branch = _hook_master
2203
result.local_branch = result.target_branch
2205
result.master_branch = result.target_branch
2206
result.local_branch = None
2208
for hook in Branch.hooks['post_pull']:
2499
2214
def _get_parent_location(self):
2500
2215
_locs = ['parent', 'pull', 'x-pull']
2501
2216
for l in _locs:
2224
def push(self, target, overwrite=False, stop_revision=None,
2225
_override_hook_source_branch=None):
2228
This is the basic concrete implementation of push()
2230
:param _override_hook_source_branch: If specified, run
2231
the hooks passing this Branch as the source, rather than self.
2232
This is for use of RemoteBranch, where push is delegated to the
2233
underlying vfs-based Branch.
2235
# TODO: Public option to disable running hooks - should be trivial but
2237
return _run_with_write_locked_target(
2238
target, self._push_with_bound_branches, target, overwrite,
2240
_override_hook_source_branch=_override_hook_source_branch)
2242
def _push_with_bound_branches(self, target, overwrite,
2244
_override_hook_source_branch=None):
2245
"""Push from self into target, and into target's master if any.
2247
This is on the base BzrBranch class even though it doesn't support
2248
bound branches because the *target* might be bound.
2251
if _override_hook_source_branch:
2252
result.source_branch = _override_hook_source_branch
2253
for hook in Branch.hooks['post_push']:
2256
bound_location = target.get_bound_location()
2257
if bound_location and target.base != bound_location:
2258
# there is a master branch.
2260
# XXX: Why the second check? Is it even supported for a branch to
2261
# be bound to itself? -- mbp 20070507
2262
master_branch = target.get_master_branch()
2263
master_branch.lock_write()
2265
# push into the master from this branch.
2266
self._basic_push(master_branch, overwrite, stop_revision)
2267
# and push into the target branch from this. Note that we push from
2268
# this branch again, because its considered the highest bandwidth
2270
result = self._basic_push(target, overwrite, stop_revision)
2271
result.master_branch = master_branch
2272
result.local_branch = target
2276
master_branch.unlock()
2279
result = self._basic_push(target, overwrite, stop_revision)
2280
# TODO: Why set master_branch and local_branch if there's no
2281
# binding? Maybe cleaner to just leave them unset? -- mbp
2283
result.master_branch = target
2284
result.local_branch = None
2508
2288
def _basic_push(self, target, overwrite, stop_revision):
2509
2289
"""Basic implementation of push without bound branches or hooks.
2511
Must be called with source read locked and target write locked.
2291
Must be called with self read locked and target write locked.
2513
2293
result = BranchPushResult()
2514
2294
result.source_branch = self
2550
2329
It has support for a master_branch which is the data for bound branches.
2333
def pull(self, source, overwrite=False, stop_revision=None,
2334
run_hooks=True, possible_transports=None,
2335
_override_hook_target=None):
2336
"""Pull from source into self, updating my master if any.
2338
:param run_hooks: Private parameter - if false, this branch
2339
is being called because it's the master of the primary branch,
2340
so it should not run its hooks.
2342
bound_location = self.get_bound_location()
2343
master_branch = None
2344
if bound_location and source.base != bound_location:
2345
# not pulling from master, so we need to update master.
2346
master_branch = self.get_master_branch(possible_transports)
2347
master_branch.lock_write()
2350
# pull from source into master.
2351
master_branch.pull(source, overwrite, stop_revision,
2353
return super(BzrBranch5, self).pull(source, overwrite,
2354
stop_revision, _hook_master=master_branch,
2355
run_hooks=run_hooks,
2356
_override_hook_target=_override_hook_target)
2359
master_branch.unlock()
2553
2361
def get_bound_location(self):
2555
2363
return self._transport.get_bytes('bound')[:-1]
2733
2543
self._extend_partial_history(stop_index=last_revno-1)
2734
2544
return list(reversed(self._partial_revision_history_cache))
2546
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2547
"""Extend the partial history to include a given index
2549
If a stop_index is supplied, stop when that index has been reached.
2550
If a stop_revision is supplied, stop when that revision is
2551
encountered. Otherwise, stop when the beginning of history is
2554
:param stop_index: The index which should be present. When it is
2555
present, history extension will stop.
2556
:param revision_id: The revision id which should be present. When
2557
it is encountered, history extension will stop.
2559
repo = self.repository
2560
if len(self._partial_revision_history_cache) == 0:
2561
iterator = repo.iter_reverse_revision_history(self.last_revision())
2563
start_revision = self._partial_revision_history_cache[-1]
2564
iterator = repo.iter_reverse_revision_history(start_revision)
2565
#skip the last revision in the list
2566
next_revision = iterator.next()
2567
for revision_id in iterator:
2568
self._partial_revision_history_cache.append(revision_id)
2569
if (stop_index is not None and
2570
len(self._partial_revision_history_cache) > stop_index):
2572
if revision_id == stop_revision:
2736
2575
def _write_revision_history(self, history):
2737
2576
"""Factored out of set_revision_history.
3234
3061
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
3064
def is_compatible(self, source, target):
3359
3065
# 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
3069
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)