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.
457
414
# start_revision_id.
458
415
if self._merge_sorted_revisions_cache is None:
459
416
last_revision = self.last_revision()
460
known_graph = self.repository.get_known_graph_ancestry(
462
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]
464
426
filtered = self._filter_merge_sorted_revisions(
465
427
self._merge_sorted_revisions_cache, start_revision_id,
466
428
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
429
if direction == 'reverse':
472
431
if direction == 'forward':
479
438
"""Iterate over an inclusive range of sorted revisions."""
480
439
rev_iter = iter(merge_sorted_revisions)
481
440
if start_revision_id is not None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
441
for rev_id, depth, revno, end_of_merge in rev_iter:
484
442
if rev_id != start_revision_id:
487
445
# The decision to include the start or not
488
446
# 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)
448
iter([(rev_id, depth, revno, end_of_merge)]),
492
451
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,
452
for rev_id, depth, revno, end_of_merge in rev_iter:
453
yield rev_id, depth, revno, end_of_merge
498
454
elif stop_rule == 'exclude':
499
for node in rev_iter:
500
rev_id = node.key[-1]
455
for rev_id, depth, revno, end_of_merge in rev_iter:
501
456
if rev_id == stop_revision_id:
503
yield (rev_id, node.merge_depth, node.revno,
458
yield rev_id, depth, revno, end_of_merge
505
459
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,
460
for rev_id, depth, revno, end_of_merge in rev_iter:
461
yield rev_id, depth, revno, end_of_merge
510
462
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
464
elif stop_rule == 'with-merges':
525
465
stop_rev = self.repository.get_revision(stop_revision_id)
526
466
if stop_rev.parent_ids:
527
467
left_parent = stop_rev.parent_ids[0]
529
469
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]
470
for rev_id, depth, revno, end_of_merge in rev_iter:
536
471
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)
473
yield rev_id, depth, revno, end_of_merge
550
475
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
477
def leave_lock_in_place(self):
598
478
"""Tell this branch object not to release the physical lock when this
599
479
object is unlocked.
769
617
except (errors.NotStacked, errors.UnstackableBranchFormat,
770
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,
774
633
self._activate_fallback_location(url)
775
634
# write this out after the repository is stacked to avoid setting a
776
635
# stacked config that doesn't work.
777
636
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
639
def _set_tags_bytes(self, bytes):
835
640
"""Mirror method for _get_tags_bytes.
1002
809
except ValueError:
1003
810
raise errors.NoSuchRevision(self, revision_id)
1006
812
def get_rev_id(self, revno, history=None):
1007
813
"""Find the revision id of the specified revno."""
1009
815
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:
817
history = self.revision_history()
818
if revno <= 0 or revno > len(history):
1014
819
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]
820
return history[revno - 1]
1021
822
def pull(self, source, overwrite=False, stop_revision=None,
1022
possible_transports=None, *args, **kwargs):
823
possible_transports=None, _override_hook_target=None):
1023
824
"""Mirror source into this branch.
1025
826
This branch is considered to be 'local', having low latency.
1027
828
:returns: PullResult instance
1029
return InterBranch.get(source, self).pull(overwrite=overwrite,
1030
stop_revision=stop_revision,
1031
possible_transports=possible_transports, *args, **kwargs)
830
raise NotImplementedError(self.pull)
1033
def push(self, target, overwrite=False, stop_revision=None, *args,
832
def push(self, target, overwrite=False, stop_revision=None):
1035
833
"""Mirror this branch into target.
1037
835
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)
837
raise NotImplementedError(self.push)
1063
839
def basis_tree(self):
1064
840
"""Return `Tree` object for last revision."""
1256
1028
source_revno, source_revision_id = self.last_revision_info()
1257
1029
if revision_id is None:
1258
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
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
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(
1267
1043
destination.set_last_revision_info(revno, revision_id)
1269
1045
@needs_read_lock
1313
1089
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
1091
:return: A BranchCheckResult.
1319
result = BranchCheckResult(self)
1093
mainline_parent_id = None
1320
1094
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
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)
1333
1120
def _get_checkout_format(self):
1334
1121
"""Return the most suitable metadir for a checkout of this branch.
1346
1133
def create_clone_on_transport(self, to_transport, revision_id=None,
1347
stacked_on=None, create_prefix=False, use_existing_dir=False):
1348
1135
"""Create a clone of this branch and its bzrdir.
1350
1137
:param to_transport: The transport to clone onto.
1351
1138
:param revision_id: The revision id to use as tip in the new branch.
1352
1139
If None the tip is obtained from this branch.
1353
1140
:param stacked_on: An optional URL to stack the clone on.
1354
:param create_prefix: Create any missing directories leading up to
1356
:param use_existing_dir: Use an existing directory if one exists.
1358
1142
# XXX: Fix the bzrdir API to allow getting the branch back from the
1359
1143
# clone call. Or something. 20090224 RBC/spiv.
1360
if revision_id is None:
1361
revision_id = self.last_revision()
1362
1144
dir_to = self.bzrdir.clone_on_transport(to_transport,
1363
revision_id=revision_id, stacked_on=stacked_on,
1364
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1145
revision_id=revision_id, stacked_on=stacked_on)
1365
1146
return dir_to.open_branch()
1367
1148
def create_checkout(self, to_location, revision_id=None,
1565
1331
"""Return the short format description for this format."""
1566
1332
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):
1334
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1578
1336
"""Initialize a branch in a bzrdir, with specified files
1580
1338
:param a_bzrdir: The bzrdir to initialize the branch in
1581
1339
:param utf8_files: The files to create as a list of
1582
1340
(filename, content) tuples
1583
:param name: Name of colocated branch to create, if any
1584
1341
:param set_format: If True, set the format with
1585
1342
self.get_format_string. (BzrBranch4 has its format set
1587
1344
: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)
1346
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1347
branch_transport = a_bzrdir.get_branch_transport(self)
1592
1349
'metadir': ('lock', lockdir.LockDir),
1593
1350
'branch4': ('branch-lock', lockable_files.TransportLock),
1776
1515
"multiple hooks installed for transform_fallback_location, "
1777
1516
"all are called with the url returned from the previous hook."
1778
1517
"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
1520
# install the default hooks into the Branch class.
1837
1559
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
1562
class BzrBranchFormat4(BranchFormat):
1919
1563
"""Bzr branch format 4.
1973
1616
return self.get_format_string()
1975
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1618
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1976
1619
"""See BranchFormat.open()."""
1978
format = BranchFormat.find_format(a_bzrdir, name=name)
1621
format = BranchFormat.find_format(a_bzrdir)
1979
1622
if format.__class__ != self.__class__:
1980
1623
raise AssertionError("wrong format %r found for %r" %
1981
1624
(format, self))
1982
transport = a_bzrdir.get_branch_transport(None, name=name)
1626
transport = a_bzrdir.get_branch_transport(None)
1984
1627
control_files = lockable_files.LockableFiles(transport, 'lock',
1985
1628
lockdir.LockDir)
1986
1629
return self._branch_class()(_format=self,
1987
1630
_control_files=control_files,
1989
1631
a_bzrdir=a_bzrdir,
1990
1632
_repository=a_bzrdir.find_repository(),
1991
1633
ignore_fallbacks=ignore_fallbacks)
1992
1634
except errors.NoSuchFile:
1993
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1635
raise errors.NotBranchError(path=transport.base)
1995
1637
def __init__(self):
1996
1638
super(BranchFormatMetadir, self).__init__()
2171
1797
def get_reference(self, a_bzrdir):
2172
1798
"""See BranchFormat.get_reference()."""
2173
1799
transport = a_bzrdir.get_branch_transport(None)
2174
return transport.get_bytes('location')
1800
return transport.get('location').read()
2176
1802
def set_reference(self, a_bzrdir, to_branch):
2177
1803
"""See BranchFormat.set_reference()."""
2178
1804
transport = a_bzrdir.get_branch_transport(None)
2179
1805
location = transport.put_bytes('location', to_branch.base)
2181
def initialize(self, a_bzrdir, name=None, target_branch=None):
1807
def initialize(self, a_bzrdir, target_branch=None):
2182
1808
"""Create a branch of this format in a_bzrdir."""
2183
1809
if target_branch is None:
2184
1810
# this format does not implement branch itself, thus the implicit
2185
1811
# creation contract must see it as uninitializable
2186
1812
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)
1813
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1814
branch_transport = a_bzrdir.get_branch_transport(self)
2189
1815
branch_transport.put_bytes('location',
2190
target_branch.bzrdir.user_url)
1816
target_branch.bzrdir.root_transport.base)
2191
1817
branch_transport.put_bytes('format', self.get_format_string())
2193
a_bzrdir, name, _found=True,
1819
a_bzrdir, _found=True,
2194
1820
possible_transports=[target_branch.bzrdir.root_transport])
2195
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2198
1822
def __init__(self):
2199
1823
super(BranchReferenceFormat, self).__init__()
2205
1829
def clone(to_bzrdir, revision_id=None,
2206
1830
repository_policy=None):
2207
1831
"""See Branch.clone()."""
2208
return format.initialize(to_bzrdir, target_branch=a_branch)
1832
return format.initialize(to_bzrdir, a_branch)
2209
1833
# cannot obey revision_id limits when cloning a reference ...
2210
1834
# FIXME RBC 20060210 either nuke revision_id for clone, or
2211
1835
# emit some sort of warning/error to the caller ?!
2214
def open(self, a_bzrdir, name=None, _found=False, location=None,
1838
def open(self, a_bzrdir, _found=False, location=None,
2215
1839
possible_transports=None, ignore_fallbacks=False):
2216
1840
"""Return the branch that the branch reference in a_bzrdir points at.
2218
1842
:param a_bzrdir: A BzrDir that contains a branch.
2219
:param name: Name of colocated branch to open, if any
2220
1843
:param _found: a private parameter, do not use it. It is used to
2221
1844
indicate if format probing has already be done.
2222
1845
:param ignore_fallbacks: when set, no fallback branches will be opened
2348
1950
return self.control_files.is_locked()
2350
1952
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
# All-in-one needs to always unlock/lock.
2360
repo_control = getattr(self.repository, 'control_files', None)
2361
if self.control_files == repo_control or not self.is_locked():
2362
self.repository._warn_if_deprecated(self)
2363
self.repository.lock_write()
1953
repo_token = self.repository.lock_write()
2368
return BranchWriteLockResult(self.unlock,
2369
self.control_files.lock_write(token=token))
1955
token = self.control_files.lock_write(token=token)
2372
self.repository.unlock()
1957
self.repository.unlock()
2375
1961
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
# All-in-one needs to always unlock/lock.
2384
repo_control = getattr(self.repository, 'control_files', None)
2385
if self.control_files == repo_control or not self.is_locked():
2386
self.repository._warn_if_deprecated(self)
2387
self.repository.lock_read()
1962
self.repository.lock_read()
2392
1964
self.control_files.lock_read()
2396
self.repository.unlock()
1966
self.repository.unlock()
2399
@only_raises(errors.LockNotHeld, errors.LockBroken)
2400
1969
def unlock(self):
1970
# TODO: test for failed two phase locks. This is known broken.
2402
1972
self.control_files.unlock()
2404
# All-in-one needs to always unlock/lock.
2405
repo_control = getattr(self.repository, 'control_files', None)
2406
if (self.control_files == repo_control or
2407
not self.control_files.is_locked()):
2408
self.repository.unlock()
2409
if not self.control_files.is_locked():
2410
# we just released the lock
2411
self._clear_cached_state()
1974
self.repository.unlock()
1975
if not self.control_files.is_locked():
1976
# we just released the lock
1977
self._clear_cached_state()
2413
1979
def peek_lock_mode(self):
2414
1980
if self.control_files._lock_count == 0:
2533
2099
"""See Branch.basis_tree."""
2534
2100
return self.repository.revision_tree(self.last_revision())
2103
def pull(self, source, overwrite=False, stop_revision=None,
2104
_hook_master=None, run_hooks=True, possible_transports=None,
2105
_override_hook_target=None):
2108
:param _hook_master: Private parameter - set the branch to
2109
be supplied as the master to pull hooks.
2110
:param run_hooks: Private parameter - if false, this branch
2111
is being called because it's the master of the primary branch,
2112
so it should not run its hooks.
2113
:param _override_hook_target: Private parameter - set the branch to be
2114
supplied as the target_branch to pull hooks.
2116
result = PullResult()
2117
result.source_branch = source
2118
if _override_hook_target is None:
2119
result.target_branch = self
2121
result.target_branch = _override_hook_target
2124
# We assume that during 'pull' the local repository is closer than
2126
source.update_references(self)
2127
graph = self.repository.get_graph(source.repository)
2128
result.old_revno, result.old_revid = self.last_revision_info()
2129
self.update_revisions(source, stop_revision, overwrite=overwrite,
2131
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2132
result.new_revno, result.new_revid = self.last_revision_info()
2134
result.master_branch = _hook_master
2135
result.local_branch = result.target_branch
2137
result.master_branch = result.target_branch
2138
result.local_branch = None
2140
for hook in Branch.hooks['post_pull']:
2536
2146
def _get_parent_location(self):
2537
2147
_locs = ['parent', 'pull', 'x-pull']
2538
2148
for l in _locs:
2156
def push(self, target, overwrite=False, stop_revision=None,
2157
_override_hook_source_branch=None):
2160
This is the basic concrete implementation of push()
2162
:param _override_hook_source_branch: If specified, run
2163
the hooks passing this Branch as the source, rather than self.
2164
This is for use of RemoteBranch, where push is delegated to the
2165
underlying vfs-based Branch.
2167
# TODO: Public option to disable running hooks - should be trivial but
2169
return _run_with_write_locked_target(
2170
target, self._push_with_bound_branches, target, overwrite,
2172
_override_hook_source_branch=_override_hook_source_branch)
2174
def _push_with_bound_branches(self, target, overwrite,
2176
_override_hook_source_branch=None):
2177
"""Push from self into target, and into target's master if any.
2179
This is on the base BzrBranch class even though it doesn't support
2180
bound branches because the *target* might be bound.
2183
if _override_hook_source_branch:
2184
result.source_branch = _override_hook_source_branch
2185
for hook in Branch.hooks['post_push']:
2188
bound_location = target.get_bound_location()
2189
if bound_location and target.base != bound_location:
2190
# there is a master branch.
2192
# XXX: Why the second check? Is it even supported for a branch to
2193
# be bound to itself? -- mbp 20070507
2194
master_branch = target.get_master_branch()
2195
master_branch.lock_write()
2197
# push into the master from this branch.
2198
self._basic_push(master_branch, overwrite, stop_revision)
2199
# and push into the target branch from this. Note that we push from
2200
# this branch again, because its considered the highest bandwidth
2202
result = self._basic_push(target, overwrite, stop_revision)
2203
result.master_branch = master_branch
2204
result.local_branch = target
2208
master_branch.unlock()
2211
result = self._basic_push(target, overwrite, stop_revision)
2212
# TODO: Why set master_branch and local_branch if there's no
2213
# binding? Maybe cleaner to just leave them unset? -- mbp
2215
result.master_branch = target
2216
result.local_branch = None
2545
2220
def _basic_push(self, target, overwrite, stop_revision):
2546
2221
"""Basic implementation of push without bound branches or hooks.
2548
Must be called with source read locked and target write locked.
2223
Must be called with self read locked and target write locked.
2550
2225
result = BranchPushResult()
2551
2226
result.source_branch = self
2587
2279
It has support for a master_branch which is the data for bound branches.
2283
def pull(self, source, overwrite=False, stop_revision=None,
2284
run_hooks=True, possible_transports=None,
2285
_override_hook_target=None):
2286
"""Pull from source into self, updating my master if any.
2288
:param run_hooks: Private parameter - if false, this branch
2289
is being called because it's the master of the primary branch,
2290
so it should not run its hooks.
2292
bound_location = self.get_bound_location()
2293
master_branch = None
2294
if bound_location and source.base != bound_location:
2295
# not pulling from master, so we need to update master.
2296
master_branch = self.get_master_branch(possible_transports)
2297
master_branch.lock_write()
2300
# pull from source into master.
2301
master_branch.pull(source, overwrite, stop_revision,
2303
return super(BzrBranch5, self).pull(source, overwrite,
2304
stop_revision, _hook_master=master_branch,
2305
run_hooks=run_hooks,
2306
_override_hook_target=_override_hook_target)
2309
master_branch.unlock()
2590
2311
def get_bound_location(self):
2592
2313
return self._transport.get_bytes('bound')[:-1]
2770
2491
self._extend_partial_history(stop_index=last_revno-1)
2771
2492
return list(reversed(self._partial_revision_history_cache))
2494
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2495
"""Extend the partial history to include a given index
2497
If a stop_index is supplied, stop when that index has been reached.
2498
If a stop_revision is supplied, stop when that revision is
2499
encountered. Otherwise, stop when the beginning of history is
2502
:param stop_index: The index which should be present. When it is
2503
present, history extension will stop.
2504
:param revision_id: The revision id which should be present. When
2505
it is encountered, history extension will stop.
2507
repo = self.repository
2508
if len(self._partial_revision_history_cache) == 0:
2509
iterator = repo.iter_reverse_revision_history(self.last_revision())
2511
start_revision = self._partial_revision_history_cache[-1]
2512
iterator = repo.iter_reverse_revision_history(start_revision)
2513
#skip the last revision in the list
2514
next_revision = iterator.next()
2515
for revision_id in iterator:
2516
self._partial_revision_history_cache.append(revision_id)
2517
if (stop_index is not None and
2518
len(self._partial_revision_history_cache) > stop_index):
2520
if revision_id == stop_revision:
2773
2523
def _write_revision_history(self, history):
2774
2524
"""Factored out of set_revision_history.
2796
2546
"""Set the parent branch"""
2797
2547
return self._get_config_location('parent_location')
2800
def _set_all_reference_info(self, info_dict):
2801
"""Replace all reference info stored in a branch.
2803
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2806
writer = rio.RioWriter(s)
2807
for key, (tree_path, branch_location) in info_dict.iteritems():
2808
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2809
branch_location=branch_location)
2810
writer.write_stanza(stanza)
2811
self._transport.put_bytes('references', s.getvalue())
2812
self._reference_info = info_dict
2815
def _get_all_reference_info(self):
2816
"""Return all the reference info stored in a branch.
2818
:return: A dict of {file_id: (tree_path, branch_location)}
2820
if self._reference_info is not None:
2821
return self._reference_info
2549
def _get_info_dict(self):
2822
2550
rio_file = self._transport.get('references')
2824
2552
stanzas = rio.read_stanzas(rio_file)
2847
2568
raise ValueError('branch_location must be None when tree_path'
2849
2570
del info_dict[file_id]
2850
self._set_all_reference_info(info_dict)
2571
self._save_reference_dict(info_dict)
2573
def _save_reference_dict(self, info_dict):
2575
writer = rio.RioWriter(s)
2576
for key, (tree_path, branch_location) in info_dict.iteritems():
2577
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2578
branch_location=branch_location)
2579
writer.write_stanza(stanza)
2580
self._transport.put_bytes('references', s.getvalue())
2852
2582
def get_reference_info(self, file_id):
2853
"""Get the tree_path and branch_location for a tree reference.
2855
:return: a tuple of (tree_path, branch_location)
2857
return self._get_all_reference_info().get(file_id, (None, None))
2583
"""Get the tree_path and branch_location for a tree reference."""
2584
return self._get_info_dict().get(file_id, (None, None))
2859
2586
def reference_parent(self, file_id, path, possible_transports=None):
2860
2587
"""Return the parent branch for a tree-reference file_id.
3271
2977
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
2980
def is_compatible(self, source, target):
3396
2981
# 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
2985
InterBranch.register_optimiser(GenericInterBranch)
3438
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
