782
825
old_repository = self.repository
783
826
if len(old_repository._fallback_repositories) != 1:
784
827
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
828
"of %r (fallbacks: %r)" % (old_repository,
829
old_repository._fallback_repositories))
830
# Open the new repository object.
831
# Repositories don't offer an interface to remove fallback
832
# repositories today; take the conceptually simpler option and just
833
# reopen it. We reopen it starting from the URL so that we
834
# get a separate connection for RemoteRepositories and can
835
# stream from one of them to the other. This does mean doing
836
# separate SSH connection setup, but unstacking is not a
837
# common operation so it's tolerable.
838
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
839
new_repository = new_bzrdir.find_repository()
840
if new_repository._fallback_repositories:
841
raise AssertionError("didn't expect %r to have "
842
"fallback_repositories"
843
% (self.repository,))
844
# Replace self.repository with the new repository.
845
# Do our best to transfer the lock state (i.e. lock-tokens and
846
# lock count) of self.repository to the new repository.
847
lock_token = old_repository.lock_write().repository_token
848
self.repository = new_repository
849
if isinstance(self, remote.RemoteBranch):
850
# Remote branches can have a second reference to the old
851
# repository that need to be replaced.
852
if self._real_branch is not None:
853
self._real_branch.repository = new_repository
854
self.repository.lock_write(token=lock_token)
855
if lock_token is not None:
856
old_repository.leave_lock_in_place()
787
857
old_repository.unlock()
858
if lock_token is not None:
859
# XXX: self.repository.leave_lock_in_place() before this
860
# function will not be preserved. Fortunately that doesn't
861
# affect the current default format (2a), and would be a
862
# corner-case anyway.
863
# - Andrew Bennetts, 2010/06/30
864
self.repository.dont_leave_lock_in_place()
868
old_repository.unlock()
869
except errors.LockNotHeld:
872
if old_lock_count == 0:
873
raise AssertionError(
874
'old_repository should have been locked at least once.')
875
for i in range(old_lock_count-1):
876
self.repository.lock_write()
877
# Fetch from the old repository into the new.
788
878
old_repository.lock_read()
790
# Repositories don't offer an interface to remove fallback
791
# repositories today; take the conceptually simpler option and just
792
# reopen it. We reopen it starting from the URL so that we
793
# get a separate connection for RemoteRepositories and can
794
# stream from one of them to the other. This does mean doing
795
# separate SSH connection setup, but unstacking is not a
796
# common operation so it's tolerable.
797
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
798
new_repository = new_bzrdir.find_repository()
799
self.repository = new_repository
800
if self.repository._fallback_repositories:
801
raise AssertionError("didn't expect %r to have "
802
"fallback_repositories"
803
% (self.repository,))
804
# this is not paired with an unlock because it's just restoring
805
# the previous state; the lock's released when set_stacked_on_url
807
self.repository.lock_write()
808
880
# XXX: If you unstack a branch while it has a working tree
809
881
# with a pending merge, the pending-merged revisions will no
810
882
# longer be present. You can (probably) revert and remerge.
3182
3408
raise NotImplementedError(self.push)
3411
def copy_content_into(self, revision_id=None):
3412
"""Copy the content of source into target
3414
revision_id: if not None, the revision history in the new branch will
3415
be truncated to end with revision_id.
3417
raise NotImplementedError(self.copy_content_into)
3185
3420
class GenericInterBranch(InterBranch):
3186
"""InterBranch implementation that uses public Branch functions.
3190
def _get_branch_formats_to_test():
3191
return BranchFormat._default_format, BranchFormat._default_format
3421
"""InterBranch implementation that uses public Branch functions."""
3424
def is_compatible(klass, source, target):
3425
# GenericBranch uses the public API, so always compatible
3429
def _get_branch_formats_to_test(klass):
3430
return [(BranchFormat._default_format, BranchFormat._default_format)]
3433
def unwrap_format(klass, format):
3434
if isinstance(format, remote.RemoteBranchFormat):
3435
format._ensure_real()
3436
return format._custom_format
3440
def copy_content_into(self, revision_id=None):
3441
"""Copy the content of source into target
3443
revision_id: if not None, the revision history in the new branch will
3444
be truncated to end with revision_id.
3446
self.source.update_references(self.target)
3447
self.source._synchronize_history(self.target, revision_id)
3449
parent = self.source.get_parent()
3450
except errors.InaccessibleParent, e:
3451
mutter('parent was not accessible to copy: %s', e)
3454
self.target.set_parent(parent)
3455
if self.source._push_should_merge_tags():
3456
self.source.tags.merge_to(self.target.tags)
3193
3459
def update_revisions(self, stop_revision=None, overwrite=False,
3460
graph=None, fetch_tags=True):
3195
3461
"""See InterBranch.update_revisions()."""
3196
self.source.lock_read()
3198
other_revno, other_last_revision = self.source.last_revision_info()
3199
stop_revno = None # unknown
3200
if stop_revision is None:
3201
stop_revision = other_last_revision
3202
if _mod_revision.is_null(stop_revision):
3203
# if there are no commits, we're done.
3205
stop_revno = other_revno
3207
# what's the current last revision, before we fetch [and change it
3209
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3210
# we fetch here so that we don't process data twice in the common
3211
# case of having something to pull, and so that the check for
3212
# already merged can operate on the just fetched graph, which will
3213
# be cached in memory.
3214
self.target.fetch(self.source, stop_revision)
3215
# Check to see if one is an ancestor of the other
3218
graph = self.target.repository.get_graph()
3219
if self.target._check_if_descendant_or_diverged(
3220
stop_revision, last_rev, graph, self.source):
3221
# stop_revision is a descendant of last_rev, but we aren't
3222
# overwriting, so we're done.
3224
if stop_revno is None:
3226
graph = self.target.repository.get_graph()
3227
this_revno, this_last_revision = \
3228
self.target.last_revision_info()
3229
stop_revno = graph.find_distance_to_null(stop_revision,
3230
[(other_last_revision, other_revno),
3231
(this_last_revision, this_revno)])
3232
self.target.set_last_revision_info(stop_revno, stop_revision)
3234
self.source.unlock()
3462
other_revno, other_last_revision = self.source.last_revision_info()
3463
stop_revno = None # unknown
3464
if stop_revision is None:
3465
stop_revision = other_last_revision
3466
if _mod_revision.is_null(stop_revision):
3467
# if there are no commits, we're done.
3469
stop_revno = other_revno
3471
# what's the current last revision, before we fetch [and change it
3473
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3474
# we fetch here so that we don't process data twice in the common
3475
# case of having something to pull, and so that the check for
3476
# already merged can operate on the just fetched graph, which will
3477
# be cached in memory.
3479
fetch_spec_factory = fetch.FetchSpecFactory()
3480
fetch_spec_factory.source_branch = self.source
3481
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3482
fetch_spec_factory.source_repo = self.source.repository
3483
fetch_spec_factory.target_repo = self.target.repository
3484
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3485
fetch_spec = fetch_spec_factory.make_fetch_spec()
3487
fetch_spec = _mod_graph.NotInOtherForRevs(self.target.repository,
3488
self.source.repository, revision_ids=[stop_revision]).execute()
3489
self.target.fetch(self.source, fetch_spec=fetch_spec)
3490
# Check to see if one is an ancestor of the other
3493
graph = self.target.repository.get_graph()
3494
if self.target._check_if_descendant_or_diverged(
3495
stop_revision, last_rev, graph, self.source):
3496
# stop_revision is a descendant of last_rev, but we aren't
3497
# overwriting, so we're done.
3499
if stop_revno is None:
3501
graph = self.target.repository.get_graph()
3502
this_revno, this_last_revision = \
3503
self.target.last_revision_info()
3504
stop_revno = graph.find_distance_to_null(stop_revision,
3505
[(other_last_revision, other_revno),
3506
(this_last_revision, this_revno)])
3507
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3510
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3511
possible_transports=None, run_hooks=True,
3238
3512
_override_hook_target=None, local=False):
3513
"""Pull from source into self, updating my master if any.
3241
:param _hook_master: Private parameter - set the branch to
3242
be supplied as the master to pull hooks.
3243
3515
:param run_hooks: Private parameter - if false, this branch
3244
3516
is being called because it's the master of the primary branch,
3245
3517
so it should not run its hooks.
3246
:param _override_hook_target: Private parameter - set the branch to be
3247
supplied as the target_branch to pull hooks.
3248
:param local: Only update the local branch, and not the bound branch.
3250
# This type of branch can't be bound.
3519
bound_location = self.target.get_bound_location()
3520
if local and not bound_location:
3252
3521
raise errors.LocalRequiresBoundBranch()
3253
result = PullResult()
3254
result.source_branch = self.source
3255
if _override_hook_target is None:
3256
result.target_branch = self.target
3258
result.target_branch = _override_hook_target
3259
self.source.lock_read()
3522
master_branch = None
3523
source_is_master = (self.source.user_url == bound_location)
3524
if not local and bound_location and not source_is_master:
3525
# not pulling from master, so we need to update master.
3526
master_branch = self.target.get_master_branch(possible_transports)
3527
master_branch.lock_write()
3261
# We assume that during 'pull' the target repository is closer than
3263
self.source.update_references(self.target)
3264
graph = self.target.repository.get_graph(self.source.repository)
3265
# TODO: Branch formats should have a flag that indicates
3266
# that revno's are expensive, and pull() should honor that flag.
3268
result.old_revno, result.old_revid = \
3269
self.target.last_revision_info()
3270
self.target.update_revisions(self.source, stop_revision,
3271
overwrite=overwrite, graph=graph)
3272
# TODO: The old revid should be specified when merging tags,
3273
# so a tags implementation that versions tags can only
3274
# pull in the most recent changes. -- JRV20090506
3275
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3277
result.new_revno, result.new_revid = self.target.last_revision_info()
3279
result.master_branch = _hook_master
3280
result.local_branch = result.target_branch
3282
result.master_branch = result.target_branch
3283
result.local_branch = None
3285
for hook in Branch.hooks['post_pull']:
3530
# pull from source into master.
3531
master_branch.pull(self.source, overwrite, stop_revision,
3533
return self._pull(overwrite,
3534
stop_revision, _hook_master=master_branch,
3535
run_hooks=run_hooks,
3536
_override_hook_target=_override_hook_target,
3537
merge_tags_to_master=not source_is_master)
3288
self.source.unlock()
3540
master_branch.unlock()
3291
3542
def push(self, overwrite=False, stop_revision=None,
3292
3543
_override_hook_source_branch=None):
3358
def is_compatible(self, source, target):
3359
# GenericBranch uses the public API, so always compatible
3363
class InterToBranch5(GenericInterBranch):
3366
def _get_branch_formats_to_test():
3367
return BranchFormat._default_format, BzrBranchFormat5()
3369
def pull(self, overwrite=False, stop_revision=None,
3370
possible_transports=None, run_hooks=True,
3371
_override_hook_target=None, local=False):
3372
"""Pull from source into self, updating my master if any.
3608
def _pull(self, overwrite=False, stop_revision=None,
3609
possible_transports=None, _hook_master=None, run_hooks=True,
3610
_override_hook_target=None, local=False,
3611
merge_tags_to_master=True):
3614
This function is the core worker, used by GenericInterBranch.pull to
3615
avoid duplication when pulling source->master and source->local.
3617
:param _hook_master: Private parameter - set the branch to
3618
be supplied as the master to pull hooks.
3374
3619
:param run_hooks: Private parameter - if false, this branch
3375
3620
is being called because it's the master of the primary branch,
3376
3621
so it should not run its hooks.
3622
:param _override_hook_target: Private parameter - set the branch to be
3623
supplied as the target_branch to pull hooks.
3624
:param local: Only update the local branch, and not the bound branch.
3378
bound_location = self.target.get_bound_location()
3379
if local and not bound_location:
3626
# This type of branch can't be bound.
3380
3628
raise errors.LocalRequiresBoundBranch()
3381
master_branch = None
3382
if not local and bound_location and self.source.user_url != bound_location:
3383
# not pulling from master, so we need to update master.
3384
master_branch = self.target.get_master_branch(possible_transports)
3385
master_branch.lock_write()
3629
result = PullResult()
3630
result.source_branch = self.source
3631
if _override_hook_target is None:
3632
result.target_branch = self.target
3634
result.target_branch = _override_hook_target
3635
self.source.lock_read()
3388
# pull from source into master.
3389
master_branch.pull(self.source, overwrite, stop_revision,
3391
return super(InterToBranch5, self).pull(overwrite,
3392
stop_revision, _hook_master=master_branch,
3393
run_hooks=run_hooks,
3394
_override_hook_target=_override_hook_target)
3637
# We assume that during 'pull' the target repository is closer than
3639
self.source.update_references(self.target)
3640
graph = self.target.repository.get_graph(self.source.repository)
3641
# TODO: Branch formats should have a flag that indicates
3642
# that revno's are expensive, and pull() should honor that flag.
3644
result.old_revno, result.old_revid = \
3645
self.target.last_revision_info()
3646
self.target.update_revisions(self.source, stop_revision,
3647
overwrite=overwrite, graph=graph)
3648
# TODO: The old revid should be specified when merging tags,
3649
# so a tags implementation that versions tags can only
3650
# pull in the most recent changes. -- JRV20090506
3651
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3652
overwrite, ignore_master=not merge_tags_to_master)
3653
result.new_revno, result.new_revid = self.target.last_revision_info()
3655
result.master_branch = _hook_master
3656
result.local_branch = result.target_branch
3658
result.master_branch = result.target_branch
3659
result.local_branch = None
3661
for hook in Branch.hooks['post_pull']:
3397
master_branch.unlock()
3664
self.source.unlock()
3400
3668
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)