490
462
"""Iterate over an inclusive range of sorted revisions."""
491
463
rev_iter = iter(merge_sorted_revisions)
492
464
if start_revision_id is not None:
493
for node in rev_iter:
494
rev_id = node.key[-1]
465
for rev_id, depth, revno, end_of_merge in rev_iter:
495
466
if rev_id != start_revision_id:
498
469
# The decision to include the start or not
499
470
# depends on the stop_rule if a stop is provided
500
# so pop this node back into the iterator
501
rev_iter = chain(iter([node]), rev_iter)
472
iter([(rev_id, depth, revno, end_of_merge)]),
503
475
if stop_revision_id is None:
505
for node in rev_iter:
506
rev_id = node.key[-1]
507
yield (rev_id, node.merge_depth, node.revno,
476
for rev_id, depth, revno, end_of_merge in rev_iter:
477
yield rev_id, depth, revno, end_of_merge
509
478
elif stop_rule == 'exclude':
510
for node in rev_iter:
511
rev_id = node.key[-1]
479
for rev_id, depth, revno, end_of_merge in rev_iter:
512
480
if rev_id == stop_revision_id:
514
yield (rev_id, node.merge_depth, node.revno,
482
yield rev_id, depth, revno, end_of_merge
516
483
elif stop_rule == 'include':
517
for node in rev_iter:
518
rev_id = node.key[-1]
519
yield (rev_id, node.merge_depth, node.revno,
484
for rev_id, depth, revno, end_of_merge in rev_iter:
485
yield rev_id, depth, revno, end_of_merge
521
486
if rev_id == stop_revision_id:
523
elif stop_rule == 'with-merges-without-common-ancestry':
524
# We want to exclude all revisions that are already part of the
525
# stop_revision_id ancestry.
526
graph = self.repository.get_graph()
527
ancestors = graph.find_unique_ancestors(start_revision_id,
529
for node in rev_iter:
530
rev_id = node.key[-1]
531
if rev_id not in ancestors:
533
yield (rev_id, node.merge_depth, node.revno,
535
488
elif stop_rule == 'with-merges':
536
489
stop_rev = self.repository.get_revision(stop_revision_id)
537
490
if stop_rev.parent_ids:
538
491
left_parent = stop_rev.parent_ids[0]
540
493
left_parent = _mod_revision.NULL_REVISION
541
# left_parent is the actual revision we want to stop logging at,
542
# since we want to show the merged revisions after the stop_rev too
543
reached_stop_revision_id = False
544
revision_id_whitelist = []
545
for node in rev_iter:
546
rev_id = node.key[-1]
494
for rev_id, depth, revno, end_of_merge in rev_iter:
547
495
if rev_id == left_parent:
548
# reached the left parent after the stop_revision
550
if (not reached_stop_revision_id or
551
rev_id in revision_id_whitelist):
552
yield (rev_id, node.merge_depth, node.revno,
554
if reached_stop_revision_id or rev_id == stop_revision_id:
555
# only do the merged revs of rev_id from now on
556
rev = self.repository.get_revision(rev_id)
558
reached_stop_revision_id = True
559
revision_id_whitelist.extend(rev.parent_ids)
497
yield rev_id, depth, revno, end_of_merge
561
499
raise ValueError('invalid stop_rule %r' % stop_rule)
563
def _filter_start_non_ancestors(self, rev_iter):
564
# If we started from a dotted revno, we want to consider it as a tip
565
# and don't want to yield revisions that are not part of its
566
# ancestry. Given the order guaranteed by the merge sort, we will see
567
# uninteresting descendants of the first parent of our tip before the
569
first = rev_iter.next()
570
(rev_id, merge_depth, revno, end_of_merge) = first
573
# We start at a mainline revision so by definition, all others
574
# revisions in rev_iter are ancestors
575
for node in rev_iter:
580
pmap = self.repository.get_parent_map([rev_id])
581
parents = pmap.get(rev_id, [])
583
whitelist.update(parents)
585
# If there is no parents, there is nothing of interest left
587
# FIXME: It's hard to test this scenario here as this code is never
588
# called in that case. -- vila 20100322
591
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
593
if rev_id in whitelist:
594
pmap = self.repository.get_parent_map([rev_id])
595
parents = pmap.get(rev_id, [])
596
whitelist.remove(rev_id)
597
whitelist.update(parents)
599
# We've reached the mainline, there is nothing left to
603
# A revision that is not part of the ancestry of our
606
yield (rev_id, merge_depth, revno, end_of_merge)
608
501
def leave_lock_in_place(self):
609
502
"""Tell this branch object not to release the physical lock when this
610
503
object is unlocked.
780
670
except (errors.NotStacked, errors.UnstackableBranchFormat,
781
671
errors.UnstackableRepositoryFormat):
674
# XXX: Lock correctness - should unlock our old repo if we were
676
# repositories don't offer an interface to remove fallback
677
# repositories today; take the conceptually simpler option and just
679
self.repository = self.bzrdir.find_repository()
680
self.repository.lock_write()
681
# for every revision reference the branch has, ensure it is pulled
683
source_repository = self._get_fallback_repository(old_url)
684
for revision_id in chain([self.last_revision()],
685
self.tags.get_reverse_tag_dict()):
686
self.repository.fetch(source_repository, revision_id,
785
689
self._activate_fallback_location(url)
786
690
# write this out after the repository is stacked to avoid setting a
787
691
# stacked config that doesn't work.
788
692
self._set_config_location('stacked_on_location', url)
791
"""Change a branch to be unstacked, copying data as needed.
793
Don't call this directly, use set_stacked_on_url(None).
795
pb = ui.ui_factory.nested_progress_bar()
797
pb.update("Unstacking")
798
# The basic approach here is to fetch the tip of the branch,
799
# including all available ghosts, from the existing stacked
800
# repository into a new repository object without the fallbacks.
802
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
803
# correct for CHKMap repostiories
804
old_repository = self.repository
805
if len(old_repository._fallback_repositories) != 1:
806
raise AssertionError("can't cope with fallback repositories "
807
"of %r" % (self.repository,))
808
# Open the new repository object.
809
# Repositories don't offer an interface to remove fallback
810
# repositories today; take the conceptually simpler option and just
811
# reopen it. We reopen it starting from the URL so that we
812
# get a separate connection for RemoteRepositories and can
813
# stream from one of them to the other. This does mean doing
814
# separate SSH connection setup, but unstacking is not a
815
# common operation so it's tolerable.
816
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
817
new_repository = new_bzrdir.find_repository()
818
if new_repository._fallback_repositories:
819
raise AssertionError("didn't expect %r to have "
820
"fallback_repositories"
821
% (self.repository,))
822
# Replace self.repository with the new repository.
823
# Do our best to transfer the lock state (i.e. lock-tokens and
824
# lock count) of self.repository to the new repository.
825
lock_token = old_repository.lock_write().repository_token
826
self.repository = new_repository
827
if isinstance(self, remote.RemoteBranch):
828
# Remote branches can have a second reference to the old
829
# repository that need to be replaced.
830
if self._real_branch is not None:
831
self._real_branch.repository = new_repository
832
self.repository.lock_write(token=lock_token)
833
if lock_token is not None:
834
old_repository.leave_lock_in_place()
835
old_repository.unlock()
836
if lock_token is not None:
837
# XXX: self.repository.leave_lock_in_place() before this
838
# function will not be preserved. Fortunately that doesn't
839
# affect the current default format (2a), and would be a
840
# corner-case anyway.
841
# - Andrew Bennetts, 2010/06/30
842
self.repository.dont_leave_lock_in_place()
846
old_repository.unlock()
847
except errors.LockNotHeld:
850
if old_lock_count == 0:
851
raise AssertionError(
852
'old_repository should have been locked at least once.')
853
for i in range(old_lock_count-1):
854
self.repository.lock_write()
855
# Fetch from the old repository into the new.
856
old_repository.lock_read()
858
# XXX: If you unstack a branch while it has a working tree
859
# with a pending merge, the pending-merged revisions will no
860
# longer be present. You can (probably) revert and remerge.
862
# XXX: This only fetches up to the tip of the repository; it
863
# doesn't bring across any tags. That's fairly consistent
864
# with how branch works, but perhaps not ideal.
865
self.repository.fetch(old_repository,
866
revision_id=self.last_revision(),
869
old_repository.unlock()
873
695
def _set_tags_bytes(self, bytes):
874
696
"""Mirror method for _get_tags_bytes.
1340
1179
Callers will typically also want to check the repository.
1342
:param refs: Calculated refs for this branch as specified by
1343
branch._get_check_refs()
1344
1181
:return: A BranchCheckResult.
1346
result = BranchCheckResult(self)
1183
ret = BranchCheckResult(self)
1184
mainline_parent_id = None
1347
1185
last_revno, last_revision_id = self.last_revision_info()
1348
actual_revno = refs[('lefthand-distance', last_revision_id)]
1349
if actual_revno != last_revno:
1350
result.errors.append(errors.BzrCheckError(
1351
'revno does not match len(mainline) %s != %s' % (
1352
last_revno, actual_revno)))
1353
# TODO: We should probably also check that self.revision_history
1354
# matches the repository for older branch formats.
1355
# If looking for the code that cross-checks repository parents against
1356
# the iter_reverse_revision_history output, that is now a repository
1186
real_rev_history = []
1188
for revid in self.repository.iter_reverse_revision_history(
1190
real_rev_history.append(revid)
1191
except errors.RevisionNotPresent:
1192
ret.ghosts_in_mainline = True
1194
ret.ghosts_in_mainline = False
1195
real_rev_history.reverse()
1196
if len(real_rev_history) != last_revno:
1197
raise errors.BzrCheckError('revno does not match len(mainline)'
1198
' %s != %s' % (last_revno, len(real_rev_history)))
1199
# TODO: We should probably also check that real_rev_history actually
1200
# matches self.revision_history()
1201
for revision_id in real_rev_history:
1203
revision = self.repository.get_revision(revision_id)
1204
except errors.NoSuchRevision, e:
1205
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1207
# In general the first entry on the revision history has no parents.
1208
# But it's not illegal for it to have parents listed; this can happen
1209
# in imports from Arch when the parents weren't reachable.
1210
if mainline_parent_id is not None:
1211
if mainline_parent_id not in revision.parent_ids:
1212
raise errors.BzrCheckError("previous revision {%s} not listed among "
1214
% (mainline_parent_id, revision_id))
1215
mainline_parent_id = revision_id
1360
1218
def _get_checkout_format(self):
1361
1219
"""Return the most suitable metadir for a checkout of this branch.
1613
1444
"""Return the short format description for this format."""
1614
1445
raise NotImplementedError(self.get_format_description)
1616
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1617
hooks = Branch.hooks['post_branch_init']
1620
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1624
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1625
lock_type='metadir', set_format=True):
1447
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1626
1449
"""Initialize a branch in a bzrdir, with specified files
1628
1451
:param a_bzrdir: The bzrdir to initialize the branch in
1629
1452
:param utf8_files: The files to create as a list of
1630
1453
(filename, content) tuples
1631
:param name: Name of colocated branch to create, if any
1632
1454
:param set_format: If True, set the format with
1633
1455
self.get_format_string. (BzrBranch4 has its format set
1635
1457
:return: a branch in this format
1637
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1638
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1459
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1460
branch_transport = a_bzrdir.get_branch_transport(self)
1640
1462
'metadir': ('lock', lockdir.LockDir),
1641
1463
'branch4': ('branch-lock', lockable_files.TransportLock),
1921
1684
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1924
class BranchInitHookParams(object):
1925
"""Object holding parameters passed to *_branch_init hooks.
1927
There are 4 fields that hooks may wish to access:
1929
:ivar format: the branch format
1930
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1931
:ivar name: name of colocated branch, if any (or None)
1932
:ivar branch: the branch created
1934
Note that for lightweight checkouts, the bzrdir and format fields refer to
1935
the checkout, hence they are different from the corresponding fields in
1936
branch, which refer to the original branch.
1939
def __init__(self, format, a_bzrdir, name, branch):
1940
"""Create a group of BranchInitHook parameters.
1942
:param format: the branch format
1943
:param a_bzrdir: the BzrDir where the branch will be/has been
1945
:param name: name of colocated branch, if any (or None)
1946
:param branch: the branch created
1948
Note that for lightweight checkouts, the bzrdir and format fields refer
1949
to the checkout, hence they are different from the corresponding fields
1950
in branch, which refer to the original branch.
1952
self.format = format
1953
self.bzrdir = a_bzrdir
1955
self.branch = branch
1957
def __eq__(self, other):
1958
return self.__dict__ == other.__dict__
1962
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1964
return "<%s of format:%s bzrdir:%s>" % (
1965
self.__class__.__name__, self.branch,
1966
self.format, self.bzrdir)
1969
class SwitchHookParams(object):
1970
"""Object holding parameters passed to *_switch hooks.
1972
There are 4 fields that hooks may wish to access:
1974
:ivar control_dir: BzrDir of the checkout to change
1975
:ivar to_branch: branch that the checkout is to reference
1976
:ivar force: skip the check for local commits in a heavy checkout
1977
:ivar revision_id: revision ID to switch to (or None)
1980
def __init__(self, control_dir, to_branch, force, revision_id):
1981
"""Create a group of SwitchHook parameters.
1983
:param control_dir: BzrDir of the checkout to change
1984
:param to_branch: branch that the checkout is to reference
1985
:param force: skip the check for local commits in a heavy checkout
1986
:param revision_id: revision ID to switch to (or None)
1988
self.control_dir = control_dir
1989
self.to_branch = to_branch
1991
self.revision_id = revision_id
1993
def __eq__(self, other):
1994
return self.__dict__ == other.__dict__
1997
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1998
self.control_dir, self.to_branch,
2002
1687
class BzrBranchFormat4(BranchFormat):
2003
1688
"""Bzr branch format 4.
2252
1935
"""See BranchFormat.get_format_description()."""
2253
1936
return "Checkout reference format 1"
2255
def get_reference(self, a_bzrdir, name=None):
1938
def get_reference(self, a_bzrdir):
2256
1939
"""See BranchFormat.get_reference()."""
2257
transport = a_bzrdir.get_branch_transport(None, name=name)
2258
return transport.get_bytes('location')
1940
transport = a_bzrdir.get_branch_transport(None)
1941
return transport.get('location').read()
2260
def set_reference(self, a_bzrdir, name, to_branch):
1943
def set_reference(self, a_bzrdir, to_branch):
2261
1944
"""See BranchFormat.set_reference()."""
2262
transport = a_bzrdir.get_branch_transport(None, name=name)
1945
transport = a_bzrdir.get_branch_transport(None)
2263
1946
location = transport.put_bytes('location', to_branch.base)
2265
def initialize(self, a_bzrdir, name=None, target_branch=None):
1948
def initialize(self, a_bzrdir, target_branch=None):
2266
1949
"""Create a branch of this format in a_bzrdir."""
2267
1950
if target_branch is None:
2268
1951
# this format does not implement branch itself, thus the implicit
2269
1952
# creation contract must see it as uninitializable
2270
1953
raise errors.UninitializableFormat(self)
2271
mutter('creating branch reference in %s', a_bzrdir.user_url)
2272
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1954
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1955
branch_transport = a_bzrdir.get_branch_transport(self)
2273
1956
branch_transport.put_bytes('location',
2274
target_branch.bzrdir.user_url)
1957
target_branch.bzrdir.root_transport.base)
2275
1958
branch_transport.put_bytes('format', self.get_format_string())
2277
a_bzrdir, name, _found=True,
1960
a_bzrdir, _found=True,
2278
1961
possible_transports=[target_branch.bzrdir.root_transport])
2279
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2282
1963
def __init__(self):
2283
1964
super(BranchReferenceFormat, self).__init__()
3317
2946
class GenericInterBranch(InterBranch):
3318
"""InterBranch implementation that uses public Branch functions."""
3321
def is_compatible(klass, source, target):
3322
# GenericBranch uses the public API, so always compatible
3326
def _get_branch_formats_to_test(klass):
3327
return [(BranchFormat._default_format, BranchFormat._default_format)]
3330
def unwrap_format(klass, format):
3331
if isinstance(format, remote.RemoteBranchFormat):
3332
format._ensure_real()
3333
return format._custom_format
3337
def copy_content_into(self, revision_id=None):
3338
"""Copy the content of source into target
3340
revision_id: if not None, the revision history in the new branch will
3341
be truncated to end with revision_id.
3343
self.source.update_references(self.target)
3344
self.source._synchronize_history(self.target, revision_id)
3346
parent = self.source.get_parent()
3347
except errors.InaccessibleParent, e:
3348
mutter('parent was not accessible to copy: %s', e)
3351
self.target.set_parent(parent)
3352
if self.source._push_should_merge_tags():
3353
self.source.tags.merge_to(self.target.tags)
2947
"""InterBranch implementation that uses public Branch functions.
2951
def _get_branch_formats_to_test():
2952
return BranchFormat._default_format, BranchFormat._default_format
3356
2954
def update_revisions(self, stop_revision=None, overwrite=False,
3358
2956
"""See InterBranch.update_revisions()."""
3359
other_revno, other_last_revision = self.source.last_revision_info()
3360
stop_revno = None # unknown
3361
if stop_revision is None:
3362
stop_revision = other_last_revision
3363
if _mod_revision.is_null(stop_revision):
3364
# if there are no commits, we're done.
3366
stop_revno = other_revno
3368
# what's the current last revision, before we fetch [and change it
3370
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3371
# we fetch here so that we don't process data twice in the common
3372
# case of having something to pull, and so that the check for
3373
# already merged can operate on the just fetched graph, which will
3374
# be cached in memory.
3375
self.target.fetch(self.source, stop_revision)
3376
# Check to see if one is an ancestor of the other
3379
graph = self.target.repository.get_graph()
3380
if self.target._check_if_descendant_or_diverged(
3381
stop_revision, last_rev, graph, self.source):
3382
# stop_revision is a descendant of last_rev, but we aren't
3383
# overwriting, so we're done.
3385
if stop_revno is None:
3387
graph = self.target.repository.get_graph()
3388
this_revno, this_last_revision = \
3389
self.target.last_revision_info()
3390
stop_revno = graph.find_distance_to_null(stop_revision,
3391
[(other_last_revision, other_revno),
3392
(this_last_revision, this_revno)])
3393
self.target.set_last_revision_info(stop_revno, stop_revision)
2957
self.source.lock_read()
2959
other_revno, other_last_revision = self.source.last_revision_info()
2960
stop_revno = None # unknown
2961
if stop_revision is None:
2962
stop_revision = other_last_revision
2963
if _mod_revision.is_null(stop_revision):
2964
# if there are no commits, we're done.
2966
stop_revno = other_revno
2968
# what's the current last revision, before we fetch [and change it
2970
last_rev = _mod_revision.ensure_null(self.target.last_revision())
2971
# we fetch here so that we don't process data twice in the common
2972
# case of having something to pull, and so that the check for
2973
# already merged can operate on the just fetched graph, which will
2974
# be cached in memory.
2975
self.target.fetch(self.source, stop_revision)
2976
# Check to see if one is an ancestor of the other
2979
graph = self.target.repository.get_graph()
2980
if self.target._check_if_descendant_or_diverged(
2981
stop_revision, last_rev, graph, self.source):
2982
# stop_revision is a descendant of last_rev, but we aren't
2983
# overwriting, so we're done.
2985
if stop_revno is None:
2987
graph = self.target.repository.get_graph()
2988
this_revno, this_last_revision = \
2989
self.target.last_revision_info()
2990
stop_revno = graph.find_distance_to_null(stop_revision,
2991
[(other_last_revision, other_revno),
2992
(this_last_revision, this_revno)])
2993
self.target.set_last_revision_info(stop_revno, stop_revision)
2995
self.source.unlock()
3396
2997
def pull(self, overwrite=False, stop_revision=None,
3397
possible_transports=None, run_hooks=True,
2998
possible_transports=None, _hook_master=None, run_hooks=True,
3398
2999
_override_hook_target=None, local=False):
3399
"""Pull from source into self, updating my master if any.
3002
:param _hook_master: Private parameter - set the branch to
3003
be supplied as the master to pull hooks.
3401
3004
:param run_hooks: Private parameter - if false, this branch
3402
3005
is being called because it's the master of the primary branch,
3403
3006
so it should not run its hooks.
3007
:param _override_hook_target: Private parameter - set the branch to be
3008
supplied as the target_branch to pull hooks.
3009
:param local: Only update the local branch, and not the bound branch.
3405
bound_location = self.target.get_bound_location()
3406
if local and not bound_location:
3011
# This type of branch can't be bound.
3407
3013
raise errors.LocalRequiresBoundBranch()
3408
master_branch = None
3409
if not local and bound_location and self.source.user_url != bound_location:
3410
# not pulling from master, so we need to update master.
3411
master_branch = self.target.get_master_branch(possible_transports)
3412
master_branch.lock_write()
3014
result = PullResult()
3015
result.source_branch = self.source
3016
if _override_hook_target is None:
3017
result.target_branch = self.target
3019
result.target_branch = _override_hook_target
3020
self.source.lock_read()
3415
# pull from source into master.
3416
master_branch.pull(self.source, overwrite, stop_revision,
3418
return self._pull(overwrite,
3419
stop_revision, _hook_master=master_branch,
3420
run_hooks=run_hooks,
3421
_override_hook_target=_override_hook_target)
3022
# We assume that during 'pull' the target repository is closer than
3024
self.source.update_references(self.target)
3025
graph = self.target.repository.get_graph(self.source.repository)
3026
# TODO: Branch formats should have a flag that indicates
3027
# that revno's are expensive, and pull() should honor that flag.
3029
result.old_revno, result.old_revid = \
3030
self.target.last_revision_info()
3031
self.target.update_revisions(self.source, stop_revision,
3032
overwrite=overwrite, graph=graph)
3033
# TODO: The old revid should be specified when merging tags,
3034
# so a tags implementation that versions tags can only
3035
# pull in the most recent changes. -- JRV20090506
3036
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3038
result.new_revno, result.new_revid = self.target.last_revision_info()
3040
result.master_branch = _hook_master
3041
result.local_branch = result.target_branch
3043
result.master_branch = result.target_branch
3044
result.local_branch = None
3046
for hook in Branch.hooks['post_pull']:
3424
master_branch.unlock()
3049
self.source.unlock()
3426
3052
def push(self, overwrite=False, stop_revision=None,
3427
3053
_override_hook_source_branch=None):
3492
def _pull(self, overwrite=False, stop_revision=None,
3493
possible_transports=None, _hook_master=None, run_hooks=True,
3120
def is_compatible(self, source, target):
3121
# GenericBranch uses the public API, so always compatible
3125
class InterToBranch5(GenericInterBranch):
3128
def _get_branch_formats_to_test():
3129
return BranchFormat._default_format, BzrBranchFormat5()
3131
def pull(self, overwrite=False, stop_revision=None,
3132
possible_transports=None, run_hooks=True,
3494
3133
_override_hook_target=None, local=False):
3497
This function is the core worker, used by GenericInterBranch.pull to
3498
avoid duplication when pulling source->master and source->local.
3500
:param _hook_master: Private parameter - set the branch to
3501
be supplied as the master to pull hooks.
3134
"""Pull from source into self, updating my master if any.
3502
3136
:param run_hooks: Private parameter - if false, this branch
3503
3137
is being called because it's the master of the primary branch,
3504
3138
so it should not run its hooks.
3505
:param _override_hook_target: Private parameter - set the branch to be
3506
supplied as the target_branch to pull hooks.
3507
:param local: Only update the local branch, and not the bound branch.
3509
# This type of branch can't be bound.
3140
bound_location = self.target.get_bound_location()
3141
if local and not bound_location:
3511
3142
raise errors.LocalRequiresBoundBranch()
3512
result = PullResult()
3513
result.source_branch = self.source
3514
if _override_hook_target is None:
3515
result.target_branch = self.target
3517
result.target_branch = _override_hook_target
3518
self.source.lock_read()
3143
master_branch = None
3144
if not local and bound_location and self.source.base != bound_location:
3145
# not pulling from master, so we need to update master.
3146
master_branch = self.target.get_master_branch(possible_transports)
3147
master_branch.lock_write()
3520
# We assume that during 'pull' the target repository is closer than
3522
self.source.update_references(self.target)
3523
graph = self.target.repository.get_graph(self.source.repository)
3524
# TODO: Branch formats should have a flag that indicates
3525
# that revno's are expensive, and pull() should honor that flag.
3527
result.old_revno, result.old_revid = \
3528
self.target.last_revision_info()
3529
self.target.update_revisions(self.source, stop_revision,
3530
overwrite=overwrite, graph=graph)
3531
# TODO: The old revid should be specified when merging tags,
3532
# so a tags implementation that versions tags can only
3533
# pull in the most recent changes. -- JRV20090506
3534
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3536
result.new_revno, result.new_revid = self.target.last_revision_info()
3538
result.master_branch = _hook_master
3539
result.local_branch = result.target_branch
3541
result.master_branch = result.target_branch
3542
result.local_branch = None
3544
for hook in Branch.hooks['post_pull']:
3150
# pull from source into master.
3151
master_branch.pull(self.source, overwrite, stop_revision,
3153
return super(InterToBranch5, self).pull(overwrite,
3154
stop_revision, _hook_master=master_branch,
3155
run_hooks=run_hooks,
3156
_override_hook_target=_override_hook_target)
3547
self.source.unlock()
3159
master_branch.unlock()
3551
3162
InterBranch.register_optimiser(GenericInterBranch)
3163
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
