724
870
old_repository = self.repository
725
871
if len(old_repository._fallback_repositories) != 1:
726
872
raise AssertionError("can't cope with fallback repositories "
727
"of %r" % (self.repository,))
728
# unlock it, including unlocking the fallback
873
"of %r (fallbacks: %r)" % (old_repository,
874
old_repository._fallback_repositories))
875
# Open the new repository object.
876
# Repositories don't offer an interface to remove fallback
877
# repositories today; take the conceptually simpler option and just
878
# reopen it. We reopen it starting from the URL so that we
879
# get a separate connection for RemoteRepositories and can
880
# stream from one of them to the other. This does mean doing
881
# separate SSH connection setup, but unstacking is not a
882
# common operation so it's tolerable.
883
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
884
new_repository = new_bzrdir.find_repository()
885
if new_repository._fallback_repositories:
886
raise AssertionError("didn't expect %r to have "
887
"fallback_repositories"
888
% (self.repository,))
889
# Replace self.repository with the new repository.
890
# Do our best to transfer the lock state (i.e. lock-tokens and
891
# lock count) of self.repository to the new repository.
892
lock_token = old_repository.lock_write().repository_token
893
self.repository = new_repository
894
if isinstance(self, remote.RemoteBranch):
895
# Remote branches can have a second reference to the old
896
# repository that need to be replaced.
897
if self._real_branch is not None:
898
self._real_branch.repository = new_repository
899
self.repository.lock_write(token=lock_token)
900
if lock_token is not None:
901
old_repository.leave_lock_in_place()
729
902
old_repository.unlock()
903
if lock_token is not None:
904
# XXX: self.repository.leave_lock_in_place() before this
905
# function will not be preserved. Fortunately that doesn't
906
# affect the current default format (2a), and would be a
907
# corner-case anyway.
908
# - Andrew Bennetts, 2010/06/30
909
self.repository.dont_leave_lock_in_place()
913
old_repository.unlock()
914
except errors.LockNotHeld:
917
if old_lock_count == 0:
918
raise AssertionError(
919
'old_repository should have been locked at least once.')
920
for i in range(old_lock_count-1):
921
self.repository.lock_write()
922
# Fetch from the old repository into the new.
730
923
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
749
self.repository.lock_write()
750
925
# XXX: If you unstack a branch while it has a working tree
751
926
# with a pending merge, the pending-merged revisions will no
752
927
# longer be present. You can (probably) revert and remerge.
754
# XXX: This only fetches up to the tip of the repository; it
755
# doesn't bring across any tags. That's fairly consistent
756
# with how branch works, but perhaps not ideal.
757
self.repository.fetch(old_repository,
758
revision_id=self.last_revision(),
929
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
930
except errors.TagsNotSupported:
931
tags_to_fetch = set()
932
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
933
old_repository, required_ids=[self.last_revision()],
934
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
935
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
761
937
old_repository.unlock()
859
1053
:return: A tuple (revno, revision_id).
861
1055
if self._last_revision_info_cache is None:
862
self._last_revision_info_cache = self._last_revision_info()
1056
self._last_revision_info_cache = self._read_last_revision_info()
863
1057
return self._last_revision_info_cache
865
def _last_revision_info(self):
866
rh = self.revision_history()
869
return (revno, rh[-1])
871
return (0, _mod_revision.NULL_REVISION)
873
@deprecated_method(deprecated_in((1, 6, 0)))
874
def missing_revisions(self, other, stop_revision=None):
875
"""Return a list of new revisions that would perfectly fit.
877
If self and other have not diverged, return a list of the revisions
878
present in other, but missing from self.
880
self_history = self.revision_history()
881
self_len = len(self_history)
882
other_history = other.revision_history()
883
other_len = len(other_history)
884
common_index = min(self_len, other_len) -1
885
if common_index >= 0 and \
886
self_history[common_index] != other_history[common_index]:
887
raise errors.DivergedBranches(self, other)
889
if stop_revision is None:
890
stop_revision = other_len
892
if stop_revision > other_len:
893
raise errors.NoSuchRevision(self, stop_revision)
894
return other_history[self_len:stop_revision]
897
def update_revisions(self, other, stop_revision=None, overwrite=False,
899
"""Pull in new perfect-fit revisions.
901
:param other: Another Branch to pull from
902
:param stop_revision: Updated until the given revision
903
:param overwrite: Always set the branch pointer, rather than checking
904
to see if it is a proper descendant.
905
:param graph: A Graph object that can be used to query history
906
information. This can be None.
909
return InterBranch.get(other, self).update_revisions(stop_revision,
1059
def _read_last_revision_info(self):
1060
raise NotImplementedError(self._read_last_revision_info)
1062
@deprecated_method(deprecated_in((2, 4, 0)))
912
1063
def import_last_revision_info(self, source_repo, revno, revid):
913
1064
"""Set the last revision info, importing from another repo if necessary.
915
This is used by the bound branch code to upload a revision to
916
the master branch first before updating the tip of the local branch.
918
1066
:param source_repo: Source repository to optionally fetch from
919
1067
:param revno: Revision number of the new tip
920
1068
:param revid: Revision id of the new tip
1483
1667
"""Return the short format description for this format."""
1484
1668
raise NotImplementedError(self.get_format_description)
1486
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1488
"""Initialize a branch in a bzrdir, with specified files
1670
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1671
hooks = Branch.hooks['post_branch_init']
1674
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1490
:param a_bzrdir: The bzrdir to initialize the branch in
1491
:param utf8_files: The files to create as a list of
1492
(filename, content) tuples
1493
:param set_format: If True, set the format with
1494
self.get_format_string. (BzrBranch4 has its format set
1496
:return: a branch in this format
1678
def initialize(self, a_bzrdir, name=None, repository=None,
1679
append_revisions_only=None):
1680
"""Create a branch of this format in a_bzrdir.
1682
:param name: Name of the colocated branch to create.
1498
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1499
branch_transport = a_bzrdir.get_branch_transport(self)
1501
'metadir': ('lock', lockdir.LockDir),
1502
'branch4': ('branch-lock', lockable_files.TransportLock),
1504
lock_name, lock_class = lock_map[lock_type]
1505
control_files = lockable_files.LockableFiles(branch_transport,
1506
lock_name, lock_class)
1507
control_files.create_lock()
1509
control_files.lock_write()
1510
except errors.LockContention:
1511
if lock_type != 'branch4':
1517
utf8_files += [('format', self.get_format_string())]
1519
for (filename, content) in utf8_files:
1520
branch_transport.put_bytes(
1522
mode=a_bzrdir._get_file_mode())
1525
control_files.unlock()
1526
return self.open(a_bzrdir, _found=True)
1528
def initialize(self, a_bzrdir):
1529
"""Create a branch of this format in a_bzrdir."""
1530
1684
raise NotImplementedError(self.initialize)
1532
1686
def is_supported(self):
1645
1845
"basis revision. hooks MUST NOT modify this delta. "
1646
1846
" future_tree is an in-memory tree obtained from "
1647
1847
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1648
"tree.", (0,91), None))
1649
self.create_hook(HookPoint('post_commit',
1849
self.add_hook('post_commit',
1650
1850
"Called in the bzr client after a commit has completed. "
1651
1851
"post_commit is called with (local, master, old_revno, old_revid, "
1652
1852
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1653
"commit to a branch.", (0, 15), None))
1654
self.create_hook(HookPoint('post_uncommit',
1853
"commit to a branch.", (0, 15))
1854
self.add_hook('post_uncommit',
1655
1855
"Called in the bzr client after an uncommit completes. "
1656
1856
"post_uncommit is called with (local, master, old_revno, "
1657
1857
"old_revid, new_revno, new_revid) where local is the local branch "
1658
1858
"or None, master is the target branch, and an empty branch "
1659
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1660
self.create_hook(HookPoint('pre_change_branch_tip',
1859
"receives new_revno of 0, new_revid of None.", (0, 15))
1860
self.add_hook('pre_change_branch_tip',
1661
1861
"Called in bzr client and server before a change to the tip of a "
1662
1862
"branch is made. pre_change_branch_tip is called with a "
1663
1863
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1664
"commit, uncommit will all trigger this hook.", (1, 6), None))
1665
self.create_hook(HookPoint('post_change_branch_tip',
1864
"commit, uncommit will all trigger this hook.", (1, 6))
1865
self.add_hook('post_change_branch_tip',
1666
1866
"Called in bzr client and server after a change to the tip of a "
1667
1867
"branch is made. post_change_branch_tip is called with a "
1668
1868
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1669
"commit, uncommit will all trigger this hook.", (1, 4), None))
1670
self.create_hook(HookPoint('transform_fallback_location',
1869
"commit, uncommit will all trigger this hook.", (1, 4))
1870
self.add_hook('transform_fallback_location',
1671
1871
"Called when a stacked branch is activating its fallback "
1672
1872
"locations. transform_fallback_location is called with (branch, "
1673
1873
"url), and should return a new url. Returning the same url "
1723
1940
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1726
class BzrBranchFormat4(BranchFormat):
1727
"""Bzr branch format 4.
1730
- a revision-history file.
1731
- a branch-lock lock file [ to be shared with the bzrdir ]
1734
def get_format_description(self):
1735
"""See BranchFormat.get_format_description()."""
1736
return "Branch format 4"
1738
def initialize(self, a_bzrdir):
1739
"""Create a branch of this format in a_bzrdir."""
1740
utf8_files = [('revision-history', ''),
1741
('branch-name', ''),
1743
return self._initialize_helper(a_bzrdir, utf8_files,
1744
lock_type='branch4', set_format=False)
1747
super(BzrBranchFormat4, self).__init__()
1748
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1750
def network_name(self):
1751
"""The network name for this format is the control dirs disk label."""
1752
return self._matchingbzrdir.get_format_string()
1754
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1755
"""See BranchFormat.open()."""
1757
# we are being called directly and must probe.
1758
raise NotImplementedError
1759
return BzrBranch(_format=self,
1760
_control_files=a_bzrdir._control_files,
1762
_repository=a_bzrdir.open_repository())
1765
return "Bazaar-NG branch format 4"
1943
class BranchInitHookParams(object):
1944
"""Object holding parameters passed to `*_branch_init` hooks.
1946
There are 4 fields that hooks may wish to access:
1948
:ivar format: the branch format
1949
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1950
:ivar name: name of colocated branch, if any (or None)
1951
:ivar branch: the branch created
1953
Note that for lightweight checkouts, the bzrdir and format fields refer to
1954
the checkout, hence they are different from the corresponding fields in
1955
branch, which refer to the original branch.
1958
def __init__(self, format, a_bzrdir, name, branch):
1959
"""Create a group of BranchInitHook parameters.
1961
:param format: the branch format
1962
:param a_bzrdir: the BzrDir where the branch will be/has been
1964
:param name: name of colocated branch, if any (or None)
1965
:param branch: the branch created
1967
Note that for lightweight checkouts, the bzrdir and format fields refer
1968
to the checkout, hence they are different from the corresponding fields
1969
in branch, which refer to the original branch.
1971
self.format = format
1972
self.bzrdir = a_bzrdir
1974
self.branch = branch
1976
def __eq__(self, other):
1977
return self.__dict__ == other.__dict__
1980
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1983
class SwitchHookParams(object):
1984
"""Object holding parameters passed to `*_switch` hooks.
1986
There are 4 fields that hooks may wish to access:
1988
:ivar control_dir: BzrDir of the checkout to change
1989
:ivar to_branch: branch that the checkout is to reference
1990
:ivar force: skip the check for local commits in a heavy checkout
1991
:ivar revision_id: revision ID to switch to (or None)
1994
def __init__(self, control_dir, to_branch, force, revision_id):
1995
"""Create a group of SwitchHook parameters.
1997
:param control_dir: BzrDir of the checkout to change
1998
:param to_branch: branch that the checkout is to reference
1999
:param force: skip the check for local commits in a heavy checkout
2000
:param revision_id: revision ID to switch to (or None)
2002
self.control_dir = control_dir
2003
self.to_branch = to_branch
2005
self.revision_id = revision_id
2007
def __eq__(self, other):
2008
return self.__dict__ == other.__dict__
2011
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
2012
self.control_dir, self.to_branch,
1768
2016
class BranchFormatMetadir(BranchFormat):
1974
2277
"""See BranchFormat.get_format_description()."""
1975
2278
return "Checkout reference format 1"
1977
def get_reference(self, a_bzrdir):
2280
def get_reference(self, a_bzrdir, name=None):
1978
2281
"""See BranchFormat.get_reference()."""
1979
transport = a_bzrdir.get_branch_transport(None)
2282
transport = a_bzrdir.get_branch_transport(None, name=name)
1980
2283
return transport.get_bytes('location')
1982
def set_reference(self, a_bzrdir, to_branch):
2285
def set_reference(self, a_bzrdir, name, to_branch):
1983
2286
"""See BranchFormat.set_reference()."""
1984
transport = a_bzrdir.get_branch_transport(None)
2287
transport = a_bzrdir.get_branch_transport(None, name=name)
1985
2288
location = transport.put_bytes('location', to_branch.base)
1987
def initialize(self, a_bzrdir, target_branch=None):
2290
def initialize(self, a_bzrdir, name=None, target_branch=None,
2291
repository=None, append_revisions_only=None):
1988
2292
"""Create a branch of this format in a_bzrdir."""
1989
2293
if target_branch is None:
1990
2294
# this format does not implement branch itself, thus the implicit
1991
2295
# creation contract must see it as uninitializable
1992
2296
raise errors.UninitializableFormat(self)
1993
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1994
branch_transport = a_bzrdir.get_branch_transport(self)
2297
mutter('creating branch reference in %s', a_bzrdir.user_url)
2298
if a_bzrdir._format.fixed_components:
2299
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2300
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1995
2301
branch_transport.put_bytes('location',
1996
target_branch.bzrdir.root_transport.base)
2302
target_branch.bzrdir.user_url)
1997
2303
branch_transport.put_bytes('format', self.get_format_string())
1999
a_bzrdir, _found=True,
2305
a_bzrdir, name, _found=True,
2000
2306
possible_transports=[target_branch.bzrdir.root_transport])
2307
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2002
2310
def __init__(self):
2003
2311
super(BranchReferenceFormat, self).__init__()
2193
2552
"""See Branch.print_file."""
2194
2553
return self.repository.print_file(file, revision_id)
2196
def _write_revision_history(self, history):
2197
"""Factored out of set_revision_history.
2199
This performs the actual writing to disk.
2200
It is intended to be called by BzrBranch5.set_revision_history."""
2201
self._transport.put_bytes(
2202
'revision-history', '\n'.join(history),
2203
mode=self.bzrdir._get_file_mode())
2206
def set_revision_history(self, rev_history):
2207
"""See Branch.set_revision_history."""
2208
if 'evil' in debug.debug_flags:
2209
mutter_callsite(3, "set_revision_history scales with history.")
2210
check_not_reserved_id = _mod_revision.check_not_reserved_id
2211
for rev_id in rev_history:
2212
check_not_reserved_id(rev_id)
2213
if Branch.hooks['post_change_branch_tip']:
2214
# Don't calculate the last_revision_info() if there are no hooks
2216
old_revno, old_revid = self.last_revision_info()
2217
if len(rev_history) == 0:
2218
revid = _mod_revision.NULL_REVISION
2220
revid = rev_history[-1]
2221
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2222
self._write_revision_history(rev_history)
2223
self._clear_cached_state()
2224
self._cache_revision_history(rev_history)
2225
for hook in Branch.hooks['set_rh']:
2226
hook(self, rev_history)
2227
if Branch.hooks['post_change_branch_tip']:
2228
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230
def _synchronize_history(self, destination, revision_id):
2231
"""Synchronize last revision and revision history between branches.
2233
This version is most efficient when the destination is also a
2234
BzrBranch5, but works for BzrBranch6 as long as the revision
2235
history is the true lefthand parent history, and all of the revisions
2236
are in the destination's repository. If not, set_revision_history
2239
:param destination: The branch to copy the history into
2240
:param revision_id: The revision-id to truncate history at. May
2241
be None to copy complete history.
2243
if not isinstance(destination._format, BzrBranchFormat5):
2244
super(BzrBranch, self)._synchronize_history(
2245
destination, revision_id)
2247
if revision_id == _mod_revision.NULL_REVISION:
2250
new_history = self.revision_history()
2251
if revision_id is not None and new_history != []:
2253
new_history = new_history[:new_history.index(revision_id) + 1]
2255
rev = self.repository.get_revision(revision_id)
2256
new_history = rev.get_history(self.repository)[1:]
2257
destination.set_revision_history(new_history)
2259
2555
@needs_write_lock
2260
2556
def set_last_revision_info(self, revno, revision_id):
2261
"""Set the last revision of this branch.
2263
The caller is responsible for checking that the revno is correct
2264
for this revision id.
2266
It may be possible to set the branch last revision to an id not
2267
present in the repository. However, branches can also be
2268
configured to check constraints on history, in which case this may not
2557
if not revision_id or not isinstance(revision_id, basestring):
2558
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2271
2559
revision_id = _mod_revision.ensure_null(revision_id)
2272
# this old format stores the full history, but this api doesn't
2273
# provide it, so we must generate, and might as well check it's
2275
history = self._lefthand_history(revision_id)
2276
if len(history) != revno:
2277
raise AssertionError('%d != %d' % (len(history), revno))
2278
self.set_revision_history(history)
2280
def _gen_revision_history(self):
2281
history = self._transport.get_bytes('revision-history').split('\n')
2282
if history[-1:] == ['']:
2283
# There shouldn't be a trailing newline, but just in case.
2288
def generate_revision_history(self, revision_id, last_rev=None,
2290
"""Create a new revision history that will finish with revision_id.
2292
:param revision_id: the new tip to use.
2293
:param last_rev: The previous last_revision. If not None, then this
2294
must be a ancestory of revision_id, or DivergedBranches is raised.
2295
:param other_branch: The other branch that DivergedBranches should
2296
raise with respect to.
2298
self.set_revision_history(self._lefthand_history(revision_id,
2299
last_rev, other_branch))
2560
old_revno, old_revid = self.last_revision_info()
2561
if self.get_append_revisions_only():
2562
self._check_history_violation(revision_id)
2563
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2564
self._write_last_revision_info(revno, revision_id)
2565
self._clear_cached_state()
2566
self._last_revision_info_cache = revno, revision_id
2567
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2301
2569
def basis_tree(self):
2302
2570
"""See Branch.basis_tree."""
2451
class BzrBranch8(BzrBranch5):
2691
def _read_last_revision_info(self):
2692
revision_string = self._transport.get_bytes('last-revision')
2693
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2694
revision_id = cache_utf8.get_cached_utf8(revision_id)
2696
return revno, revision_id
2698
def _write_last_revision_info(self, revno, revision_id):
2699
"""Simply write out the revision id, with no checks.
2701
Use set_last_revision_info to perform this safely.
2703
Does not update the revision_history cache.
2705
revision_id = _mod_revision.ensure_null(revision_id)
2706
out_string = '%d %s\n' % (revno, revision_id)
2707
self._transport.put_bytes('last-revision', out_string,
2708
mode=self.bzrdir._get_file_mode())
2711
class FullHistoryBzrBranch(BzrBranch):
2712
"""Bzr branch which contains the full revision history."""
2715
def set_last_revision_info(self, revno, revision_id):
2716
if not revision_id or not isinstance(revision_id, basestring):
2717
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2718
revision_id = _mod_revision.ensure_null(revision_id)
2719
# this old format stores the full history, but this api doesn't
2720
# provide it, so we must generate, and might as well check it's
2722
history = self._lefthand_history(revision_id)
2723
if len(history) != revno:
2724
raise AssertionError('%d != %d' % (len(history), revno))
2725
self._set_revision_history(history)
2727
def _read_last_revision_info(self):
2728
rh = self._revision_history()
2731
return (revno, rh[-1])
2733
return (0, _mod_revision.NULL_REVISION)
2735
@deprecated_method(deprecated_in((2, 4, 0)))
2737
def set_revision_history(self, rev_history):
2738
"""See Branch.set_revision_history."""
2739
self._set_revision_history(rev_history)
2741
def _set_revision_history(self, rev_history):
2742
if 'evil' in debug.debug_flags:
2743
mutter_callsite(3, "set_revision_history scales with history.")
2744
check_not_reserved_id = _mod_revision.check_not_reserved_id
2745
for rev_id in rev_history:
2746
check_not_reserved_id(rev_id)
2747
if Branch.hooks['post_change_branch_tip']:
2748
# Don't calculate the last_revision_info() if there are no hooks
2750
old_revno, old_revid = self.last_revision_info()
2751
if len(rev_history) == 0:
2752
revid = _mod_revision.NULL_REVISION
2754
revid = rev_history[-1]
2755
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2756
self._write_revision_history(rev_history)
2757
self._clear_cached_state()
2758
self._cache_revision_history(rev_history)
2759
for hook in Branch.hooks['set_rh']:
2760
hook(self, rev_history)
2761
if Branch.hooks['post_change_branch_tip']:
2762
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2764
def _write_revision_history(self, history):
2765
"""Factored out of set_revision_history.
2767
This performs the actual writing to disk.
2768
It is intended to be called by set_revision_history."""
2769
self._transport.put_bytes(
2770
'revision-history', '\n'.join(history),
2771
mode=self.bzrdir._get_file_mode())
2773
def _gen_revision_history(self):
2774
history = self._transport.get_bytes('revision-history').split('\n')
2775
if history[-1:] == ['']:
2776
# There shouldn't be a trailing newline, but just in case.
2780
def _synchronize_history(self, destination, revision_id):
2781
if not isinstance(destination, FullHistoryBzrBranch):
2782
super(BzrBranch, self)._synchronize_history(
2783
destination, revision_id)
2785
if revision_id == _mod_revision.NULL_REVISION:
2788
new_history = self._revision_history()
2789
if revision_id is not None and new_history != []:
2791
new_history = new_history[:new_history.index(revision_id) + 1]
2793
rev = self.repository.get_revision(revision_id)
2794
new_history = rev.get_history(self.repository)[1:]
2795
destination._set_revision_history(new_history)
2798
def generate_revision_history(self, revision_id, last_rev=None,
2800
"""Create a new revision history that will finish with revision_id.
2802
:param revision_id: the new tip to use.
2803
:param last_rev: The previous last_revision. If not None, then this
2804
must be a ancestory of revision_id, or DivergedBranches is raised.
2805
:param other_branch: The other branch that DivergedBranches should
2806
raise with respect to.
2808
self._set_revision_history(self._lefthand_history(revision_id,
2809
last_rev, other_branch))
2812
class BzrBranch5(FullHistoryBzrBranch):
2813
"""A format 5 branch. This supports new features over plain branches.
2815
It has support for a master_branch which is the data for bound branches.
2819
class BzrBranch8(BzrBranch):
2452
2820
"""A branch that stores tree-reference locations."""
2454
2822
def _open_hook(self):
2480
2848
self._last_revision_info_cache = None
2481
2849
self._reference_info = None
2483
def _last_revision_info(self):
2484
revision_string = self._transport.get_bytes('last-revision')
2485
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2486
revision_id = cache_utf8.get_cached_utf8(revision_id)
2488
return revno, revision_id
2490
def _write_last_revision_info(self, revno, revision_id):
2491
"""Simply write out the revision id, with no checks.
2493
Use set_last_revision_info to perform this safely.
2495
Does not update the revision_history cache.
2496
Intended to be called by set_last_revision_info and
2497
_write_revision_history.
2499
revision_id = _mod_revision.ensure_null(revision_id)
2500
out_string = '%d %s\n' % (revno, revision_id)
2501
self._transport.put_bytes('last-revision', out_string,
2502
mode=self.bzrdir._get_file_mode())
2505
def set_last_revision_info(self, revno, revision_id):
2506
revision_id = _mod_revision.ensure_null(revision_id)
2507
old_revno, old_revid = self.last_revision_info()
2508
if self._get_append_revisions_only():
2509
self._check_history_violation(revision_id)
2510
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2511
self._write_last_revision_info(revno, revision_id)
2512
self._clear_cached_state()
2513
self._last_revision_info_cache = revno, revision_id
2514
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2516
def _synchronize_history(self, destination, revision_id):
2517
"""Synchronize last revision and revision history between branches.
2519
:see: Branch._synchronize_history
2521
# XXX: The base Branch has a fast implementation of this method based
2522
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2523
# that uses set_revision_history. This class inherits from BzrBranch5,
2524
# but wants the fast implementation, so it calls
2525
# Branch._synchronize_history directly.
2526
Branch._synchronize_history(self, destination, revision_id)
2528
2851
def _check_history_violation(self, revision_id):
2529
last_revision = _mod_revision.ensure_null(self.last_revision())
2852
current_revid = self.last_revision()
2853
last_revision = _mod_revision.ensure_null(current_revid)
2530
2854
if _mod_revision.is_null(last_revision):
2532
if last_revision not in self._lefthand_history(revision_id):
2533
raise errors.AppendRevisionsOnlyViolation(self.base)
2856
graph = self.repository.get_graph()
2857
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2858
if lh_ancestor == current_revid:
2860
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2535
2862
def _gen_revision_history(self):
2536
2863
"""Generate the revision history from last revision
2988
3283
raise NotImplementedError(self.push)
3286
def copy_content_into(self, revision_id=None):
3287
"""Copy the content of source into target
3289
revision_id: if not None, the revision history in the new branch will
3290
be truncated to end with revision_id.
3292
raise NotImplementedError(self.copy_content_into)
3295
def fetch(self, stop_revision=None, limit=None):
3298
:param stop_revision: Last revision to fetch
3299
:param limit: Optional rough limit of revisions to fetch
3301
raise NotImplementedError(self.fetch)
2991
3304
class GenericInterBranch(InterBranch):
2992
"""InterBranch implementation that uses public Branch functions.
2996
def _get_branch_formats_to_test():
2997
return BranchFormat._default_format, BranchFormat._default_format
2999
def update_revisions(self, stop_revision=None, overwrite=False,
3001
"""See InterBranch.update_revisions()."""
3305
"""InterBranch implementation that uses public Branch functions."""
3308
def is_compatible(klass, source, target):
3309
# GenericBranch uses the public API, so always compatible
3313
def _get_branch_formats_to_test(klass):
3314
return [(format_registry.get_default(), format_registry.get_default())]
3317
def unwrap_format(klass, format):
3318
if isinstance(format, remote.RemoteBranchFormat):
3319
format._ensure_real()
3320
return format._custom_format
3324
def copy_content_into(self, revision_id=None):
3325
"""Copy the content of source into target
3327
revision_id: if not None, the revision history in the new branch will
3328
be truncated to end with revision_id.
3330
self.source.update_references(self.target)
3331
self.source._synchronize_history(self.target, revision_id)
3333
parent = self.source.get_parent()
3334
except errors.InaccessibleParent, e:
3335
mutter('parent was not accessible to copy: %s', e)
3338
self.target.set_parent(parent)
3339
if self.source._push_should_merge_tags():
3340
self.source.tags.merge_to(self.target.tags)
3343
def fetch(self, stop_revision=None, limit=None):
3344
if self.target.base == self.source.base:
3002
3346
self.source.lock_read()
3004
other_revno, other_last_revision = self.source.last_revision_info()
3005
stop_revno = None # unknown
3006
if stop_revision is None:
3007
stop_revision = other_last_revision
3008
if _mod_revision.is_null(stop_revision):
3009
# if there are no commits, we're done.
3011
stop_revno = other_revno
3013
# what's the current last revision, before we fetch [and change it
3015
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3016
# we fetch here so that we don't process data twice in the common
3017
# case of having something to pull, and so that the check for
3018
# already merged can operate on the just fetched graph, which will
3019
# be cached in memory.
3020
self.target.fetch(self.source, stop_revision)
3021
# Check to see if one is an ancestor of the other
3024
graph = self.target.repository.get_graph()
3025
if self.target._check_if_descendant_or_diverged(
3026
stop_revision, last_rev, graph, self.source):
3027
# stop_revision is a descendant of last_rev, but we aren't
3028
# overwriting, so we're done.
3030
if stop_revno is None:
3032
graph = self.target.repository.get_graph()
3033
this_revno, this_last_revision = \
3034
self.target.last_revision_info()
3035
stop_revno = graph.find_distance_to_null(stop_revision,
3036
[(other_last_revision, other_revno),
3037
(this_last_revision, this_revno)])
3038
self.target.set_last_revision_info(stop_revno, stop_revision)
3348
fetch_spec_factory = fetch.FetchSpecFactory()
3349
fetch_spec_factory.source_branch = self.source
3350
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3351
fetch_spec_factory.source_repo = self.source.repository
3352
fetch_spec_factory.target_repo = self.target.repository
3353
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3354
fetch_spec_factory.limit = limit
3355
fetch_spec = fetch_spec_factory.make_fetch_spec()
3356
return self.target.repository.fetch(self.source.repository,
3357
fetch_spec=fetch_spec)
3040
3359
self.source.unlock()
3362
def _update_revisions(self, stop_revision=None, overwrite=False,
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.fetch(stop_revision=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)
3042
3401
def pull(self, overwrite=False, stop_revision=None,
3402
possible_transports=None, run_hooks=True,
3403
_override_hook_target=None, local=False):
3404
"""Pull from source into self, updating my master if any.
3406
:param run_hooks: Private parameter - if false, this branch
3407
is being called because it's the master of the primary branch,
3408
so it should not run its hooks.
3410
bound_location = self.target.get_bound_location()
3411
if local and not bound_location:
3412
raise errors.LocalRequiresBoundBranch()
3413
master_branch = None
3414
source_is_master = False
3416
# bound_location comes from a config file, some care has to be
3417
# taken to relate it to source.user_url
3418
normalized = urlutils.normalize_url(bound_location)
3420
relpath = self.source.user_transport.relpath(normalized)
3421
source_is_master = (relpath == '')
3422
except (errors.PathNotChild, errors.InvalidURL):
3423
source_is_master = False
3424
if not local and bound_location and not source_is_master:
3425
# not pulling from master, so we need to update master.
3426
master_branch = self.target.get_master_branch(possible_transports)
3427
master_branch.lock_write()
3430
# pull from source into master.
3431
master_branch.pull(self.source, overwrite, stop_revision,
3433
return self._pull(overwrite,
3434
stop_revision, _hook_master=master_branch,
3435
run_hooks=run_hooks,
3436
_override_hook_target=_override_hook_target,
3437
merge_tags_to_master=not source_is_master)
3440
master_branch.unlock()
3442
def push(self, overwrite=False, stop_revision=None, lossy=False,
3443
_override_hook_source_branch=None):
3444
"""See InterBranch.push.
3446
This is the basic concrete implementation of push()
3448
:param _override_hook_source_branch: If specified, run the hooks
3449
passing this Branch as the source, rather than self. This is for
3450
use of RemoteBranch, where push is delegated to the underlying
3454
raise errors.LossyPushToSameVCS(self.source, self.target)
3455
# TODO: Public option to disable running hooks - should be trivial but
3458
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3459
op.add_cleanup(self.source.lock_read().unlock)
3460
op.add_cleanup(self.target.lock_write().unlock)
3461
return op.run(overwrite, stop_revision,
3462
_override_hook_source_branch=_override_hook_source_branch)
3464
def _basic_push(self, overwrite, stop_revision):
3465
"""Basic implementation of push without bound branches or hooks.
3467
Must be called with source read locked and target write locked.
3469
result = BranchPushResult()
3470
result.source_branch = self.source
3471
result.target_branch = self.target
3472
result.old_revno, result.old_revid = self.target.last_revision_info()
3473
self.source.update_references(self.target)
3474
if result.old_revid != stop_revision:
3475
# We assume that during 'push' this repository is closer than
3477
graph = self.source.repository.get_graph(self.target.repository)
3478
self._update_revisions(stop_revision, overwrite=overwrite,
3480
if self.source._push_should_merge_tags():
3481
result.tag_updates, result.tag_conflicts = (
3482
self.source.tags.merge_to(self.target.tags, overwrite))
3483
result.new_revno, result.new_revid = self.target.last_revision_info()
3486
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3487
_override_hook_source_branch=None):
3488
"""Push from source into target, and into target's master if any.
3491
if _override_hook_source_branch:
3492
result.source_branch = _override_hook_source_branch
3493
for hook in Branch.hooks['post_push']:
3496
bound_location = self.target.get_bound_location()
3497
if bound_location and self.target.base != bound_location:
3498
# there is a master branch.
3500
# XXX: Why the second check? Is it even supported for a branch to
3501
# be bound to itself? -- mbp 20070507
3502
master_branch = self.target.get_master_branch()
3503
master_branch.lock_write()
3504
operation.add_cleanup(master_branch.unlock)
3505
# push into the master from the source branch.
3506
master_inter = InterBranch.get(self.source, master_branch)
3507
master_inter._basic_push(overwrite, stop_revision)
3508
# and push into the target branch from the source. Note that
3509
# we push from the source branch again, because it's considered
3510
# the highest bandwidth repository.
3511
result = self._basic_push(overwrite, stop_revision)
3512
result.master_branch = master_branch
3513
result.local_branch = self.target
3515
master_branch = None
3517
result = self._basic_push(overwrite, stop_revision)
3518
# TODO: Why set master_branch and local_branch if there's no
3519
# binding? Maybe cleaner to just leave them unset? -- mbp
3521
result.master_branch = self.target
3522
result.local_branch = None
3526
def _pull(self, overwrite=False, stop_revision=None,
3043
3527
possible_transports=None, _hook_master=None, run_hooks=True,
3044
_override_hook_target=None, local=False):
3528
_override_hook_target=None, local=False,
3529
merge_tags_to_master=True):
3045
3530
"""See Branch.pull.
3532
This function is the core worker, used by GenericInterBranch.pull to
3533
avoid duplication when pulling source->master and source->local.
3047
3535
:param _hook_master: Private parameter - set the branch to
3048
3536
be supplied as the master to pull hooks.
3049
3537
:param run_hooks: Private parameter - if false, this branch
3050
3538
is being called because it's the master of the primary branch,
3051
3539
so it should not run its hooks.
3540
is being called because it's the master of the primary branch,
3541
so it should not run its hooks.
3052
3542
:param _override_hook_target: Private parameter - set the branch to be
3053
3543
supplied as the target_branch to pull hooks.
3054
3544
:param local: Only update the local branch, and not the bound branch.
3094
3585
self.source.unlock()
3097
def push(self, overwrite=False, stop_revision=None,
3098
_override_hook_source_branch=None):
3099
"""See InterBranch.push.
3101
This is the basic concrete implementation of push()
3103
:param _override_hook_source_branch: If specified, run
3104
the hooks passing this Branch as the source, rather than self.
3105
This is for use of RemoteBranch, where push is delegated to the
3106
underlying vfs-based Branch.
3108
# TODO: Public option to disable running hooks - should be trivial but
3110
self.source.lock_read()
3112
return _run_with_write_locked_target(
3113
self.target, self._push_with_bound_branches, overwrite,
3115
_override_hook_source_branch=_override_hook_source_branch)
3117
self.source.unlock()
3119
def _push_with_bound_branches(self, overwrite, stop_revision,
3120
_override_hook_source_branch=None):
3121
"""Push from source into target, and into target's master if any.
3124
if _override_hook_source_branch:
3125
result.source_branch = _override_hook_source_branch
3126
for hook in Branch.hooks['post_push']:
3129
bound_location = self.target.get_bound_location()
3130
if bound_location and self.target.base != bound_location:
3131
# there is a master branch.
3133
# XXX: Why the second check? Is it even supported for a branch to
3134
# be bound to itself? -- mbp 20070507
3135
master_branch = self.target.get_master_branch()
3136
master_branch.lock_write()
3138
# push into the master from the source branch.
3139
self.source._basic_push(master_branch, overwrite, stop_revision)
3140
# and push into the target branch from the source. Note that we
3141
# push from the source branch again, because its considered the
3142
# highest bandwidth repository.
3143
result = self.source._basic_push(self.target, overwrite,
3145
result.master_branch = master_branch
3146
result.local_branch = self.target
3150
master_branch.unlock()
3153
result = self.source._basic_push(self.target, overwrite,
3155
# TODO: Why set master_branch and local_branch if there's no
3156
# binding? Maybe cleaner to just leave them unset? -- mbp
3158
result.master_branch = self.target
3159
result.local_branch = None
3164
def is_compatible(self, source, target):
3165
# GenericBranch uses the public API, so always compatible
3169
class InterToBranch5(GenericInterBranch):
3172
def _get_branch_formats_to_test():
3173
return BranchFormat._default_format, BzrBranchFormat5()
3175
def pull(self, overwrite=False, stop_revision=None,
3176
possible_transports=None, run_hooks=True,
3177
_override_hook_target=None, local=False):
3178
"""Pull from source into self, updating my master if any.
3180
:param run_hooks: Private parameter - if false, this branch
3181
is being called because it's the master of the primary branch,
3182
so it should not run its hooks.
3184
bound_location = self.target.get_bound_location()
3185
if local and not bound_location:
3186
raise errors.LocalRequiresBoundBranch()
3187
master_branch = None
3188
if not local and bound_location and self.source.base != bound_location:
3189
# not pulling from master, so we need to update master.
3190
master_branch = self.target.get_master_branch(possible_transports)
3191
master_branch.lock_write()
3194
# pull from source into master.
3195
master_branch.pull(self.source, overwrite, stop_revision,
3197
return super(InterToBranch5, self).pull(overwrite,
3198
stop_revision, _hook_master=master_branch,
3199
run_hooks=run_hooks,
3200
_override_hook_target=_override_hook_target)
3203
master_branch.unlock()
3206
3589
InterBranch.register_optimiser(GenericInterBranch)
3207
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
