561
526
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
528
def leave_lock_in_place(self):
609
529
"""Tell this branch object not to release the physical lock when this
610
530
object is unlocked.
805
725
if len(old_repository._fallback_repositories) != 1:
806
726
raise AssertionError("can't cope with fallback repositories "
807
727
"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()
728
# unlock it, including unlocking the fallback
835
729
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):
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
854
749
self.repository.lock_write()
855
# Fetch from the old repository into the new.
856
old_repository.lock_read()
858
750
# XXX: If you unstack a branch while it has a working tree
859
751
# with a pending merge, the pending-merged revisions will no
860
752
# longer be present. You can (probably) revert and remerge.
1613
1491
"""Return the short format description for this format."""
1614
1492
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):
1494
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1626
1496
"""Initialize a branch in a bzrdir, with specified files
1628
1498
:param a_bzrdir: The bzrdir to initialize the branch in
1629
1499
:param utf8_files: The files to create as a list of
1630
1500
(filename, content) tuples
1631
:param name: Name of colocated branch to create, if any
1632
1501
:param set_format: If True, set the format with
1633
1502
self.get_format_string. (BzrBranch4 has its format set
1635
1504
: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)
1506
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1507
branch_transport = a_bzrdir.get_branch_transport(self)
1640
1509
'metadir': ('lock', lockdir.LockDir),
1641
1510
'branch4': ('branch-lock', lockable_files.TransportLock),
1921
1731
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
1734
class BzrBranchFormat4(BranchFormat):
2003
1735
"""Bzr branch format 4.
2252
1982
"""See BranchFormat.get_format_description()."""
2253
1983
return "Checkout reference format 1"
2255
def get_reference(self, a_bzrdir, name=None):
1985
def get_reference(self, a_bzrdir):
2256
1986
"""See BranchFormat.get_reference()."""
2257
transport = a_bzrdir.get_branch_transport(None, name=name)
1987
transport = a_bzrdir.get_branch_transport(None)
2258
1988
return transport.get_bytes('location')
2260
def set_reference(self, a_bzrdir, name, to_branch):
1990
def set_reference(self, a_bzrdir, to_branch):
2261
1991
"""See BranchFormat.set_reference()."""
2262
transport = a_bzrdir.get_branch_transport(None, name=name)
1992
transport = a_bzrdir.get_branch_transport(None)
2263
1993
location = transport.put_bytes('location', to_branch.base)
2265
def initialize(self, a_bzrdir, name=None, target_branch=None):
1995
def initialize(self, a_bzrdir, target_branch=None):
2266
1996
"""Create a branch of this format in a_bzrdir."""
2267
1997
if target_branch is None:
2268
1998
# this format does not implement branch itself, thus the implicit
2269
1999
# creation contract must see it as uninitializable
2270
2000
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)
2001
mutter('creating branch reference in %s', a_bzrdir.transport.base)
2002
branch_transport = a_bzrdir.get_branch_transport(self)
2273
2003
branch_transport.put_bytes('location',
2274
target_branch.bzrdir.user_url)
2004
target_branch.bzrdir.root_transport.base)
2275
2005
branch_transport.put_bytes('format', self.get_format_string())
2277
a_bzrdir, name, _found=True,
2007
a_bzrdir, _found=True,
2278
2008
possible_transports=[target_branch.bzrdir.root_transport])
2279
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2282
2010
def __init__(self):
2283
2011
super(BranchReferenceFormat, self).__init__()
3317
2999
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)
3000
"""InterBranch implementation that uses public Branch functions.
3004
def _get_branch_formats_to_test():
3005
return BranchFormat._default_format, BranchFormat._default_format
3356
3007
def update_revisions(self, stop_revision=None, overwrite=False,
3358
3009
"""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)
3010
self.source.lock_read()
3012
other_revno, other_last_revision = self.source.last_revision_info()
3013
stop_revno = None # unknown
3014
if stop_revision is None:
3015
stop_revision = other_last_revision
3016
if _mod_revision.is_null(stop_revision):
3017
# if there are no commits, we're done.
3019
stop_revno = other_revno
3021
# what's the current last revision, before we fetch [and change it
3023
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3024
# we fetch here so that we don't process data twice in the common
3025
# case of having something to pull, and so that the check for
3026
# already merged can operate on the just fetched graph, which will
3027
# be cached in memory.
3028
self.target.fetch(self.source, stop_revision)
3029
# Check to see if one is an ancestor of the other
3032
graph = self.target.repository.get_graph()
3033
if self.target._check_if_descendant_or_diverged(
3034
stop_revision, last_rev, graph, self.source):
3035
# stop_revision is a descendant of last_rev, but we aren't
3036
# overwriting, so we're done.
3038
if stop_revno is None:
3040
graph = self.target.repository.get_graph()
3041
this_revno, this_last_revision = \
3042
self.target.last_revision_info()
3043
stop_revno = graph.find_distance_to_null(stop_revision,
3044
[(other_last_revision, other_revno),
3045
(this_last_revision, this_revno)])
3046
self.target.set_last_revision_info(stop_revno, stop_revision)
3048
self.source.unlock()
3396
3050
def pull(self, overwrite=False, stop_revision=None,
3397
possible_transports=None, run_hooks=True,
3051
possible_transports=None, _hook_master=None, run_hooks=True,
3398
3052
_override_hook_target=None, local=False):
3399
"""Pull from source into self, updating my master if any.
3055
:param _hook_master: Private parameter - set the branch to
3056
be supplied as the master to pull hooks.
3401
3057
:param run_hooks: Private parameter - if false, this branch
3402
3058
is being called because it's the master of the primary branch,
3403
3059
so it should not run its hooks.
3060
:param _override_hook_target: Private parameter - set the branch to be
3061
supplied as the target_branch to pull hooks.
3062
: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:
3064
# This type of branch can't be bound.
3407
3066
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()
3067
result = PullResult()
3068
result.source_branch = self.source
3069
if _override_hook_target is None:
3070
result.target_branch = self.target
3072
result.target_branch = _override_hook_target
3073
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)
3075
# We assume that during 'pull' the target repository is closer than
3077
self.source.update_references(self.target)
3078
graph = self.target.repository.get_graph(self.source.repository)
3079
# TODO: Branch formats should have a flag that indicates
3080
# that revno's are expensive, and pull() should honor that flag.
3082
result.old_revno, result.old_revid = \
3083
self.target.last_revision_info()
3084
self.target.update_revisions(self.source, stop_revision,
3085
overwrite=overwrite, graph=graph)
3086
# TODO: The old revid should be specified when merging tags,
3087
# so a tags implementation that versions tags can only
3088
# pull in the most recent changes. -- JRV20090506
3089
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3091
result.new_revno, result.new_revid = self.target.last_revision_info()
3093
result.master_branch = _hook_master
3094
result.local_branch = result.target_branch
3096
result.master_branch = result.target_branch
3097
result.local_branch = None
3099
for hook in Branch.hooks['post_pull']:
3424
master_branch.unlock()
3102
self.source.unlock()
3426
3105
def push(self, overwrite=False, stop_revision=None,
3427
3106
_override_hook_source_branch=None):
3492
def _pull(self, overwrite=False, stop_revision=None,
3493
possible_transports=None, _hook_master=None, run_hooks=True,
3172
def is_compatible(self, source, target):
3173
# GenericBranch uses the public API, so always compatible
3177
class InterToBranch5(GenericInterBranch):
3180
def _get_branch_formats_to_test():
3181
return BranchFormat._default_format, BzrBranchFormat5()
3183
def pull(self, overwrite=False, stop_revision=None,
3184
possible_transports=None, run_hooks=True,
3494
3185
_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.
3186
"""Pull from source into self, updating my master if any.
3502
3188
:param run_hooks: Private parameter - if false, this branch
3503
3189
is being called because it's the master of the primary branch,
3504
3190
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.
3192
bound_location = self.target.get_bound_location()
3193
if local and not bound_location:
3511
3194
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()
3195
master_branch = None
3196
if not local and bound_location and self.source.base != bound_location:
3197
# not pulling from master, so we need to update master.
3198
master_branch = self.target.get_master_branch(possible_transports)
3199
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']:
3202
# pull from source into master.
3203
master_branch.pull(self.source, overwrite, stop_revision,
3205
return super(InterToBranch5, self).pull(overwrite,
3206
stop_revision, _hook_master=master_branch,
3207
run_hooks=run_hooks,
3208
_override_hook_target=_override_hook_target)
3547
self.source.unlock()
3211
master_branch.unlock()
3551
3214
InterBranch.register_optimiser(GenericInterBranch)
3215
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
