869
724
old_repository = self.repository
870
725
if len(old_repository._fallback_repositories) != 1:
871
726
raise AssertionError("can't cope with fallback repositories "
872
"of %r (fallbacks: %r)" % (old_repository,
873
old_repository._fallback_repositories))
874
# Open the new repository object.
875
# Repositories don't offer an interface to remove fallback
876
# repositories today; take the conceptually simpler option and just
877
# reopen it. We reopen it starting from the URL so that we
878
# get a separate connection for RemoteRepositories and can
879
# stream from one of them to the other. This does mean doing
880
# separate SSH connection setup, but unstacking is not a
881
# common operation so it's tolerable.
882
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
883
new_repository = new_bzrdir.find_repository()
884
if new_repository._fallback_repositories:
885
raise AssertionError("didn't expect %r to have "
886
"fallback_repositories"
887
% (self.repository,))
888
# Replace self.repository with the new repository.
889
# Do our best to transfer the lock state (i.e. lock-tokens and
890
# lock count) of self.repository to the new repository.
891
lock_token = old_repository.lock_write().repository_token
892
self.repository = new_repository
893
if isinstance(self, remote.RemoteBranch):
894
# Remote branches can have a second reference to the old
895
# repository that need to be replaced.
896
if self._real_branch is not None:
897
self._real_branch.repository = new_repository
898
self.repository.lock_write(token=lock_token)
899
if lock_token is not None:
900
old_repository.leave_lock_in_place()
727
"of %r" % (self.repository,))
728
# unlock it, including unlocking the fallback
901
729
old_repository.unlock()
902
if lock_token is not None:
903
# XXX: self.repository.leave_lock_in_place() before this
904
# function will not be preserved. Fortunately that doesn't
905
# affect the current default format (2a), and would be a
906
# corner-case anyway.
907
# - Andrew Bennetts, 2010/06/30
908
self.repository.dont_leave_lock_in_place()
912
old_repository.unlock()
913
except errors.LockNotHeld:
916
if old_lock_count == 0:
917
raise AssertionError(
918
'old_repository should have been locked at least once.')
919
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
920
749
self.repository.lock_write()
921
# Fetch from the old repository into the new.
922
old_repository.lock_read()
924
750
# XXX: If you unstack a branch while it has a working tree
925
751
# with a pending merge, the pending-merged revisions will no
926
752
# longer be present. You can (probably) revert and remerge.
928
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
929
except errors.TagsNotSupported:
930
tags_to_fetch = set()
931
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
932
old_repository, required_ids=[self.last_revision()],
933
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
934
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
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(),
936
761
old_repository.unlock()
1041
859
:return: A tuple (revno, revision_id).
1043
861
if self._last_revision_info_cache is None:
1044
self._last_revision_info_cache = self._read_last_revision_info()
862
self._last_revision_info_cache = self._last_revision_info()
1045
863
return self._last_revision_info_cache
1047
def _read_last_revision_info(self):
1048
raise NotImplementedError(self._read_last_revision_info)
1050
@deprecated_method(deprecated_in((2, 4, 0)))
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,
1051
912
def import_last_revision_info(self, source_repo, revno, revid):
1052
913
"""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.
1054
918
:param source_repo: Source repository to optionally fetch from
1055
919
:param revno: Revision number of the new tip
1056
920
:param revid: Revision id of the new tip
1655
1491
"""Return the short format description for this format."""
1656
1492
raise NotImplementedError(self.get_format_description)
1658
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1659
hooks = Branch.hooks['post_branch_init']
1662
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1494
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1496
"""Initialize a branch in a bzrdir, with specified files
1666
def initialize(self, a_bzrdir, name=None, repository=None,
1667
append_revisions_only=None):
1668
"""Create a branch of this format in a_bzrdir.
1670
:param name: Name of the colocated branch to create.
1498
:param a_bzrdir: The bzrdir to initialize the branch in
1499
:param utf8_files: The files to create as a list of
1500
(filename, content) tuples
1501
:param set_format: If True, set the format with
1502
self.get_format_string. (BzrBranch4 has its format set
1504
:return: a branch in this format
1506
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1507
branch_transport = a_bzrdir.get_branch_transport(self)
1509
'metadir': ('lock', lockdir.LockDir),
1510
'branch4': ('branch-lock', lockable_files.TransportLock),
1512
lock_name, lock_class = lock_map[lock_type]
1513
control_files = lockable_files.LockableFiles(branch_transport,
1514
lock_name, lock_class)
1515
control_files.create_lock()
1517
control_files.lock_write()
1518
except errors.LockContention:
1519
if lock_type != 'branch4':
1525
utf8_files += [('format', self.get_format_string())]
1527
for (filename, content) in utf8_files:
1528
branch_transport.put_bytes(
1530
mode=a_bzrdir._get_file_mode())
1533
control_files.unlock()
1534
return self.open(a_bzrdir, _found=True)
1536
def initialize(self, a_bzrdir):
1537
"""Create a branch of this format in a_bzrdir."""
1672
1538
raise NotImplementedError(self.initialize)
1674
1540
def is_supported(self):
1833
1653
"basis revision. hooks MUST NOT modify this delta. "
1834
1654
" future_tree is an in-memory tree obtained from "
1835
1655
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1837
self.add_hook('post_commit',
1656
"tree.", (0,91), None))
1657
self.create_hook(HookPoint('post_commit',
1838
1658
"Called in the bzr client after a commit has completed. "
1839
1659
"post_commit is called with (local, master, old_revno, old_revid, "
1840
1660
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1841
"commit to a branch.", (0, 15))
1842
self.add_hook('post_uncommit',
1661
"commit to a branch.", (0, 15), None))
1662
self.create_hook(HookPoint('post_uncommit',
1843
1663
"Called in the bzr client after an uncommit completes. "
1844
1664
"post_uncommit is called with (local, master, old_revno, "
1845
1665
"old_revid, new_revno, new_revid) where local is the local branch "
1846
1666
"or None, master is the target branch, and an empty branch "
1847
"receives new_revno of 0, new_revid of None.", (0, 15))
1848
self.add_hook('pre_change_branch_tip',
1667
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1668
self.create_hook(HookPoint('pre_change_branch_tip',
1849
1669
"Called in bzr client and server before a change to the tip of a "
1850
1670
"branch is made. pre_change_branch_tip is called with a "
1851
1671
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1852
"commit, uncommit will all trigger this hook.", (1, 6))
1853
self.add_hook('post_change_branch_tip',
1672
"commit, uncommit will all trigger this hook.", (1, 6), None))
1673
self.create_hook(HookPoint('post_change_branch_tip',
1854
1674
"Called in bzr client and server after a change to the tip of a "
1855
1675
"branch is made. post_change_branch_tip is called with a "
1856
1676
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1857
"commit, uncommit will all trigger this hook.", (1, 4))
1858
self.add_hook('transform_fallback_location',
1677
"commit, uncommit will all trigger this hook.", (1, 4), None))
1678
self.create_hook(HookPoint('transform_fallback_location',
1859
1679
"Called when a stacked branch is activating its fallback "
1860
1680
"locations. transform_fallback_location is called with (branch, "
1861
1681
"url), and should return a new url. Returning the same url "
1928
1731
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1931
class BranchInitHookParams(object):
1932
"""Object holding parameters passed to `*_branch_init` hooks.
1934
There are 4 fields that hooks may wish to access:
1936
:ivar format: the branch format
1937
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1938
:ivar name: name of colocated branch, if any (or None)
1939
:ivar branch: the branch created
1941
Note that for lightweight checkouts, the bzrdir and format fields refer to
1942
the checkout, hence they are different from the corresponding fields in
1943
branch, which refer to the original branch.
1946
def __init__(self, format, a_bzrdir, name, branch):
1947
"""Create a group of BranchInitHook parameters.
1949
:param format: the branch format
1950
:param a_bzrdir: the BzrDir where the branch will be/has been
1952
:param name: name of colocated branch, if any (or None)
1953
:param branch: the branch created
1955
Note that for lightweight checkouts, the bzrdir and format fields refer
1956
to the checkout, hence they are different from the corresponding fields
1957
in branch, which refer to the original branch.
1959
self.format = format
1960
self.bzrdir = a_bzrdir
1962
self.branch = branch
1964
def __eq__(self, other):
1965
return self.__dict__ == other.__dict__
1968
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1971
class SwitchHookParams(object):
1972
"""Object holding parameters passed to `*_switch` hooks.
1974
There are 4 fields that hooks may wish to access:
1976
:ivar control_dir: BzrDir of the checkout to change
1977
:ivar to_branch: branch that the checkout is to reference
1978
:ivar force: skip the check for local commits in a heavy checkout
1979
:ivar revision_id: revision ID to switch to (or None)
1982
def __init__(self, control_dir, to_branch, force, revision_id):
1983
"""Create a group of SwitchHook parameters.
1985
:param control_dir: BzrDir of the checkout to change
1986
:param to_branch: branch that the checkout is to reference
1987
:param force: skip the check for local commits in a heavy checkout
1988
:param revision_id: revision ID to switch to (or None)
1990
self.control_dir = control_dir
1991
self.to_branch = to_branch
1993
self.revision_id = revision_id
1995
def __eq__(self, other):
1996
return self.__dict__ == other.__dict__
1999
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
2000
self.control_dir, self.to_branch,
1734
class BzrBranchFormat4(BranchFormat):
1735
"""Bzr branch format 4.
1738
- a revision-history file.
1739
- a branch-lock lock file [ to be shared with the bzrdir ]
1742
def get_format_description(self):
1743
"""See BranchFormat.get_format_description()."""
1744
return "Branch format 4"
1746
def initialize(self, a_bzrdir):
1747
"""Create a branch of this format in a_bzrdir."""
1748
utf8_files = [('revision-history', ''),
1749
('branch-name', ''),
1751
return self._initialize_helper(a_bzrdir, utf8_files,
1752
lock_type='branch4', set_format=False)
1755
super(BzrBranchFormat4, self).__init__()
1756
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1758
def network_name(self):
1759
"""The network name for this format is the control dirs disk label."""
1760
return self._matchingbzrdir.get_format_string()
1762
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1763
"""See BranchFormat.open()."""
1765
# we are being called directly and must probe.
1766
raise NotImplementedError
1767
return BzrBranch(_format=self,
1768
_control_files=a_bzrdir._control_files,
1770
_repository=a_bzrdir.open_repository())
1773
return "Bazaar-NG branch format 4"
2004
1776
class BranchFormatMetadir(BranchFormat):
2265
1982
"""See BranchFormat.get_format_description()."""
2266
1983
return "Checkout reference format 1"
2268
def get_reference(self, a_bzrdir, name=None):
1985
def get_reference(self, a_bzrdir):
2269
1986
"""See BranchFormat.get_reference()."""
2270
transport = a_bzrdir.get_branch_transport(None, name=name)
1987
transport = a_bzrdir.get_branch_transport(None)
2271
1988
return transport.get_bytes('location')
2273
def set_reference(self, a_bzrdir, name, to_branch):
1990
def set_reference(self, a_bzrdir, to_branch):
2274
1991
"""See BranchFormat.set_reference()."""
2275
transport = a_bzrdir.get_branch_transport(None, name=name)
1992
transport = a_bzrdir.get_branch_transport(None)
2276
1993
location = transport.put_bytes('location', to_branch.base)
2278
def initialize(self, a_bzrdir, name=None, target_branch=None,
2279
repository=None, append_revisions_only=None):
1995
def initialize(self, a_bzrdir, target_branch=None):
2280
1996
"""Create a branch of this format in a_bzrdir."""
2281
1997
if target_branch is None:
2282
1998
# this format does not implement branch itself, thus the implicit
2283
1999
# creation contract must see it as uninitializable
2284
2000
raise errors.UninitializableFormat(self)
2285
mutter('creating branch reference in %s', a_bzrdir.user_url)
2286
if a_bzrdir._format.fixed_components:
2287
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2288
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)
2289
2003
branch_transport.put_bytes('location',
2290
target_branch.bzrdir.user_url)
2004
target_branch.bzrdir.root_transport.base)
2291
2005
branch_transport.put_bytes('format', self.get_format_string())
2293
a_bzrdir, name, _found=True,
2007
a_bzrdir, _found=True,
2294
2008
possible_transports=[target_branch.bzrdir.root_transport])
2295
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2298
2010
def __init__(self):
2299
2011
super(BranchReferenceFormat, self).__init__()
2540
2201
"""See Branch.print_file."""
2541
2202
return self.repository.print_file(file, revision_id)
2204
def _write_revision_history(self, history):
2205
"""Factored out of set_revision_history.
2207
This performs the actual writing to disk.
2208
It is intended to be called by BzrBranch5.set_revision_history."""
2209
self._transport.put_bytes(
2210
'revision-history', '\n'.join(history),
2211
mode=self.bzrdir._get_file_mode())
2214
def set_revision_history(self, rev_history):
2215
"""See Branch.set_revision_history."""
2216
if 'evil' in debug.debug_flags:
2217
mutter_callsite(3, "set_revision_history scales with history.")
2218
check_not_reserved_id = _mod_revision.check_not_reserved_id
2219
for rev_id in rev_history:
2220
check_not_reserved_id(rev_id)
2221
if Branch.hooks['post_change_branch_tip']:
2222
# Don't calculate the last_revision_info() if there are no hooks
2224
old_revno, old_revid = self.last_revision_info()
2225
if len(rev_history) == 0:
2226
revid = _mod_revision.NULL_REVISION
2228
revid = rev_history[-1]
2229
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2230
self._write_revision_history(rev_history)
2231
self._clear_cached_state()
2232
self._cache_revision_history(rev_history)
2233
for hook in Branch.hooks['set_rh']:
2234
hook(self, rev_history)
2235
if Branch.hooks['post_change_branch_tip']:
2236
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2238
def _synchronize_history(self, destination, revision_id):
2239
"""Synchronize last revision and revision history between branches.
2241
This version is most efficient when the destination is also a
2242
BzrBranch5, but works for BzrBranch6 as long as the revision
2243
history is the true lefthand parent history, and all of the revisions
2244
are in the destination's repository. If not, set_revision_history
2247
:param destination: The branch to copy the history into
2248
:param revision_id: The revision-id to truncate history at. May
2249
be None to copy complete history.
2251
if not isinstance(destination._format, BzrBranchFormat5):
2252
super(BzrBranch, self)._synchronize_history(
2253
destination, revision_id)
2255
if revision_id == _mod_revision.NULL_REVISION:
2258
new_history = self.revision_history()
2259
if revision_id is not None and new_history != []:
2261
new_history = new_history[:new_history.index(revision_id) + 1]
2263
rev = self.repository.get_revision(revision_id)
2264
new_history = rev.get_history(self.repository)[1:]
2265
destination.set_revision_history(new_history)
2543
2267
@needs_write_lock
2544
2268
def set_last_revision_info(self, revno, revision_id):
2545
if not revision_id or not isinstance(revision_id, basestring):
2546
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2269
"""Set the last revision of this branch.
2271
The caller is responsible for checking that the revno is correct
2272
for this revision id.
2274
It may be possible to set the branch last revision to an id not
2275
present in the repository. However, branches can also be
2276
configured to check constraints on history, in which case this may not
2547
2279
revision_id = _mod_revision.ensure_null(revision_id)
2548
old_revno, old_revid = self.last_revision_info()
2549
if self.get_append_revisions_only():
2550
self._check_history_violation(revision_id)
2551
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2552
self._write_last_revision_info(revno, revision_id)
2553
self._clear_cached_state()
2554
self._last_revision_info_cache = revno, revision_id
2555
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2280
# this old format stores the full history, but this api doesn't
2281
# provide it, so we must generate, and might as well check it's
2283
history = self._lefthand_history(revision_id)
2284
if len(history) != revno:
2285
raise AssertionError('%d != %d' % (len(history), revno))
2286
self.set_revision_history(history)
2288
def _gen_revision_history(self):
2289
history = self._transport.get_bytes('revision-history').split('\n')
2290
if history[-1:] == ['']:
2291
# There shouldn't be a trailing newline, but just in case.
2296
def generate_revision_history(self, revision_id, last_rev=None,
2298
"""Create a new revision history that will finish with revision_id.
2300
:param revision_id: the new tip to use.
2301
:param last_rev: The previous last_revision. If not None, then this
2302
must be a ancestory of revision_id, or DivergedBranches is raised.
2303
:param other_branch: The other branch that DivergedBranches should
2304
raise with respect to.
2306
self.set_revision_history(self._lefthand_history(revision_id,
2307
last_rev, other_branch))
2557
2309
def basis_tree(self):
2558
2310
"""See Branch.basis_tree."""
2679
def _read_last_revision_info(self):
2680
revision_string = self._transport.get_bytes('last-revision')
2681
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2682
revision_id = cache_utf8.get_cached_utf8(revision_id)
2684
return revno, revision_id
2686
def _write_last_revision_info(self, revno, revision_id):
2687
"""Simply write out the revision id, with no checks.
2689
Use set_last_revision_info to perform this safely.
2691
Does not update the revision_history cache.
2693
revision_id = _mod_revision.ensure_null(revision_id)
2694
out_string = '%d %s\n' % (revno, revision_id)
2695
self._transport.put_bytes('last-revision', out_string,
2696
mode=self.bzrdir._get_file_mode())
2699
class FullHistoryBzrBranch(BzrBranch):
2700
"""Bzr branch which contains the full revision history."""
2703
def set_last_revision_info(self, revno, revision_id):
2704
if not revision_id or not isinstance(revision_id, basestring):
2705
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2706
revision_id = _mod_revision.ensure_null(revision_id)
2707
# this old format stores the full history, but this api doesn't
2708
# provide it, so we must generate, and might as well check it's
2710
history = self._lefthand_history(revision_id)
2711
if len(history) != revno:
2712
raise AssertionError('%d != %d' % (len(history), revno))
2713
self._set_revision_history(history)
2715
def _read_last_revision_info(self):
2716
rh = self.revision_history()
2719
return (revno, rh[-1])
2721
return (0, _mod_revision.NULL_REVISION)
2723
@deprecated_method(deprecated_in((2, 4, 0)))
2725
def set_revision_history(self, rev_history):
2726
"""See Branch.set_revision_history."""
2727
self._set_revision_history(rev_history)
2729
def _set_revision_history(self, rev_history):
2730
if 'evil' in debug.debug_flags:
2731
mutter_callsite(3, "set_revision_history scales with history.")
2732
check_not_reserved_id = _mod_revision.check_not_reserved_id
2733
for rev_id in rev_history:
2734
check_not_reserved_id(rev_id)
2735
if Branch.hooks['post_change_branch_tip']:
2736
# Don't calculate the last_revision_info() if there are no hooks
2738
old_revno, old_revid = self.last_revision_info()
2739
if len(rev_history) == 0:
2740
revid = _mod_revision.NULL_REVISION
2742
revid = rev_history[-1]
2743
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2744
self._write_revision_history(rev_history)
2745
self._clear_cached_state()
2746
self._cache_revision_history(rev_history)
2747
for hook in Branch.hooks['set_rh']:
2748
hook(self, rev_history)
2749
if Branch.hooks['post_change_branch_tip']:
2750
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2752
def _write_revision_history(self, history):
2753
"""Factored out of set_revision_history.
2755
This performs the actual writing to disk.
2756
It is intended to be called by set_revision_history."""
2757
self._transport.put_bytes(
2758
'revision-history', '\n'.join(history),
2759
mode=self.bzrdir._get_file_mode())
2761
def _gen_revision_history(self):
2762
history = self._transport.get_bytes('revision-history').split('\n')
2763
if history[-1:] == ['']:
2764
# There shouldn't be a trailing newline, but just in case.
2768
def _synchronize_history(self, destination, revision_id):
2769
if not isinstance(destination, FullHistoryBzrBranch):
2770
super(BzrBranch, self)._synchronize_history(
2771
destination, revision_id)
2773
if revision_id == _mod_revision.NULL_REVISION:
2776
new_history = self.revision_history()
2777
if revision_id is not None and new_history != []:
2779
new_history = new_history[:new_history.index(revision_id) + 1]
2781
rev = self.repository.get_revision(revision_id)
2782
new_history = rev.get_history(self.repository)[1:]
2783
destination._set_revision_history(new_history)
2786
def generate_revision_history(self, revision_id, last_rev=None,
2788
"""Create a new revision history that will finish with revision_id.
2790
:param revision_id: the new tip to use.
2791
:param last_rev: The previous last_revision. If not None, then this
2792
must be a ancestory of revision_id, or DivergedBranches is raised.
2793
:param other_branch: The other branch that DivergedBranches should
2794
raise with respect to.
2796
self._set_revision_history(self._lefthand_history(revision_id,
2797
last_rev, other_branch))
2800
class BzrBranch5(FullHistoryBzrBranch):
2801
"""A format 5 branch. This supports new features over plain branches.
2803
It has support for a master_branch which is the data for bound branches.
2807
class BzrBranch8(BzrBranch):
2459
class BzrBranch8(BzrBranch5):
2808
2460
"""A branch that stores tree-reference locations."""
2810
2462
def _open_hook(self):
2836
2488
self._last_revision_info_cache = None
2837
2489
self._reference_info = None
2491
def _last_revision_info(self):
2492
revision_string = self._transport.get_bytes('last-revision')
2493
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2494
revision_id = cache_utf8.get_cached_utf8(revision_id)
2496
return revno, revision_id
2498
def _write_last_revision_info(self, revno, revision_id):
2499
"""Simply write out the revision id, with no checks.
2501
Use set_last_revision_info to perform this safely.
2503
Does not update the revision_history cache.
2504
Intended to be called by set_last_revision_info and
2505
_write_revision_history.
2507
revision_id = _mod_revision.ensure_null(revision_id)
2508
out_string = '%d %s\n' % (revno, revision_id)
2509
self._transport.put_bytes('last-revision', out_string,
2510
mode=self.bzrdir._get_file_mode())
2513
def set_last_revision_info(self, revno, revision_id):
2514
revision_id = _mod_revision.ensure_null(revision_id)
2515
old_revno, old_revid = self.last_revision_info()
2516
if self._get_append_revisions_only():
2517
self._check_history_violation(revision_id)
2518
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2519
self._write_last_revision_info(revno, revision_id)
2520
self._clear_cached_state()
2521
self._last_revision_info_cache = revno, revision_id
2522
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2524
def _synchronize_history(self, destination, revision_id):
2525
"""Synchronize last revision and revision history between branches.
2527
:see: Branch._synchronize_history
2529
# XXX: The base Branch has a fast implementation of this method based
2530
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2531
# that uses set_revision_history. This class inherits from BzrBranch5,
2532
# but wants the fast implementation, so it calls
2533
# Branch._synchronize_history directly.
2534
Branch._synchronize_history(self, destination, revision_id)
2839
2536
def _check_history_violation(self, revision_id):
2840
current_revid = self.last_revision()
2841
last_revision = _mod_revision.ensure_null(current_revid)
2537
last_revision = _mod_revision.ensure_null(self.last_revision())
2842
2538
if _mod_revision.is_null(last_revision):
2844
graph = self.repository.get_graph()
2845
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2846
if lh_ancestor == current_revid:
2848
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2540
if last_revision not in self._lefthand_history(revision_id):
2541
raise errors.AppendRevisionsOnlyViolation(self.base)
2850
2543
def _gen_revision_history(self):
2851
2544
"""Generate the revision history from last revision
3271
2996
raise NotImplementedError(self.push)
3274
def copy_content_into(self, revision_id=None):
3275
"""Copy the content of source into target
3277
revision_id: if not None, the revision history in the new branch will
3278
be truncated to end with revision_id.
3280
raise NotImplementedError(self.copy_content_into)
3283
def fetch(self, stop_revision=None, limit=None):
3286
:param stop_revision: Last revision to fetch
3287
:param limit: Optional rough limit of revisions to fetch
3289
raise NotImplementedError(self.fetch)
3292
2999
class GenericInterBranch(InterBranch):
3293
"""InterBranch implementation that uses public Branch functions."""
3296
def is_compatible(klass, source, target):
3297
# GenericBranch uses the public API, so always compatible
3301
def _get_branch_formats_to_test(klass):
3302
return [(format_registry.get_default(), format_registry.get_default())]
3305
def unwrap_format(klass, format):
3306
if isinstance(format, remote.RemoteBranchFormat):
3307
format._ensure_real()
3308
return format._custom_format
3312
def copy_content_into(self, revision_id=None):
3313
"""Copy the content of source into target
3315
revision_id: if not None, the revision history in the new branch will
3316
be truncated to end with revision_id.
3318
self.source.update_references(self.target)
3319
self.source._synchronize_history(self.target, revision_id)
3321
parent = self.source.get_parent()
3322
except errors.InaccessibleParent, e:
3323
mutter('parent was not accessible to copy: %s', e)
3326
self.target.set_parent(parent)
3327
if self.source._push_should_merge_tags():
3328
self.source.tags.merge_to(self.target.tags)
3331
def fetch(self, stop_revision=None, limit=None):
3332
if self.target.base == self.source.base:
3000
"""InterBranch implementation that uses public Branch functions.
3004
def _get_branch_formats_to_test():
3005
return BranchFormat._default_format, BranchFormat._default_format
3007
def update_revisions(self, stop_revision=None, overwrite=False,
3009
"""See InterBranch.update_revisions()."""
3334
3010
self.source.lock_read()
3336
fetch_spec_factory = fetch.FetchSpecFactory()
3337
fetch_spec_factory.source_branch = self.source
3338
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3339
fetch_spec_factory.source_repo = self.source.repository
3340
fetch_spec_factory.target_repo = self.target.repository
3341
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3342
fetch_spec_factory.limit = limit
3343
fetch_spec = fetch_spec_factory.make_fetch_spec()
3344
return self.target.repository.fetch(self.source.repository,
3345
fetch_spec=fetch_spec)
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)
3347
3048
self.source.unlock()
3350
def _update_revisions(self, stop_revision=None, overwrite=False,
3352
other_revno, other_last_revision = self.source.last_revision_info()
3353
stop_revno = None # unknown
3354
if stop_revision is None:
3355
stop_revision = other_last_revision
3356
if _mod_revision.is_null(stop_revision):
3357
# if there are no commits, we're done.
3359
stop_revno = other_revno
3361
# what's the current last revision, before we fetch [and change it
3363
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3364
# we fetch here so that we don't process data twice in the common
3365
# case of having something to pull, and so that the check for
3366
# already merged can operate on the just fetched graph, which will
3367
# be cached in memory.
3368
self.fetch(stop_revision=stop_revision)
3369
# Check to see if one is an ancestor of the other
3372
graph = self.target.repository.get_graph()
3373
if self.target._check_if_descendant_or_diverged(
3374
stop_revision, last_rev, graph, self.source):
3375
# stop_revision is a descendant of last_rev, but we aren't
3376
# overwriting, so we're done.
3378
if stop_revno is None:
3380
graph = self.target.repository.get_graph()
3381
this_revno, this_last_revision = \
3382
self.target.last_revision_info()
3383
stop_revno = graph.find_distance_to_null(stop_revision,
3384
[(other_last_revision, other_revno),
3385
(this_last_revision, this_revno)])
3386
self.target.set_last_revision_info(stop_revno, stop_revision)
3389
3050
def pull(self, overwrite=False, stop_revision=None,
3390
possible_transports=None, run_hooks=True,
3391
_override_hook_target=None, local=False):
3392
"""Pull from source into self, updating my master if any.
3394
:param run_hooks: Private parameter - if false, this branch
3395
is being called because it's the master of the primary branch,
3396
so it should not run its hooks.
3398
bound_location = self.target.get_bound_location()
3399
if local and not bound_location:
3400
raise errors.LocalRequiresBoundBranch()
3401
master_branch = None
3402
source_is_master = False
3404
# bound_location comes from a config file, some care has to be
3405
# taken to relate it to source.user_url
3406
normalized = urlutils.normalize_url(bound_location)
3408
relpath = self.source.user_transport.relpath(normalized)
3409
source_is_master = (relpath == '')
3410
except (errors.PathNotChild, errors.InvalidURL):
3411
source_is_master = False
3412
if not local and bound_location and not source_is_master:
3413
# not pulling from master, so we need to update master.
3414
master_branch = self.target.get_master_branch(possible_transports)
3415
master_branch.lock_write()
3418
# pull from source into master.
3419
master_branch.pull(self.source, overwrite, stop_revision,
3421
return self._pull(overwrite,
3422
stop_revision, _hook_master=master_branch,
3423
run_hooks=run_hooks,
3424
_override_hook_target=_override_hook_target,
3425
merge_tags_to_master=not source_is_master)
3428
master_branch.unlock()
3430
def push(self, overwrite=False, stop_revision=None, lossy=False,
3431
_override_hook_source_branch=None):
3432
"""See InterBranch.push.
3434
This is the basic concrete implementation of push()
3436
:param _override_hook_source_branch: If specified, run the hooks
3437
passing this Branch as the source, rather than self. This is for
3438
use of RemoteBranch, where push is delegated to the underlying
3442
raise errors.LossyPushToSameVCS(self.source, self.target)
3443
# TODO: Public option to disable running hooks - should be trivial but
3446
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3447
op.add_cleanup(self.source.lock_read().unlock)
3448
op.add_cleanup(self.target.lock_write().unlock)
3449
return op.run(overwrite, stop_revision,
3450
_override_hook_source_branch=_override_hook_source_branch)
3452
def _basic_push(self, overwrite, stop_revision):
3453
"""Basic implementation of push without bound branches or hooks.
3455
Must be called with source read locked and target write locked.
3457
result = BranchPushResult()
3458
result.source_branch = self.source
3459
result.target_branch = self.target
3460
result.old_revno, result.old_revid = self.target.last_revision_info()
3461
self.source.update_references(self.target)
3462
if result.old_revid != stop_revision:
3463
# We assume that during 'push' this repository is closer than
3465
graph = self.source.repository.get_graph(self.target.repository)
3466
self._update_revisions(stop_revision, overwrite=overwrite,
3468
if self.source._push_should_merge_tags():
3469
result.tag_updates, result.tag_conflicts = (
3470
self.source.tags.merge_to(self.target.tags, overwrite))
3471
result.new_revno, result.new_revid = self.target.last_revision_info()
3474
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3475
_override_hook_source_branch=None):
3476
"""Push from source into target, and into target's master if any.
3479
if _override_hook_source_branch:
3480
result.source_branch = _override_hook_source_branch
3481
for hook in Branch.hooks['post_push']:
3484
bound_location = self.target.get_bound_location()
3485
if bound_location and self.target.base != bound_location:
3486
# there is a master branch.
3488
# XXX: Why the second check? Is it even supported for a branch to
3489
# be bound to itself? -- mbp 20070507
3490
master_branch = self.target.get_master_branch()
3491
master_branch.lock_write()
3492
operation.add_cleanup(master_branch.unlock)
3493
# push into the master from the source branch.
3494
master_inter = InterBranch.get(self.source, master_branch)
3495
master_inter._basic_push(overwrite, stop_revision)
3496
# and push into the target branch from the source. Note that
3497
# we push from the source branch again, because it's considered
3498
# the highest bandwidth repository.
3499
result = self._basic_push(overwrite, stop_revision)
3500
result.master_branch = master_branch
3501
result.local_branch = self.target
3503
master_branch = None
3505
result = self._basic_push(overwrite, stop_revision)
3506
# TODO: Why set master_branch and local_branch if there's no
3507
# binding? Maybe cleaner to just leave them unset? -- mbp
3509
result.master_branch = self.target
3510
result.local_branch = None
3514
def _pull(self, overwrite=False, stop_revision=None,
3515
3051
possible_transports=None, _hook_master=None, run_hooks=True,
3516
_override_hook_target=None, local=False,
3517
merge_tags_to_master=True):
3052
_override_hook_target=None, local=False):
3518
3053
"""See Branch.pull.
3520
This function is the core worker, used by GenericInterBranch.pull to
3521
avoid duplication when pulling source->master and source->local.
3523
3055
:param _hook_master: Private parameter - set the branch to
3524
3056
be supplied as the master to pull hooks.
3525
3057
:param run_hooks: Private parameter - if false, this branch
3526
3058
is being called because it's the master of the primary branch,
3527
3059
so it should not run its hooks.
3528
is being called because it's the master of the primary branch,
3529
so it should not run its hooks.
3530
3060
:param _override_hook_target: Private parameter - set the branch to be
3531
3061
supplied as the target_branch to pull hooks.
3532
3062
:param local: Only update the local branch, and not the bound branch.
3573
3102
self.source.unlock()
3105
def push(self, overwrite=False, stop_revision=None,
3106
_override_hook_source_branch=None):
3107
"""See InterBranch.push.
3109
This is the basic concrete implementation of push()
3111
:param _override_hook_source_branch: If specified, run
3112
the hooks passing this Branch as the source, rather than self.
3113
This is for use of RemoteBranch, where push is delegated to the
3114
underlying vfs-based Branch.
3116
# TODO: Public option to disable running hooks - should be trivial but
3118
self.source.lock_read()
3120
return _run_with_write_locked_target(
3121
self.target, self._push_with_bound_branches, overwrite,
3123
_override_hook_source_branch=_override_hook_source_branch)
3125
self.source.unlock()
3127
def _push_with_bound_branches(self, overwrite, stop_revision,
3128
_override_hook_source_branch=None):
3129
"""Push from source into target, and into target's master if any.
3132
if _override_hook_source_branch:
3133
result.source_branch = _override_hook_source_branch
3134
for hook in Branch.hooks['post_push']:
3137
bound_location = self.target.get_bound_location()
3138
if bound_location and self.target.base != bound_location:
3139
# there is a master branch.
3141
# XXX: Why the second check? Is it even supported for a branch to
3142
# be bound to itself? -- mbp 20070507
3143
master_branch = self.target.get_master_branch()
3144
master_branch.lock_write()
3146
# push into the master from the source branch.
3147
self.source._basic_push(master_branch, overwrite, stop_revision)
3148
# and push into the target branch from the source. Note that we
3149
# push from the source branch again, because its considered the
3150
# highest bandwidth repository.
3151
result = self.source._basic_push(self.target, overwrite,
3153
result.master_branch = master_branch
3154
result.local_branch = self.target
3158
master_branch.unlock()
3161
result = self.source._basic_push(self.target, overwrite,
3163
# TODO: Why set master_branch and local_branch if there's no
3164
# binding? Maybe cleaner to just leave them unset? -- mbp
3166
result.master_branch = self.target
3167
result.local_branch = None
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,
3185
_override_hook_target=None, local=False):
3186
"""Pull from source into self, updating my master if any.
3188
:param run_hooks: Private parameter - if false, this branch
3189
is being called because it's the master of the primary branch,
3190
so it should not run its hooks.
3192
bound_location = self.target.get_bound_location()
3193
if local and not bound_location:
3194
raise errors.LocalRequiresBoundBranch()
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()
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)
3211
master_branch.unlock()
3577
3214
InterBranch.register_optimiser(GenericInterBranch)
3215
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
