782
828
old_repository = self.repository
783
829
if len(old_repository._fallback_repositories) != 1:
784
830
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
831
"of %r (fallbacks: %r)" % (old_repository,
832
old_repository._fallback_repositories))
833
# Open the new repository object.
834
# Repositories don't offer an interface to remove fallback
835
# repositories today; take the conceptually simpler option and just
836
# reopen it. We reopen it starting from the URL so that we
837
# get a separate connection for RemoteRepositories and can
838
# stream from one of them to the other. This does mean doing
839
# separate SSH connection setup, but unstacking is not a
840
# common operation so it's tolerable.
841
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
842
new_repository = new_bzrdir.find_repository()
843
if new_repository._fallback_repositories:
844
raise AssertionError("didn't expect %r to have "
845
"fallback_repositories"
846
% (self.repository,))
847
# Replace self.repository with the new repository.
848
# Do our best to transfer the lock state (i.e. lock-tokens and
849
# lock count) of self.repository to the new repository.
850
lock_token = old_repository.lock_write().repository_token
851
self.repository = new_repository
852
if isinstance(self, remote.RemoteBranch):
853
# Remote branches can have a second reference to the old
854
# repository that need to be replaced.
855
if self._real_branch is not None:
856
self._real_branch.repository = new_repository
857
self.repository.lock_write(token=lock_token)
858
if lock_token is not None:
859
old_repository.leave_lock_in_place()
787
860
old_repository.unlock()
861
if lock_token is not None:
862
# XXX: self.repository.leave_lock_in_place() before this
863
# function will not be preserved. Fortunately that doesn't
864
# affect the current default format (2a), and would be a
865
# corner-case anyway.
866
# - Andrew Bennetts, 2010/06/30
867
self.repository.dont_leave_lock_in_place()
871
old_repository.unlock()
872
except errors.LockNotHeld:
875
if old_lock_count == 0:
876
raise AssertionError(
877
'old_repository should have been locked at least once.')
878
for i in range(old_lock_count-1):
879
self.repository.lock_write()
880
# Fetch from the old repository into the new.
788
881
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
883
# XXX: If you unstack a branch while it has a working tree
809
884
# with a pending merge, the pending-merged revisions will no
810
885
# longer be present. You can (probably) revert and remerge.
812
# XXX: This only fetches up to the tip of the repository; it
813
# doesn't bring across any tags. That's fairly consistent
814
# with how branch works, but perhaps not ideal.
815
self.repository.fetch(old_repository,
816
revision_id=self.last_revision(),
887
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
888
except errors.TagsNotSupported:
889
tags_to_fetch = set()
890
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
891
old_repository, required_ids=[self.last_revision()],
892
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
893
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
895
old_repository.unlock()
1565
1661
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1566
lock_type='metadir', set_format=True):
1567
1663
"""Initialize a branch in a bzrdir, with specified files
1569
1665
:param a_bzrdir: The bzrdir to initialize the branch in
1570
1666
:param utf8_files: The files to create as a list of
1571
1667
(filename, content) tuples
1572
1668
:param name: Name of colocated branch to create, if any
1573
:param set_format: If True, set the format with
1574
self.get_format_string. (BzrBranch4 has its format set
1576
1669
:return: a branch in this format
1578
1671
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1579
1672
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1581
'metadir': ('lock', lockdir.LockDir),
1582
'branch4': ('branch-lock', lockable_files.TransportLock),
1584
lock_name, lock_class = lock_map[lock_type]
1585
1673
control_files = lockable_files.LockableFiles(branch_transport,
1586
lock_name, lock_class)
1674
'lock', lockdir.LockDir)
1587
1675
control_files.create_lock()
1676
control_files.lock_write()
1589
control_files.lock_write()
1590
except errors.LockContention:
1591
if lock_type != 'branch4':
1597
1678
utf8_files += [('format', self.get_format_string())]
1599
1679
for (filename, content) in utf8_files:
1600
1680
branch_transport.put_bytes(
1601
1681
filename, content,
1602
1682
mode=a_bzrdir._get_file_mode())
1605
control_files.unlock()
1606
branch = self.open(a_bzrdir, name, _found=True)
1684
control_files.unlock()
1685
branch = self.open(a_bzrdir, name, _found=True,
1686
found_repository=repository)
1607
1687
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1610
def initialize(self, a_bzrdir, name=None):
1690
def initialize(self, a_bzrdir, name=None, repository=None):
1611
1691
"""Create a branch of this format in a_bzrdir.
1613
1693
:param name: Name of the colocated branch to create.
3182
3323
raise NotImplementedError(self.push)
3326
def copy_content_into(self, revision_id=None):
3327
"""Copy the content of source into target
3329
revision_id: if not None, the revision history in the new branch will
3330
be truncated to end with revision_id.
3332
raise NotImplementedError(self.copy_content_into)
3185
3335
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
3336
"""InterBranch implementation that uses public Branch functions."""
3339
def is_compatible(klass, source, target):
3340
# GenericBranch uses the public API, so always compatible
3344
def _get_branch_formats_to_test(klass):
3345
return [(format_registry.get_default(), format_registry.get_default())]
3348
def unwrap_format(klass, format):
3349
if isinstance(format, remote.RemoteBranchFormat):
3350
format._ensure_real()
3351
return format._custom_format
3355
def copy_content_into(self, revision_id=None):
3356
"""Copy the content of source into target
3358
revision_id: if not None, the revision history in the new branch will
3359
be truncated to end with revision_id.
3361
self.source.update_references(self.target)
3362
self.source._synchronize_history(self.target, revision_id)
3364
parent = self.source.get_parent()
3365
except errors.InaccessibleParent, e:
3366
mutter('parent was not accessible to copy: %s', e)
3369
self.target.set_parent(parent)
3370
if self.source._push_should_merge_tags():
3371
self.source.tags.merge_to(self.target.tags)
3193
3374
def update_revisions(self, stop_revision=None, overwrite=False,
3375
graph=None, fetch_tags=True):
3195
3376
"""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()
3377
other_revno, other_last_revision = self.source.last_revision_info()
3378
stop_revno = None # unknown
3379
if stop_revision is None:
3380
stop_revision = other_last_revision
3381
if _mod_revision.is_null(stop_revision):
3382
# if there are no commits, we're done.
3384
stop_revno = other_revno
3386
# what's the current last revision, before we fetch [and change it
3388
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3389
# we fetch here so that we don't process data twice in the common
3390
# case of having something to pull, and so that the check for
3391
# already merged can operate on the just fetched graph, which will
3392
# be cached in memory.
3394
fetch_spec_factory = fetch.FetchSpecFactory()
3395
fetch_spec_factory.source_branch = self.source
3396
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3397
fetch_spec_factory.source_repo = self.source.repository
3398
fetch_spec_factory.target_repo = self.target.repository
3399
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3400
fetch_spec = fetch_spec_factory.make_fetch_spec()
3402
fetch_spec = _mod_graph.NotInOtherForRevs(self.target.repository,
3403
self.source.repository, revision_ids=[stop_revision]).execute()
3404
self.target.fetch(self.source, fetch_spec=fetch_spec)
3405
# Check to see if one is an ancestor of the other
3408
graph = self.target.repository.get_graph()
3409
if self.target._check_if_descendant_or_diverged(
3410
stop_revision, last_rev, graph, self.source):
3411
# stop_revision is a descendant of last_rev, but we aren't
3412
# overwriting, so we're done.
3414
if stop_revno is None:
3416
graph = self.target.repository.get_graph()
3417
this_revno, this_last_revision = \
3418
self.target.last_revision_info()
3419
stop_revno = graph.find_distance_to_null(stop_revision,
3420
[(other_last_revision, other_revno),
3421
(this_last_revision, this_revno)])
3422
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3425
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3426
possible_transports=None, run_hooks=True,
3238
3427
_override_hook_target=None, local=False):
3428
"""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
3430
:param run_hooks: Private parameter - if false, this branch
3244
3431
is being called because it's the master of the primary branch,
3245
3432
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.
3434
bound_location = self.target.get_bound_location()
3435
if local and not bound_location:
3252
3436
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()
3437
master_branch = None
3438
source_is_master = (self.source.user_url == bound_location)
3439
if not local and bound_location and not source_is_master:
3440
# not pulling from master, so we need to update master.
3441
master_branch = self.target.get_master_branch(possible_transports)
3442
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']:
3445
# pull from source into master.
3446
master_branch.pull(self.source, overwrite, stop_revision,
3448
return self._pull(overwrite,
3449
stop_revision, _hook_master=master_branch,
3450
run_hooks=run_hooks,
3451
_override_hook_target=_override_hook_target,
3452
merge_tags_to_master=not source_is_master)
3288
self.source.unlock()
3455
master_branch.unlock()
3291
3457
def push(self, overwrite=False, stop_revision=None,
3292
3458
_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.
3523
def _pull(self, overwrite=False, stop_revision=None,
3524
possible_transports=None, _hook_master=None, run_hooks=True,
3525
_override_hook_target=None, local=False,
3526
merge_tags_to_master=True):
3529
This function is the core worker, used by GenericInterBranch.pull to
3530
avoid duplication when pulling source->master and source->local.
3532
:param _hook_master: Private parameter - set the branch to
3533
be supplied as the master to pull hooks.
3374
3534
:param run_hooks: Private parameter - if false, this branch
3375
3535
is being called because it's the master of the primary branch,
3376
3536
so it should not run its hooks.
3537
is being called because it's the master of the primary branch,
3538
so it should not run its hooks.
3539
:param _override_hook_target: Private parameter - set the branch to be
3540
supplied as the target_branch to pull hooks.
3541
: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:
3543
# This type of branch can't be bound.
3380
3545
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()
3546
result = PullResult()
3547
result.source_branch = self.source
3548
if _override_hook_target is None:
3549
result.target_branch = self.target
3551
result.target_branch = _override_hook_target
3552
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)
3554
# We assume that during 'pull' the target repository is closer than
3556
self.source.update_references(self.target)
3557
graph = self.target.repository.get_graph(self.source.repository)
3558
# TODO: Branch formats should have a flag that indicates
3559
# that revno's are expensive, and pull() should honor that flag.
3561
result.old_revno, result.old_revid = \
3562
self.target.last_revision_info()
3563
self.target.update_revisions(self.source, stop_revision,
3564
overwrite=overwrite, graph=graph)
3565
# TODO: The old revid should be specified when merging tags,
3566
# so a tags implementation that versions tags can only
3567
# pull in the most recent changes. -- JRV20090506
3568
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3569
overwrite, ignore_master=not merge_tags_to_master)
3570
result.new_revno, result.new_revid = self.target.last_revision_info()
3572
result.master_branch = _hook_master
3573
result.local_branch = result.target_branch
3575
result.master_branch = result.target_branch
3576
result.local_branch = None
3578
for hook in Branch.hooks['post_pull']:
3397
master_branch.unlock()
3581
self.source.unlock()
3400
3585
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)