126
127
raise errors.UnstackableRepositoryFormat(self.repository._format,
127
128
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
131
def open(base, _unsupported=False, possible_transports=None):
160
132
"""Open the branch rooted at base.
456
416
# start_revision_id.
457
417
if self._merge_sorted_revisions_cache is None:
458
418
last_revision = self.last_revision()
459
known_graph = self.repository.get_known_graph_ancestry(
461
self._merge_sorted_revisions_cache = known_graph.merge_sort(
419
graph = self.repository.get_graph()
420
parent_map = dict(((key, value) for key, value in
421
graph.iter_ancestry([last_revision]) if value is not None))
422
revision_graph = repository._strip_NULL_ghosts(parent_map)
423
revs = tsort.merge_sort(revision_graph, last_revision, None,
425
# Drop the sequence # before caching
426
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
463
428
filtered = self._filter_merge_sorted_revisions(
464
429
self._merge_sorted_revisions_cache, start_revision_id,
465
430
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
431
if direction == 'reverse':
471
433
if direction == 'forward':
478
440
"""Iterate over an inclusive range of sorted revisions."""
479
441
rev_iter = iter(merge_sorted_revisions)
480
442
if start_revision_id is not None:
481
for node in rev_iter:
482
rev_id = node.key[-1]
443
for rev_id, depth, revno, end_of_merge in rev_iter:
483
444
if rev_id != start_revision_id:
486
447
# The decision to include the start or not
487
448
# 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)
450
iter([(rev_id, depth, revno, end_of_merge)]),
491
453
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,
454
for rev_id, depth, revno, end_of_merge in rev_iter:
455
yield rev_id, depth, revno, end_of_merge
497
456
elif stop_rule == 'exclude':
498
for node in rev_iter:
499
rev_id = node.key[-1]
457
for rev_id, depth, revno, end_of_merge in rev_iter:
500
458
if rev_id == stop_revision_id:
502
yield (rev_id, node.merge_depth, node.revno,
460
yield rev_id, depth, revno, end_of_merge
504
461
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,
462
for rev_id, depth, revno, end_of_merge in rev_iter:
463
yield rev_id, depth, revno, end_of_merge
509
464
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
466
elif stop_rule == 'with-merges':
524
467
stop_rev = self.repository.get_revision(stop_revision_id)
525
468
if stop_rev.parent_ids:
526
469
left_parent = stop_rev.parent_ids[0]
528
471
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]
472
for rev_id, depth, revno, end_of_merge in rev_iter:
535
473
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)
475
yield rev_id, depth, revno, end_of_merge
549
477
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
479
def leave_lock_in_place(self):
597
480
"""Tell this branch object not to release the physical lock when this
598
481
object is unlocked.
768
630
except (errors.NotStacked, errors.UnstackableBranchFormat,
769
631
errors.UnstackableRepositoryFormat):
634
# XXX: Lock correctness - should unlock our old repo if we were
636
# repositories don't offer an interface to remove fallback
637
# repositories today; take the conceptually simpler option and just
639
self.repository = self.bzrdir.find_repository()
640
self.repository.lock_write()
641
# for every revision reference the branch has, ensure it is pulled
643
source_repository = self._get_fallback_repository(old_url)
644
for revision_id in chain([self.last_revision()],
645
self.tags.get_reverse_tag_dict()):
646
self.repository.fetch(source_repository, revision_id,
773
self._activate_fallback_location(url)
649
self._activate_fallback_location(url, 'write')
774
650
# write this out after the repository is stacked to avoid setting a
775
651
# stacked config that doesn't work.
776
652
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
655
def _set_tags_bytes(self, bytes):
834
656
"""Mirror method for _get_tags_bytes.
1001
825
except ValueError:
1002
826
raise errors.NoSuchRevision(self, revision_id)
1005
828
def get_rev_id(self, revno, history=None):
1006
829
"""Find the revision id of the specified revno."""
1008
831
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:
833
history = self.revision_history()
834
if revno <= 0 or revno > len(history):
1013
835
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]
836
return history[revno - 1]
1020
838
def pull(self, source, overwrite=False, stop_revision=None,
1021
possible_transports=None, *args, **kwargs):
839
possible_transports=None, _override_hook_target=None):
1022
840
"""Mirror source into this branch.
1024
842
This branch is considered to be 'local', having low latency.
1026
844
:returns: PullResult instance
1028
return InterBranch.get(source, self).pull(overwrite=overwrite,
1029
stop_revision=stop_revision,
1030
possible_transports=possible_transports, *args, **kwargs)
846
raise NotImplementedError(self.pull)
1032
def push(self, target, overwrite=False, stop_revision=None, *args,
848
def push(self, target, overwrite=False, stop_revision=None):
1034
849
"""Mirror this branch into target.
1036
851
This branch is considered to be 'local', having low latency.
1038
return InterBranch.get(self, target).push(overwrite, stop_revision,
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)
853
raise NotImplementedError(self.push)
1062
855
def basis_tree(self):
1063
856
"""Return `Tree` object for last revision."""
1255
1049
source_revno, source_revision_id = self.last_revision_info()
1256
1050
if revision_id is None:
1257
1051
revno, revision_id = source_revno, source_revision_id
1052
elif source_revision_id == revision_id:
1053
# we know the revno without needing to walk all of history
1054
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
1056
# To figure out the revno for a random revision, we need to build
1057
# the revision history, and count its length.
1058
# We don't care about the order, just how long it is.
1059
# Alternatively, we could start at the current location, and count
1060
# backwards. But there is no guarantee that we will find it since
1061
# it may be a merged revision.
1062
revno = len(list(self.repository.iter_reverse_revision_history(
1266
1064
destination.set_last_revision_info(revno, revision_id)
1268
1066
@needs_read_lock
1312
1092
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
1094
:return: A BranchCheckResult.
1318
result = BranchCheckResult(self)
1096
mainline_parent_id = None
1319
1097
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
1098
real_rev_history = list(self.repository.iter_reverse_revision_history(
1100
real_rev_history.reverse()
1101
if len(real_rev_history) != last_revno:
1102
raise errors.BzrCheckError('revno does not match len(mainline)'
1103
' %s != %s' % (last_revno, len(real_rev_history)))
1104
# TODO: We should probably also check that real_rev_history actually
1105
# matches self.revision_history()
1106
for revision_id in real_rev_history:
1108
revision = self.repository.get_revision(revision_id)
1109
except errors.NoSuchRevision, e:
1110
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1112
# In general the first entry on the revision history has no parents.
1113
# But it's not illegal for it to have parents listed; this can happen
1114
# in imports from Arch when the parents weren't reachable.
1115
if mainline_parent_id is not None:
1116
if mainline_parent_id not in revision.parent_ids:
1117
raise errors.BzrCheckError("previous revision {%s} not listed among "
1119
% (mainline_parent_id, revision_id))
1120
mainline_parent_id = revision_id
1121
return BranchCheckResult(self)
1332
1123
def _get_checkout_format(self):
1333
1124
"""Return the most suitable metadir for a checkout of this branch.
1345
1136
def create_clone_on_transport(self, to_transport, revision_id=None,
1346
stacked_on=None, create_prefix=False, use_existing_dir=False):
1347
1138
"""Create a clone of this branch and its bzrdir.
1349
1140
:param to_transport: The transport to clone onto.
1350
1141
:param revision_id: The revision id to use as tip in the new branch.
1351
1142
If None the tip is obtained from this branch.
1352
1143
:param stacked_on: An optional URL to stack the clone on.
1353
:param create_prefix: Create any missing directories leading up to
1355
:param use_existing_dir: Use an existing directory if one exists.
1357
1145
# XXX: Fix the bzrdir API to allow getting the branch back from the
1358
1146
# clone call. Or something. 20090224 RBC/spiv.
1359
# XXX: Should this perhaps clone colocated branches as well,
1360
# rather than just the default branch? 20100319 JRV
1361
if revision_id is None:
1362
revision_id = self.last_revision()
1363
1147
dir_to = self.bzrdir.clone_on_transport(to_transport,
1364
revision_id=revision_id, stacked_on=stacked_on,
1365
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1148
revision_id=revision_id, stacked_on=stacked_on)
1366
1149
return dir_to.open_branch()
1368
1151
def create_checkout(self, to_location, revision_id=None,
1423
1205
reconciler.reconcile()
1424
1206
return reconciler
1426
def reference_parent(self, file_id, path, possible_transports=None):
1208
def reference_parent(self, file_id, path):
1427
1209
"""Return the parent branch for a tree-reference file_id
1428
1210
:param file_id: The file_id of the tree reference
1429
1211
:param path: The path of the file_id in the tree
1430
1212
:return: A branch associated with the file_id
1432
1214
# FIXME should provide multiple branches, based on config
1433
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1434
possible_transports=possible_transports)
1215
return Branch.open(self.bzrdir.root_transport.clone(path).base)
1436
1217
def supports_tags(self):
1437
1218
return self._format.supports_tags()
1439
def automatic_tag_name(self, revision_id):
1440
"""Try to automatically find the tag name for a revision.
1442
:param revision_id: Revision id of the revision.
1443
:return: A tag name or None if no tag name could be determined.
1445
for hook in Branch.hooks['automatic_tag_name']:
1446
ret = hook(self, revision_id)
1451
1220
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1453
1222
"""Ensure that revision_b is a descendant of revision_a.
1568
1333
"""Return the short format description for this format."""
1569
1334
raise NotImplementedError(self.get_format_description)
1571
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1572
hooks = Branch.hooks['post_branch_init']
1575
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1579
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1580
lock_type='metadir', set_format=True):
1336
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1581
1338
"""Initialize a branch in a bzrdir, with specified files
1583
1340
:param a_bzrdir: The bzrdir to initialize the branch in
1584
1341
:param utf8_files: The files to create as a list of
1585
1342
(filename, content) tuples
1586
:param name: Name of colocated branch to create, if any
1587
1343
:param set_format: If True, set the format with
1588
1344
self.get_format_string. (BzrBranch4 has its format set
1590
1346
:return: a branch in this format
1592
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1593
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1348
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1349
branch_transport = a_bzrdir.get_branch_transport(self)
1595
1351
'metadir': ('lock', lockdir.LockDir),
1596
1352
'branch4': ('branch-lock', lockable_files.TransportLock),
1779
1517
"multiple hooks installed for transform_fallback_location, "
1780
1518
"all are called with the url returned from the previous hook."
1781
1519
"The order is however undefined.", (1, 9), None))
1782
self.create_hook(HookPoint('automatic_tag_name',
1783
"Called to determine an automatic tag name for a revision."
1784
"automatic_tag_name is called with (branch, revision_id) and "
1785
"should return a tag name or None if no tag name could be "
1786
"determined. The first non-None tag name returned will be used.",
1788
self.create_hook(HookPoint('post_branch_init',
1789
"Called after new branch initialization completes. "
1790
"post_branch_init is called with a "
1791
"bzrlib.branch.BranchInitHookParams. "
1792
"Note that init, branch and checkout (both heavyweight and "
1793
"lightweight) will all trigger this hook.", (2, 2), None))
1794
self.create_hook(HookPoint('post_switch',
1795
"Called after a checkout switches branch. "
1796
"post_switch is called with a "
1797
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1801
1522
# install the default hooks into the Branch class.
1840
1561
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1843
class BranchInitHookParams(object):
1844
"""Object holding parameters passed to *_branch_init hooks.
1846
There are 4 fields that hooks may wish to access:
1848
:ivar format: the branch format
1849
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1850
:ivar name: name of colocated branch, if any (or None)
1851
:ivar branch: the branch created
1853
Note that for lightweight checkouts, the bzrdir and format fields refer to
1854
the checkout, hence they are different from the corresponding fields in
1855
branch, which refer to the original branch.
1858
def __init__(self, format, a_bzrdir, name, branch):
1859
"""Create a group of BranchInitHook parameters.
1861
:param format: the branch format
1862
:param a_bzrdir: the BzrDir where the branch will be/has been
1864
:param name: name of colocated branch, if any (or None)
1865
:param branch: the branch created
1867
Note that for lightweight checkouts, the bzrdir and format fields refer
1868
to the checkout, hence they are different from the corresponding fields
1869
in branch, which refer to the original branch.
1871
self.format = format
1872
self.bzrdir = a_bzrdir
1874
self.branch = branch
1876
def __eq__(self, other):
1877
return self.__dict__ == other.__dict__
1881
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1883
return "<%s of format:%s bzrdir:%s>" % (
1884
self.__class__.__name__, self.branch,
1885
self.format, self.bzrdir)
1888
class SwitchHookParams(object):
1889
"""Object holding parameters passed to *_switch hooks.
1891
There are 4 fields that hooks may wish to access:
1893
:ivar control_dir: BzrDir of the checkout to change
1894
:ivar to_branch: branch that the checkout is to reference
1895
:ivar force: skip the check for local commits in a heavy checkout
1896
:ivar revision_id: revision ID to switch to (or None)
1899
def __init__(self, control_dir, to_branch, force, revision_id):
1900
"""Create a group of SwitchHook parameters.
1902
:param control_dir: BzrDir of the checkout to change
1903
:param to_branch: branch that the checkout is to reference
1904
:param force: skip the check for local commits in a heavy checkout
1905
:param revision_id: revision ID to switch to (or None)
1907
self.control_dir = control_dir
1908
self.to_branch = to_branch
1910
self.revision_id = revision_id
1912
def __eq__(self, other):
1913
return self.__dict__ == other.__dict__
1916
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1917
self.control_dir, self.to_branch,
1921
1564
class BzrBranchFormat4(BranchFormat):
1922
1565
"""Bzr branch format 4.
1976
1618
return self.get_format_string()
1978
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1620
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1979
1621
"""See BranchFormat.open()."""
1981
format = BranchFormat.find_format(a_bzrdir, name=name)
1623
format = BranchFormat.find_format(a_bzrdir)
1982
1624
if format.__class__ != self.__class__:
1983
1625
raise AssertionError("wrong format %r found for %r" %
1984
1626
(format, self))
1985
transport = a_bzrdir.get_branch_transport(None, name=name)
1628
transport = a_bzrdir.get_branch_transport(None)
1987
1629
control_files = lockable_files.LockableFiles(transport, 'lock',
1988
1630
lockdir.LockDir)
1989
1631
return self._branch_class()(_format=self,
1990
1632
_control_files=control_files,
1992
1633
a_bzrdir=a_bzrdir,
1993
1634
_repository=a_bzrdir.find_repository(),
1994
1635
ignore_fallbacks=ignore_fallbacks)
1995
1636
except errors.NoSuchFile:
1996
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1637
raise errors.NotBranchError(path=transport.base)
1998
1639
def __init__(self):
1999
1640
super(BranchFormatMetadir, self).__init__()
2061
1702
"""See BranchFormat.get_format_description()."""
2062
1703
return "Branch format 6"
2064
def initialize(self, a_bzrdir, name=None):
2065
"""Create a branch of this format in a_bzrdir."""
2066
utf8_files = [('last-revision', '0 null:\n'),
2067
('branch.conf', ''),
2070
return self._initialize_helper(a_bzrdir, utf8_files, name)
2072
def make_tags(self, branch):
2073
"""See bzrlib.branch.BranchFormat.make_tags()."""
2074
return BasicTags(branch)
2076
def supports_set_append_revisions_only(self):
2080
class BzrBranchFormat8(BranchFormatMetadir):
2081
"""Metadir format supporting storing locations of subtree branches."""
2083
def _branch_class(self):
2086
def get_format_string(self):
2087
"""See BranchFormat.get_format_string()."""
2088
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2090
def get_format_description(self):
2091
"""See BranchFormat.get_format_description()."""
2092
return "Branch format 8"
2094
def initialize(self, a_bzrdir, name=None):
2095
"""Create a branch of this format in a_bzrdir."""
2096
utf8_files = [('last-revision', '0 null:\n'),
2097
('branch.conf', ''),
2101
return self._initialize_helper(a_bzrdir, utf8_files, name)
2104
super(BzrBranchFormat8, self).__init__()
2105
self._matchingbzrdir.repository_format = \
2106
RepositoryFormatKnitPack5RichRoot()
2108
def make_tags(self, branch):
2109
"""See bzrlib.branch.BranchFormat.make_tags()."""
2110
return BasicTags(branch)
2112
def supports_set_append_revisions_only(self):
2115
def supports_stacking(self):
2118
supports_reference_locations = True
2121
class BzrBranchFormat7(BzrBranchFormat8):
1705
def initialize(self, a_bzrdir):
1706
"""Create a branch of this format in a_bzrdir."""
1707
utf8_files = [('last-revision', '0 null:\n'),
1708
('branch.conf', ''),
1711
return self._initialize_helper(a_bzrdir, utf8_files)
1713
def make_tags(self, branch):
1714
"""See bzrlib.branch.BranchFormat.make_tags()."""
1715
return BasicTags(branch)
1719
class BzrBranchFormat7(BranchFormatMetadir):
2122
1720
"""Branch format with last-revision, tags, and a stacked location pointer.
2124
1722
The stacked location pointer is passed down to the repository and requires
2171
1776
"""See BranchFormat.get_format_description()."""
2172
1777
return "Checkout reference format 1"
2174
def get_reference(self, a_bzrdir, name=None):
1779
def get_reference(self, a_bzrdir):
2175
1780
"""See BranchFormat.get_reference()."""
2176
transport = a_bzrdir.get_branch_transport(None, name=name)
2177
return transport.get_bytes('location')
1781
transport = a_bzrdir.get_branch_transport(None)
1782
return transport.get('location').read()
2179
def set_reference(self, a_bzrdir, name, to_branch):
1784
def set_reference(self, a_bzrdir, to_branch):
2180
1785
"""See BranchFormat.set_reference()."""
2181
transport = a_bzrdir.get_branch_transport(None, name=name)
1786
transport = a_bzrdir.get_branch_transport(None)
2182
1787
location = transport.put_bytes('location', to_branch.base)
2184
def initialize(self, a_bzrdir, name=None, target_branch=None):
1789
def initialize(self, a_bzrdir, target_branch=None):
2185
1790
"""Create a branch of this format in a_bzrdir."""
2186
1791
if target_branch is None:
2187
1792
# this format does not implement branch itself, thus the implicit
2188
1793
# creation contract must see it as uninitializable
2189
1794
raise errors.UninitializableFormat(self)
2190
mutter('creating branch reference in %s', a_bzrdir.user_url)
2191
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1795
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1796
branch_transport = a_bzrdir.get_branch_transport(self)
2192
1797
branch_transport.put_bytes('location',
2193
target_branch.bzrdir.user_url)
1798
target_branch.bzrdir.root_transport.base)
2194
1799
branch_transport.put_bytes('format', self.get_format_string())
2196
a_bzrdir, name, _found=True,
1801
a_bzrdir, _found=True,
2197
1802
possible_transports=[target_branch.bzrdir.root_transport])
2198
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2201
1804
def __init__(self):
2202
1805
super(BranchReferenceFormat, self).__init__()
2208
1811
def clone(to_bzrdir, revision_id=None,
2209
1812
repository_policy=None):
2210
1813
"""See Branch.clone()."""
2211
return format.initialize(to_bzrdir, target_branch=a_branch)
1814
return format.initialize(to_bzrdir, a_branch)
2212
1815
# cannot obey revision_id limits when cloning a reference ...
2213
1816
# FIXME RBC 20060210 either nuke revision_id for clone, or
2214
1817
# emit some sort of warning/error to the caller ?!
2217
def open(self, a_bzrdir, name=None, _found=False, location=None,
1820
def open(self, a_bzrdir, _found=False, location=None,
2218
1821
possible_transports=None, ignore_fallbacks=False):
2219
1822
"""Return the branch that the branch reference in a_bzrdir points at.
2221
1824
:param a_bzrdir: A BzrDir that contains a branch.
2222
:param name: Name of colocated branch to open, if any
2223
1825
:param _found: a private parameter, do not use it. It is used to
2224
1826
indicate if format probing has already be done.
2225
1827
:param ignore_fallbacks: when set, no fallback branches will be opened
2266
1867
__format5 = BzrBranchFormat5()
2267
1868
__format6 = BzrBranchFormat6()
2268
1869
__format7 = BzrBranchFormat7()
2269
__format8 = BzrBranchFormat8()
2270
1870
BranchFormat.register_format(__format5)
2271
1871
BranchFormat.register_format(BranchReferenceFormat())
2272
1872
BranchFormat.register_format(__format6)
2273
1873
BranchFormat.register_format(__format7)
2274
BranchFormat.register_format(__format8)
2275
BranchFormat.set_default_format(__format7)
1874
BranchFormat.set_default_format(__format6)
2276
1875
_legacy_formats = [BzrBranchFormat4(),
2278
1877
network_format_registry.register(
2279
1878
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2282
class BranchWriteLockResult(LogicalLockResult):
2283
"""The result of write locking a branch.
2285
:ivar branch_token: The token obtained from the underlying branch lock, or
2287
:ivar unlock: A callable which will unlock the lock.
2290
def __init__(self, unlock, branch_token):
2291
LogicalLockResult.__init__(self, unlock)
2292
self.branch_token = branch_token
2295
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2299
class BzrBranch(Branch, _RelockDebugMixin):
1881
class BzrBranch(Branch):
2300
1882
"""A branch stored in the actual filesystem.
2302
1884
Note that it's "local" in the context of the filesystem; it doesn't
2355
1930
return self.control_files.is_locked()
2357
1932
def lock_write(self, token=None):
2358
"""Lock the branch for write operations.
2360
:param token: A token to permit reacquiring a previously held and
2362
:return: A BranchWriteLockResult.
2364
if not self.is_locked():
2365
self._note_lock('w')
2366
1933
# All-in-one needs to always unlock/lock.
2367
1934
repo_control = getattr(self.repository, 'control_files', None)
2368
1935
if self.control_files == repo_control or not self.is_locked():
2369
self.repository._warn_if_deprecated(self)
2370
1936
self.repository.lock_write()
2371
1937
took_lock = True
2373
1939
took_lock = False
2375
return BranchWriteLockResult(self.unlock,
2376
self.control_files.lock_write(token=token))
1941
return self.control_files.lock_write(token=token)
2379
1944
self.repository.unlock()
2382
1947
def lock_read(self):
2383
"""Lock the branch for read operations.
2385
:return: A bzrlib.lock.LogicalLockResult.
2387
if not self.is_locked():
2388
self._note_lock('r')
2389
1948
# All-in-one needs to always unlock/lock.
2390
1949
repo_control = getattr(self.repository, 'control_files', None)
2391
1950
if self.control_files == repo_control or not self.is_locked():
2392
self.repository._warn_if_deprecated(self)
2393
1951
self.repository.lock_read()
2394
1952
took_lock = True
2396
1954
took_lock = False
2398
1956
self.control_files.lock_read()
2399
return LogicalLockResult(self.unlock)
2402
1959
self.repository.unlock()
2405
@only_raises(errors.LockNotHeld, errors.LockBroken)
2406
1962
def unlock(self):
2408
1964
self.control_files.unlock()
2539
2095
"""See Branch.basis_tree."""
2540
2096
return self.repository.revision_tree(self.last_revision())
2099
def pull(self, source, overwrite=False, stop_revision=None,
2100
_hook_master=None, run_hooks=True, possible_transports=None,
2101
_override_hook_target=None):
2104
:param _hook_master: Private parameter - set the branch to
2105
be supplied as the master to pull hooks.
2106
:param run_hooks: Private parameter - if false, this branch
2107
is being called because it's the master of the primary branch,
2108
so it should not run its hooks.
2109
:param _override_hook_target: Private parameter - set the branch to be
2110
supplied as the target_branch to pull hooks.
2112
result = PullResult()
2113
result.source_branch = source
2114
if _override_hook_target is None:
2115
result.target_branch = self
2117
result.target_branch = _override_hook_target
2120
# We assume that during 'pull' the local repository is closer than
2122
graph = self.repository.get_graph(source.repository)
2123
result.old_revno, result.old_revid = self.last_revision_info()
2124
self.update_revisions(source, stop_revision, overwrite=overwrite,
2126
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2127
result.new_revno, result.new_revid = self.last_revision_info()
2129
result.master_branch = _hook_master
2130
result.local_branch = result.target_branch
2132
result.master_branch = result.target_branch
2133
result.local_branch = None
2135
for hook in Branch.hooks['post_pull']:
2542
2141
def _get_parent_location(self):
2543
2142
_locs = ['parent', 'pull', 'x-pull']
2544
2143
for l in _locs:
2151
def push(self, target, overwrite=False, stop_revision=None,
2152
_override_hook_source_branch=None):
2155
This is the basic concrete implementation of push()
2157
:param _override_hook_source_branch: If specified, run
2158
the hooks passing this Branch as the source, rather than self.
2159
This is for use of RemoteBranch, where push is delegated to the
2160
underlying vfs-based Branch.
2162
# TODO: Public option to disable running hooks - should be trivial but
2164
return _run_with_write_locked_target(
2165
target, self._push_with_bound_branches, target, overwrite,
2167
_override_hook_source_branch=_override_hook_source_branch)
2169
def _push_with_bound_branches(self, target, overwrite,
2171
_override_hook_source_branch=None):
2172
"""Push from self into target, and into target's master if any.
2174
This is on the base BzrBranch class even though it doesn't support
2175
bound branches because the *target* might be bound.
2178
if _override_hook_source_branch:
2179
result.source_branch = _override_hook_source_branch
2180
for hook in Branch.hooks['post_push']:
2183
bound_location = target.get_bound_location()
2184
if bound_location and target.base != bound_location:
2185
# there is a master branch.
2187
# XXX: Why the second check? Is it even supported for a branch to
2188
# be bound to itself? -- mbp 20070507
2189
master_branch = target.get_master_branch()
2190
master_branch.lock_write()
2192
# push into the master from this branch.
2193
self._basic_push(master_branch, overwrite, stop_revision)
2194
# and push into the target branch from this. Note that we push from
2195
# this branch again, because its considered the highest bandwidth
2197
result = self._basic_push(target, overwrite, stop_revision)
2198
result.master_branch = master_branch
2199
result.local_branch = target
2203
master_branch.unlock()
2206
result = self._basic_push(target, overwrite, stop_revision)
2207
# TODO: Why set master_branch and local_branch if there's no
2208
# binding? Maybe cleaner to just leave them unset? -- mbp
2210
result.master_branch = target
2211
result.local_branch = None
2551
2215
def _basic_push(self, target, overwrite, stop_revision):
2552
2216
"""Basic implementation of push without bound branches or hooks.
2554
Must be called with source read locked and target write locked.
2218
Must be called with self read locked and target write locked.
2556
2220
result = BranchPushResult()
2557
2221
result.source_branch = self
2558
2222
result.target_branch = target
2559
2223
result.old_revno, result.old_revid = target.last_revision_info()
2560
self.update_references(target)
2561
2224
if result.old_revid != self.last_revision():
2562
2225
# We assume that during 'push' this repository is closer than
2564
2227
graph = self.repository.get_graph(target.repository)
2565
target.update_revisions(self, stop_revision,
2566
overwrite=overwrite, graph=graph)
2228
target.update_revisions(self, stop_revision, overwrite=overwrite,
2567
2230
if self._push_should_merge_tags():
2568
result.tag_conflicts = self.tags.merge_to(target.tags,
2231
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2570
2232
result.new_revno, result.new_revid = target.last_revision_info()
2573
2235
def get_stacked_on_url(self):
2574
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2236
raise errors.UnstackableBranchFormat(self._format, self.base)
2576
2238
def set_push_location(self, location):
2577
2239
"""See Branch.set_push_location."""
2593
2255
It has support for a master_branch which is the data for bound branches.
2259
def pull(self, source, overwrite=False, stop_revision=None,
2260
run_hooks=True, possible_transports=None,
2261
_override_hook_target=None):
2262
"""Pull from source into self, updating my master if any.
2264
:param run_hooks: Private parameter - if false, this branch
2265
is being called because it's the master of the primary branch,
2266
so it should not run its hooks.
2268
bound_location = self.get_bound_location()
2269
master_branch = None
2270
if bound_location and source.base != bound_location:
2271
# not pulling from master, so we need to update master.
2272
master_branch = self.get_master_branch(possible_transports)
2273
master_branch.lock_write()
2276
# pull from source into master.
2277
master_branch.pull(source, overwrite, stop_revision,
2279
return super(BzrBranch5, self).pull(source, overwrite,
2280
stop_revision, _hook_master=master_branch,
2281
run_hooks=run_hooks,
2282
_override_hook_target=_override_hook_target)
2285
master_branch.unlock()
2596
2287
def get_bound_location(self):
2598
2289
return self._transport.get_bytes('bound')[:-1]
2704
2395
raise AssertionError(
2705
2396
"'transform_fallback_location' hook %s returned "
2706
2397
"None, not a URL." % hook_name)
2707
self._activate_fallback_location(url)
2398
self._activate_fallback_location(url, None)
2709
2400
def __init__(self, *args, **kwargs):
2710
2401
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2711
super(BzrBranch8, self).__init__(*args, **kwargs)
2402
super(BzrBranch7, self).__init__(*args, **kwargs)
2712
2403
self._last_revision_info_cache = None
2713
self._reference_info = None
2404
self._partial_revision_history_cache = []
2715
2406
def _clear_cached_state(self):
2716
super(BzrBranch8, self)._clear_cached_state()
2407
super(BzrBranch7, self)._clear_cached_state()
2717
2408
self._last_revision_info_cache = None
2718
self._reference_info = None
2409
self._partial_revision_history_cache = []
2720
2411
def _last_revision_info(self):
2721
2412
revision_string = self._transport.get_bytes('last-revision')
2776
2467
self._extend_partial_history(stop_index=last_revno-1)
2777
2468
return list(reversed(self._partial_revision_history_cache))
2470
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2471
"""Extend the partial history to include a given index
2473
If a stop_index is supplied, stop when that index has been reached.
2474
If a stop_revision is supplied, stop when that revision is
2475
encountered. Otherwise, stop when the beginning of history is
2478
:param stop_index: The index which should be present. When it is
2479
present, history extension will stop.
2480
:param revision_id: The revision id which should be present. When
2481
it is encountered, history extension will stop.
2483
repo = self.repository
2484
if len(self._partial_revision_history_cache) == 0:
2485
iterator = repo.iter_reverse_revision_history(self.last_revision())
2487
start_revision = self._partial_revision_history_cache[-1]
2488
iterator = repo.iter_reverse_revision_history(start_revision)
2489
#skip the last revision in the list
2490
next_revision = iterator.next()
2491
for revision_id in iterator:
2492
self._partial_revision_history_cache.append(revision_id)
2493
if (stop_index is not None and
2494
len(self._partial_revision_history_cache) > stop_index):
2496
if revision_id == stop_revision:
2779
2499
def _write_revision_history(self, history):
2780
2500
"""Factored out of set_revision_history.
2802
2522
"""Set the parent branch"""
2803
2523
return self._get_config_location('parent_location')
2806
def _set_all_reference_info(self, info_dict):
2807
"""Replace all reference info stored in a branch.
2809
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2812
writer = rio.RioWriter(s)
2813
for key, (tree_path, branch_location) in info_dict.iteritems():
2814
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2815
branch_location=branch_location)
2816
writer.write_stanza(stanza)
2817
self._transport.put_bytes('references', s.getvalue())
2818
self._reference_info = info_dict
2821
def _get_all_reference_info(self):
2822
"""Return all the reference info stored in a branch.
2824
:return: A dict of {file_id: (tree_path, branch_location)}
2826
if self._reference_info is not None:
2827
return self._reference_info
2828
rio_file = self._transport.get('references')
2830
stanzas = rio.read_stanzas(rio_file)
2831
info_dict = dict((s['file_id'], (s['tree_path'],
2832
s['branch_location'])) for s in stanzas)
2835
self._reference_info = info_dict
2838
def set_reference_info(self, file_id, tree_path, branch_location):
2839
"""Set the branch location to use for a tree reference.
2841
:param file_id: The file-id of the tree reference.
2842
:param tree_path: The path of the tree reference in the tree.
2843
:param branch_location: The location of the branch to retrieve tree
2846
info_dict = self._get_all_reference_info()
2847
info_dict[file_id] = (tree_path, branch_location)
2848
if None in (tree_path, branch_location):
2849
if tree_path is not None:
2850
raise ValueError('tree_path must be None when branch_location'
2852
if branch_location is not None:
2853
raise ValueError('branch_location must be None when tree_path'
2855
del info_dict[file_id]
2856
self._set_all_reference_info(info_dict)
2858
def get_reference_info(self, file_id):
2859
"""Get the tree_path and branch_location for a tree reference.
2861
:return: a tuple of (tree_path, branch_location)
2863
return self._get_all_reference_info().get(file_id, (None, None))
2865
def reference_parent(self, file_id, path, possible_transports=None):
2866
"""Return the parent branch for a tree-reference file_id.
2868
:param file_id: The file_id of the tree reference
2869
:param path: The path of the file_id in the tree
2870
:return: A branch associated with the file_id
2872
branch_location = self.get_reference_info(file_id)[1]
2873
if branch_location is None:
2874
return Branch.reference_parent(self, file_id, path,
2875
possible_transports)
2876
branch_location = urlutils.join(self.user_url, branch_location)
2877
return Branch.open(branch_location,
2878
possible_transports=possible_transports)
2880
2525
def set_push_location(self, location):
2881
2526
"""See Branch.set_push_location."""
2882
2527
self._set_config_location('push_location', location)
3277
2887
self.source.unlock()
3279
def pull(self, overwrite=False, stop_revision=None,
3280
possible_transports=None, _hook_master=None, run_hooks=True,
3281
_override_hook_target=None, local=False):
3284
:param _hook_master: Private parameter - set the branch to
3285
be supplied as the master to pull hooks.
3286
:param run_hooks: Private parameter - if false, this branch
3287
is being called because it's the master of the primary branch,
3288
so it should not run its hooks.
3289
:param _override_hook_target: Private parameter - set the branch to be
3290
supplied as the target_branch to pull hooks.
3291
:param local: Only update the local branch, and not the bound branch.
3293
# This type of branch can't be bound.
3295
raise errors.LocalRequiresBoundBranch()
3296
result = PullResult()
3297
result.source_branch = self.source
3298
if _override_hook_target is None:
3299
result.target_branch = self.target
3301
result.target_branch = _override_hook_target
3302
self.source.lock_read()
3304
# We assume that during 'pull' the target repository is closer than
3306
self.source.update_references(self.target)
3307
graph = self.target.repository.get_graph(self.source.repository)
3308
# TODO: Branch formats should have a flag that indicates
3309
# that revno's are expensive, and pull() should honor that flag.
3311
result.old_revno, result.old_revid = \
3312
self.target.last_revision_info()
3313
self.target.update_revisions(self.source, stop_revision,
3314
overwrite=overwrite, graph=graph)
3315
# TODO: The old revid should be specified when merging tags,
3316
# so a tags implementation that versions tags can only
3317
# pull in the most recent changes. -- JRV20090506
3318
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3320
result.new_revno, result.new_revid = self.target.last_revision_info()
3322
result.master_branch = _hook_master
3323
result.local_branch = result.target_branch
3325
result.master_branch = result.target_branch
3326
result.local_branch = None
3328
for hook in Branch.hooks['post_pull']:
3331
self.source.unlock()
3334
def push(self, overwrite=False, stop_revision=None,
3335
_override_hook_source_branch=None):
3336
"""See InterBranch.push.
3338
This is the basic concrete implementation of push()
3340
:param _override_hook_source_branch: If specified, run
3341
the hooks passing this Branch as the source, rather than self.
3342
This is for use of RemoteBranch, where push is delegated to the
3343
underlying vfs-based Branch.
3345
# TODO: Public option to disable running hooks - should be trivial but
3347
self.source.lock_read()
3349
return _run_with_write_locked_target(
3350
self.target, self._push_with_bound_branches, overwrite,
3352
_override_hook_source_branch=_override_hook_source_branch)
3354
self.source.unlock()
3356
def _push_with_bound_branches(self, overwrite, stop_revision,
3357
_override_hook_source_branch=None):
3358
"""Push from source into target, and into target's master if any.
3361
if _override_hook_source_branch:
3362
result.source_branch = _override_hook_source_branch
3363
for hook in Branch.hooks['post_push']:
3366
bound_location = self.target.get_bound_location()
3367
if bound_location and self.target.base != bound_location:
3368
# there is a master branch.
3370
# XXX: Why the second check? Is it even supported for a branch to
3371
# be bound to itself? -- mbp 20070507
3372
master_branch = self.target.get_master_branch()
3373
master_branch.lock_write()
3375
# push into the master from the source branch.
3376
self.source._basic_push(master_branch, overwrite, stop_revision)
3377
# and push into the target branch from the source. Note that we
3378
# push from the source branch again, because its considered the
3379
# highest bandwidth repository.
3380
result = self.source._basic_push(self.target, overwrite,
3382
result.master_branch = master_branch
3383
result.local_branch = self.target
3387
master_branch.unlock()
3390
result = self.source._basic_push(self.target, overwrite,
3392
# TODO: Why set master_branch and local_branch if there's no
3393
# binding? Maybe cleaner to just leave them unset? -- mbp
3395
result.master_branch = self.target
3396
result.local_branch = None
3401
2890
def is_compatible(self, source, target):
3402
2891
# GenericBranch uses the public API, so always compatible
3406
class InterToBranch5(GenericInterBranch):
3409
def _get_branch_formats_to_test():
3410
return BranchFormat._default_format, BzrBranchFormat5()
3412
def pull(self, overwrite=False, stop_revision=None,
3413
possible_transports=None, run_hooks=True,
3414
_override_hook_target=None, local=False):
3415
"""Pull from source into self, updating my master if any.
3417
:param run_hooks: Private parameter - if false, this branch
3418
is being called because it's the master of the primary branch,
3419
so it should not run its hooks.
3421
bound_location = self.target.get_bound_location()
3422
if local and not bound_location:
3423
raise errors.LocalRequiresBoundBranch()
3424
master_branch = None
3425
if not local and bound_location and self.source.user_url != bound_location:
3426
# not pulling from master, so we need to update master.
3427
master_branch = self.target.get_master_branch(possible_transports)
3428
master_branch.lock_write()
3431
# pull from source into master.
3432
master_branch.pull(self.source, overwrite, stop_revision,
3434
return super(InterToBranch5, self).pull(overwrite,
3435
stop_revision, _hook_master=master_branch,
3436
run_hooks=run_hooks,
3437
_override_hook_target=_override_hook_target)
3440
master_branch.unlock()
3443
2895
InterBranch.register_optimiser(GenericInterBranch)
3444
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
