512
440
"""Iterate over an inclusive range of sorted revisions."""
513
441
rev_iter = iter(merge_sorted_revisions)
514
442
if start_revision_id is not None:
515
for node in rev_iter:
443
for rev_id, depth, revno, end_of_merge in rev_iter:
517
444
if rev_id != start_revision_id:
520
447
# The decision to include the start or not
521
448
# depends on the stop_rule if a stop is provided
522
# so pop this node back into the iterator
523
rev_iter = chain(iter([node]), rev_iter)
450
iter([(rev_id, depth, revno, end_of_merge)]),
525
453
if stop_revision_id is None:
527
for node in rev_iter:
529
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
531
456
elif stop_rule == 'exclude':
532
for node in rev_iter:
457
for rev_id, depth, revno, end_of_merge in rev_iter:
534
458
if rev_id == stop_revision_id:
536
yield (rev_id, node.merge_depth, node.revno,
460
yield rev_id, depth, revno, end_of_merge
538
461
elif stop_rule == 'include':
539
for node in rev_iter:
541
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
543
464
if rev_id == stop_revision_id:
545
elif stop_rule == 'with-merges-without-common-ancestry':
546
# We want to exclude all revisions that are already part of the
547
# stop_revision_id ancestry.
548
graph = self.repository.get_graph()
549
ancestors = graph.find_unique_ancestors(start_revision_id,
551
for node in rev_iter:
553
if rev_id not in ancestors:
555
yield (rev_id, node.merge_depth, node.revno,
557
466
elif stop_rule == 'with-merges':
558
467
stop_rev = self.repository.get_revision(stop_revision_id)
559
468
if stop_rev.parent_ids:
560
469
left_parent = stop_rev.parent_ids[0]
562
471
left_parent = _mod_revision.NULL_REVISION
563
# left_parent is the actual revision we want to stop logging at,
564
# since we want to show the merged revisions after the stop_rev too
565
reached_stop_revision_id = False
566
revision_id_whitelist = []
567
for node in rev_iter:
472
for rev_id, depth, revno, end_of_merge in rev_iter:
569
473
if rev_id == left_parent:
570
# reached the left parent after the stop_revision
572
if (not reached_stop_revision_id or
573
rev_id in revision_id_whitelist):
574
yield (rev_id, node.merge_depth, node.revno,
576
if reached_stop_revision_id or rev_id == stop_revision_id:
577
# only do the merged revs of rev_id from now on
578
rev = self.repository.get_revision(rev_id)
580
reached_stop_revision_id = True
581
revision_id_whitelist.extend(rev.parent_ids)
475
yield rev_id, depth, revno, end_of_merge
583
477
raise ValueError('invalid stop_rule %r' % stop_rule)
585
def _filter_start_non_ancestors(self, rev_iter):
586
# If we started from a dotted revno, we want to consider it as a tip
587
# and don't want to yield revisions that are not part of its
588
# ancestry. Given the order guaranteed by the merge sort, we will see
589
# uninteresting descendants of the first parent of our tip before the
591
first = rev_iter.next()
592
(rev_id, merge_depth, revno, end_of_merge) = first
595
# We start at a mainline revision so by definition, all others
596
# revisions in rev_iter are ancestors
597
for node in rev_iter:
602
pmap = self.repository.get_parent_map([rev_id])
603
parents = pmap.get(rev_id, [])
605
whitelist.update(parents)
607
# If there is no parents, there is nothing of interest left
609
# FIXME: It's hard to test this scenario here as this code is never
610
# called in that case. -- vila 20100322
613
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
615
if rev_id in whitelist:
616
pmap = self.repository.get_parent_map([rev_id])
617
parents = pmap.get(rev_id, [])
618
whitelist.remove(rev_id)
619
whitelist.update(parents)
621
# We've reached the mainline, there is nothing left to
625
# A revision that is not part of the ancestry of our
628
yield (rev_id, merge_depth, revno, end_of_merge)
630
479
def leave_lock_in_place(self):
631
480
"""Tell this branch object not to release the physical lock when this
632
481
object is unlocked.
835
630
except (errors.NotStacked, errors.UnstackableBranchFormat,
836
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,
840
self._activate_fallback_location(url)
649
self._activate_fallback_location(url, 'write')
841
650
# write this out after the repository is stacked to avoid setting a
842
651
# stacked config that doesn't work.
843
652
self._set_config_location('stacked_on_location', url)
846
"""Change a branch to be unstacked, copying data as needed.
848
Don't call this directly, use set_stacked_on_url(None).
850
pb = ui.ui_factory.nested_progress_bar()
852
pb.update("Unstacking")
853
# The basic approach here is to fetch the tip of the branch,
854
# including all available ghosts, from the existing stacked
855
# repository into a new repository object without the fallbacks.
857
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
858
# correct for CHKMap repostiories
859
old_repository = self.repository
860
if len(old_repository._fallback_repositories) != 1:
861
raise AssertionError("can't cope with fallback repositories "
862
"of %r (fallbacks: %r)" % (old_repository,
863
old_repository._fallback_repositories))
864
# Open the new repository object.
865
# Repositories don't offer an interface to remove fallback
866
# repositories today; take the conceptually simpler option and just
867
# reopen it. We reopen it starting from the URL so that we
868
# get a separate connection for RemoteRepositories and can
869
# stream from one of them to the other. This does mean doing
870
# separate SSH connection setup, but unstacking is not a
871
# common operation so it's tolerable.
872
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
873
new_repository = new_bzrdir.find_repository()
874
if new_repository._fallback_repositories:
875
raise AssertionError("didn't expect %r to have "
876
"fallback_repositories"
877
% (self.repository,))
878
# Replace self.repository with the new repository.
879
# Do our best to transfer the lock state (i.e. lock-tokens and
880
# lock count) of self.repository to the new repository.
881
lock_token = old_repository.lock_write().repository_token
882
self.repository = new_repository
883
if isinstance(self, remote.RemoteBranch):
884
# Remote branches can have a second reference to the old
885
# repository that need to be replaced.
886
if self._real_branch is not None:
887
self._real_branch.repository = new_repository
888
self.repository.lock_write(token=lock_token)
889
if lock_token is not None:
890
old_repository.leave_lock_in_place()
891
old_repository.unlock()
892
if lock_token is not None:
893
# XXX: self.repository.leave_lock_in_place() before this
894
# function will not be preserved. Fortunately that doesn't
895
# affect the current default format (2a), and would be a
896
# corner-case anyway.
897
# - Andrew Bennetts, 2010/06/30
898
self.repository.dont_leave_lock_in_place()
902
old_repository.unlock()
903
except errors.LockNotHeld:
906
if old_lock_count == 0:
907
raise AssertionError(
908
'old_repository should have been locked at least once.')
909
for i in range(old_lock_count-1):
910
self.repository.lock_write()
911
# Fetch from the old repository into the new.
912
old_repository.lock_read()
914
# XXX: If you unstack a branch while it has a working tree
915
# with a pending merge, the pending-merged revisions will no
916
# longer be present. You can (probably) revert and remerge.
918
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
919
except errors.TagsNotSupported:
920
tags_to_fetch = set()
921
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
922
old_repository, required_ids=[self.last_revision()],
923
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
924
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
926
old_repository.unlock()
930
655
def _set_tags_bytes(self, bytes):
931
656
"""Mirror method for _get_tags_bytes.
933
658
:seealso: Branch._get_tags_bytes.
935
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked)
936
op.add_cleanup(self.lock_write().unlock)
937
return op.run_simple(bytes)
939
def _set_tags_bytes_locked(self, bytes):
940
self._tags_bytes = bytes
941
return self._transport.put_bytes('tags', bytes)
660
return _run_with_write_locked_target(self, self._transport.put_bytes,
943
663
def _cache_revision_history(self, rev_history):
944
664
"""Set the cached revision history to rev_history.
1364
1092
Callers will typically also want to check the repository.
1366
:param refs: Calculated refs for this branch as specified by
1367
branch._get_check_refs()
1368
1094
:return: A BranchCheckResult.
1370
result = BranchCheckResult(self)
1096
mainline_parent_id = None
1371
1097
last_revno, last_revision_id = self.last_revision_info()
1372
actual_revno = refs[('lefthand-distance', last_revision_id)]
1373
if actual_revno != last_revno:
1374
result.errors.append(errors.BzrCheckError(
1375
'revno does not match len(mainline) %s != %s' % (
1376
last_revno, actual_revno)))
1377
# TODO: We should probably also check that self.revision_history
1378
# matches the repository for older branch formats.
1379
# If looking for the code that cross-checks repository parents against
1380
# 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)
1384
1123
def _get_checkout_format(self):
1385
1124
"""Return the most suitable metadir for a checkout of this branch.
1386
1125
Weaves are used if this branch's repository uses weaves.
1388
format = self.repository.bzrdir.checkout_metadir()
1389
format.set_branch_format(self._format)
1127
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1128
from bzrlib.repofmt import weaverepo
1129
format = bzrdir.BzrDirMetaFormat1()
1130
format.repository_format = weaverepo.RepositoryFormat7()
1132
format = self.repository.bzrdir.checkout_metadir()
1133
format.set_branch_format(self._format)
1392
1136
def create_clone_on_transport(self, to_transport, revision_id=None,
1393
stacked_on=None, create_prefix=False, use_existing_dir=False,
1137
stacked_on=None, create_prefix=False, use_existing_dir=False):
1395
1138
"""Create a clone of this branch and its bzrdir.
1397
1140
:param to_transport: The transport to clone onto.
1812
1496
"basis revision. hooks MUST NOT modify this delta. "
1813
1497
" future_tree is an in-memory tree obtained from "
1814
1498
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1816
self.add_hook('post_commit',
1499
"tree.", (0,91), None))
1500
self.create_hook(HookPoint('post_commit',
1817
1501
"Called in the bzr client after a commit has completed. "
1818
1502
"post_commit is called with (local, master, old_revno, old_revid, "
1819
1503
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1820
"commit to a branch.", (0, 15))
1821
self.add_hook('post_uncommit',
1504
"commit to a branch.", (0, 15), None))
1505
self.create_hook(HookPoint('post_uncommit',
1822
1506
"Called in the bzr client after an uncommit completes. "
1823
1507
"post_uncommit is called with (local, master, old_revno, "
1824
1508
"old_revid, new_revno, new_revid) where local is the local branch "
1825
1509
"or None, master is the target branch, and an empty branch "
1826
"receives new_revno of 0, new_revid of None.", (0, 15))
1827
self.add_hook('pre_change_branch_tip',
1510
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1511
self.create_hook(HookPoint('pre_change_branch_tip',
1828
1512
"Called in bzr client and server before a change to the tip of a "
1829
1513
"branch is made. pre_change_branch_tip is called with a "
1830
1514
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1831
"commit, uncommit will all trigger this hook.", (1, 6))
1832
self.add_hook('post_change_branch_tip',
1515
"commit, uncommit will all trigger this hook.", (1, 6), None))
1516
self.create_hook(HookPoint('post_change_branch_tip',
1833
1517
"Called in bzr client and server after a change to the tip of a "
1834
1518
"branch is made. post_change_branch_tip is called with a "
1835
1519
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1836
"commit, uncommit will all trigger this hook.", (1, 4))
1837
self.add_hook('transform_fallback_location',
1520
"commit, uncommit will all trigger this hook.", (1, 4), None))
1521
self.create_hook(HookPoint('transform_fallback_location',
1838
1522
"Called when a stacked branch is activating its fallback "
1839
1523
"locations. transform_fallback_location is called with (branch, "
1840
1524
"url), and should return a new url. Returning the same url "
1907
1574
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1910
class BranchInitHookParams(object):
1911
"""Object holding parameters passed to `*_branch_init` hooks.
1913
There are 4 fields that hooks may wish to access:
1915
:ivar format: the branch format
1916
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1917
:ivar name: name of colocated branch, if any (or None)
1918
:ivar branch: the branch created
1920
Note that for lightweight checkouts, the bzrdir and format fields refer to
1921
the checkout, hence they are different from the corresponding fields in
1922
branch, which refer to the original branch.
1925
def __init__(self, format, a_bzrdir, name, branch):
1926
"""Create a group of BranchInitHook parameters.
1928
:param format: the branch format
1929
:param a_bzrdir: the BzrDir where the branch will be/has been
1931
:param name: name of colocated branch, if any (or None)
1932
:param branch: the branch created
1934
Note that for lightweight checkouts, the bzrdir and format fields refer
1935
to the checkout, hence they are different from the corresponding fields
1936
in branch, which refer to the original branch.
1938
self.format = format
1939
self.bzrdir = a_bzrdir
1941
self.branch = branch
1943
def __eq__(self, other):
1944
return self.__dict__ == other.__dict__
1947
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1950
class SwitchHookParams(object):
1951
"""Object holding parameters passed to `*_switch` hooks.
1953
There are 4 fields that hooks may wish to access:
1955
:ivar control_dir: BzrDir of the checkout to change
1956
:ivar to_branch: branch that the checkout is to reference
1957
:ivar force: skip the check for local commits in a heavy checkout
1958
:ivar revision_id: revision ID to switch to (or None)
1961
def __init__(self, control_dir, to_branch, force, revision_id):
1962
"""Create a group of SwitchHook parameters.
1964
:param control_dir: BzrDir of the checkout to change
1965
:param to_branch: branch that the checkout is to reference
1966
:param force: skip the check for local commits in a heavy checkout
1967
:param revision_id: revision ID to switch to (or None)
1969
self.control_dir = control_dir
1970
self.to_branch = to_branch
1972
self.revision_id = revision_id
1974
def __eq__(self, other):
1975
return self.__dict__ == other.__dict__
1978
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1979
self.control_dir, self.to_branch,
1577
class BzrBranchFormat4(BranchFormat):
1578
"""Bzr branch format 4.
1581
- a revision-history file.
1582
- a branch-lock lock file [ to be shared with the bzrdir ]
1585
def get_format_description(self):
1586
"""See BranchFormat.get_format_description()."""
1587
return "Branch format 4"
1589
def initialize(self, a_bzrdir):
1590
"""Create a branch of this format in a_bzrdir."""
1591
utf8_files = [('revision-history', ''),
1592
('branch-name', ''),
1594
return self._initialize_helper(a_bzrdir, utf8_files,
1595
lock_type='branch4', set_format=False)
1598
super(BzrBranchFormat4, self).__init__()
1599
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1601
def network_name(self):
1602
"""The network name for this format is the control dirs disk label."""
1603
return self._matchingbzrdir.get_format_string()
1605
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1606
"""See BranchFormat.open()."""
1608
# we are being called directly and must probe.
1609
raise NotImplementedError
1610
return BzrBranch(_format=self,
1611
_control_files=a_bzrdir._control_files,
1613
_repository=a_bzrdir.open_repository())
1616
return "Bazaar-NG branch format 4"
1983
1619
class BranchFormatMetadir(BranchFormat):
2500
1999
"""See Branch.print_file."""
2501
2000
return self.repository.print_file(file, revision_id)
2002
def _write_revision_history(self, history):
2003
"""Factored out of set_revision_history.
2005
This performs the actual writing to disk.
2006
It is intended to be called by BzrBranch5.set_revision_history."""
2007
self._transport.put_bytes(
2008
'revision-history', '\n'.join(history),
2009
mode=self.bzrdir._get_file_mode())
2012
def set_revision_history(self, rev_history):
2013
"""See Branch.set_revision_history."""
2014
if 'evil' in debug.debug_flags:
2015
mutter_callsite(3, "set_revision_history scales with history.")
2016
check_not_reserved_id = _mod_revision.check_not_reserved_id
2017
for rev_id in rev_history:
2018
check_not_reserved_id(rev_id)
2019
if Branch.hooks['post_change_branch_tip']:
2020
# Don't calculate the last_revision_info() if there are no hooks
2022
old_revno, old_revid = self.last_revision_info()
2023
if len(rev_history) == 0:
2024
revid = _mod_revision.NULL_REVISION
2026
revid = rev_history[-1]
2027
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2028
self._write_revision_history(rev_history)
2029
self._clear_cached_state()
2030
self._cache_revision_history(rev_history)
2031
for hook in Branch.hooks['set_rh']:
2032
hook(self, rev_history)
2033
if Branch.hooks['post_change_branch_tip']:
2034
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2036
def _synchronize_history(self, destination, revision_id):
2037
"""Synchronize last revision and revision history between branches.
2039
This version is most efficient when the destination is also a
2040
BzrBranch5, but works for BzrBranch6 as long as the revision
2041
history is the true lefthand parent history, and all of the revisions
2042
are in the destination's repository. If not, set_revision_history
2045
:param destination: The branch to copy the history into
2046
:param revision_id: The revision-id to truncate history at. May
2047
be None to copy complete history.
2049
if not isinstance(destination._format, BzrBranchFormat5):
2050
super(BzrBranch, self)._synchronize_history(
2051
destination, revision_id)
2053
if revision_id == _mod_revision.NULL_REVISION:
2056
new_history = self.revision_history()
2057
if revision_id is not None and new_history != []:
2059
new_history = new_history[:new_history.index(revision_id) + 1]
2061
rev = self.repository.get_revision(revision_id)
2062
new_history = rev.get_history(self.repository)[1:]
2063
destination.set_revision_history(new_history)
2503
2065
@needs_write_lock
2504
2066
def set_last_revision_info(self, revno, revision_id):
2505
if not revision_id or not isinstance(revision_id, basestring):
2506
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2067
"""Set the last revision of this branch.
2069
The caller is responsible for checking that the revno is correct
2070
for this revision id.
2072
It may be possible to set the branch last revision to an id not
2073
present in the repository. However, branches can also be
2074
configured to check constraints on history, in which case this may not
2507
2077
revision_id = _mod_revision.ensure_null(revision_id)
2508
old_revno, old_revid = self.last_revision_info()
2509
if self._get_append_revisions_only():
2510
self._check_history_violation(revision_id)
2511
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2512
self._write_last_revision_info(revno, revision_id)
2513
self._clear_cached_state()
2514
self._last_revision_info_cache = revno, revision_id
2515
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2078
# this old format stores the full history, but this api doesn't
2079
# provide it, so we must generate, and might as well check it's
2081
history = self._lefthand_history(revision_id)
2082
if len(history) != revno:
2083
raise AssertionError('%d != %d' % (len(history), revno))
2084
self.set_revision_history(history)
2086
def _gen_revision_history(self):
2087
history = self._transport.get_bytes('revision-history').split('\n')
2088
if history[-1:] == ['']:
2089
# There shouldn't be a trailing newline, but just in case.
2094
def generate_revision_history(self, revision_id, last_rev=None,
2096
"""Create a new revision history that will finish with revision_id.
2098
:param revision_id: the new tip to use.
2099
:param last_rev: The previous last_revision. If not None, then this
2100
must be a ancestory of revision_id, or DivergedBranches is raised.
2101
:param other_branch: The other branch that DivergedBranches should
2102
raise with respect to.
2104
self.set_revision_history(self._lefthand_history(revision_id,
2105
last_rev, other_branch))
2517
2107
def basis_tree(self):
2518
2108
"""See Branch.basis_tree."""
2519
2109
return self.repository.revision_tree(self.last_revision())
2112
def pull(self, source, overwrite=False, stop_revision=None,
2113
_hook_master=None, run_hooks=True, possible_transports=None,
2114
_override_hook_target=None):
2117
:param _hook_master: Private parameter - set the branch to
2118
be supplied as the master to pull hooks.
2119
:param run_hooks: Private parameter - if false, this branch
2120
is being called because it's the master of the primary branch,
2121
so it should not run its hooks.
2122
:param _override_hook_target: Private parameter - set the branch to be
2123
supplied as the target_branch to pull hooks.
2125
result = PullResult()
2126
result.source_branch = source
2127
if _override_hook_target is None:
2128
result.target_branch = self
2130
result.target_branch = _override_hook_target
2133
# We assume that during 'pull' the local repository is closer than
2135
graph = self.repository.get_graph(source.repository)
2136
result.old_revno, result.old_revid = self.last_revision_info()
2137
self.update_revisions(source, stop_revision, overwrite=overwrite,
2139
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2140
result.new_revno, result.new_revid = self.last_revision_info()
2142
result.master_branch = _hook_master
2143
result.local_branch = result.target_branch
2145
result.master_branch = result.target_branch
2146
result.local_branch = None
2148
for hook in Branch.hooks['post_pull']:
2521
2154
def _get_parent_location(self):
2522
2155
_locs = ['parent', 'pull', 'x-pull']
2523
2156
for l in _locs:
2164
def push(self, target, overwrite=False, stop_revision=None,
2165
_override_hook_source_branch=None):
2168
This is the basic concrete implementation of push()
2170
:param _override_hook_source_branch: If specified, run
2171
the hooks passing this Branch as the source, rather than self.
2172
This is for use of RemoteBranch, where push is delegated to the
2173
underlying vfs-based Branch.
2175
# TODO: Public option to disable running hooks - should be trivial but
2177
return _run_with_write_locked_target(
2178
target, self._push_with_bound_branches, target, overwrite,
2180
_override_hook_source_branch=_override_hook_source_branch)
2182
def _push_with_bound_branches(self, target, overwrite,
2184
_override_hook_source_branch=None):
2185
"""Push from self into target, and into target's master if any.
2187
This is on the base BzrBranch class even though it doesn't support
2188
bound branches because the *target* might be bound.
2191
if _override_hook_source_branch:
2192
result.source_branch = _override_hook_source_branch
2193
for hook in Branch.hooks['post_push']:
2196
bound_location = target.get_bound_location()
2197
if bound_location and target.base != bound_location:
2198
# there is a master branch.
2200
# XXX: Why the second check? Is it even supported for a branch to
2201
# be bound to itself? -- mbp 20070507
2202
master_branch = target.get_master_branch()
2203
master_branch.lock_write()
2205
# push into the master from this branch.
2206
self._basic_push(master_branch, overwrite, stop_revision)
2207
# and push into the target branch from this. Note that we push from
2208
# this branch again, because its considered the highest bandwidth
2210
result = self._basic_push(target, overwrite, stop_revision)
2211
result.master_branch = master_branch
2212
result.local_branch = target
2216
master_branch.unlock()
2219
result = self._basic_push(target, overwrite, stop_revision)
2220
# TODO: Why set master_branch and local_branch if there's no
2221
# binding? Maybe cleaner to just leave them unset? -- mbp
2223
result.master_branch = target
2224
result.local_branch = None
2228
def _basic_push(self, target, overwrite, stop_revision):
2229
"""Basic implementation of push without bound branches or hooks.
2231
Must be called with self read locked and target write locked.
2233
result = BranchPushResult()
2234
result.source_branch = self
2235
result.target_branch = target
2236
result.old_revno, result.old_revid = target.last_revision_info()
2237
if result.old_revid != self.last_revision():
2238
# We assume that during 'push' this repository is closer than
2240
graph = self.repository.get_graph(target.repository)
2241
target.update_revisions(self, stop_revision, overwrite=overwrite,
2243
if self._push_should_merge_tags():
2244
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2245
result.new_revno, result.new_revid = target.last_revision_info()
2530
2248
def get_stacked_on_url(self):
2531
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2249
raise errors.UnstackableBranchFormat(self._format, self.base)
2533
2251
def set_push_location(self, location):
2534
2252
"""See Branch.set_push_location."""
2639
def _read_last_revision_info(self):
2640
revision_string = self._transport.get_bytes('last-revision')
2641
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2642
revision_id = cache_utf8.get_cached_utf8(revision_id)
2644
return revno, revision_id
2646
def _write_last_revision_info(self, revno, revision_id):
2647
"""Simply write out the revision id, with no checks.
2649
Use set_last_revision_info to perform this safely.
2651
Does not update the revision_history cache.
2653
revision_id = _mod_revision.ensure_null(revision_id)
2654
out_string = '%d %s\n' % (revno, revision_id)
2655
self._transport.put_bytes('last-revision', out_string,
2656
mode=self.bzrdir._get_file_mode())
2659
class FullHistoryBzrBranch(BzrBranch):
2660
"""Bzr branch which contains the full revision history."""
2663
def set_last_revision_info(self, revno, revision_id):
2664
if not revision_id or not isinstance(revision_id, basestring):
2665
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2666
revision_id = _mod_revision.ensure_null(revision_id)
2667
# this old format stores the full history, but this api doesn't
2668
# provide it, so we must generate, and might as well check it's
2670
history = self._lefthand_history(revision_id)
2671
if len(history) != revno:
2672
raise AssertionError('%d != %d' % (len(history), revno))
2673
self._set_revision_history(history)
2675
def _read_last_revision_info(self):
2676
rh = self.revision_history()
2679
return (revno, rh[-1])
2681
return (0, _mod_revision.NULL_REVISION)
2683
@deprecated_method(deprecated_in((2, 4, 0)))
2685
def set_revision_history(self, rev_history):
2686
"""See Branch.set_revision_history."""
2687
self._set_revision_history(rev_history)
2689
def _set_revision_history(self, rev_history):
2690
if 'evil' in debug.debug_flags:
2691
mutter_callsite(3, "set_revision_history scales with history.")
2692
check_not_reserved_id = _mod_revision.check_not_reserved_id
2693
for rev_id in rev_history:
2694
check_not_reserved_id(rev_id)
2695
if Branch.hooks['post_change_branch_tip']:
2696
# Don't calculate the last_revision_info() if there are no hooks
2698
old_revno, old_revid = self.last_revision_info()
2699
if len(rev_history) == 0:
2700
revid = _mod_revision.NULL_REVISION
2702
revid = rev_history[-1]
2703
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2704
self._write_revision_history(rev_history)
2705
self._clear_cached_state()
2706
self._cache_revision_history(rev_history)
2707
for hook in Branch.hooks['set_rh']:
2708
hook(self, rev_history)
2709
if Branch.hooks['post_change_branch_tip']:
2710
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2712
def _write_revision_history(self, history):
2713
"""Factored out of set_revision_history.
2715
This performs the actual writing to disk.
2716
It is intended to be called by set_revision_history."""
2717
self._transport.put_bytes(
2718
'revision-history', '\n'.join(history),
2719
mode=self.bzrdir._get_file_mode())
2721
def _gen_revision_history(self):
2722
history = self._transport.get_bytes('revision-history').split('\n')
2723
if history[-1:] == ['']:
2724
# There shouldn't be a trailing newline, but just in case.
2728
def _synchronize_history(self, destination, revision_id):
2729
if not isinstance(destination, FullHistoryBzrBranch):
2730
super(BzrBranch, self)._synchronize_history(
2731
destination, revision_id)
2733
if revision_id == _mod_revision.NULL_REVISION:
2736
new_history = self.revision_history()
2737
if revision_id is not None and new_history != []:
2739
new_history = new_history[:new_history.index(revision_id) + 1]
2741
rev = self.repository.get_revision(revision_id)
2742
new_history = rev.get_history(self.repository)[1:]
2743
destination._set_revision_history(new_history)
2746
def generate_revision_history(self, revision_id, last_rev=None,
2748
"""Create a new revision history that will finish with revision_id.
2750
:param revision_id: the new tip to use.
2751
:param last_rev: The previous last_revision. If not None, then this
2752
must be a ancestory of revision_id, or DivergedBranches is raised.
2753
:param other_branch: The other branch that DivergedBranches should
2754
raise with respect to.
2756
self._set_revision_history(self._lefthand_history(revision_id,
2757
last_rev, other_branch))
2760
class BzrBranch5(FullHistoryBzrBranch):
2761
"""A format 5 branch. This supports new features over plain branches.
2763
It has support for a master_branch which is the data for bound branches.
2767
class BzrBranch8(BzrBranch):
2768
"""A branch that stores tree-reference locations."""
2392
class BzrBranch7(BzrBranch5):
2393
"""A branch with support for a fallback repository."""
2770
2395
def _open_hook(self):
2771
2396
if self._ignore_fallbacks:
2783
2408
raise AssertionError(
2784
2409
"'transform_fallback_location' hook %s returned "
2785
2410
"None, not a URL." % hook_name)
2786
self._activate_fallback_location(url)
2411
self._activate_fallback_location(url, None)
2788
2413
def __init__(self, *args, **kwargs):
2789
2414
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2790
super(BzrBranch8, self).__init__(*args, **kwargs)
2415
super(BzrBranch7, self).__init__(*args, **kwargs)
2791
2416
self._last_revision_info_cache = None
2792
self._reference_info = None
2417
self._partial_revision_history_cache = []
2794
2419
def _clear_cached_state(self):
2795
super(BzrBranch8, self)._clear_cached_state()
2420
super(BzrBranch7, self)._clear_cached_state()
2796
2421
self._last_revision_info_cache = None
2797
self._reference_info = None
2422
self._partial_revision_history_cache = []
2424
def _last_revision_info(self):
2425
revision_string = self._transport.get_bytes('last-revision')
2426
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2427
revision_id = cache_utf8.get_cached_utf8(revision_id)
2429
return revno, revision_id
2431
def _write_last_revision_info(self, revno, revision_id):
2432
"""Simply write out the revision id, with no checks.
2434
Use set_last_revision_info to perform this safely.
2436
Does not update the revision_history cache.
2437
Intended to be called by set_last_revision_info and
2438
_write_revision_history.
2440
revision_id = _mod_revision.ensure_null(revision_id)
2441
out_string = '%d %s\n' % (revno, revision_id)
2442
self._transport.put_bytes('last-revision', out_string,
2443
mode=self.bzrdir._get_file_mode())
2446
def set_last_revision_info(self, revno, revision_id):
2447
revision_id = _mod_revision.ensure_null(revision_id)
2448
old_revno, old_revid = self.last_revision_info()
2449
if self._get_append_revisions_only():
2450
self._check_history_violation(revision_id)
2451
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2452
self._write_last_revision_info(revno, revision_id)
2453
self._clear_cached_state()
2454
self._last_revision_info_cache = revno, revision_id
2455
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2457
def _synchronize_history(self, destination, revision_id):
2458
"""Synchronize last revision and revision history between branches.
2460
:see: Branch._synchronize_history
2462
# XXX: The base Branch has a fast implementation of this method based
2463
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2464
# that uses set_revision_history. This class inherits from BzrBranch5,
2465
# but wants the fast implementation, so it calls
2466
# Branch._synchronize_history directly.
2467
Branch._synchronize_history(self, destination, revision_id)
2799
2469
def _check_history_violation(self, revision_id):
2800
current_revid = self.last_revision()
2801
last_revision = _mod_revision.ensure_null(current_revid)
2470
last_revision = _mod_revision.ensure_null(self.last_revision())
2802
2471
if _mod_revision.is_null(last_revision):
2804
graph = self.repository.get_graph()
2805
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2806
if lh_ancestor == current_revid:
2808
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2473
if last_revision not in self._lefthand_history(revision_id):
2474
raise errors.AppendRevisionsOnlyViolation(self.base)
2810
2476
def _gen_revision_history(self):
2811
2477
"""Generate the revision history from last revision
2824
2535
"""Set the parent branch"""
2825
2536
return self._get_config_location('parent_location')
2828
def _set_all_reference_info(self, info_dict):
2829
"""Replace all reference info stored in a branch.
2831
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2834
writer = rio.RioWriter(s)
2835
for key, (tree_path, branch_location) in info_dict.iteritems():
2836
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2837
branch_location=branch_location)
2838
writer.write_stanza(stanza)
2839
self._transport.put_bytes('references', s.getvalue())
2840
self._reference_info = info_dict
2843
def _get_all_reference_info(self):
2844
"""Return all the reference info stored in a branch.
2846
:return: A dict of {file_id: (tree_path, branch_location)}
2848
if self._reference_info is not None:
2849
return self._reference_info
2850
rio_file = self._transport.get('references')
2852
stanzas = rio.read_stanzas(rio_file)
2853
info_dict = dict((s['file_id'], (s['tree_path'],
2854
s['branch_location'])) for s in stanzas)
2857
self._reference_info = info_dict
2860
def set_reference_info(self, file_id, tree_path, branch_location):
2861
"""Set the branch location to use for a tree reference.
2863
:param file_id: The file-id of the tree reference.
2864
:param tree_path: The path of the tree reference in the tree.
2865
:param branch_location: The location of the branch to retrieve tree
2868
info_dict = self._get_all_reference_info()
2869
info_dict[file_id] = (tree_path, branch_location)
2870
if None in (tree_path, branch_location):
2871
if tree_path is not None:
2872
raise ValueError('tree_path must be None when branch_location'
2874
if branch_location is not None:
2875
raise ValueError('branch_location must be None when tree_path'
2877
del info_dict[file_id]
2878
self._set_all_reference_info(info_dict)
2880
def get_reference_info(self, file_id):
2881
"""Get the tree_path and branch_location for a tree reference.
2883
:return: a tuple of (tree_path, branch_location)
2885
return self._get_all_reference_info().get(file_id, (None, None))
2887
def reference_parent(self, file_id, path, possible_transports=None):
2888
"""Return the parent branch for a tree-reference file_id.
2890
:param file_id: The file_id of the tree reference
2891
:param path: The path of the file_id in the tree
2892
:return: A branch associated with the file_id
2894
branch_location = self.get_reference_info(file_id)[1]
2895
if branch_location is None:
2896
return Branch.reference_parent(self, file_id, path,
2897
possible_transports)
2898
branch_location = urlutils.join(self.user_url, branch_location)
2899
return Branch.open(branch_location,
2900
possible_transports=possible_transports)
2902
2538
def set_push_location(self, location):
2903
2539
"""See Branch.set_push_location."""
2904
2540
self._set_config_location('push_location', location)
2906
2542
def set_bound_location(self, location):
2907
2543
"""See Branch.set_push_location."""
2908
self._master_branch_cache = None
2910
2545
config = self.get_config()
2911
2546
if location is None:
3185
2829
_optimisers = []
3186
2830
"""The available optimised InterBranch types."""
3189
def _get_branch_formats_to_test(klass):
3190
"""Return an iterable of format tuples for testing.
3192
:return: An iterable of (from_format, to_format) to use when testing
3193
this InterBranch class. Each InterBranch class should define this
3196
raise NotImplementedError(klass._get_branch_formats_to_test)
3199
def pull(self, overwrite=False, stop_revision=None,
3200
possible_transports=None, local=False):
3201
"""Mirror source into target branch.
3203
The target branch is considered to be 'local', having low latency.
3205
:returns: PullResult instance
3207
raise NotImplementedError(self.pull)
3210
def push(self, overwrite=False, stop_revision=None, lossy=False,
3211
_override_hook_source_branch=None):
3212
"""Mirror the source branch into the target branch.
3214
The source branch is considered to be 'local', having low latency.
3216
raise NotImplementedError(self.push)
3219
def copy_content_into(self, revision_id=None):
3220
"""Copy the content of source into target
3222
revision_id: if not None, the revision history in the new branch will
3223
be truncated to end with revision_id.
3225
raise NotImplementedError(self.copy_content_into)
3228
def fetch(self, stop_revision=None, limit=None):
3231
:param stop_revision: Last revision to fetch
3232
:param limit: Optional rough limit of revisions to fetch
3234
raise NotImplementedError(self.fetch)
2833
def _get_branch_formats_to_test():
2834
"""Return a tuple with the Branch formats to use when testing."""
2835
raise NotImplementedError(self._get_branch_formats_to_test)
2837
def update_revisions(self, stop_revision=None, overwrite=False,
2839
"""Pull in new perfect-fit revisions.
2841
:param stop_revision: Updated until the given revision
2842
:param overwrite: Always set the branch pointer, rather than checking
2843
to see if it is a proper descendant.
2844
:param graph: A Graph object that can be used to query history
2845
information. This can be None.
2848
raise NotImplementedError(self.update_revisions)
3237
2851
class GenericInterBranch(InterBranch):
3238
"""InterBranch implementation that uses public Branch functions."""
2852
"""InterBranch implementation that uses public Branch functions.
2856
def _get_branch_formats_to_test():
2857
return BranchFormat._default_format, BranchFormat._default_format
2859
def update_revisions(self, stop_revision=None, overwrite=False,
2861
"""See InterBranch.update_revisions()."""
2862
self.source.lock_read()
2864
other_revno, other_last_revision = self.source.last_revision_info()
2865
stop_revno = None # unknown
2866
if stop_revision is None:
2867
stop_revision = other_last_revision
2868
if _mod_revision.is_null(stop_revision):
2869
# if there are no commits, we're done.
2871
stop_revno = other_revno
2873
# what's the current last revision, before we fetch [and change it
2875
last_rev = _mod_revision.ensure_null(self.target.last_revision())
2876
# we fetch here so that we don't process data twice in the common
2877
# case of having something to pull, and so that the check for
2878
# already merged can operate on the just fetched graph, which will
2879
# be cached in memory.
2880
self.target.fetch(self.source, stop_revision)
2881
# Check to see if one is an ancestor of the other
2884
graph = self.target.repository.get_graph()
2885
if self.target._check_if_descendant_or_diverged(
2886
stop_revision, last_rev, graph, self.source):
2887
# stop_revision is a descendant of last_rev, but we aren't
2888
# overwriting, so we're done.
2890
if stop_revno is None:
2892
graph = self.target.repository.get_graph()
2893
this_revno, this_last_revision = \
2894
self.target.last_revision_info()
2895
stop_revno = graph.find_distance_to_null(stop_revision,
2896
[(other_last_revision, other_revno),
2897
(this_last_revision, this_revno)])
2898
self.target.set_last_revision_info(stop_revno, stop_revision)
2900
self.source.unlock()
3241
def is_compatible(klass, source, target):
2903
def is_compatible(self, source, target):
3242
2904
# GenericBranch uses the public API, so always compatible
3246
def _get_branch_formats_to_test(klass):
3247
return [(format_registry.get_default(), format_registry.get_default())]
3250
def unwrap_format(klass, format):
3251
if isinstance(format, remote.RemoteBranchFormat):
3252
format._ensure_real()
3253
return format._custom_format
3257
def copy_content_into(self, revision_id=None):
3258
"""Copy the content of source into target
3260
revision_id: if not None, the revision history in the new branch will
3261
be truncated to end with revision_id.
3263
self.source.update_references(self.target)
3264
self.source._synchronize_history(self.target, revision_id)
3266
parent = self.source.get_parent()
3267
except errors.InaccessibleParent, e:
3268
mutter('parent was not accessible to copy: %s', e)
3271
self.target.set_parent(parent)
3272
if self.source._push_should_merge_tags():
3273
self.source.tags.merge_to(self.target.tags)
3276
def fetch(self, stop_revision=None, limit=None):
3277
if self.target.base == self.source.base:
3279
self.source.lock_read()
3281
fetch_spec_factory = fetch.FetchSpecFactory()
3282
fetch_spec_factory.source_branch = self.source
3283
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3284
fetch_spec_factory.source_repo = self.source.repository
3285
fetch_spec_factory.target_repo = self.target.repository
3286
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3287
fetch_spec_factory.limit = limit
3288
fetch_spec = fetch_spec_factory.make_fetch_spec()
3289
return self.target.repository.fetch(self.source.repository,
3290
fetch_spec=fetch_spec)
3292
self.source.unlock()
3295
def _update_revisions(self, stop_revision=None, overwrite=False,
3297
other_revno, other_last_revision = self.source.last_revision_info()
3298
stop_revno = None # unknown
3299
if stop_revision is None:
3300
stop_revision = other_last_revision
3301
if _mod_revision.is_null(stop_revision):
3302
# if there are no commits, we're done.
3304
stop_revno = other_revno
3306
# what's the current last revision, before we fetch [and change it
3308
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3309
# we fetch here so that we don't process data twice in the common
3310
# case of having something to pull, and so that the check for
3311
# already merged can operate on the just fetched graph, which will
3312
# be cached in memory.
3313
self.fetch(stop_revision=stop_revision)
3314
# Check to see if one is an ancestor of the other
3317
graph = self.target.repository.get_graph()
3318
if self.target._check_if_descendant_or_diverged(
3319
stop_revision, last_rev, graph, self.source):
3320
# stop_revision is a descendant of last_rev, but we aren't
3321
# overwriting, so we're done.
3323
if stop_revno is None:
3325
graph = self.target.repository.get_graph()
3326
this_revno, this_last_revision = \
3327
self.target.last_revision_info()
3328
stop_revno = graph.find_distance_to_null(stop_revision,
3329
[(other_last_revision, other_revno),
3330
(this_last_revision, this_revno)])
3331
self.target.set_last_revision_info(stop_revno, stop_revision)
3334
def pull(self, overwrite=False, stop_revision=None,
3335
possible_transports=None, run_hooks=True,
3336
_override_hook_target=None, local=False):
3337
"""Pull from source into self, updating my master if any.
3339
:param run_hooks: Private parameter - if false, this branch
3340
is being called because it's the master of the primary branch,
3341
so it should not run its hooks.
3343
bound_location = self.target.get_bound_location()
3344
if local and not bound_location:
3345
raise errors.LocalRequiresBoundBranch()
3346
master_branch = None
3347
source_is_master = (self.source.user_url == bound_location)
3348
if not local and bound_location and not source_is_master:
3349
# not pulling from master, so we need to update master.
3350
master_branch = self.target.get_master_branch(possible_transports)
3351
master_branch.lock_write()
3354
# pull from source into master.
3355
master_branch.pull(self.source, overwrite, stop_revision,
3357
return self._pull(overwrite,
3358
stop_revision, _hook_master=master_branch,
3359
run_hooks=run_hooks,
3360
_override_hook_target=_override_hook_target,
3361
merge_tags_to_master=not source_is_master)
3364
master_branch.unlock()
3366
def push(self, overwrite=False, stop_revision=None, lossy=False,
3367
_override_hook_source_branch=None):
3368
"""See InterBranch.push.
3370
This is the basic concrete implementation of push()
3372
:param _override_hook_source_branch: If specified, run the hooks
3373
passing this Branch as the source, rather than self. This is for
3374
use of RemoteBranch, where push is delegated to the underlying
3378
raise errors.LossyPushToSameVCS(self.source, self.target)
3379
# TODO: Public option to disable running hooks - should be trivial but
3382
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3383
op.add_cleanup(self.source.lock_read().unlock)
3384
op.add_cleanup(self.target.lock_write().unlock)
3385
return op.run(overwrite, stop_revision,
3386
_override_hook_source_branch=_override_hook_source_branch)
3388
def _basic_push(self, overwrite, stop_revision):
3389
"""Basic implementation of push without bound branches or hooks.
3391
Must be called with source read locked and target write locked.
3393
result = BranchPushResult()
3394
result.source_branch = self.source
3395
result.target_branch = self.target
3396
result.old_revno, result.old_revid = self.target.last_revision_info()
3397
self.source.update_references(self.target)
3398
if result.old_revid != stop_revision:
3399
# We assume that during 'push' this repository is closer than
3401
graph = self.source.repository.get_graph(self.target.repository)
3402
self._update_revisions(stop_revision, overwrite=overwrite,
3404
if self.source._push_should_merge_tags():
3405
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3407
result.new_revno, result.new_revid = self.target.last_revision_info()
3410
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3411
_override_hook_source_branch=None):
3412
"""Push from source into target, and into target's master if any.
3415
if _override_hook_source_branch:
3416
result.source_branch = _override_hook_source_branch
3417
for hook in Branch.hooks['post_push']:
3420
bound_location = self.target.get_bound_location()
3421
if bound_location and self.target.base != bound_location:
3422
# there is a master branch.
3424
# XXX: Why the second check? Is it even supported for a branch to
3425
# be bound to itself? -- mbp 20070507
3426
master_branch = self.target.get_master_branch()
3427
master_branch.lock_write()
3428
operation.add_cleanup(master_branch.unlock)
3429
# push into the master from the source branch.
3430
master_inter = InterBranch.get(self.source, master_branch)
3431
master_inter._basic_push(overwrite, stop_revision)
3432
# and push into the target branch from the source. Note that
3433
# we push from the source branch again, because it's considered
3434
# the highest bandwidth repository.
3435
result = self._basic_push(overwrite, stop_revision)
3436
result.master_branch = master_branch
3437
result.local_branch = self.target
3439
master_branch = None
3441
result = self._basic_push(overwrite, stop_revision)
3442
# TODO: Why set master_branch and local_branch if there's no
3443
# binding? Maybe cleaner to just leave them unset? -- mbp
3445
result.master_branch = self.target
3446
result.local_branch = None
3450
def _pull(self, overwrite=False, stop_revision=None,
3451
possible_transports=None, _hook_master=None, run_hooks=True,
3452
_override_hook_target=None, local=False,
3453
merge_tags_to_master=True):
3456
This function is the core worker, used by GenericInterBranch.pull to
3457
avoid duplication when pulling source->master and source->local.
3459
:param _hook_master: Private parameter - set the branch to
3460
be supplied as the master to pull hooks.
3461
:param run_hooks: Private parameter - if false, this branch
3462
is being called because it's the master of the primary branch,
3463
so it should not run its hooks.
3464
is being called because it's the master of the primary branch,
3465
so it should not run its hooks.
3466
:param _override_hook_target: Private parameter - set the branch to be
3467
supplied as the target_branch to pull hooks.
3468
:param local: Only update the local branch, and not the bound branch.
3470
# This type of branch can't be bound.
3472
raise errors.LocalRequiresBoundBranch()
3473
result = PullResult()
3474
result.source_branch = self.source
3475
if _override_hook_target is None:
3476
result.target_branch = self.target
3478
result.target_branch = _override_hook_target
3479
self.source.lock_read()
3481
# We assume that during 'pull' the target repository is closer than
3483
self.source.update_references(self.target)
3484
graph = self.target.repository.get_graph(self.source.repository)
3485
# TODO: Branch formats should have a flag that indicates
3486
# that revno's are expensive, and pull() should honor that flag.
3488
result.old_revno, result.old_revid = \
3489
self.target.last_revision_info()
3490
self._update_revisions(stop_revision, overwrite=overwrite,
3492
# TODO: The old revid should be specified when merging tags,
3493
# so a tags implementation that versions tags can only
3494
# pull in the most recent changes. -- JRV20090506
3495
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3496
overwrite, ignore_master=not merge_tags_to_master)
3497
result.new_revno, result.new_revid = self.target.last_revision_info()
3499
result.master_branch = _hook_master
3500
result.local_branch = result.target_branch
3502
result.master_branch = result.target_branch
3503
result.local_branch = None
3505
for hook in Branch.hooks['post_pull']:
3508
self.source.unlock()
3512
2908
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
