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.
457
418
# start_revision_id.
458
419
if self._merge_sorted_revisions_cache is None:
459
420
last_revision = self.last_revision()
460
known_graph = self.repository.get_known_graph_ancestry(
462
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]
464
430
filtered = self._filter_merge_sorted_revisions(
465
431
self._merge_sorted_revisions_cache, start_revision_id,
466
432
stop_revision_id, stop_rule)
467
# Make sure we don't return revisions that are not part of the
468
# start_revision_id ancestry.
469
filtered = self._filter_start_non_ancestors(filtered)
470
433
if direction == 'reverse':
472
435
if direction == 'forward':
479
442
"""Iterate over an inclusive range of sorted revisions."""
480
443
rev_iter = iter(merge_sorted_revisions)
481
444
if start_revision_id is not None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
445
for rev_id, depth, revno, end_of_merge in rev_iter:
484
446
if rev_id != start_revision_id:
487
449
# The decision to include the start or not
488
450
# 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)
452
iter([(rev_id, depth, revno, end_of_merge)]),
492
455
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,
456
for rev_id, depth, revno, end_of_merge in rev_iter:
457
yield rev_id, depth, revno, end_of_merge
498
458
elif stop_rule == 'exclude':
499
for node in rev_iter:
500
rev_id = node.key[-1]
459
for rev_id, depth, revno, end_of_merge in rev_iter:
501
460
if rev_id == stop_revision_id:
503
yield (rev_id, node.merge_depth, node.revno,
462
yield rev_id, depth, revno, end_of_merge
505
463
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,
464
for rev_id, depth, revno, end_of_merge in rev_iter:
465
yield rev_id, depth, revno, end_of_merge
510
466
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
468
elif stop_rule == 'with-merges':
525
469
stop_rev = self.repository.get_revision(stop_revision_id)
526
470
if stop_rev.parent_ids:
527
471
left_parent = stop_rev.parent_ids[0]
529
473
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]
474
for rev_id, depth, revno, end_of_merge in rev_iter:
536
475
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)
477
yield rev_id, depth, revno, end_of_merge
550
479
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
481
def leave_lock_in_place(self):
598
482
"""Tell this branch object not to release the physical lock when this
599
483
object is unlocked.
769
640
except (errors.NotStacked, errors.UnstackableBranchFormat,
770
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,
774
self._activate_fallback_location(url)
659
self._activate_fallback_location(url, 'write')
775
660
# write this out after the repository is stacked to avoid setting a
776
661
# stacked config that doesn't work.
777
662
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
665
def _set_tags_bytes(self, bytes):
835
666
"""Mirror method for _get_tags_bytes.
1002
835
except ValueError:
1003
836
raise errors.NoSuchRevision(self, revision_id)
1006
838
def get_rev_id(self, revno, history=None):
1007
839
"""Find the revision id of the specified revno."""
1009
841
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:
843
history = self.revision_history()
844
if revno <= 0 or revno > len(history):
1014
845
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]
846
return history[revno - 1]
1021
848
def pull(self, source, overwrite=False, stop_revision=None,
1022
possible_transports=None, *args, **kwargs):
849
possible_transports=None, _override_hook_target=None):
1023
850
"""Mirror source into this branch.
1025
852
This branch is considered to be 'local', having low latency.
1027
854
:returns: PullResult instance
1029
return InterBranch.get(source, self).pull(overwrite=overwrite,
1030
stop_revision=stop_revision,
1031
possible_transports=possible_transports, *args, **kwargs)
856
raise NotImplementedError(self.pull)
1033
def push(self, target, overwrite=False, stop_revision=None, *args,
858
def push(self, target, overwrite=False, stop_revision=None):
1035
859
"""Mirror this branch into target.
1037
861
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)
863
raise NotImplementedError(self.push)
1063
865
def basis_tree(self):
1064
866
"""Return `Tree` object for last revision."""
1256
1059
source_revno, source_revision_id = self.last_revision_info()
1257
1060
if revision_id is None:
1258
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
1260
graph = self.repository.get_graph()
1262
revno = graph.find_distance_to_null(revision_id,
1263
[(source_revision_id, source_revno)])
1264
except errors.GhostRevisionsHaveNoRevno:
1265
# 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(
1267
1074
destination.set_last_revision_info(revno, revision_id)
1269
1076
@needs_read_lock
1313
1120
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
1122
:return: A BranchCheckResult.
1319
result = BranchCheckResult(self)
1124
mainline_parent_id = None
1320
1125
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
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)
1333
1151
def _get_checkout_format(self):
1334
1152
"""Return the most suitable metadir for a checkout of this branch.
1565
1375
"""Return the short format description for this format."""
1566
1376
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):
1378
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1578
1380
"""Initialize a branch in a bzrdir, with specified files
1580
1382
:param a_bzrdir: The bzrdir to initialize the branch in
1581
1383
:param utf8_files: The files to create as a list of
1582
1384
(filename, content) tuples
1583
:param name: Name of colocated branch to create, if any
1584
1385
:param set_format: If True, set the format with
1585
1386
self.get_format_string. (BzrBranch4 has its format set
1587
1388
: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)
1390
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1391
branch_transport = a_bzrdir.get_branch_transport(self)
1592
1393
'metadir': ('lock', lockdir.LockDir),
1593
1394
'branch4': ('branch-lock', lockable_files.TransportLock),
1776
1559
"multiple hooks installed for transform_fallback_location, "
1777
1560
"all are called with the url returned from the previous hook."
1778
1561
"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))
1798
1564
# install the default hooks into the Branch class.
1837
1603
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
1606
class BzrBranchFormat4(BranchFormat):
1919
1607
"""Bzr branch format 4.
1973
1660
return self.get_format_string()
1975
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1662
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1976
1663
"""See BranchFormat.open()."""
1978
format = BranchFormat.find_format(a_bzrdir, name=name)
1665
format = BranchFormat.find_format(a_bzrdir)
1979
1666
if format.__class__ != self.__class__:
1980
1667
raise AssertionError("wrong format %r found for %r" %
1981
1668
(format, self))
1982
transport = a_bzrdir.get_branch_transport(None, name=name)
1670
transport = a_bzrdir.get_branch_transport(None)
1984
1671
control_files = lockable_files.LockableFiles(transport, 'lock',
1985
1672
lockdir.LockDir)
1986
1673
return self._branch_class()(_format=self,
1987
1674
_control_files=control_files,
1989
1675
a_bzrdir=a_bzrdir,
1990
1676
_repository=a_bzrdir.find_repository(),
1991
1677
ignore_fallbacks=ignore_fallbacks)
1992
1678
except errors.NoSuchFile:
1993
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1679
raise errors.NotBranchError(path=transport.base)
1995
1681
def __init__(self):
1996
1682
super(BranchFormatMetadir, self).__init__()
2171
1849
def get_reference(self, a_bzrdir):
2172
1850
"""See BranchFormat.get_reference()."""
2173
1851
transport = a_bzrdir.get_branch_transport(None)
2174
return transport.get_bytes('location')
1852
return transport.get('location').read()
2176
1854
def set_reference(self, a_bzrdir, to_branch):
2177
1855
"""See BranchFormat.set_reference()."""
2178
1856
transport = a_bzrdir.get_branch_transport(None)
2179
1857
location = transport.put_bytes('location', to_branch.base)
2181
def initialize(self, a_bzrdir, name=None, target_branch=None):
1859
def initialize(self, a_bzrdir, target_branch=None):
2182
1860
"""Create a branch of this format in a_bzrdir."""
2183
1861
if target_branch is None:
2184
1862
# this format does not implement branch itself, thus the implicit
2185
1863
# creation contract must see it as uninitializable
2186
1864
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)
1865
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1866
branch_transport = a_bzrdir.get_branch_transport(self)
2189
1867
branch_transport.put_bytes('location',
2190
target_branch.bzrdir.user_url)
1868
target_branch.bzrdir.root_transport.base)
2191
1869
branch_transport.put_bytes('format', self.get_format_string())
2193
a_bzrdir, name, _found=True,
1871
a_bzrdir, _found=True,
2194
1872
possible_transports=[target_branch.bzrdir.root_transport])
2195
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2198
1874
def __init__(self):
2199
1875
super(BranchReferenceFormat, self).__init__()
2205
1881
def clone(to_bzrdir, revision_id=None,
2206
1882
repository_policy=None):
2207
1883
"""See Branch.clone()."""
2208
return format.initialize(to_bzrdir, target_branch=a_branch)
1884
return format.initialize(to_bzrdir, a_branch)
2209
1885
# cannot obey revision_id limits when cloning a reference ...
2210
1886
# FIXME RBC 20060210 either nuke revision_id for clone, or
2211
1887
# emit some sort of warning/error to the caller ?!
2214
def open(self, a_bzrdir, name=None, _found=False, location=None,
1890
def open(self, a_bzrdir, _found=False, location=None,
2215
1891
possible_transports=None, ignore_fallbacks=False):
2216
1892
"""Return the branch that the branch reference in a_bzrdir points at.
2218
1894
:param a_bzrdir: A BzrDir that contains a branch.
2219
:param name: Name of colocated branch to open, if any
2220
1895
:param _found: a private parameter, do not use it. It is used to
2221
1896
indicate if format probing has already be done.
2222
1897
:param ignore_fallbacks: when set, no fallback branches will be opened
2348
2002
return self.control_files.is_locked()
2350
2004
def lock_write(self, token=None):
2351
"""Lock the branch for write operations.
2353
:param token: A token to permit reacquiring a previously held and
2355
:return: A BranchWriteLockResult.
2357
if not self.is_locked():
2358
self._note_lock('w')
2359
2005
# All-in-one needs to always unlock/lock.
2360
2006
repo_control = getattr(self.repository, 'control_files', None)
2361
2007
if self.control_files == repo_control or not self.is_locked():
2362
self.repository._warn_if_deprecated(self)
2363
2008
self.repository.lock_write()
2364
2009
took_lock = True
2366
2011
took_lock = False
2368
return BranchWriteLockResult(self.unlock,
2369
self.control_files.lock_write(token=token))
2013
return self.control_files.lock_write(token=token)
2372
2016
self.repository.unlock()
2375
2019
def lock_read(self):
2376
"""Lock the branch for read operations.
2378
:return: An object with an unlock method which will release the lock
2381
if not self.is_locked():
2382
self._note_lock('r')
2383
2020
# All-in-one needs to always unlock/lock.
2384
2021
repo_control = getattr(self.repository, 'control_files', None)
2385
2022
if self.control_files == repo_control or not self.is_locked():
2386
self.repository._warn_if_deprecated(self)
2387
2023
self.repository.lock_read()
2388
2024
took_lock = True
2390
2026
took_lock = False
2392
2028
self.control_files.lock_read()
2396
2031
self.repository.unlock()
2399
@only_raises(errors.LockNotHeld, errors.LockBroken)
2400
2034
def unlock(self):
2402
2036
self.control_files.unlock()
2533
2167
"""See Branch.basis_tree."""
2534
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']:
2536
2214
def _get_parent_location(self):
2537
2215
_locs = ['parent', 'pull', 'x-pull']
2538
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
2545
2288
def _basic_push(self, target, overwrite, stop_revision):
2546
2289
"""Basic implementation of push without bound branches or hooks.
2548
Must be called with source read locked and target write locked.
2291
Must be called with self read locked and target write locked.
2550
2293
result = BranchPushResult()
2551
2294
result.source_branch = self
2587
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()
2590
2361
def get_bound_location(self):
2592
2363
return self._transport.get_bytes('bound')[:-1]
2770
2543
self._extend_partial_history(stop_index=last_revno-1)
2771
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:
2773
2575
def _write_revision_history(self, history):
2774
2576
"""Factored out of set_revision_history.
3271
3061
self.source.unlock()
3273
def pull(self, overwrite=False, stop_revision=None,
3274
possible_transports=None, _hook_master=None, run_hooks=True,
3275
_override_hook_target=None, local=False):
3278
:param _hook_master: Private parameter - set the branch to
3279
be supplied as the master to pull hooks.
3280
:param run_hooks: Private parameter - if false, this branch
3281
is being called because it's the master of the primary branch,
3282
so it should not run its hooks.
3283
:param _override_hook_target: Private parameter - set the branch to be
3284
supplied as the target_branch to pull hooks.
3285
:param local: Only update the local branch, and not the bound branch.
3287
# This type of branch can't be bound.
3289
raise errors.LocalRequiresBoundBranch()
3290
result = PullResult()
3291
result.source_branch = self.source
3292
if _override_hook_target is None:
3293
result.target_branch = self.target
3295
result.target_branch = _override_hook_target
3296
self.source.lock_read()
3298
# We assume that during 'pull' the target repository is closer than
3300
self.source.update_references(self.target)
3301
graph = self.target.repository.get_graph(self.source.repository)
3302
# TODO: Branch formats should have a flag that indicates
3303
# that revno's are expensive, and pull() should honor that flag.
3305
result.old_revno, result.old_revid = \
3306
self.target.last_revision_info()
3307
self.target.update_revisions(self.source, stop_revision,
3308
overwrite=overwrite, graph=graph)
3309
# TODO: The old revid should be specified when merging tags,
3310
# so a tags implementation that versions tags can only
3311
# pull in the most recent changes. -- JRV20090506
3312
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3314
result.new_revno, result.new_revid = self.target.last_revision_info()
3316
result.master_branch = _hook_master
3317
result.local_branch = result.target_branch
3319
result.master_branch = result.target_branch
3320
result.local_branch = None
3322
for hook in Branch.hooks['post_pull']:
3325
self.source.unlock()
3328
def push(self, overwrite=False, stop_revision=None,
3329
_override_hook_source_branch=None):
3330
"""See InterBranch.push.
3332
This is the basic concrete implementation of push()
3334
:param _override_hook_source_branch: If specified, run
3335
the hooks passing this Branch as the source, rather than self.
3336
This is for use of RemoteBranch, where push is delegated to the
3337
underlying vfs-based Branch.
3339
# TODO: Public option to disable running hooks - should be trivial but
3341
self.source.lock_read()
3343
return _run_with_write_locked_target(
3344
self.target, self._push_with_bound_branches, overwrite,
3346
_override_hook_source_branch=_override_hook_source_branch)
3348
self.source.unlock()
3350
def _push_with_bound_branches(self, overwrite, stop_revision,
3351
_override_hook_source_branch=None):
3352
"""Push from source into target, and into target's master if any.
3355
if _override_hook_source_branch:
3356
result.source_branch = _override_hook_source_branch
3357
for hook in Branch.hooks['post_push']:
3360
bound_location = self.target.get_bound_location()
3361
if bound_location and self.target.base != bound_location:
3362
# there is a master branch.
3364
# XXX: Why the second check? Is it even supported for a branch to
3365
# be bound to itself? -- mbp 20070507
3366
master_branch = self.target.get_master_branch()
3367
master_branch.lock_write()
3369
# push into the master from the source branch.
3370
self.source._basic_push(master_branch, overwrite, stop_revision)
3371
# and push into the target branch from the source. Note that we
3372
# push from the source branch again, because its considered the
3373
# highest bandwidth repository.
3374
result = self.source._basic_push(self.target, overwrite,
3376
result.master_branch = master_branch
3377
result.local_branch = self.target
3381
master_branch.unlock()
3384
result = self.source._basic_push(self.target, overwrite,
3386
# TODO: Why set master_branch and local_branch if there's no
3387
# binding? Maybe cleaner to just leave them unset? -- mbp
3389
result.master_branch = self.target
3390
result.local_branch = None
3395
3064
def is_compatible(self, source, target):
3396
3065
# GenericBranch uses the public API, so always compatible
3400
class InterToBranch5(GenericInterBranch):
3403
def _get_branch_formats_to_test():
3404
return BranchFormat._default_format, BzrBranchFormat5()
3406
def pull(self, overwrite=False, stop_revision=None,
3407
possible_transports=None, run_hooks=True,
3408
_override_hook_target=None, local=False):
3409
"""Pull from source into self, updating my master if any.
3411
:param run_hooks: Private parameter - if false, this branch
3412
is being called because it's the master of the primary branch,
3413
so it should not run its hooks.
3415
bound_location = self.target.get_bound_location()
3416
if local and not bound_location:
3417
raise errors.LocalRequiresBoundBranch()
3418
master_branch = None
3419
if not local and bound_location and self.source.user_url != bound_location:
3420
# not pulling from master, so we need to update master.
3421
master_branch = self.target.get_master_branch(possible_transports)
3422
master_branch.lock_write()
3425
# pull from source into master.
3426
master_branch.pull(self.source, overwrite, stop_revision,
3428
return super(InterToBranch5, self).pull(overwrite,
3429
stop_revision, _hook_master=master_branch,
3430
run_hooks=run_hooks,
3431
_override_hook_target=_override_hook_target)
3434
master_branch.unlock()
3437
3069
InterBranch.register_optimiser(GenericInterBranch)
3438
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
