782
815
old_repository = self.repository
783
816
if len(old_repository._fallback_repositories) != 1:
784
817
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
818
"of %r (fallbacks: %r)" % (old_repository,
819
old_repository._fallback_repositories))
820
# Open the new repository object.
821
# Repositories don't offer an interface to remove fallback
822
# repositories today; take the conceptually simpler option and just
823
# reopen it. We reopen it starting from the URL so that we
824
# get a separate connection for RemoteRepositories and can
825
# stream from one of them to the other. This does mean doing
826
# separate SSH connection setup, but unstacking is not a
827
# common operation so it's tolerable.
828
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
829
new_repository = new_bzrdir.find_repository()
830
if new_repository._fallback_repositories:
831
raise AssertionError("didn't expect %r to have "
832
"fallback_repositories"
833
% (self.repository,))
834
# Replace self.repository with the new repository.
835
# Do our best to transfer the lock state (i.e. lock-tokens and
836
# lock count) of self.repository to the new repository.
837
lock_token = old_repository.lock_write().repository_token
838
self.repository = new_repository
839
if isinstance(self, remote.RemoteBranch):
840
# Remote branches can have a second reference to the old
841
# repository that need to be replaced.
842
if self._real_branch is not None:
843
self._real_branch.repository = new_repository
844
self.repository.lock_write(token=lock_token)
845
if lock_token is not None:
846
old_repository.leave_lock_in_place()
787
847
old_repository.unlock()
848
if lock_token is not None:
849
# XXX: self.repository.leave_lock_in_place() before this
850
# function will not be preserved. Fortunately that doesn't
851
# affect the current default format (2a), and would be a
852
# corner-case anyway.
853
# - Andrew Bennetts, 2010/06/30
854
self.repository.dont_leave_lock_in_place()
858
old_repository.unlock()
859
except errors.LockNotHeld:
862
if old_lock_count == 0:
863
raise AssertionError(
864
'old_repository should have been locked at least once.')
865
for i in range(old_lock_count-1):
866
self.repository.lock_write()
867
# Fetch from the old repository into the new.
788
868
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
870
# XXX: If you unstack a branch while it has a working tree
809
871
# with a pending merge, the pending-merged revisions will no
810
872
# 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(),
874
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
875
except errors.TagsNotSupported:
876
tags_to_fetch = set()
877
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
878
old_repository, required_ids=[self.last_revision()],
879
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
880
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
882
old_repository.unlock()
1562
1645
for hook in hooks:
1565
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1566
lock_type='metadir', set_format=True):
1567
"""Initialize a branch in a bzrdir, with specified files
1569
:param a_bzrdir: The bzrdir to initialize the branch in
1570
:param utf8_files: The files to create as a list of
1571
(filename, content) tuples
1572
: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
:return: a branch in this format
1578
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1579
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
control_files = lockable_files.LockableFiles(branch_transport,
1586
lock_name, lock_class)
1587
control_files.create_lock()
1589
control_files.lock_write()
1590
except errors.LockContention:
1591
if lock_type != 'branch4':
1597
utf8_files += [('format', self.get_format_string())]
1599
for (filename, content) in utf8_files:
1600
branch_transport.put_bytes(
1602
mode=a_bzrdir._get_file_mode())
1605
control_files.unlock()
1606
branch = self.open(a_bzrdir, name, _found=True)
1607
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1610
def initialize(self, a_bzrdir, name=None):
1648
def initialize(self, a_bzrdir, name=None, repository=None):
1611
1649
"""Create a branch of this format in a_bzrdir.
1613
1651
:param name: Name of the colocated branch to create.
1704
1779
These are all empty initially, because by default nothing should get
1707
Hooks.__init__(self)
1708
self.create_hook(HookPoint('set_rh',
1782
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1783
self.add_hook('set_rh',
1709
1784
"Invoked whenever the revision history has been set via "
1710
1785
"set_revision_history. The api signature is (branch, "
1711
1786
"revision_history), and the branch will be write-locked. "
1712
1787
"The set_rh hook can be expensive for bzr to trigger, a better "
1713
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1714
self.create_hook(HookPoint('open',
1788
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1789
self.add_hook('open',
1715
1790
"Called with the Branch object that has been opened after a "
1716
"branch is opened.", (1, 8), None))
1717
self.create_hook(HookPoint('post_push',
1791
"branch is opened.", (1, 8))
1792
self.add_hook('post_push',
1718
1793
"Called after a push operation completes. post_push is called "
1719
1794
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1720
"bzr client.", (0, 15), None))
1721
self.create_hook(HookPoint('post_pull',
1795
"bzr client.", (0, 15))
1796
self.add_hook('post_pull',
1722
1797
"Called after a pull operation completes. post_pull is called "
1723
1798
"with a bzrlib.branch.PullResult object and only runs in the "
1724
"bzr client.", (0, 15), None))
1725
self.create_hook(HookPoint('pre_commit',
1726
"Called after a commit is calculated but before it is is "
1799
"bzr client.", (0, 15))
1800
self.add_hook('pre_commit',
1801
"Called after a commit is calculated but before it is "
1727
1802
"completed. pre_commit is called with (local, master, old_revno, "
1728
1803
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1729
1804
"). old_revid is NULL_REVISION for the first commit to a branch, "
1731
1806
"basis revision. hooks MUST NOT modify this delta. "
1732
1807
" future_tree is an in-memory tree obtained from "
1733
1808
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1810
self.add_hook('post_commit',
1736
1811
"Called in the bzr client after a commit has completed. "
1737
1812
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1813
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1739
"commit to a branch.", (0, 15), None))
1740
self.create_hook(HookPoint('post_uncommit',
1814
"commit to a branch.", (0, 15))
1815
self.add_hook('post_uncommit',
1741
1816
"Called in the bzr client after an uncommit completes. "
1742
1817
"post_uncommit is called with (local, master, old_revno, "
1743
1818
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1819
"or None, master is the target branch, and an empty branch "
1745
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1746
self.create_hook(HookPoint('pre_change_branch_tip',
1820
"receives new_revno of 0, new_revid of None.", (0, 15))
1821
self.add_hook('pre_change_branch_tip',
1747
1822
"Called in bzr client and server before a change to the tip of a "
1748
1823
"branch is made. pre_change_branch_tip is called with a "
1749
1824
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1750
"commit, uncommit will all trigger this hook.", (1, 6), None))
1751
self.create_hook(HookPoint('post_change_branch_tip',
1825
"commit, uncommit will all trigger this hook.", (1, 6))
1826
self.add_hook('post_change_branch_tip',
1752
1827
"Called in bzr client and server after a change to the tip of a "
1753
1828
"branch is made. post_change_branch_tip is called with a "
1754
1829
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1755
"commit, uncommit will all trigger this hook.", (1, 4), None))
1756
self.create_hook(HookPoint('transform_fallback_location',
1830
"commit, uncommit will all trigger this hook.", (1, 4))
1831
self.add_hook('transform_fallback_location',
1757
1832
"Called when a stacked branch is activating its fallback "
1758
1833
"locations. transform_fallback_location is called with (branch, "
1759
1834
"url), and should return a new url. Returning the same url "
1764
1839
"fallback locations have not been activated. When there are "
1765
1840
"multiple hooks installed for transform_fallback_location, "
1766
1841
"all are called with the url returned from the previous hook."
1767
"The order is however undefined.", (1, 9), None))
1768
self.create_hook(HookPoint('automatic_tag_name',
1769
"Called to determine an automatic tag name for a revision."
1842
"The order is however undefined.", (1, 9))
1843
self.add_hook('automatic_tag_name',
1844
"Called to determine an automatic tag name for a revision. "
1770
1845
"automatic_tag_name is called with (branch, revision_id) and "
1771
1846
"should return a tag name or None if no tag name could be "
1772
1847
"determined. The first non-None tag name returned will be used.",
1774
self.create_hook(HookPoint('post_branch_init',
1849
self.add_hook('post_branch_init',
1775
1850
"Called after new branch initialization completes. "
1776
1851
"post_branch_init is called with a "
1777
1852
"bzrlib.branch.BranchInitHookParams. "
1778
1853
"Note that init, branch and checkout (both heavyweight and "
1779
"lightweight) will all trigger this hook.", (2, 2), None))
1780
self.create_hook(HookPoint('post_switch',
1854
"lightweight) will all trigger this hook.", (2, 2))
1855
self.add_hook('post_switch',
1781
1856
"Called after a checkout switches branch. "
1782
1857
"post_switch is called with a "
1783
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1858
"bzrlib.branch.SwitchHookParams.", (2, 2))
3182
3313
raise NotImplementedError(self.push)
3316
def copy_content_into(self, revision_id=None):
3317
"""Copy the content of source into target
3319
revision_id: if not None, the revision history in the new branch will
3320
be truncated to end with revision_id.
3322
raise NotImplementedError(self.copy_content_into)
3325
def fetch(self, stop_revision=None, fetch_spec=None):
3328
:param stop_revision: Last revision to fetch
3329
:param fetch_spec: Fetch spec.
3331
raise NotImplementedError(self.fetch)
3185
3334
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
3335
"""InterBranch implementation that uses public Branch functions."""
3338
def is_compatible(klass, source, target):
3339
# GenericBranch uses the public API, so always compatible
3343
def _get_branch_formats_to_test(klass):
3344
return [(format_registry.get_default(), format_registry.get_default())]
3347
def unwrap_format(klass, format):
3348
if isinstance(format, remote.RemoteBranchFormat):
3349
format._ensure_real()
3350
return format._custom_format
3354
def copy_content_into(self, revision_id=None):
3355
"""Copy the content of source into target
3357
revision_id: if not None, the revision history in the new branch will
3358
be truncated to end with revision_id.
3360
self.source.update_references(self.target)
3361
self.source._synchronize_history(self.target, revision_id)
3363
parent = self.source.get_parent()
3364
except errors.InaccessibleParent, e:
3365
mutter('parent was not accessible to copy: %s', e)
3368
self.target.set_parent(parent)
3369
if self.source._push_should_merge_tags():
3370
self.source.tags.merge_to(self.target.tags)
3373
def fetch(self, stop_revision=None, fetch_spec=None):
3374
if fetch_spec is not None and stop_revision is not None:
3375
raise AssertionError(
3376
"fetch_spec and last_revision are mutually exclusive.")
3377
if self.target.base == self.source.base:
3379
self.source.lock_read()
3381
if stop_revision is None and fetch_spec is None:
3382
stop_revision = self.source.last_revision()
3383
stop_revision = _mod_revision.ensure_null(stop_revision)
3384
return self.target.repository.fetch(self.source.repository,
3385
revision_id=stop_revision, fetch_spec=fetch_spec)
3387
self.source.unlock()
3193
3390
def update_revisions(self, stop_revision=None, overwrite=False,
3391
graph=None, fetch_tags=True):
3195
3392
"""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()
3393
other_revno, other_last_revision = self.source.last_revision_info()
3394
stop_revno = None # unknown
3395
if stop_revision is None:
3396
stop_revision = other_last_revision
3397
if _mod_revision.is_null(stop_revision):
3398
# if there are no commits, we're done.
3400
stop_revno = other_revno
3402
# what's the current last revision, before we fetch [and change it
3404
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3405
# we fetch here so that we don't process data twice in the common
3406
# case of having something to pull, and so that the check for
3407
# already merged can operate on the just fetched graph, which will
3408
# be cached in memory.
3410
fetch_spec_factory = fetch.FetchSpecFactory()
3411
fetch_spec_factory.source_branch = self.source
3412
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3413
fetch_spec_factory.source_repo = self.source.repository
3414
fetch_spec_factory.target_repo = self.target.repository
3415
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3416
fetch_spec = fetch_spec_factory.make_fetch_spec()
3418
fetch_spec = _mod_graph.NotInOtherForRevs(self.target.repository,
3419
self.source.repository, revision_ids=[stop_revision]).execute()
3420
self.target.fetch(self.source, fetch_spec=fetch_spec)
3421
# Check to see if one is an ancestor of the other
3424
graph = self.target.repository.get_graph()
3425
if self.target._check_if_descendant_or_diverged(
3426
stop_revision, last_rev, graph, self.source):
3427
# stop_revision is a descendant of last_rev, but we aren't
3428
# overwriting, so we're done.
3430
if stop_revno is None:
3432
graph = self.target.repository.get_graph()
3433
this_revno, this_last_revision = \
3434
self.target.last_revision_info()
3435
stop_revno = graph.find_distance_to_null(stop_revision,
3436
[(other_last_revision, other_revno),
3437
(this_last_revision, this_revno)])
3438
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3441
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3442
possible_transports=None, run_hooks=True,
3238
3443
_override_hook_target=None, local=False):
3444
"""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
3446
:param run_hooks: Private parameter - if false, this branch
3244
3447
is being called because it's the master of the primary branch,
3245
3448
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.
3450
bound_location = self.target.get_bound_location()
3451
if local and not bound_location:
3252
3452
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()
3453
master_branch = None
3454
source_is_master = (self.source.user_url == bound_location)
3455
if not local and bound_location and not source_is_master:
3456
# not pulling from master, so we need to update master.
3457
master_branch = self.target.get_master_branch(possible_transports)
3458
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']:
3461
# pull from source into master.
3462
master_branch.pull(self.source, overwrite, stop_revision,
3464
return self._pull(overwrite,
3465
stop_revision, _hook_master=master_branch,
3466
run_hooks=run_hooks,
3467
_override_hook_target=_override_hook_target,
3468
merge_tags_to_master=not source_is_master)
3288
self.source.unlock()
3471
master_branch.unlock()
3291
3473
def push(self, overwrite=False, stop_revision=None,
3292
3474
_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.
3539
def _pull(self, overwrite=False, stop_revision=None,
3540
possible_transports=None, _hook_master=None, run_hooks=True,
3541
_override_hook_target=None, local=False,
3542
merge_tags_to_master=True):
3545
This function is the core worker, used by GenericInterBranch.pull to
3546
avoid duplication when pulling source->master and source->local.
3548
:param _hook_master: Private parameter - set the branch to
3549
be supplied as the master to pull hooks.
3374
3550
:param run_hooks: Private parameter - if false, this branch
3375
3551
is being called because it's the master of the primary branch,
3376
3552
so it should not run its hooks.
3553
is being called because it's the master of the primary branch,
3554
so it should not run its hooks.
3555
:param _override_hook_target: Private parameter - set the branch to be
3556
supplied as the target_branch to pull hooks.
3557
: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:
3559
# This type of branch can't be bound.
3380
3561
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()
3562
result = PullResult()
3563
result.source_branch = self.source
3564
if _override_hook_target is None:
3565
result.target_branch = self.target
3567
result.target_branch = _override_hook_target
3568
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)
3570
# We assume that during 'pull' the target repository is closer than
3572
self.source.update_references(self.target)
3573
graph = self.target.repository.get_graph(self.source.repository)
3574
# TODO: Branch formats should have a flag that indicates
3575
# that revno's are expensive, and pull() should honor that flag.
3577
result.old_revno, result.old_revid = \
3578
self.target.last_revision_info()
3579
self.target.update_revisions(self.source, stop_revision,
3580
overwrite=overwrite, graph=graph)
3581
# TODO: The old revid should be specified when merging tags,
3582
# so a tags implementation that versions tags can only
3583
# pull in the most recent changes. -- JRV20090506
3584
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3585
overwrite, ignore_master=not merge_tags_to_master)
3586
result.new_revno, result.new_revid = self.target.last_revision_info()
3588
result.master_branch = _hook_master
3589
result.local_branch = result.target_branch
3591
result.master_branch = result.target_branch
3592
result.local_branch = None
3594
for hook in Branch.hooks['post_pull']:
3397
master_branch.unlock()
3597
self.source.unlock()
3400
3601
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
