562
526
raise ValueError('invalid stop_rule %r' % stop_rule)
564
def _filter_start_non_ancestors(self, rev_iter):
565
# If we started from a dotted revno, we want to consider it as a tip
566
# and don't want to yield revisions that are not part of its
567
# ancestry. Given the order guaranteed by the merge sort, we will see
568
# uninteresting descendants of the first parent of our tip before the
570
first = rev_iter.next()
571
(rev_id, merge_depth, revno, end_of_merge) = first
574
# We start at a mainline revision so by definition, all others
575
# revisions in rev_iter are ancestors
576
for node in rev_iter:
581
pmap = self.repository.get_parent_map([rev_id])
582
parents = pmap.get(rev_id, [])
584
whitelist.update(parents)
586
# If there is no parents, there is nothing of interest left
588
# FIXME: It's hard to test this scenario here as this code is never
589
# called in that case. -- vila 20100322
592
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
594
if rev_id in whitelist:
595
pmap = self.repository.get_parent_map([rev_id])
596
parents = pmap.get(rev_id, [])
597
whitelist.remove(rev_id)
598
whitelist.update(parents)
600
# We've reached the mainline, there is nothing left to
604
# A revision that is not part of the ancestry of our
607
yield (rev_id, merge_depth, revno, end_of_merge)
609
528
def leave_lock_in_place(self):
610
529
"""Tell this branch object not to release the physical lock when this
611
530
object is unlocked.
806
725
if len(old_repository._fallback_repositories) != 1:
807
726
raise AssertionError("can't cope with fallback repositories "
808
727
"of %r" % (self.repository,))
809
# Open the new repository object.
810
# Repositories don't offer an interface to remove fallback
811
# repositories today; take the conceptually simpler option and just
812
# reopen it. We reopen it starting from the URL so that we
813
# get a separate connection for RemoteRepositories and can
814
# stream from one of them to the other. This does mean doing
815
# separate SSH connection setup, but unstacking is not a
816
# common operation so it's tolerable.
817
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
818
new_repository = new_bzrdir.find_repository()
819
if new_repository._fallback_repositories:
820
raise AssertionError("didn't expect %r to have "
821
"fallback_repositories"
822
% (self.repository,))
823
# Replace self.repository with the new repository.
824
# Do our best to transfer the lock state (i.e. lock-tokens and
825
# lock count) of self.repository to the new repository.
826
lock_token = old_repository.lock_write().repository_token
827
self.repository = new_repository
828
if isinstance(self, remote.RemoteBranch):
829
# Remote branches can have a second reference to the old
830
# repository that need to be replaced.
831
if self._real_branch is not None:
832
self._real_branch.repository = new_repository
833
self.repository.lock_write(token=lock_token)
834
if lock_token is not None:
835
old_repository.leave_lock_in_place()
728
# unlock it, including unlocking the fallback
836
729
old_repository.unlock()
837
if lock_token is not None:
838
# XXX: self.repository.leave_lock_in_place() before this
839
# function will not be preserved. Fortunately that doesn't
840
# affect the current default format (2a), and would be a
841
# corner-case anyway.
842
# - Andrew Bennetts, 2010/06/30
843
self.repository.dont_leave_lock_in_place()
847
old_repository.unlock()
848
except errors.LockNotHeld:
851
if old_lock_count == 0:
852
raise AssertionError(
853
'old_repository should have been locked at least once.')
854
for i in range(old_lock_count-1):
730
old_repository.lock_read()
732
# Repositories don't offer an interface to remove fallback
733
# repositories today; take the conceptually simpler option and just
734
# reopen it. We reopen it starting from the URL so that we
735
# get a separate connection for RemoteRepositories and can
736
# stream from one of them to the other. This does mean doing
737
# separate SSH connection setup, but unstacking is not a
738
# common operation so it's tolerable.
739
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
740
new_repository = new_bzrdir.find_repository()
741
self.repository = new_repository
742
if self.repository._fallback_repositories:
743
raise AssertionError("didn't expect %r to have "
744
"fallback_repositories"
745
% (self.repository,))
746
# this is not paired with an unlock because it's just restoring
747
# the previous state; the lock's released when set_stacked_on_url
855
749
self.repository.lock_write()
856
# Fetch from the old repository into the new.
857
old_repository.lock_read()
859
750
# XXX: If you unstack a branch while it has a working tree
860
751
# with a pending merge, the pending-merged revisions will no
861
752
# longer be present. You can (probably) revert and remerge.
1922
1748
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1925
class BranchInitHookParams(object):
1926
"""Object holding parameters passed to *_branch_init hooks.
1928
There are 4 fields that hooks may wish to access:
1930
:ivar format: the branch format
1931
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1932
:ivar name: name of colocated branch, if any (or None)
1933
:ivar branch: the branch created
1935
Note that for lightweight checkouts, the bzrdir and format fields refer to
1936
the checkout, hence they are different from the corresponding fields in
1937
branch, which refer to the original branch.
1940
def __init__(self, format, a_bzrdir, name, branch):
1941
"""Create a group of BranchInitHook parameters.
1943
:param format: the branch format
1944
:param a_bzrdir: the BzrDir where the branch will be/has been
1946
:param name: name of colocated branch, if any (or None)
1947
:param branch: the branch created
1949
Note that for lightweight checkouts, the bzrdir and format fields refer
1950
to the checkout, hence they are different from the corresponding fields
1951
in branch, which refer to the original branch.
1953
self.format = format
1954
self.bzrdir = a_bzrdir
1956
self.branch = branch
1958
def __eq__(self, other):
1959
return self.__dict__ == other.__dict__
1962
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1965
class SwitchHookParams(object):
1966
"""Object holding parameters passed to *_switch hooks.
1968
There are 4 fields that hooks may wish to access:
1970
:ivar control_dir: BzrDir of the checkout to change
1971
:ivar to_branch: branch that the checkout is to reference
1972
:ivar force: skip the check for local commits in a heavy checkout
1973
:ivar revision_id: revision ID to switch to (or None)
1976
def __init__(self, control_dir, to_branch, force, revision_id):
1977
"""Create a group of SwitchHook parameters.
1979
:param control_dir: BzrDir of the checkout to change
1980
:param to_branch: branch that the checkout is to reference
1981
:param force: skip the check for local commits in a heavy checkout
1982
:param revision_id: revision ID to switch to (or None)
1984
self.control_dir = control_dir
1985
self.to_branch = to_branch
1987
self.revision_id = revision_id
1989
def __eq__(self, other):
1990
return self.__dict__ == other.__dict__
1993
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1994
self.control_dir, self.to_branch,
1998
1751
class BzrBranchFormat4(BranchFormat):
1999
1752
"""Bzr branch format 4.
3310
3023
raise NotImplementedError(self.push)
3313
def copy_content_into(self, revision_id=None):
3314
"""Copy the content of source into target
3316
revision_id: if not None, the revision history in the new branch will
3317
be truncated to end with revision_id.
3319
raise NotImplementedError(self.copy_content_into)
3322
3026
class GenericInterBranch(InterBranch):
3323
"""InterBranch implementation that uses public Branch functions."""
3326
def is_compatible(klass, source, target):
3327
# GenericBranch uses the public API, so always compatible
3331
def _get_branch_formats_to_test(klass):
3332
return [(BranchFormat._default_format, BranchFormat._default_format)]
3335
def unwrap_format(klass, format):
3336
if isinstance(format, remote.RemoteBranchFormat):
3337
format._ensure_real()
3338
return format._custom_format
3342
def copy_content_into(self, revision_id=None):
3343
"""Copy the content of source into target
3345
revision_id: if not None, the revision history in the new branch will
3346
be truncated to end with revision_id.
3348
self.source.update_references(self.target)
3349
self.source._synchronize_history(self.target, revision_id)
3351
parent = self.source.get_parent()
3352
except errors.InaccessibleParent, e:
3353
mutter('parent was not accessible to copy: %s', e)
3356
self.target.set_parent(parent)
3357
if self.source._push_should_merge_tags():
3358
self.source.tags.merge_to(self.target.tags)
3027
"""InterBranch implementation that uses public Branch functions.
3031
def _get_branch_formats_to_test():
3032
return BranchFormat._default_format, BranchFormat._default_format
3361
3034
def update_revisions(self, stop_revision=None, overwrite=False,
3363
3036
"""See InterBranch.update_revisions()."""
3364
other_revno, other_last_revision = self.source.last_revision_info()
3365
stop_revno = None # unknown
3366
if stop_revision is None:
3367
stop_revision = other_last_revision
3368
if _mod_revision.is_null(stop_revision):
3369
# if there are no commits, we're done.
3371
stop_revno = other_revno
3373
# what's the current last revision, before we fetch [and change it
3375
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3376
# we fetch here so that we don't process data twice in the common
3377
# case of having something to pull, and so that the check for
3378
# already merged can operate on the just fetched graph, which will
3379
# be cached in memory.
3380
self.target.fetch(self.source, stop_revision)
3381
# Check to see if one is an ancestor of the other
3384
graph = self.target.repository.get_graph()
3385
if self.target._check_if_descendant_or_diverged(
3386
stop_revision, last_rev, graph, self.source):
3387
# stop_revision is a descendant of last_rev, but we aren't
3388
# overwriting, so we're done.
3390
if stop_revno is None:
3392
graph = self.target.repository.get_graph()
3393
this_revno, this_last_revision = \
3394
self.target.last_revision_info()
3395
stop_revno = graph.find_distance_to_null(stop_revision,
3396
[(other_last_revision, other_revno),
3397
(this_last_revision, this_revno)])
3398
self.target.set_last_revision_info(stop_revno, stop_revision)
3037
self.source.lock_read()
3039
other_revno, other_last_revision = self.source.last_revision_info()
3040
stop_revno = None # unknown
3041
if stop_revision is None:
3042
stop_revision = other_last_revision
3043
if _mod_revision.is_null(stop_revision):
3044
# if there are no commits, we're done.
3046
stop_revno = other_revno
3048
# what's the current last revision, before we fetch [and change it
3050
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3051
# we fetch here so that we don't process data twice in the common
3052
# case of having something to pull, and so that the check for
3053
# already merged can operate on the just fetched graph, which will
3054
# be cached in memory.
3055
self.target.fetch(self.source, stop_revision)
3056
# Check to see if one is an ancestor of the other
3059
graph = self.target.repository.get_graph()
3060
if self.target._check_if_descendant_or_diverged(
3061
stop_revision, last_rev, graph, self.source):
3062
# stop_revision is a descendant of last_rev, but we aren't
3063
# overwriting, so we're done.
3065
if stop_revno is None:
3067
graph = self.target.repository.get_graph()
3068
this_revno, this_last_revision = \
3069
self.target.last_revision_info()
3070
stop_revno = graph.find_distance_to_null(stop_revision,
3071
[(other_last_revision, other_revno),
3072
(this_last_revision, this_revno)])
3073
self.target.set_last_revision_info(stop_revno, stop_revision)
3075
self.source.unlock()
3401
3077
def pull(self, overwrite=False, stop_revision=None,
3402
possible_transports=None, run_hooks=True,
3078
possible_transports=None, _hook_master=None, run_hooks=True,
3403
3079
_override_hook_target=None, local=False):
3404
"""Pull from source into self, updating my master if any.
3082
:param _hook_master: Private parameter - set the branch to
3083
be supplied as the master to pull hooks.
3406
3084
:param run_hooks: Private parameter - if false, this branch
3407
3085
is being called because it's the master of the primary branch,
3408
3086
so it should not run its hooks.
3087
:param _override_hook_target: Private parameter - set the branch to be
3088
supplied as the target_branch to pull hooks.
3089
:param local: Only update the local branch, and not the bound branch.
3410
bound_location = self.target.get_bound_location()
3411
if local and not bound_location:
3091
# This type of branch can't be bound.
3412
3093
raise errors.LocalRequiresBoundBranch()
3413
master_branch = None
3414
if not local and bound_location and self.source.user_url != bound_location:
3415
# not pulling from master, so we need to update master.
3416
master_branch = self.target.get_master_branch(possible_transports)
3417
master_branch.lock_write()
3094
result = PullResult()
3095
result.source_branch = self.source
3096
if _override_hook_target is None:
3097
result.target_branch = self.target
3099
result.target_branch = _override_hook_target
3100
self.source.lock_read()
3420
# pull from source into master.
3421
master_branch.pull(self.source, overwrite, stop_revision,
3423
return self._pull(overwrite,
3424
stop_revision, _hook_master=master_branch,
3425
run_hooks=run_hooks,
3426
_override_hook_target=_override_hook_target)
3102
# We assume that during 'pull' the target repository is closer than
3104
self.source.update_references(self.target)
3105
graph = self.target.repository.get_graph(self.source.repository)
3106
# TODO: Branch formats should have a flag that indicates
3107
# that revno's are expensive, and pull() should honor that flag.
3109
result.old_revno, result.old_revid = \
3110
self.target.last_revision_info()
3111
self.target.update_revisions(self.source, stop_revision,
3112
overwrite=overwrite, graph=graph)
3113
# TODO: The old revid should be specified when merging tags,
3114
# so a tags implementation that versions tags can only
3115
# pull in the most recent changes. -- JRV20090506
3116
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3118
result.new_revno, result.new_revid = self.target.last_revision_info()
3120
result.master_branch = _hook_master
3121
result.local_branch = result.target_branch
3123
result.master_branch = result.target_branch
3124
result.local_branch = None
3126
for hook in Branch.hooks['post_pull']:
3429
master_branch.unlock()
3129
self.source.unlock()
3431
3132
def push(self, overwrite=False, stop_revision=None,
3432
3133
_override_hook_source_branch=None):
3497
def _pull(self, overwrite=False, stop_revision=None,
3498
possible_transports=None, _hook_master=None, run_hooks=True,
3199
def is_compatible(self, source, target):
3200
# GenericBranch uses the public API, so always compatible
3204
class InterToBranch5(GenericInterBranch):
3207
def _get_branch_formats_to_test():
3208
return BranchFormat._default_format, BzrBranchFormat5()
3210
def pull(self, overwrite=False, stop_revision=None,
3211
possible_transports=None, run_hooks=True,
3499
3212
_override_hook_target=None, local=False):
3502
This function is the core worker, used by GenericInterBranch.pull to
3503
avoid duplication when pulling source->master and source->local.
3505
:param _hook_master: Private parameter - set the branch to
3506
be supplied as the master to pull hooks.
3213
"""Pull from source into self, updating my master if any.
3507
3215
:param run_hooks: Private parameter - if false, this branch
3508
3216
is being called because it's the master of the primary branch,
3509
3217
so it should not run its hooks.
3510
:param _override_hook_target: Private parameter - set the branch to be
3511
supplied as the target_branch to pull hooks.
3512
:param local: Only update the local branch, and not the bound branch.
3514
# This type of branch can't be bound.
3219
bound_location = self.target.get_bound_location()
3220
if local and not bound_location:
3516
3221
raise errors.LocalRequiresBoundBranch()
3517
result = PullResult()
3518
result.source_branch = self.source
3519
if _override_hook_target is None:
3520
result.target_branch = self.target
3522
result.target_branch = _override_hook_target
3523
self.source.lock_read()
3222
master_branch = None
3223
if not local and bound_location and self.source.base != bound_location:
3224
# not pulling from master, so we need to update master.
3225
master_branch = self.target.get_master_branch(possible_transports)
3226
master_branch.lock_write()
3525
# We assume that during 'pull' the target repository is closer than
3527
self.source.update_references(self.target)
3528
graph = self.target.repository.get_graph(self.source.repository)
3529
# TODO: Branch formats should have a flag that indicates
3530
# that revno's are expensive, and pull() should honor that flag.
3532
result.old_revno, result.old_revid = \
3533
self.target.last_revision_info()
3534
self.target.update_revisions(self.source, stop_revision,
3535
overwrite=overwrite, graph=graph)
3536
# TODO: The old revid should be specified when merging tags,
3537
# so a tags implementation that versions tags can only
3538
# pull in the most recent changes. -- JRV20090506
3539
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3541
result.new_revno, result.new_revid = self.target.last_revision_info()
3543
result.master_branch = _hook_master
3544
result.local_branch = result.target_branch
3546
result.master_branch = result.target_branch
3547
result.local_branch = None
3549
for hook in Branch.hooks['post_pull']:
3229
# pull from source into master.
3230
master_branch.pull(self.source, overwrite, stop_revision,
3232
return super(InterToBranch5, self).pull(overwrite,
3233
stop_revision, _hook_master=master_branch,
3234
run_hooks=run_hooks,
3235
_override_hook_target=_override_hook_target)
3552
self.source.unlock()
3238
master_branch.unlock()
3556
3241
InterBranch.register_optimiser(GenericInterBranch)
3242
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
