113
121
if master is not None:
114
122
master.break_lock()
124
def _check_stackable_repo(self):
125
if not self.repository._format.supports_external_lookups:
126
raise errors.UnstackableRepositoryFormat(self.repository._format,
127
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)]
117
159
def open(base, _unsupported=False, possible_transports=None):
118
160
"""Open the branch rooted at base.
383
456
# start_revision_id.
384
457
if self._merge_sorted_revisions_cache is None:
385
458
last_revision = self.last_revision()
386
graph = self.repository.get_graph()
387
parent_map = dict(((key, value) for key, value in
388
graph.iter_ancestry([last_revision]) if value is not None))
389
revision_graph = repository._strip_NULL_ghosts(parent_map)
390
revs = tsort.merge_sort(revision_graph, last_revision, None,
392
# Drop the sequence # before caching
393
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
459
known_graph = self.repository.get_known_graph_ancestry(
461
self._merge_sorted_revisions_cache = known_graph.merge_sort(
395
463
filtered = self._filter_merge_sorted_revisions(
396
464
self._merge_sorted_revisions_cache, start_revision_id,
397
465
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)
398
469
if direction == 'reverse':
400
471
if direction == 'forward':
407
478
"""Iterate over an inclusive range of sorted revisions."""
408
479
rev_iter = iter(merge_sorted_revisions)
409
480
if start_revision_id is not None:
410
for rev_id, depth, revno, end_of_merge in rev_iter:
481
for node in rev_iter:
482
rev_id = node.key[-1]
411
483
if rev_id != start_revision_id:
414
486
# The decision to include the start or not
415
487
# depends on the stop_rule if a stop is provided
417
iter([(rev_id, depth, revno, end_of_merge)]),
488
# so pop this node back into the iterator
489
rev_iter = chain(iter([node]), rev_iter)
420
491
if stop_revision_id is None:
421
for rev_id, depth, revno, end_of_merge in rev_iter:
422
yield rev_id, depth, revno, end_of_merge
493
for node in rev_iter:
494
rev_id = node.key[-1]
495
yield (rev_id, node.merge_depth, node.revno,
423
497
elif stop_rule == 'exclude':
424
for rev_id, depth, revno, end_of_merge in rev_iter:
498
for node in rev_iter:
499
rev_id = node.key[-1]
425
500
if rev_id == stop_revision_id:
427
yield rev_id, depth, revno, end_of_merge
502
yield (rev_id, node.merge_depth, node.revno,
428
504
elif stop_rule == 'include':
429
for rev_id, depth, revno, end_of_merge in rev_iter:
430
yield rev_id, depth, revno, end_of_merge
505
for node in rev_iter:
506
rev_id = node.key[-1]
507
yield (rev_id, node.merge_depth, node.revno,
431
509
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,
433
523
elif stop_rule == 'with-merges':
434
524
stop_rev = self.repository.get_revision(stop_revision_id)
435
525
if stop_rev.parent_ids:
436
526
left_parent = stop_rev.parent_ids[0]
438
528
left_parent = _mod_revision.NULL_REVISION
439
for rev_id, depth, revno, end_of_merge in rev_iter:
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]
440
535
if rev_id == left_parent:
536
# reached the left parent after the stop_revision
442
yield rev_id, depth, revno, end_of_merge
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)
444
549
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)
446
596
def leave_lock_in_place(self):
447
597
"""Tell this branch object not to release the physical lock when this
448
598
object is unlocked.
569
756
:raises UnstackableRepositoryFormat: If the repository does not support
572
raise NotImplementedError(self.set_stacked_on_url)
759
if not self._format.supports_stacking():
760
raise errors.UnstackableBranchFormat(self._format, self.user_url)
761
# XXX: Changing from one fallback repository to another does not check
762
# that all the data you need is present in the new fallback.
763
# Possibly it should.
764
self._check_stackable_repo()
767
old_url = self.get_stacked_on_url()
768
except (errors.NotStacked, errors.UnstackableBranchFormat,
769
errors.UnstackableRepositoryFormat):
773
self._activate_fallback_location(url)
774
# write this out after the repository is stacked to avoid setting a
775
# stacked config that doesn't work.
776
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()
574
833
def _set_tags_bytes(self, bytes):
575
834
"""Mirror method for _get_tags_bytes.
744
1001
except ValueError:
745
1002
raise errors.NoSuchRevision(self, revision_id)
747
1005
def get_rev_id(self, revno, history=None):
748
1006
"""Find the revision id of the specified revno."""
750
1008
return _mod_revision.NULL_REVISION
752
history = self.revision_history()
753
if revno <= 0 or revno > len(history):
1009
last_revno, last_revid = self.last_revision_info()
1010
if revno == last_revno:
1012
if revno <= 0 or revno > last_revno:
754
1013
raise errors.NoSuchRevision(self, revno)
755
return history[revno - 1]
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]
757
1020
def pull(self, source, overwrite=False, stop_revision=None,
758
possible_transports=None, _override_hook_target=None):
1021
possible_transports=None, *args, **kwargs):
759
1022
"""Mirror source into this branch.
761
1024
This branch is considered to be 'local', having low latency.
763
1026
:returns: PullResult instance
765
raise NotImplementedError(self.pull)
1028
return InterBranch.get(source, self).pull(overwrite=overwrite,
1029
stop_revision=stop_revision,
1030
possible_transports=possible_transports, *args, **kwargs)
767
def push(self, target, overwrite=False, stop_revision=None):
1032
def push(self, target, overwrite=False, stop_revision=None, *args,
768
1034
"""Mirror this branch into target.
770
1036
This branch is considered to be 'local', having low latency.
772
raise NotImplementedError(self.push)
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)
774
1062
def basis_tree(self):
775
1063
"""Return `Tree` object for last revision."""
963
1255
source_revno, source_revision_id = self.last_revision_info()
964
1256
if revision_id is None:
965
1257
revno, revision_id = source_revno, source_revision_id
966
elif source_revision_id == revision_id:
967
# we know the revno without needing to walk all of history
970
# To figure out the revno for a random revision, we need to build
971
# the revision history, and count its length.
972
# We don't care about the order, just how long it is.
973
# Alternatively, we could start at the current location, and count
974
# backwards. But there is no guarantee that we will find it since
975
# it may be a merged revision.
976
revno = len(list(self.repository.iter_reverse_revision_history(
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
978
1266
destination.set_last_revision_info(revno, revision_id)
980
1268
@needs_read_lock
1006
1312
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()
1008
1316
:return: A BranchCheckResult.
1010
mainline_parent_id = None
1318
result = BranchCheckResult(self)
1011
1319
last_revno, last_revision_id = self.last_revision_info()
1012
real_rev_history = list(self.repository.iter_reverse_revision_history(
1014
real_rev_history.reverse()
1015
if len(real_rev_history) != last_revno:
1016
raise errors.BzrCheckError('revno does not match len(mainline)'
1017
' %s != %s' % (last_revno, len(real_rev_history)))
1018
# TODO: We should probably also check that real_rev_history actually
1019
# matches self.revision_history()
1020
for revision_id in real_rev_history:
1022
revision = self.repository.get_revision(revision_id)
1023
except errors.NoSuchRevision, e:
1024
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1026
# In general the first entry on the revision history has no parents.
1027
# But it's not illegal for it to have parents listed; this can happen
1028
# in imports from Arch when the parents weren't reachable.
1029
if mainline_parent_id is not None:
1030
if mainline_parent_id not in revision.parent_ids:
1031
raise errors.BzrCheckError("previous revision {%s} not listed among "
1033
% (mainline_parent_id, revision_id))
1034
mainline_parent_id = revision_id
1035
return BranchCheckResult(self)
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
1037
1332
def _get_checkout_format(self):
1038
1333
"""Return the most suitable metadir for a checkout of this branch.
1050
1345
def create_clone_on_transport(self, to_transport, revision_id=None,
1346
stacked_on=None, create_prefix=False, use_existing_dir=False):
1052
1347
"""Create a clone of this branch and its bzrdir.
1054
1349
:param to_transport: The transport to clone onto.
1055
1350
:param revision_id: The revision id to use as tip in the new branch.
1056
1351
If None the tip is obtained from this branch.
1057
1352
: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.
1059
1357
# XXX: Fix the bzrdir API to allow getting the branch back from the
1060
1358
# 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()
1061
1363
dir_to = self.bzrdir.clone_on_transport(to_transport,
1062
revision_id=revision_id, stacked_on=stacked_on)
1364
revision_id=revision_id, stacked_on=stacked_on,
1365
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1063
1366
return dir_to.open_branch()
1065
1368
def create_checkout(self, to_location, revision_id=None,
1119
1423
reconciler.reconcile()
1120
1424
return reconciler
1122
def reference_parent(self, file_id, path):
1426
def reference_parent(self, file_id, path, possible_transports=None):
1123
1427
"""Return the parent branch for a tree-reference file_id
1124
1428
:param file_id: The file_id of the tree reference
1125
1429
:param path: The path of the file_id in the tree
1126
1430
:return: A branch associated with the file_id
1128
1432
# FIXME should provide multiple branches, based on config
1129
return Branch.open(self.bzrdir.root_transport.clone(path).base)
1433
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1434
possible_transports=possible_transports)
1131
1436
def supports_tags(self):
1132
1437
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)
1134
1451
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1136
1453
"""Ensure that revision_b is a descendant of revision_a.
1247
1568
"""Return the short format description for this format."""
1248
1569
raise NotImplementedError(self.get_format_description)
1250
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
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):
1252
1581
"""Initialize a branch in a bzrdir, with specified files
1254
1583
:param a_bzrdir: The bzrdir to initialize the branch in
1255
1584
:param utf8_files: The files to create as a list of
1256
1585
(filename, content) tuples
1586
:param name: Name of colocated branch to create, if any
1257
1587
:param set_format: If True, set the format with
1258
1588
self.get_format_string. (BzrBranch4 has its format set
1260
1590
:return: a branch in this format
1262
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1263
branch_transport = a_bzrdir.get_branch_transport(self)
1592
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1593
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1265
1595
'metadir': ('lock', lockdir.LockDir),
1266
1596
'branch4': ('branch-lock', lockable_files.TransportLock),
1431
1779
"multiple hooks installed for transform_fallback_location, "
1432
1780
"all are called with the url returned from the previous hook."
1433
1781
"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))
1436
1801
# install the default hooks into the Branch class.
1475
1840
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,
1478
1921
class BzrBranchFormat4(BranchFormat):
1479
1922
"""Bzr branch format 4.
1532
1976
return self.get_format_string()
1534
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1978
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1535
1979
"""See BranchFormat.open()."""
1537
format = BranchFormat.find_format(a_bzrdir)
1981
format = BranchFormat.find_format(a_bzrdir, name=name)
1538
1982
if format.__class__ != self.__class__:
1539
1983
raise AssertionError("wrong format %r found for %r" %
1540
1984
(format, self))
1985
transport = a_bzrdir.get_branch_transport(None, name=name)
1542
transport = a_bzrdir.get_branch_transport(None)
1543
1987
control_files = lockable_files.LockableFiles(transport, 'lock',
1544
1988
lockdir.LockDir)
1545
1989
return self._branch_class()(_format=self,
1546
1990
_control_files=control_files,
1547
1992
a_bzrdir=a_bzrdir,
1548
1993
_repository=a_bzrdir.find_repository(),
1549
1994
ignore_fallbacks=ignore_fallbacks)
1550
1995
except errors.NoSuchFile:
1551
raise errors.NotBranchError(path=transport.base)
1996
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1553
1998
def __init__(self):
1554
1999
super(BranchFormatMetadir, self).__init__()
1616
2061
"""See BranchFormat.get_format_description()."""
1617
2062
return "Branch format 6"
1619
def initialize(self, a_bzrdir):
1620
"""Create a branch of this format in a_bzrdir."""
1621
utf8_files = [('last-revision', '0 null:\n'),
1622
('branch.conf', ''),
1625
return self._initialize_helper(a_bzrdir, utf8_files)
1627
def make_tags(self, branch):
1628
"""See bzrlib.branch.BranchFormat.make_tags()."""
1629
return BasicTags(branch)
1633
class BzrBranchFormat7(BranchFormatMetadir):
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):
1634
2122
"""Branch format with last-revision, tags, and a stacked location pointer.
1636
2124
The stacked location pointer is passed down to the repository and requires
1690
2171
"""See BranchFormat.get_format_description()."""
1691
2172
return "Checkout reference format 1"
1693
def get_reference(self, a_bzrdir):
2174
def get_reference(self, a_bzrdir, name=None):
1694
2175
"""See BranchFormat.get_reference()."""
1695
transport = a_bzrdir.get_branch_transport(None)
1696
return transport.get('location').read()
2176
transport = a_bzrdir.get_branch_transport(None, name=name)
2177
return transport.get_bytes('location')
1698
def set_reference(self, a_bzrdir, to_branch):
2179
def set_reference(self, a_bzrdir, name, to_branch):
1699
2180
"""See BranchFormat.set_reference()."""
1700
transport = a_bzrdir.get_branch_transport(None)
2181
transport = a_bzrdir.get_branch_transport(None, name=name)
1701
2182
location = transport.put_bytes('location', to_branch.base)
1703
def initialize(self, a_bzrdir, target_branch=None):
2184
def initialize(self, a_bzrdir, name=None, target_branch=None):
1704
2185
"""Create a branch of this format in a_bzrdir."""
1705
2186
if target_branch is None:
1706
2187
# this format does not implement branch itself, thus the implicit
1707
2188
# creation contract must see it as uninitializable
1708
2189
raise errors.UninitializableFormat(self)
1709
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1710
branch_transport = a_bzrdir.get_branch_transport(self)
2190
mutter('creating branch reference in %s', a_bzrdir.user_url)
2191
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1711
2192
branch_transport.put_bytes('location',
1712
target_branch.bzrdir.root_transport.base)
2193
target_branch.bzrdir.user_url)
1713
2194
branch_transport.put_bytes('format', self.get_format_string())
1715
a_bzrdir, _found=True,
2196
a_bzrdir, name, _found=True,
1716
2197
possible_transports=[target_branch.bzrdir.root_transport])
2198
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1718
2201
def __init__(self):
1719
2202
super(BranchReferenceFormat, self).__init__()
1725
2208
def clone(to_bzrdir, revision_id=None,
1726
2209
repository_policy=None):
1727
2210
"""See Branch.clone()."""
1728
return format.initialize(to_bzrdir, a_branch)
2211
return format.initialize(to_bzrdir, target_branch=a_branch)
1729
2212
# cannot obey revision_id limits when cloning a reference ...
1730
2213
# FIXME RBC 20060210 either nuke revision_id for clone, or
1731
2214
# emit some sort of warning/error to the caller ?!
1734
def open(self, a_bzrdir, _found=False, location=None,
2217
def open(self, a_bzrdir, name=None, _found=False, location=None,
1735
2218
possible_transports=None, ignore_fallbacks=False):
1736
2219
"""Return the branch that the branch reference in a_bzrdir points at.
1738
2221
:param a_bzrdir: A BzrDir that contains a branch.
2222
:param name: Name of colocated branch to open, if any
1739
2223
:param _found: a private parameter, do not use it. It is used to
1740
2224
indicate if format probing has already be done.
1741
2225
:param ignore_fallbacks: when set, no fallback branches will be opened
1781
2266
__format5 = BzrBranchFormat5()
1782
2267
__format6 = BzrBranchFormat6()
1783
2268
__format7 = BzrBranchFormat7()
2269
__format8 = BzrBranchFormat8()
1784
2270
BranchFormat.register_format(__format5)
1785
2271
BranchFormat.register_format(BranchReferenceFormat())
1786
2272
BranchFormat.register_format(__format6)
1787
2273
BranchFormat.register_format(__format7)
1788
BranchFormat.set_default_format(__format6)
2274
BranchFormat.register_format(__format8)
2275
BranchFormat.set_default_format(__format7)
1789
2276
_legacy_formats = [BzrBranchFormat4(),
1791
2278
network_format_registry.register(
1792
2279
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
1795
class BzrBranch(Branch):
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):
1796
2300
"""A branch stored in the actual filesystem.
1798
2302
Note that it's "local" in the context of the filesystem; it doesn't
1838
2349
base = property(_get_base, doc="The URL for the root of this branch.")
2351
def _get_config(self):
2352
return TransportConfig(self._transport, 'branch.conf')
1840
2354
def is_locked(self):
1841
2355
return self.control_files.is_locked()
1843
2357
def lock_write(self, token=None):
1844
repo_token = self.repository.lock_write()
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
# All-in-one needs to always unlock/lock.
2367
repo_control = getattr(self.repository, 'control_files', None)
2368
if self.control_files == repo_control or not self.is_locked():
2369
self.repository._warn_if_deprecated(self)
2370
self.repository.lock_write()
1846
token = self.control_files.lock_write(token=token)
2375
return BranchWriteLockResult(self.unlock,
2376
self.control_files.lock_write(token=token))
1848
self.repository.unlock()
2379
self.repository.unlock()
1852
2382
def lock_read(self):
1853
self.repository.lock_read()
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
# All-in-one needs to always unlock/lock.
2390
repo_control = getattr(self.repository, 'control_files', None)
2391
if self.control_files == repo_control or not self.is_locked():
2392
self.repository._warn_if_deprecated(self)
2393
self.repository.lock_read()
1855
2398
self.control_files.lock_read()
2399
return LogicalLockResult(self.unlock)
1857
self.repository.unlock()
2402
self.repository.unlock()
2405
@only_raises(errors.LockNotHeld, errors.LockBroken)
1860
2406
def unlock(self):
1861
# TODO: test for failed two phase locks. This is known broken.
1863
2408
self.control_files.unlock()
1865
self.repository.unlock()
1866
if not self.control_files.is_locked():
1867
# we just released the lock
1868
self._clear_cached_state()
2410
# All-in-one needs to always unlock/lock.
2411
repo_control = getattr(self.repository, 'control_files', None)
2412
if (self.control_files == repo_control or
2413
not self.control_files.is_locked()):
2414
self.repository.unlock()
2415
if not self.control_files.is_locked():
2416
# we just released the lock
2417
self._clear_cached_state()
1870
2419
def peek_lock_mode(self):
1871
2420
if self.control_files._lock_count == 0:
1990
2539
"""See Branch.basis_tree."""
1991
2540
return self.repository.revision_tree(self.last_revision())
1994
def pull(self, source, overwrite=False, stop_revision=None,
1995
_hook_master=None, run_hooks=True, possible_transports=None,
1996
_override_hook_target=None):
1999
:param _hook_master: Private parameter - set the branch to
2000
be supplied as the master to pull hooks.
2001
:param run_hooks: Private parameter - if false, this branch
2002
is being called because it's the master of the primary branch,
2003
so it should not run its hooks.
2004
:param _override_hook_target: Private parameter - set the branch to be
2005
supplied as the target_branch to pull hooks.
2007
result = PullResult()
2008
result.source_branch = source
2009
if _override_hook_target is None:
2010
result.target_branch = self
2012
result.target_branch = _override_hook_target
2015
# We assume that during 'pull' the local repository is closer than
2017
graph = self.repository.get_graph(source.repository)
2018
result.old_revno, result.old_revid = self.last_revision_info()
2019
self.update_revisions(source, stop_revision, overwrite=overwrite,
2021
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2022
result.new_revno, result.new_revid = self.last_revision_info()
2024
result.master_branch = _hook_master
2025
result.local_branch = result.target_branch
2027
result.master_branch = result.target_branch
2028
result.local_branch = None
2030
for hook in Branch.hooks['post_pull']:
2036
2542
def _get_parent_location(self):
2037
2543
_locs = ['parent', 'pull', 'x-pull']
2038
2544
for l in _locs:
2046
def push(self, target, overwrite=False, stop_revision=None,
2047
_override_hook_source_branch=None):
2050
This is the basic concrete implementation of push()
2052
:param _override_hook_source_branch: If specified, run
2053
the hooks passing this Branch as the source, rather than self.
2054
This is for use of RemoteBranch, where push is delegated to the
2055
underlying vfs-based Branch.
2057
# TODO: Public option to disable running hooks - should be trivial but
2059
return _run_with_write_locked_target(
2060
target, self._push_with_bound_branches, target, overwrite,
2062
_override_hook_source_branch=_override_hook_source_branch)
2064
def _push_with_bound_branches(self, target, overwrite,
2066
_override_hook_source_branch=None):
2067
"""Push from self into target, and into target's master if any.
2069
This is on the base BzrBranch class even though it doesn't support
2070
bound branches because the *target* might be bound.
2073
if _override_hook_source_branch:
2074
result.source_branch = _override_hook_source_branch
2075
for hook in Branch.hooks['post_push']:
2078
bound_location = target.get_bound_location()
2079
if bound_location and target.base != bound_location:
2080
# there is a master branch.
2082
# XXX: Why the second check? Is it even supported for a branch to
2083
# be bound to itself? -- mbp 20070507
2084
master_branch = target.get_master_branch()
2085
master_branch.lock_write()
2087
# push into the master from this branch.
2088
self._basic_push(master_branch, overwrite, stop_revision)
2089
# and push into the target branch from this. Note that we push from
2090
# this branch again, because its considered the highest bandwidth
2092
result = self._basic_push(target, overwrite, stop_revision)
2093
result.master_branch = master_branch
2094
result.local_branch = target
2098
master_branch.unlock()
2101
result = self._basic_push(target, overwrite, stop_revision)
2102
# TODO: Why set master_branch and local_branch if there's no
2103
# binding? Maybe cleaner to just leave them unset? -- mbp
2105
result.master_branch = target
2106
result.local_branch = None
2110
2551
def _basic_push(self, target, overwrite, stop_revision):
2111
2552
"""Basic implementation of push without bound branches or hooks.
2113
Must be called with self read locked and target write locked.
2554
Must be called with source read locked and target write locked.
2115
2556
result = BranchPushResult()
2116
2557
result.source_branch = self
2117
2558
result.target_branch = target
2118
2559
result.old_revno, result.old_revid = target.last_revision_info()
2560
self.update_references(target)
2119
2561
if result.old_revid != self.last_revision():
2120
2562
# We assume that during 'push' this repository is closer than
2122
2564
graph = self.repository.get_graph(target.repository)
2123
target.update_revisions(self, stop_revision, overwrite=overwrite,
2565
target.update_revisions(self, stop_revision,
2566
overwrite=overwrite, graph=graph)
2125
2567
if self._push_should_merge_tags():
2126
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2568
result.tag_conflicts = self.tags.merge_to(target.tags,
2127
2570
result.new_revno, result.new_revid = target.last_revision_info()
2130
2573
def get_stacked_on_url(self):
2131
raise errors.UnstackableBranchFormat(self._format, self.base)
2574
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2133
2576
def set_push_location(self, location):
2134
2577
"""See Branch.set_push_location."""
2171
2593
It has support for a master_branch which is the data for bound branches.
2175
def pull(self, source, overwrite=False, stop_revision=None,
2176
run_hooks=True, possible_transports=None,
2177
_override_hook_target=None):
2178
"""Pull from source into self, updating my master if any.
2180
:param run_hooks: Private parameter - if false, this branch
2181
is being called because it's the master of the primary branch,
2182
so it should not run its hooks.
2184
bound_location = self.get_bound_location()
2185
master_branch = None
2186
if bound_location and source.base != bound_location:
2187
# not pulling from master, so we need to update master.
2188
master_branch = self.get_master_branch(possible_transports)
2189
master_branch.lock_write()
2192
# pull from source into master.
2193
master_branch.pull(source, overwrite, stop_revision,
2195
return super(BzrBranch5, self).pull(source, overwrite,
2196
stop_revision, _hook_master=master_branch,
2197
run_hooks=run_hooks,
2198
_override_hook_target=_override_hook_target)
2201
master_branch.unlock()
2203
2596
def get_bound_location(self):
2205
2598
return self._transport.get_bytes('bound')[:-1]
2325
2706
"None, not a URL." % hook_name)
2326
2707
self._activate_fallback_location(url)
2328
def _check_stackable_repo(self):
2329
if not self.repository._format.supports_external_lookups:
2330
raise errors.UnstackableRepositoryFormat(self.repository._format,
2331
self.repository.base)
2333
2709
def __init__(self, *args, **kwargs):
2334
2710
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2335
super(BzrBranch7, self).__init__(*args, **kwargs)
2711
super(BzrBranch8, self).__init__(*args, **kwargs)
2336
2712
self._last_revision_info_cache = None
2337
self._partial_revision_history_cache = []
2713
self._reference_info = None
2339
2715
def _clear_cached_state(self):
2340
super(BzrBranch7, self)._clear_cached_state()
2716
super(BzrBranch8, self)._clear_cached_state()
2341
2717
self._last_revision_info_cache = None
2342
self._partial_revision_history_cache = []
2718
self._reference_info = None
2344
2720
def _last_revision_info(self):
2345
2721
revision_string = self._transport.get_bytes('last-revision')
2400
2776
self._extend_partial_history(stop_index=last_revno-1)
2401
2777
return list(reversed(self._partial_revision_history_cache))
2403
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2404
"""Extend the partial history to include a given index
2406
If a stop_index is supplied, stop when that index has been reached.
2407
If a stop_revision is supplied, stop when that revision is
2408
encountered. Otherwise, stop when the beginning of history is
2411
:param stop_index: The index which should be present. When it is
2412
present, history extension will stop.
2413
:param revision_id: The revision id which should be present. When
2414
it is encountered, history extension will stop.
2416
repo = self.repository
2417
if len(self._partial_revision_history_cache) == 0:
2418
iterator = repo.iter_reverse_revision_history(self.last_revision())
2420
start_revision = self._partial_revision_history_cache[-1]
2421
iterator = repo.iter_reverse_revision_history(start_revision)
2422
#skip the last revision in the list
2423
next_revision = iterator.next()
2424
for revision_id in iterator:
2425
self._partial_revision_history_cache.append(revision_id)
2426
if (stop_index is not None and
2427
len(self._partial_revision_history_cache) > stop_index):
2429
if revision_id == stop_revision:
2432
2779
def _write_revision_history(self, history):
2433
2780
"""Factored out of set_revision_history.
2455
2802
"""Set the parent branch"""
2456
2803
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)
2458
2880
def set_push_location(self, location):
2459
2881
"""See Branch.set_push_location."""
2460
2882
self._set_config_location('push_location', location)
2502
2924
raise errors.NotStacked(self)
2503
2925
return stacked_url
2505
def set_append_revisions_only(self, enabled):
2510
self.get_config().set_user_option('append_revisions_only', value,
2513
def set_stacked_on_url(self, url):
2514
self._check_stackable_repo()
2517
old_url = self.get_stacked_on_url()
2518
except (errors.NotStacked, errors.UnstackableBranchFormat,
2519
errors.UnstackableRepositoryFormat):
2522
# repositories don't offer an interface to remove fallback
2523
# repositories today; take the conceptually simpler option and just
2525
self.repository = self.bzrdir.find_repository()
2526
# for every revision reference the branch has, ensure it is pulled
2528
source_repository = self._get_fallback_repository(old_url)
2529
for revision_id in chain([self.last_revision()],
2530
self.tags.get_reverse_tag_dict()):
2531
self.repository.fetch(source_repository, revision_id,
2534
self._activate_fallback_location(url)
2535
# write this out after the repository is stacked to avoid setting a
2536
# stacked config that doesn't work.
2537
self._set_config_location('stacked_on_location', url)
2539
2927
def _get_append_revisions_only(self):
2540
value = self.get_config().get_user_option('append_revisions_only')
2541
return value == 'True'
2928
return self.get_config(
2929
).get_user_option_as_bool('append_revisions_only')
2543
2931
@needs_write_lock
2544
2932
def generate_revision_history(self, revision_id, last_rev=None,
2849
3277
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
2852
3401
def is_compatible(self, source, target):
2853
3402
# 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()
2857
3443
InterBranch.register_optimiser(GenericInterBranch)
3444
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
