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.
456
418
# start_revision_id.
457
419
if self._merge_sorted_revisions_cache is None:
458
420
last_revision = self.last_revision()
459
known_graph = self.repository.get_known_graph_ancestry(
461
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]
463
430
filtered = self._filter_merge_sorted_revisions(
464
431
self._merge_sorted_revisions_cache, start_revision_id,
465
432
stop_revision_id, stop_rule)
466
# Make sure we don't return revisions that are not part of the
467
# start_revision_id ancestry.
468
filtered = self._filter_start_non_ancestors(filtered)
469
433
if direction == 'reverse':
471
435
if direction == 'forward':
478
442
"""Iterate over an inclusive range of sorted revisions."""
479
443
rev_iter = iter(merge_sorted_revisions)
480
444
if start_revision_id is not None:
481
for node in rev_iter:
482
rev_id = node.key[-1]
445
for rev_id, depth, revno, end_of_merge in rev_iter:
483
446
if rev_id != start_revision_id:
486
449
# The decision to include the start or not
487
450
# depends on the stop_rule if a stop is provided
488
# so pop this node back into the iterator
489
rev_iter = chain(iter([node]), rev_iter)
452
iter([(rev_id, depth, revno, end_of_merge)]),
491
455
if stop_revision_id is None:
493
for node in rev_iter:
494
rev_id = node.key[-1]
495
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
497
458
elif stop_rule == 'exclude':
498
for node in rev_iter:
499
rev_id = node.key[-1]
459
for rev_id, depth, revno, end_of_merge in rev_iter:
500
460
if rev_id == stop_revision_id:
502
yield (rev_id, node.merge_depth, node.revno,
462
yield rev_id, depth, revno, end_of_merge
504
463
elif stop_rule == 'include':
505
for node in rev_iter:
506
rev_id = node.key[-1]
507
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
509
466
if rev_id == stop_revision_id:
511
elif stop_rule == 'with-merges-without-common-ancestry':
512
# We want to exclude all revisions that are already part of the
513
# stop_revision_id ancestry.
514
graph = self.repository.get_graph()
515
ancestors = graph.find_unique_ancestors(start_revision_id,
517
for node in rev_iter:
518
rev_id = node.key[-1]
519
if rev_id not in ancestors:
521
yield (rev_id, node.merge_depth, node.revno,
523
468
elif stop_rule == 'with-merges':
524
469
stop_rev = self.repository.get_revision(stop_revision_id)
525
470
if stop_rev.parent_ids:
526
471
left_parent = stop_rev.parent_ids[0]
528
473
left_parent = _mod_revision.NULL_REVISION
529
# left_parent is the actual revision we want to stop logging at,
530
# since we want to show the merged revisions after the stop_rev too
531
reached_stop_revision_id = False
532
revision_id_whitelist = []
533
for node in rev_iter:
534
rev_id = node.key[-1]
474
for rev_id, depth, revno, end_of_merge in rev_iter:
535
475
if rev_id == left_parent:
536
# reached the left parent after the stop_revision
538
if (not reached_stop_revision_id or
539
rev_id in revision_id_whitelist):
540
yield (rev_id, node.merge_depth, node.revno,
542
if reached_stop_revision_id or rev_id == stop_revision_id:
543
# only do the merged revs of rev_id from now on
544
rev = self.repository.get_revision(rev_id)
546
reached_stop_revision_id = True
547
revision_id_whitelist.extend(rev.parent_ids)
477
yield rev_id, depth, revno, end_of_merge
549
479
raise ValueError('invalid stop_rule %r' % stop_rule)
551
def _filter_start_non_ancestors(self, rev_iter):
552
# If we started from a dotted revno, we want to consider it as a tip
553
# and don't want to yield revisions that are not part of its
554
# ancestry. Given the order guaranteed by the merge sort, we will see
555
# uninteresting descendants of the first parent of our tip before the
557
first = rev_iter.next()
558
(rev_id, merge_depth, revno, end_of_merge) = first
561
# We start at a mainline revision so by definition, all others
562
# revisions in rev_iter are ancestors
563
for node in rev_iter:
568
pmap = self.repository.get_parent_map([rev_id])
569
parents = pmap.get(rev_id, [])
571
whitelist.update(parents)
573
# If there is no parents, there is nothing of interest left
575
# FIXME: It's hard to test this scenario here as this code is never
576
# called in that case. -- vila 20100322
579
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
581
if rev_id in whitelist:
582
pmap = self.repository.get_parent_map([rev_id])
583
parents = pmap.get(rev_id, [])
584
whitelist.remove(rev_id)
585
whitelist.update(parents)
587
# We've reached the mainline, there is nothing left to
591
# A revision that is not part of the ancestry of our
594
yield (rev_id, merge_depth, revno, end_of_merge)
596
481
def leave_lock_in_place(self):
597
482
"""Tell this branch object not to release the physical lock when this
598
483
object is unlocked.
768
640
except (errors.NotStacked, errors.UnstackableBranchFormat,
769
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,
773
self._activate_fallback_location(url)
659
self._activate_fallback_location(url, 'write')
774
660
# write this out after the repository is stacked to avoid setting a
775
661
# stacked config that doesn't work.
776
662
self._set_config_location('stacked_on_location', url)
779
"""Change a branch to be unstacked, copying data as needed.
781
Don't call this directly, use set_stacked_on_url(None).
783
pb = ui.ui_factory.nested_progress_bar()
785
pb.update("Unstacking")
786
# The basic approach here is to fetch the tip of the branch,
787
# including all available ghosts, from the existing stacked
788
# repository into a new repository object without the fallbacks.
790
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
791
# correct for CHKMap repostiories
792
old_repository = self.repository
793
if len(old_repository._fallback_repositories) != 1:
794
raise AssertionError("can't cope with fallback repositories "
795
"of %r" % (self.repository,))
796
# unlock it, including unlocking the fallback
797
old_repository.unlock()
798
old_repository.lock_read()
800
# Repositories don't offer an interface to remove fallback
801
# repositories today; take the conceptually simpler option and just
802
# reopen it. We reopen it starting from the URL so that we
803
# get a separate connection for RemoteRepositories and can
804
# stream from one of them to the other. This does mean doing
805
# separate SSH connection setup, but unstacking is not a
806
# common operation so it's tolerable.
807
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
808
new_repository = new_bzrdir.find_repository()
809
self.repository = new_repository
810
if self.repository._fallback_repositories:
811
raise AssertionError("didn't expect %r to have "
812
"fallback_repositories"
813
% (self.repository,))
814
# this is not paired with an unlock because it's just restoring
815
# the previous state; the lock's released when set_stacked_on_url
817
self.repository.lock_write()
818
# XXX: If you unstack a branch while it has a working tree
819
# with a pending merge, the pending-merged revisions will no
820
# longer be present. You can (probably) revert and remerge.
822
# XXX: This only fetches up to the tip of the repository; it
823
# doesn't bring across any tags. That's fairly consistent
824
# with how branch works, but perhaps not ideal.
825
self.repository.fetch(old_repository,
826
revision_id=self.last_revision(),
829
old_repository.unlock()
833
665
def _set_tags_bytes(self, bytes):
834
666
"""Mirror method for _get_tags_bytes.
1001
835
except ValueError:
1002
836
raise errors.NoSuchRevision(self, revision_id)
1005
838
def get_rev_id(self, revno, history=None):
1006
839
"""Find the revision id of the specified revno."""
1008
841
return _mod_revision.NULL_REVISION
1009
last_revno, last_revid = self.last_revision_info()
1010
if revno == last_revno:
1012
if revno <= 0 or revno > last_revno:
843
history = self.revision_history()
844
if revno <= 0 or revno > len(history):
1013
845
raise errors.NoSuchRevision(self, revno)
1014
distance_from_last = last_revno - revno
1015
if len(self._partial_revision_history_cache) <= distance_from_last:
1016
self._extend_partial_history(distance_from_last)
1017
return self._partial_revision_history_cache[distance_from_last]
846
return history[revno - 1]
1020
848
def pull(self, source, overwrite=False, stop_revision=None,
1021
possible_transports=None, *args, **kwargs):
849
possible_transports=None, _override_hook_target=None):
1022
850
"""Mirror source into this branch.
1024
852
This branch is considered to be 'local', having low latency.
1026
854
:returns: PullResult instance
1028
return InterBranch.get(source, self).pull(overwrite=overwrite,
1029
stop_revision=stop_revision,
1030
possible_transports=possible_transports, *args, **kwargs)
856
raise NotImplementedError(self.pull)
1032
858
def push(self, target, overwrite=False, stop_revision=None, *args,
1038
864
return InterBranch.get(self, target).push(overwrite, stop_revision,
1039
865
*args, **kwargs)
1041
def lossy_push(self, target, stop_revision=None):
1042
"""Push deltas into another branch.
1044
:note: This does not, like push, retain the revision ids from
1045
the source branch and will, rather than adding bzr-specific
1046
metadata, push only those semantics of the revision that can be
1047
natively represented by this branch' VCS.
1049
:param target: Target branch
1050
:param stop_revision: Revision to push, defaults to last revision.
1051
:return: BranchPushResult with an extra member revidmap:
1052
A dictionary mapping revision ids from the target branch
1053
to new revision ids in the target branch, for each
1054
revision that was pushed.
1056
inter = InterBranch.get(self, target)
1057
lossy_push = getattr(inter, "lossy_push", None)
1058
if lossy_push is None:
1059
raise errors.LossyPushToSameVCS(self, target)
1060
return lossy_push(stop_revision)
1062
867
def basis_tree(self):
1063
868
"""Return `Tree` object for last revision."""
1064
869
return self.repository.revision_tree(self.last_revision())
1255
1061
source_revno, source_revision_id = self.last_revision_info()
1256
1062
if revision_id is None:
1257
1063
revno, revision_id = source_revno, source_revision_id
1064
elif source_revision_id == revision_id:
1065
# we know the revno without needing to walk all of history
1066
revno = source_revno
1259
graph = self.repository.get_graph()
1261
revno = graph.find_distance_to_null(revision_id,
1262
[(source_revision_id, source_revno)])
1263
except errors.GhostRevisionsHaveNoRevno:
1264
# Default to 1, if we can't find anything else
1068
# To figure out the revno for a random revision, we need to build
1069
# the revision history, and count its length.
1070
# We don't care about the order, just how long it is.
1071
# Alternatively, we could start at the current location, and count
1072
# backwards. But there is no guarantee that we will find it since
1073
# it may be a merged revision.
1074
revno = len(list(self.repository.iter_reverse_revision_history(
1266
1076
destination.set_last_revision_info(revno, revision_id)
1268
1078
@needs_read_lock
1312
1122
Callers will typically also want to check the repository.
1314
:param refs: Calculated refs for this branch as specified by
1315
branch._get_check_refs()
1316
1124
:return: A BranchCheckResult.
1318
result = BranchCheckResult(self)
1126
mainline_parent_id = None
1319
1127
last_revno, last_revision_id = self.last_revision_info()
1320
actual_revno = refs[('lefthand-distance', last_revision_id)]
1321
if actual_revno != last_revno:
1322
result.errors.append(errors.BzrCheckError(
1323
'revno does not match len(mainline) %s != %s' % (
1324
last_revno, actual_revno)))
1325
# TODO: We should probably also check that self.revision_history
1326
# matches the repository for older branch formats.
1327
# If looking for the code that cross-checks repository parents against
1328
# the iter_reverse_revision_history output, that is now a repository
1128
real_rev_history = list(self.repository.iter_reverse_revision_history(
1130
real_rev_history.reverse()
1131
if len(real_rev_history) != last_revno:
1132
raise errors.BzrCheckError('revno does not match len(mainline)'
1133
' %s != %s' % (last_revno, len(real_rev_history)))
1134
# TODO: We should probably also check that real_rev_history actually
1135
# matches self.revision_history()
1136
for revision_id in real_rev_history:
1138
revision = self.repository.get_revision(revision_id)
1139
except errors.NoSuchRevision, e:
1140
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1142
# In general the first entry on the revision history has no parents.
1143
# But it's not illegal for it to have parents listed; this can happen
1144
# in imports from Arch when the parents weren't reachable.
1145
if mainline_parent_id is not None:
1146
if mainline_parent_id not in revision.parent_ids:
1147
raise errors.BzrCheckError("previous revision {%s} not listed among "
1149
% (mainline_parent_id, revision_id))
1150
mainline_parent_id = revision_id
1151
return BranchCheckResult(self)
1332
1153
def _get_checkout_format(self):
1333
1154
"""Return the most suitable metadir for a checkout of this branch.
1564
1377
"""Return the short format description for this format."""
1565
1378
raise NotImplementedError(self.get_format_description)
1567
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1568
hooks = Branch.hooks['post_branch_init']
1571
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1575
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1576
lock_type='metadir', set_format=True):
1380
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1577
1382
"""Initialize a branch in a bzrdir, with specified files
1579
1384
:param a_bzrdir: The bzrdir to initialize the branch in
1580
1385
:param utf8_files: The files to create as a list of
1581
1386
(filename, content) tuples
1582
:param name: Name of colocated branch to create, if any
1583
1387
:param set_format: If True, set the format with
1584
1388
self.get_format_string. (BzrBranch4 has its format set
1586
1390
:return: a branch in this format
1588
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1589
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1392
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1393
branch_transport = a_bzrdir.get_branch_transport(self)
1591
1395
'metadir': ('lock', lockdir.LockDir),
1592
1396
'branch4': ('branch-lock', lockable_files.TransportLock),
1775
1569
"multiple hooks installed for transform_fallback_location, "
1776
1570
"all are called with the url returned from the previous hook."
1777
1571
"The order is however undefined.", (1, 9), None))
1778
self.create_hook(HookPoint('automatic_tag_name',
1779
"Called to determine an automatic tag name for a revision."
1780
"automatic_tag_name is called with (branch, revision_id) and "
1781
"should return a tag name or None if no tag name could be "
1782
"determined. The first non-None tag name returned will be used.",
1784
self.create_hook(HookPoint('post_branch_init',
1785
"Called after new branch initialization completes. "
1786
"post_branch_init is called with a "
1787
"bzrlib.branch.BranchInitHookParams. "
1788
"Note that init, branch and checkout (both heavyweight and "
1789
"lightweight) will all trigger this hook.", (2, 2), None))
1790
self.create_hook(HookPoint('post_switch',
1791
"Called after a checkout switches branch. "
1792
"post_switch is called with a "
1793
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1797
1574
# install the default hooks into the Branch class.
1836
1613
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1839
class BranchInitHookParams(object):
1840
"""Object holding parameters passed to *_branch_init hooks.
1842
There are 4 fields that hooks may wish to access:
1844
:ivar format: the branch format
1845
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1846
:ivar name: name of colocated branch, if any (or None)
1847
:ivar branch: the branch created
1849
Note that for lightweight checkouts, the bzrdir and format fields refer to
1850
the checkout, hence they are different from the corresponding fields in
1851
branch, which refer to the original branch.
1854
def __init__(self, format, a_bzrdir, name, branch):
1855
"""Create a group of BranchInitHook parameters.
1857
:param format: the branch format
1858
:param a_bzrdir: the BzrDir where the branch will be/has been
1860
:param name: name of colocated branch, if any (or None)
1861
:param branch: the branch created
1863
Note that for lightweight checkouts, the bzrdir and format fields refer
1864
to the checkout, hence they are different from the corresponding fields
1865
in branch, which refer to the original branch.
1867
self.format = format
1868
self.bzrdir = a_bzrdir
1870
self.branch = branch
1872
def __eq__(self, other):
1873
return self.__dict__ == other.__dict__
1877
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1879
return "<%s of format:%s bzrdir:%s>" % (
1880
self.__class__.__name__, self.branch,
1881
self.format, self.bzrdir)
1884
class SwitchHookParams(object):
1885
"""Object holding parameters passed to *_switch hooks.
1887
There are 4 fields that hooks may wish to access:
1889
:ivar control_dir: BzrDir of the checkout to change
1890
:ivar to_branch: branch that the checkout is to reference
1891
:ivar force: skip the check for local commits in a heavy checkout
1892
:ivar revision_id: revision ID to switch to (or None)
1895
def __init__(self, control_dir, to_branch, force, revision_id):
1896
"""Create a group of SwitchHook parameters.
1898
:param control_dir: BzrDir of the checkout to change
1899
:param to_branch: branch that the checkout is to reference
1900
:param force: skip the check for local commits in a heavy checkout
1901
:param revision_id: revision ID to switch to (or None)
1903
self.control_dir = control_dir
1904
self.to_branch = to_branch
1906
self.revision_id = revision_id
1908
def __eq__(self, other):
1909
return self.__dict__ == other.__dict__
1912
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1913
self.control_dir, self.to_branch,
1917
1616
class BzrBranchFormat4(BranchFormat):
1918
1617
"""Bzr branch format 4.
1972
1670
return self.get_format_string()
1974
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1672
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1975
1673
"""See BranchFormat.open()."""
1977
format = BranchFormat.find_format(a_bzrdir, name=name)
1675
format = BranchFormat.find_format(a_bzrdir)
1978
1676
if format.__class__ != self.__class__:
1979
1677
raise AssertionError("wrong format %r found for %r" %
1980
1678
(format, self))
1981
transport = a_bzrdir.get_branch_transport(None, name=name)
1680
transport = a_bzrdir.get_branch_transport(None)
1983
1681
control_files = lockable_files.LockableFiles(transport, 'lock',
1984
1682
lockdir.LockDir)
1985
1683
return self._branch_class()(_format=self,
1986
1684
_control_files=control_files,
1988
1685
a_bzrdir=a_bzrdir,
1989
1686
_repository=a_bzrdir.find_repository(),
1990
1687
ignore_fallbacks=ignore_fallbacks)
1991
1688
except errors.NoSuchFile:
1992
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1689
raise errors.NotBranchError(path=transport.base)
1994
1691
def __init__(self):
1995
1692
super(BranchFormatMetadir, self).__init__()
2170
1859
def get_reference(self, a_bzrdir):
2171
1860
"""See BranchFormat.get_reference()."""
2172
1861
transport = a_bzrdir.get_branch_transport(None)
2173
return transport.get_bytes('location')
1862
return transport.get('location').read()
2175
1864
def set_reference(self, a_bzrdir, to_branch):
2176
1865
"""See BranchFormat.set_reference()."""
2177
1866
transport = a_bzrdir.get_branch_transport(None)
2178
1867
location = transport.put_bytes('location', to_branch.base)
2180
def initialize(self, a_bzrdir, name=None, target_branch=None):
1869
def initialize(self, a_bzrdir, target_branch=None):
2181
1870
"""Create a branch of this format in a_bzrdir."""
2182
1871
if target_branch is None:
2183
1872
# this format does not implement branch itself, thus the implicit
2184
1873
# creation contract must see it as uninitializable
2185
1874
raise errors.UninitializableFormat(self)
2186
mutter('creating branch reference in %s', a_bzrdir.user_url)
2187
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1875
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1876
branch_transport = a_bzrdir.get_branch_transport(self)
2188
1877
branch_transport.put_bytes('location',
2189
target_branch.bzrdir.user_url)
1878
target_branch.bzrdir.root_transport.base)
2190
1879
branch_transport.put_bytes('format', self.get_format_string())
2192
a_bzrdir, name, _found=True,
1881
a_bzrdir, _found=True,
2193
1882
possible_transports=[target_branch.bzrdir.root_transport])
2194
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2197
1884
def __init__(self):
2198
1885
super(BranchReferenceFormat, self).__init__()
2204
1891
def clone(to_bzrdir, revision_id=None,
2205
1892
repository_policy=None):
2206
1893
"""See Branch.clone()."""
2207
return format.initialize(to_bzrdir, target_branch=a_branch)
1894
return format.initialize(to_bzrdir, a_branch)
2208
1895
# cannot obey revision_id limits when cloning a reference ...
2209
1896
# FIXME RBC 20060210 either nuke revision_id for clone, or
2210
1897
# emit some sort of warning/error to the caller ?!
2213
def open(self, a_bzrdir, name=None, _found=False, location=None,
1900
def open(self, a_bzrdir, _found=False, location=None,
2214
1901
possible_transports=None, ignore_fallbacks=False):
2215
1902
"""Return the branch that the branch reference in a_bzrdir points at.
2217
1904
:param a_bzrdir: A BzrDir that contains a branch.
2218
:param name: Name of colocated branch to open, if any
2219
1905
:param _found: a private parameter, do not use it. It is used to
2220
1906
indicate if format probing has already be done.
2221
1907
:param ignore_fallbacks: when set, no fallback branches will be opened
2268
1953
BranchFormat.register_format(__format6)
2269
1954
BranchFormat.register_format(__format7)
2270
1955
BranchFormat.register_format(__format8)
2271
BranchFormat.set_default_format(__format7)
1956
BranchFormat.set_default_format(__format6)
2272
1957
_legacy_formats = [BzrBranchFormat4(),
2274
1959
network_format_registry.register(
2275
1960
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2278
class BranchWriteLockResult(LogicalLockResult):
2279
"""The result of write locking a branch.
2281
:ivar branch_token: The token obtained from the underlying branch lock, or
2283
:ivar unlock: A callable which will unlock the lock.
2286
def __init__(self, unlock, branch_token):
2287
LogicalLockResult.__init__(self, unlock)
2288
self.branch_token = branch_token
2291
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2295
class BzrBranch(Branch, _RelockDebugMixin):
1963
class BzrBranch(Branch):
2296
1964
"""A branch stored in the actual filesystem.
2298
1966
Note that it's "local" in the context of the filesystem; it doesn't
2304
1972
:ivar repository: Repository for this branch.
2305
1973
:ivar base: The url of the base directory for this branch; the one
2306
1974
containing the .bzr directory.
2307
:ivar name: Optional colocated branch name as it exists in the control
2311
1977
def __init__(self, _format=None,
2312
_control_files=None, a_bzrdir=None, name=None,
2313
_repository=None, ignore_fallbacks=False):
1978
_control_files=None, a_bzrdir=None, _repository=None,
1979
ignore_fallbacks=False):
2314
1980
"""Create new branch object at a particular location."""
2315
1981
if a_bzrdir is None:
2316
1982
raise ValueError('a_bzrdir must be supplied')
2318
1984
self.bzrdir = a_bzrdir
2319
1985
self._base = self.bzrdir.transport.clone('..').base
2321
1986
# XXX: We should be able to just do
2322
1987
# self.base = self.bzrdir.root_transport.base
2323
1988
# but this does not quite work yet -- mbp 20080522
2351
2012
return self.control_files.is_locked()
2353
2014
def lock_write(self, token=None):
2354
"""Lock the branch for write operations.
2356
:param token: A token to permit reacquiring a previously held and
2358
:return: A BranchWriteLockResult.
2360
if not self.is_locked():
2361
self._note_lock('w')
2362
2015
# All-in-one needs to always unlock/lock.
2363
2016
repo_control = getattr(self.repository, 'control_files', None)
2364
2017
if self.control_files == repo_control or not self.is_locked():
2365
self.repository._warn_if_deprecated(self)
2366
2018
self.repository.lock_write()
2367
2019
took_lock = True
2369
2021
took_lock = False
2371
return BranchWriteLockResult(self.unlock,
2372
self.control_files.lock_write(token=token))
2023
return self.control_files.lock_write(token=token)
2375
2026
self.repository.unlock()
2378
2029
def lock_read(self):
2379
"""Lock the branch for read operations.
2381
:return: A bzrlib.lock.LogicalLockResult.
2383
if not self.is_locked():
2384
self._note_lock('r')
2385
2030
# All-in-one needs to always unlock/lock.
2386
2031
repo_control = getattr(self.repository, 'control_files', None)
2387
2032
if self.control_files == repo_control or not self.is_locked():
2388
self.repository._warn_if_deprecated(self)
2389
2033
self.repository.lock_read()
2390
2034
took_lock = True
2392
2036
took_lock = False
2394
2038
self.control_files.lock_read()
2395
return LogicalLockResult(self.unlock)
2398
2041
self.repository.unlock()
2401
@only_raises(errors.LockNotHeld, errors.LockBroken)
2402
2044
def unlock(self):
2404
2046
self.control_files.unlock()
2535
2177
"""See Branch.basis_tree."""
2536
2178
return self.repository.revision_tree(self.last_revision())
2181
def pull(self, source, overwrite=False, stop_revision=None,
2182
_hook_master=None, run_hooks=True, possible_transports=None,
2183
_override_hook_target=None):
2186
:param _hook_master: Private parameter - set the branch to
2187
be supplied as the master to pull hooks.
2188
:param run_hooks: Private parameter - if false, this branch
2189
is being called because it's the master of the primary branch,
2190
so it should not run its hooks.
2191
:param _override_hook_target: Private parameter - set the branch to be
2192
supplied as the target_branch to pull hooks.
2194
result = PullResult()
2195
result.source_branch = source
2196
if _override_hook_target is None:
2197
result.target_branch = self
2199
result.target_branch = _override_hook_target
2202
# We assume that during 'pull' the local repository is closer than
2204
source.update_references(self)
2205
graph = self.repository.get_graph(source.repository)
2206
result.old_revno, result.old_revid = self.last_revision_info()
2207
self.update_revisions(source, stop_revision, overwrite=overwrite,
2209
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2210
result.new_revno, result.new_revid = self.last_revision_info()
2212
result.master_branch = _hook_master
2213
result.local_branch = result.target_branch
2215
result.master_branch = result.target_branch
2216
result.local_branch = None
2218
for hook in Branch.hooks['post_pull']:
2538
2224
def _get_parent_location(self):
2539
2225
_locs = ['parent', 'pull', 'x-pull']
2540
2226
for l in _locs:
2589
2275
It has support for a master_branch which is the data for bound branches.
2279
def pull(self, source, overwrite=False, stop_revision=None,
2280
run_hooks=True, possible_transports=None,
2281
_override_hook_target=None):
2282
"""Pull from source into self, updating my master if any.
2284
:param run_hooks: Private parameter - if false, this branch
2285
is being called because it's the master of the primary branch,
2286
so it should not run its hooks.
2288
bound_location = self.get_bound_location()
2289
master_branch = None
2290
if bound_location and source.base != bound_location:
2291
# not pulling from master, so we need to update master.
2292
master_branch = self.get_master_branch(possible_transports)
2293
master_branch.lock_write()
2296
# pull from source into master.
2297
master_branch.pull(source, overwrite, stop_revision,
2299
return super(BzrBranch5, self).pull(source, overwrite,
2300
stop_revision, _hook_master=master_branch,
2301
run_hooks=run_hooks,
2302
_override_hook_target=_override_hook_target)
2305
master_branch.unlock()
2592
2307
def get_bound_location(self):
2594
2309
return self._transport.get_bytes('bound')[:-1]
2700
2415
raise AssertionError(
2701
2416
"'transform_fallback_location' hook %s returned "
2702
2417
"None, not a URL." % hook_name)
2703
self._activate_fallback_location(url)
2418
self._activate_fallback_location(url, None)
2705
2420
def __init__(self, *args, **kwargs):
2706
2421
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2707
2422
super(BzrBranch8, self).__init__(*args, **kwargs)
2708
2423
self._last_revision_info_cache = None
2424
self._partial_revision_history_cache = []
2709
2425
self._reference_info = None
2711
2427
def _clear_cached_state(self):
2712
2428
super(BzrBranch8, self)._clear_cached_state()
2713
2429
self._last_revision_info_cache = None
2430
self._partial_revision_history_cache = []
2714
2431
self._reference_info = None
2716
2433
def _last_revision_info(self):
2772
2489
self._extend_partial_history(stop_index=last_revno-1)
2773
2490
return list(reversed(self._partial_revision_history_cache))
2492
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2493
"""Extend the partial history to include a given index
2495
If a stop_index is supplied, stop when that index has been reached.
2496
If a stop_revision is supplied, stop when that revision is
2497
encountered. Otherwise, stop when the beginning of history is
2500
:param stop_index: The index which should be present. When it is
2501
present, history extension will stop.
2502
:param revision_id: The revision id which should be present. When
2503
it is encountered, history extension will stop.
2505
repo = self.repository
2506
if len(self._partial_revision_history_cache) == 0:
2507
iterator = repo.iter_reverse_revision_history(self.last_revision())
2509
start_revision = self._partial_revision_history_cache[-1]
2510
iterator = repo.iter_reverse_revision_history(start_revision)
2511
#skip the last revision in the list
2512
next_revision = iterator.next()
2513
for revision_id in iterator:
2514
self._partial_revision_history_cache.append(revision_id)
2515
if (stop_index is not None and
2516
len(self._partial_revision_history_cache) > stop_index):
2518
if revision_id == stop_revision:
2775
2521
def _write_revision_history(self, history):
2776
2522
"""Factored out of set_revision_history.
3273
3015
self.source.unlock()
3275
def pull(self, overwrite=False, stop_revision=None,
3276
possible_transports=None, _hook_master=None, run_hooks=True,
3277
_override_hook_target=None, local=False):
3280
:param _hook_master: Private parameter - set the branch to
3281
be supplied as the master to pull hooks.
3282
:param run_hooks: Private parameter - if false, this branch
3283
is being called because it's the master of the primary branch,
3284
so it should not run its hooks.
3285
:param _override_hook_target: Private parameter - set the branch to be
3286
supplied as the target_branch to pull hooks.
3287
:param local: Only update the local branch, and not the bound branch.
3289
# This type of branch can't be bound.
3291
raise errors.LocalRequiresBoundBranch()
3292
result = PullResult()
3293
result.source_branch = self.source
3294
if _override_hook_target is None:
3295
result.target_branch = self.target
3297
result.target_branch = _override_hook_target
3298
self.source.lock_read()
3300
# We assume that during 'pull' the target repository is closer than
3302
self.source.update_references(self.target)
3303
graph = self.target.repository.get_graph(self.source.repository)
3304
# TODO: Branch formats should have a flag that indicates
3305
# that revno's are expensive, and pull() should honor that flag.
3307
result.old_revno, result.old_revid = \
3308
self.target.last_revision_info()
3309
self.target.update_revisions(self.source, stop_revision,
3310
overwrite=overwrite, graph=graph)
3311
# TODO: The old revid should be specified when merging tags,
3312
# so a tags implementation that versions tags can only
3313
# pull in the most recent changes. -- JRV20090506
3314
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3316
result.new_revno, result.new_revid = self.target.last_revision_info()
3318
result.master_branch = _hook_master
3319
result.local_branch = result.target_branch
3321
result.master_branch = result.target_branch
3322
result.local_branch = None
3324
for hook in Branch.hooks['post_pull']:
3327
self.source.unlock()
3330
3017
def push(self, overwrite=False, stop_revision=None,
3331
3018
_override_hook_source_branch=None):
3332
3019
"""See InterBranch.push.
3402
class InterToBranch5(GenericInterBranch):
3405
def _get_branch_formats_to_test():
3406
return BranchFormat._default_format, BzrBranchFormat5()
3408
def pull(self, overwrite=False, stop_revision=None,
3409
possible_transports=None, run_hooks=True,
3410
_override_hook_target=None, local=False):
3411
"""Pull from source into self, updating my master if any.
3413
:param run_hooks: Private parameter - if false, this branch
3414
is being called because it's the master of the primary branch,
3415
so it should not run its hooks.
3417
bound_location = self.target.get_bound_location()
3418
if local and not bound_location:
3419
raise errors.LocalRequiresBoundBranch()
3420
master_branch = None
3421
if not local and bound_location and self.source.user_url != bound_location:
3422
# not pulling from master, so we need to update master.
3423
master_branch = self.target.get_master_branch(possible_transports)
3424
master_branch.lock_write()
3427
# pull from source into master.
3428
master_branch.pull(self.source, overwrite, stop_revision,
3430
return super(InterToBranch5, self).pull(overwrite,
3431
stop_revision, _hook_master=master_branch,
3432
run_hooks=run_hooks,
3433
_override_hook_target=_override_hook_target)
3436
master_branch.unlock()
3439
3089
InterBranch.register_optimiser(GenericInterBranch)
3440
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
