782
880
old_repository = self.repository
783
881
if len(old_repository._fallback_repositories) != 1:
784
882
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
883
"of %r (fallbacks: %r)" % (old_repository,
884
old_repository._fallback_repositories))
885
# Open the new repository object.
886
# Repositories don't offer an interface to remove fallback
887
# repositories today; take the conceptually simpler option and just
888
# reopen it. We reopen it starting from the URL so that we
889
# get a separate connection for RemoteRepositories and can
890
# stream from one of them to the other. This does mean doing
891
# separate SSH connection setup, but unstacking is not a
892
# common operation so it's tolerable.
893
new_bzrdir = controldir.ControlDir.open(
894
self.bzrdir.root_transport.base)
895
new_repository = new_bzrdir.find_repository()
896
if new_repository._fallback_repositories:
897
raise AssertionError("didn't expect %r to have "
898
"fallback_repositories"
899
% (self.repository,))
900
# Replace self.repository with the new repository.
901
# Do our best to transfer the lock state (i.e. lock-tokens and
902
# lock count) of self.repository to the new repository.
903
lock_token = old_repository.lock_write().repository_token
904
self.repository = new_repository
905
if isinstance(self, remote.RemoteBranch):
906
# Remote branches can have a second reference to the old
907
# repository that need to be replaced.
908
if self._real_branch is not None:
909
self._real_branch.repository = new_repository
910
self.repository.lock_write(token=lock_token)
911
if lock_token is not None:
912
old_repository.leave_lock_in_place()
787
913
old_repository.unlock()
914
if lock_token is not None:
915
# XXX: self.repository.leave_lock_in_place() before this
916
# function will not be preserved. Fortunately that doesn't
917
# affect the current default format (2a), and would be a
918
# corner-case anyway.
919
# - Andrew Bennetts, 2010/06/30
920
self.repository.dont_leave_lock_in_place()
924
old_repository.unlock()
925
except errors.LockNotHeld:
928
if old_lock_count == 0:
929
raise AssertionError(
930
'old_repository should have been locked at least once.')
931
for i in range(old_lock_count-1):
932
self.repository.lock_write()
933
# Fetch from the old repository into the new.
788
934
old_repository.lock_read()
790
# Repositories don't offer an interface to remove fallback
791
# repositories today; take the conceptually simpler option and just
792
# reopen it. We reopen it starting from the URL so that we
793
# get a separate connection for RemoteRepositories and can
794
# stream from one of them to the other. This does mean doing
795
# separate SSH connection setup, but unstacking is not a
796
# common operation so it's tolerable.
797
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
798
new_repository = new_bzrdir.find_repository()
799
self.repository = new_repository
800
if self.repository._fallback_repositories:
801
raise AssertionError("didn't expect %r to have "
802
"fallback_repositories"
803
% (self.repository,))
804
# this is not paired with an unlock because it's just restoring
805
# the previous state; the lock's released when set_stacked_on_url
807
self.repository.lock_write()
808
936
# XXX: If you unstack a branch while it has a working tree
809
937
# with a pending merge, the pending-merged revisions will no
810
938
# longer be present. You can (probably) revert and remerge.
812
# XXX: This only fetches up to the tip of the repository; it
813
# doesn't bring across any tags. That's fairly consistent
814
# with how branch works, but perhaps not ideal.
815
self.repository.fetch(old_repository,
816
revision_id=self.last_revision(),
940
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
941
except errors.TagsNotSupported:
942
tags_to_fetch = set()
943
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
944
old_repository, required_ids=[self.last_revision()],
945
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
946
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
948
old_repository.unlock()
917
1047
:return: A tuple (revno, revision_id).
919
1049
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1050
self._last_revision_info_cache = self._read_last_revision_info()
921
1051
return self._last_revision_info_cache
923
def _last_revision_info(self):
924
rh = self.revision_history()
927
return (revno, rh[-1])
929
return (0, _mod_revision.NULL_REVISION)
931
@deprecated_method(deprecated_in((1, 6, 0)))
932
def missing_revisions(self, other, stop_revision=None):
933
"""Return a list of new revisions that would perfectly fit.
935
If self and other have not diverged, return a list of the revisions
936
present in other, but missing from self.
938
self_history = self.revision_history()
939
self_len = len(self_history)
940
other_history = other.revision_history()
941
other_len = len(other_history)
942
common_index = min(self_len, other_len) -1
943
if common_index >= 0 and \
944
self_history[common_index] != other_history[common_index]:
945
raise errors.DivergedBranches(self, other)
947
if stop_revision is None:
948
stop_revision = other_len
950
if stop_revision > other_len:
951
raise errors.NoSuchRevision(self, stop_revision)
952
return other_history[self_len:stop_revision]
955
def update_revisions(self, other, stop_revision=None, overwrite=False,
957
"""Pull in new perfect-fit revisions.
959
:param other: Another Branch to pull from
960
:param stop_revision: Updated until the given revision
961
:param overwrite: Always set the branch pointer, rather than checking
962
to see if it is a proper descendant.
963
:param graph: A Graph object that can be used to query history
964
information. This can be None.
967
return InterBranch.get(other, self).update_revisions(stop_revision,
970
def import_last_revision_info(self, source_repo, revno, revid):
1053
def _read_last_revision_info(self):
1054
raise NotImplementedError(self._read_last_revision_info)
1056
def import_last_revision_info_and_tags(self, source, revno, revid,
971
1058
"""Set the last revision info, importing from another repo if necessary.
973
1060
This is used by the bound branch code to upload a revision to
974
1061
the master branch first before updating the tip of the local branch.
1062
Revisions referenced by source's tags are also transferred.
976
:param source_repo: Source repository to optionally fetch from
1064
:param source: Source branch to optionally fetch from
977
1065
:param revno: Revision number of the new tip
978
1066
:param revid: Revision id of the new tip
1067
:param lossy: Whether to discard metadata that can not be
1068
natively represented
1069
:return: Tuple with the new revision number and revision id
1070
(should only be different from the arguments when lossy=True)
980
if not self.repository.has_same_location(source_repo):
981
self.repository.fetch(source_repo, revision_id=revid)
1072
if not self.repository.has_same_location(source.repository):
1073
self.fetch(source, revid)
982
1074
self.set_last_revision_info(revno, revid)
1075
return (revno, revid)
984
1077
def revision_id_to_revno(self, revision_id):
985
1078
"""Given a revision id, return its revno"""
986
1079
if _mod_revision.is_null(revision_id):
988
history = self.revision_history()
1081
history = self._revision_history()
990
1083
return history.index(revision_id) + 1
991
1084
except ValueError:
1490
1590
object will be created every time regardless.
1493
_default_format = None
1494
"""The default format used for new branches."""
1497
"""The known formats."""
1499
can_set_append_revisions_only = True
1501
1593
def __eq__(self, other):
1502
1594
return self.__class__ is other.__class__
1504
1596
def __ne__(self, other):
1505
1597
return not (self == other)
1508
def find_format(klass, a_bzrdir, name=None):
1509
"""Return the format for the branch object in a_bzrdir."""
1511
transport = a_bzrdir.get_branch_transport(None, name=name)
1512
format_string = transport.get_bytes("format")
1513
return klass._formats[format_string]
1514
except errors.NoSuchFile:
1515
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1517
raise errors.UnknownFormatError(format=format_string, kind='branch')
1520
def get_default_format(klass):
1521
"""Return the current default format."""
1522
return klass._default_format
1524
def get_reference(self, a_bzrdir):
1525
"""Get the target reference of the branch in a_bzrdir.
1599
def get_reference(self, controldir, name=None):
1600
"""Get the target reference of the branch in controldir.
1527
1602
format probing must have been completed before calling
1528
1603
this method - it is assumed that the format of the branch
1529
in a_bzrdir is correct.
1604
in controldir is correct.
1531
:param a_bzrdir: The bzrdir to get the branch data from.
1606
:param controldir: The controldir to get the branch data from.
1607
:param name: Name of the colocated branch to fetch
1532
1608
:return: None if the branch is not a reference branch.
1537
def set_reference(self, a_bzrdir, to_branch):
1538
"""Set the target reference of the branch in a_bzrdir.
1613
def set_reference(self, controldir, name, to_branch):
1614
"""Set the target reference of the branch in controldir.
1540
1616
format probing must have been completed before calling
1541
1617
this method - it is assumed that the format of the branch
1542
in a_bzrdir is correct.
1618
in controldir is correct.
1544
:param a_bzrdir: The bzrdir to set the branch reference for.
1620
:param controldir: The controldir to set the branch reference for.
1621
:param name: Name of colocated branch to set, None for default
1545
1622
:param to_branch: branch that the checkout is to reference
1547
1624
raise NotImplementedError(self.set_reference)
1549
def get_format_string(self):
1550
"""Return the ASCII format string that identifies this format."""
1551
raise NotImplementedError(self.get_format_string)
1553
1626
def get_format_description(self):
1554
1627
"""Return the short format description for this format."""
1555
1628
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1630
def _run_post_branch_init_hooks(self, controldir, name, branch):
1558
1631
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1634
params = BranchInitHookParams(self, controldir, name, branch)
1562
1635
for hook in hooks:
1565
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1566
lock_type='metadir', set_format=True):
1567
"""Initialize a branch in a bzrdir, with specified files
1569
:param a_bzrdir: The bzrdir to initialize the branch in
1570
:param utf8_files: The files to create as a list of
1571
(filename, content) tuples
1572
:param name: Name of colocated branch to create, if any
1573
:param set_format: If True, set the format with
1574
self.get_format_string. (BzrBranch4 has its format set
1576
:return: a branch in this format
1578
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1579
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1581
'metadir': ('lock', lockdir.LockDir),
1582
'branch4': ('branch-lock', lockable_files.TransportLock),
1584
lock_name, lock_class = lock_map[lock_type]
1585
control_files = lockable_files.LockableFiles(branch_transport,
1586
lock_name, lock_class)
1587
control_files.create_lock()
1589
control_files.lock_write()
1590
except errors.LockContention:
1591
if lock_type != 'branch4':
1597
utf8_files += [('format', self.get_format_string())]
1599
for (filename, content) in utf8_files:
1600
branch_transport.put_bytes(
1602
mode=a_bzrdir._get_file_mode())
1605
control_files.unlock()
1606
branch = self.open(a_bzrdir, name, _found=True)
1607
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1610
def initialize(self, a_bzrdir, name=None):
1611
"""Create a branch of this format in a_bzrdir.
1638
def initialize(self, controldir, name=None, repository=None,
1639
append_revisions_only=None):
1640
"""Create a branch of this format in controldir.
1613
1642
:param name: Name of the colocated branch to create.
1615
1644
raise NotImplementedError(self.initialize)
1731
1779
"basis revision. hooks MUST NOT modify this delta. "
1732
1780
" future_tree is an in-memory tree obtained from "
1733
1781
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1783
self.add_hook('post_commit',
1736
1784
"Called in the bzr client after a commit has completed. "
1737
1785
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1786
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1739
"commit to a branch.", (0, 15), None))
1740
self.create_hook(HookPoint('post_uncommit',
1787
"commit to a branch.", (0, 15))
1788
self.add_hook('post_uncommit',
1741
1789
"Called in the bzr client after an uncommit completes. "
1742
1790
"post_uncommit is called with (local, master, old_revno, "
1743
1791
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1792
"or None, master is the target branch, and an empty branch "
1745
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1746
self.create_hook(HookPoint('pre_change_branch_tip',
1793
"receives new_revno of 0, new_revid of None.", (0, 15))
1794
self.add_hook('pre_change_branch_tip',
1747
1795
"Called in bzr client and server before a change to the tip of a "
1748
1796
"branch is made. pre_change_branch_tip is called with a "
1749
1797
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1750
"commit, uncommit will all trigger this hook.", (1, 6), None))
1751
self.create_hook(HookPoint('post_change_branch_tip',
1798
"commit, uncommit will all trigger this hook.", (1, 6))
1799
self.add_hook('post_change_branch_tip',
1752
1800
"Called in bzr client and server after a change to the tip of a "
1753
1801
"branch is made. post_change_branch_tip is called with a "
1754
1802
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1755
"commit, uncommit will all trigger this hook.", (1, 4), None))
1756
self.create_hook(HookPoint('transform_fallback_location',
1803
"commit, uncommit will all trigger this hook.", (1, 4))
1804
self.add_hook('transform_fallback_location',
1757
1805
"Called when a stacked branch is activating its fallback "
1758
1806
"locations. transform_fallback_location is called with (branch, "
1759
1807
"url), and should return a new url. Returning the same url "
1904
1947
self.revision_id)
1907
class BzrBranchFormat4(BranchFormat):
1908
"""Bzr branch format 4.
1911
- a revision-history file.
1912
- a branch-lock lock file [ to be shared with the bzrdir ]
1950
class BranchFormatMetadir(bzrdir.BzrFormat, BranchFormat):
1951
"""Base class for branch formats that live in meta directories.
1915
def get_format_description(self):
1916
"""See BranchFormat.get_format_description()."""
1917
return "Branch format 4"
1919
def initialize(self, a_bzrdir, name=None):
1920
"""Create a branch of this format in a_bzrdir."""
1921
utf8_files = [('revision-history', ''),
1922
('branch-name', ''),
1924
return self._initialize_helper(a_bzrdir, utf8_files, name=name,
1925
lock_type='branch4', set_format=False)
1927
1954
def __init__(self):
1928
super(BzrBranchFormat4, self).__init__()
1929
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1931
def network_name(self):
1932
"""The network name for this format is the control dirs disk label."""
1933
return self._matchingbzrdir.get_format_string()
1935
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1936
"""See BranchFormat.open()."""
1938
# we are being called directly and must probe.
1939
raise NotImplementedError
1940
return BzrBranch(_format=self,
1941
_control_files=a_bzrdir._control_files,
1944
_repository=a_bzrdir.open_repository())
1947
return "Bazaar-NG branch format 4"
1950
class BranchFormatMetadir(BranchFormat):
1951
"""Common logic for meta-dir based branch formats."""
1955
BranchFormat.__init__(self)
1956
bzrdir.BzrFormat.__init__(self)
1959
def find_format(klass, controldir, name=None):
1960
"""Return the format for the branch object in controldir."""
1962
transport = controldir.get_branch_transport(None, name=name)
1963
except errors.NoSuchFile:
1964
raise errors.NotBranchError(path=name, bzrdir=controldir)
1966
format_string = transport.get_bytes("format")
1967
except errors.NoSuchFile:
1968
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1969
return klass._find_format(format_registry, 'branch', format_string)
1953
1971
def _branch_class(self):
1954
1972
"""What class to instantiate on open calls."""
1955
1973
raise NotImplementedError(self._branch_class)
1957
def network_name(self):
1958
"""A simple byte string uniquely identifying this format for RPC calls.
1960
Metadir branch formats use their format string.
1975
def _get_initial_config(self, append_revisions_only=None):
1976
if append_revisions_only:
1977
return "append_revisions_only = True\n"
1979
# Avoid writing anything if append_revisions_only is disabled,
1980
# as that is the default.
1983
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1985
"""Initialize a branch in a control dir, with specified files
1987
:param a_bzrdir: The bzrdir to initialize the branch in
1988
:param utf8_files: The files to create as a list of
1989
(filename, content) tuples
1990
:param name: Name of colocated branch to create, if any
1991
:return: a branch in this format
1962
return self.get_format_string()
1994
name = a_bzrdir._get_selected_branch()
1995
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1996
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1997
control_files = lockable_files.LockableFiles(branch_transport,
1998
'lock', lockdir.LockDir)
1999
control_files.create_lock()
2000
control_files.lock_write()
2002
utf8_files += [('format', self.as_string())]
2003
for (filename, content) in utf8_files:
2004
branch_transport.put_bytes(
2006
mode=a_bzrdir._get_file_mode())
2008
control_files.unlock()
2009
branch = self.open(a_bzrdir, name, _found=True,
2010
found_repository=repository)
2011
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1964
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
2014
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2015
found_repository=None, possible_transports=None):
1965
2016
"""See BranchFormat.open()."""
2018
name = a_bzrdir._get_selected_branch()
1967
format = BranchFormat.find_format(a_bzrdir, name=name)
2020
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
1968
2021
if format.__class__ != self.__class__:
1969
2022
raise AssertionError("wrong format %r found for %r" %
1970
2023
(format, self))
1973
2026
control_files = lockable_files.LockableFiles(transport, 'lock',
1974
2027
lockdir.LockDir)
2028
if found_repository is None:
2029
found_repository = a_bzrdir.find_repository()
1975
2030
return self._branch_class()(_format=self,
1976
2031
_control_files=control_files,
1978
2033
a_bzrdir=a_bzrdir,
1979
_repository=a_bzrdir.find_repository(),
1980
ignore_fallbacks=ignore_fallbacks)
2034
_repository=found_repository,
2035
ignore_fallbacks=ignore_fallbacks,
2036
possible_transports=possible_transports)
1981
2037
except errors.NoSuchFile:
1982
2038
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1985
super(BranchFormatMetadir, self).__init__()
1986
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1987
self._matchingbzrdir.set_branch_format(self)
1989
def supports_tags(self):
1993
class BzrBranchFormat5(BranchFormatMetadir):
1994
"""Bzr branch format 5.
1997
- a revision-history file.
1999
- a lock dir guarding the branch itself
2000
- all of this stored in a branch/ subdirectory
2001
- works with shared repositories.
2003
This format is new in bzr 0.8.
2006
def _branch_class(self):
2009
def get_format_string(self):
2010
"""See BranchFormat.get_format_string()."""
2011
return "Bazaar-NG branch format 5\n"
2013
def get_format_description(self):
2014
"""See BranchFormat.get_format_description()."""
2015
return "Branch format 5"
2017
def initialize(self, a_bzrdir, name=None):
2018
"""Create a branch of this format in a_bzrdir."""
2019
utf8_files = [('revision-history', ''),
2020
('branch-name', ''),
2022
return self._initialize_helper(a_bzrdir, utf8_files, name)
2024
def supports_tags(self):
2041
def _matchingbzrdir(self):
2042
ret = bzrdir.BzrDirMetaFormat1()
2043
ret.set_branch_format(self)
2046
def supports_tags(self):
2049
def supports_leaving_lock(self):
2052
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
2054
BranchFormat.check_support_status(self,
2055
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
2057
bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
2058
recommend_upgrade=recommend_upgrade, basedir=basedir)
2028
2061
class BzrBranchFormat6(BranchFormatMetadir):
2157
2202
"""See BranchFormat.get_format_description()."""
2158
2203
return "Checkout reference format 1"
2160
def get_reference(self, a_bzrdir):
2205
def get_reference(self, a_bzrdir, name=None):
2161
2206
"""See BranchFormat.get_reference()."""
2162
transport = a_bzrdir.get_branch_transport(None)
2207
transport = a_bzrdir.get_branch_transport(None, name=name)
2163
2208
return transport.get_bytes('location')
2165
def set_reference(self, a_bzrdir, to_branch):
2210
def set_reference(self, a_bzrdir, name, to_branch):
2166
2211
"""See BranchFormat.set_reference()."""
2167
transport = a_bzrdir.get_branch_transport(None)
2212
transport = a_bzrdir.get_branch_transport(None, name=name)
2168
2213
location = transport.put_bytes('location', to_branch.base)
2170
def initialize(self, a_bzrdir, name=None, target_branch=None):
2215
def initialize(self, a_bzrdir, name=None, target_branch=None,
2216
repository=None, append_revisions_only=None):
2171
2217
"""Create a branch of this format in a_bzrdir."""
2172
2218
if target_branch is None:
2173
2219
# this format does not implement branch itself, thus the implicit
2174
2220
# creation contract must see it as uninitializable
2175
2221
raise errors.UninitializableFormat(self)
2176
2222
mutter('creating branch reference in %s', a_bzrdir.user_url)
2223
if a_bzrdir._format.fixed_components:
2224
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2226
name = a_bzrdir._get_selected_branch()
2177
2227
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2178
2228
branch_transport.put_bytes('location',
2179
target_branch.bzrdir.user_url)
2180
branch_transport.put_bytes('format', self.get_format_string())
2182
a_bzrdir, name, _found=True,
2229
target_branch.user_url)
2230
branch_transport.put_bytes('format', self.as_string())
2231
branch = self.open(a_bzrdir, name, _found=True,
2183
2232
possible_transports=[target_branch.bzrdir.root_transport])
2184
2233
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2188
super(BranchReferenceFormat, self).__init__()
2189
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2190
self._matchingbzrdir.set_branch_format(self)
2192
2236
def _make_reference_clone_function(format, a_branch):
2193
2237
"""Create a clone() routine for a branch dynamically."""
2194
2238
def clone(to_bzrdir, revision_id=None,
2318
2394
base = property(_get_base, doc="The URL for the root of this branch.")
2397
def user_transport(self):
2398
return self._user_transport
2320
2400
def _get_config(self):
2321
return TransportConfig(self._transport, 'branch.conf')
2401
return _mod_config.TransportConfig(self._transport, 'branch.conf')
2403
def _get_config_store(self):
2404
if self.conf_store is None:
2405
self.conf_store = _mod_config.BranchStore(self)
2406
return self.conf_store
2408
def _uncommitted_branch(self):
2409
"""Return the branch that may contain uncommitted changes."""
2410
master = self.get_master_branch()
2411
if master is not None:
2416
def store_uncommitted(self, creator, message=None):
2417
"""Store uncommitted changes from a ShelfCreator.
2419
:param creator: The ShelfCreator containing uncommitted changes, or
2420
None to delete any stored changes.
2421
:param message: The message to associate with the changes.
2422
:raises: ChangesAlreadyStored if the branch already has changes.
2424
branch = self._uncommitted_branch()
2426
branch._transport.delete('stored-transform')
2428
if branch._transport.has('stored-transform'):
2429
raise errors.ChangesAlreadyStored
2430
transform = StringIO()
2431
creator.write_shelf(transform, message)
2433
branch._transport.put_file('stored-transform', transform)
2435
def get_unshelver(self, tree):
2436
"""Return a shelf.Unshelver for this branch and tree.
2438
:param tree: The tree to use to construct the Unshelver.
2439
:return: an Unshelver or None if no changes are stored.
2441
branch = self._uncommitted_branch()
2443
transform = branch._transport.get('stored-transform')
2444
except errors.NoSuchFile:
2446
return shelf.Unshelver.from_tree_and_shelf(tree, transform)
2323
2448
def is_locked(self):
2324
2449
return self.control_files.is_locked()
2326
2451
def lock_write(self, token=None):
2452
"""Lock the branch for write operations.
2454
:param token: A token to permit reacquiring a previously held and
2456
:return: A BranchWriteLockResult.
2327
2458
if not self.is_locked():
2328
2459
self._note_lock('w')
2329
# All-in-one needs to always unlock/lock.
2330
repo_control = getattr(self.repository, 'control_files', None)
2331
if self.control_files == repo_control or not self.is_locked():
2332
2460
self.repository._warn_if_deprecated(self)
2333
2461
self.repository.lock_write()
2334
2462
took_lock = True
2336
2464
took_lock = False
2338
return self.control_files.lock_write(token=token)
2466
return BranchWriteLockResult(self.unlock,
2467
self.control_files.lock_write(token=token))
2341
2470
self.repository.unlock()
2344
2473
def lock_read(self):
2474
"""Lock the branch for read operations.
2476
:return: A bzrlib.lock.LogicalLockResult.
2345
2478
if not self.is_locked():
2346
2479
self._note_lock('r')
2347
# All-in-one needs to always unlock/lock.
2348
repo_control = getattr(self.repository, 'control_files', None)
2349
if self.control_files == repo_control or not self.is_locked():
2350
2480
self.repository._warn_if_deprecated(self)
2351
2481
self.repository.lock_read()
2352
2482
took_lock = True
2387
2516
"""See Branch.print_file."""
2388
2517
return self.repository.print_file(file, revision_id)
2390
def _write_revision_history(self, history):
2391
"""Factored out of set_revision_history.
2393
This performs the actual writing to disk.
2394
It is intended to be called by BzrBranch5.set_revision_history."""
2395
self._transport.put_bytes(
2396
'revision-history', '\n'.join(history),
2397
mode=self.bzrdir._get_file_mode())
2400
def set_revision_history(self, rev_history):
2401
"""See Branch.set_revision_history."""
2402
if 'evil' in debug.debug_flags:
2403
mutter_callsite(3, "set_revision_history scales with history.")
2404
check_not_reserved_id = _mod_revision.check_not_reserved_id
2405
for rev_id in rev_history:
2406
check_not_reserved_id(rev_id)
2407
if Branch.hooks['post_change_branch_tip']:
2408
# Don't calculate the last_revision_info() if there are no hooks
2410
old_revno, old_revid = self.last_revision_info()
2411
if len(rev_history) == 0:
2412
revid = _mod_revision.NULL_REVISION
2414
revid = rev_history[-1]
2415
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2416
self._write_revision_history(rev_history)
2417
self._clear_cached_state()
2418
self._cache_revision_history(rev_history)
2419
for hook in Branch.hooks['set_rh']:
2420
hook(self, rev_history)
2421
if Branch.hooks['post_change_branch_tip']:
2422
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2424
def _synchronize_history(self, destination, revision_id):
2425
"""Synchronize last revision and revision history between branches.
2427
This version is most efficient when the destination is also a
2428
BzrBranch5, but works for BzrBranch6 as long as the revision
2429
history is the true lefthand parent history, and all of the revisions
2430
are in the destination's repository. If not, set_revision_history
2433
:param destination: The branch to copy the history into
2434
:param revision_id: The revision-id to truncate history at. May
2435
be None to copy complete history.
2437
if not isinstance(destination._format, BzrBranchFormat5):
2438
super(BzrBranch, self)._synchronize_history(
2439
destination, revision_id)
2441
if revision_id == _mod_revision.NULL_REVISION:
2444
new_history = self.revision_history()
2445
if revision_id is not None and new_history != []:
2447
new_history = new_history[:new_history.index(revision_id) + 1]
2449
rev = self.repository.get_revision(revision_id)
2450
new_history = rev.get_history(self.repository)[1:]
2451
destination.set_revision_history(new_history)
2453
2519
@needs_write_lock
2454
2520
def set_last_revision_info(self, revno, revision_id):
2455
"""Set the last revision of this branch.
2457
The caller is responsible for checking that the revno is correct
2458
for this revision id.
2460
It may be possible to set the branch last revision to an id not
2461
present in the repository. However, branches can also be
2462
configured to check constraints on history, in which case this may not
2521
if not revision_id or not isinstance(revision_id, basestring):
2522
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2523
revision_id = _mod_revision.ensure_null(revision_id)
2466
# this old format stores the full history, but this api doesn't
2467
# provide it, so we must generate, and might as well check it's
2469
history = self._lefthand_history(revision_id)
2470
if len(history) != revno:
2471
raise AssertionError('%d != %d' % (len(history), revno))
2472
self.set_revision_history(history)
2474
def _gen_revision_history(self):
2475
history = self._transport.get_bytes('revision-history').split('\n')
2476
if history[-1:] == ['']:
2477
# There shouldn't be a trailing newline, but just in case.
2482
def generate_revision_history(self, revision_id, last_rev=None,
2484
"""Create a new revision history that will finish with revision_id.
2486
:param revision_id: the new tip to use.
2487
:param last_rev: The previous last_revision. If not None, then this
2488
must be a ancestory of revision_id, or DivergedBranches is raised.
2489
:param other_branch: The other branch that DivergedBranches should
2490
raise with respect to.
2492
self.set_revision_history(self._lefthand_history(revision_id,
2493
last_rev, other_branch))
2524
old_revno, old_revid = self.last_revision_info()
2525
if self.get_append_revisions_only():
2526
self._check_history_violation(revision_id)
2527
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2528
self._write_last_revision_info(revno, revision_id)
2529
self._clear_cached_state()
2530
self._last_revision_info_cache = revno, revision_id
2531
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2533
def basis_tree(self):
2496
2534
"""See Branch.basis_tree."""
2674
2717
self._last_revision_info_cache = None
2675
2718
self._reference_info = None
2677
def _last_revision_info(self):
2678
revision_string = self._transport.get_bytes('last-revision')
2679
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2680
revision_id = cache_utf8.get_cached_utf8(revision_id)
2682
return revno, revision_id
2684
def _write_last_revision_info(self, revno, revision_id):
2685
"""Simply write out the revision id, with no checks.
2687
Use set_last_revision_info to perform this safely.
2689
Does not update the revision_history cache.
2690
Intended to be called by set_last_revision_info and
2691
_write_revision_history.
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
def set_last_revision_info(self, revno, revision_id):
2700
revision_id = _mod_revision.ensure_null(revision_id)
2701
old_revno, old_revid = self.last_revision_info()
2702
if self._get_append_revisions_only():
2703
self._check_history_violation(revision_id)
2704
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2705
self._write_last_revision_info(revno, revision_id)
2706
self._clear_cached_state()
2707
self._last_revision_info_cache = revno, revision_id
2708
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2710
def _synchronize_history(self, destination, revision_id):
2711
"""Synchronize last revision and revision history between branches.
2713
:see: Branch._synchronize_history
2715
# XXX: The base Branch has a fast implementation of this method based
2716
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2717
# that uses set_revision_history. This class inherits from BzrBranch5,
2718
# but wants the fast implementation, so it calls
2719
# Branch._synchronize_history directly.
2720
Branch._synchronize_history(self, destination, revision_id)
2722
2720
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2721
current_revid = self.last_revision()
2722
last_revision = _mod_revision.ensure_null(current_revid)
2724
2723
if _mod_revision.is_null(last_revision):
2726
if last_revision not in self._lefthand_history(revision_id):
2727
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2725
graph = self.repository.get_graph()
2726
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2727
if lh_ancestor == current_revid:
2729
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2731
def _gen_revision_history(self):
2730
2732
"""Generate the revision history from last revision
3182
3145
raise NotImplementedError(self.push)
3148
def copy_content_into(self, revision_id=None):
3149
"""Copy the content of source into target
3151
revision_id: if not None, the revision history in the new branch will
3152
be truncated to end with revision_id.
3154
raise NotImplementedError(self.copy_content_into)
3157
def fetch(self, stop_revision=None, limit=None):
3160
:param stop_revision: Last revision to fetch
3161
:param limit: Optional rough limit of revisions to fetch
3163
raise NotImplementedError(self.fetch)
3166
def _fix_overwrite_type(overwrite):
3167
if isinstance(overwrite, bool):
3169
return ["history", "tags"]
3185
3175
class GenericInterBranch(InterBranch):
3186
"""InterBranch implementation that uses public Branch functions.
3190
def _get_branch_formats_to_test():
3191
return BranchFormat._default_format, BranchFormat._default_format
3193
def update_revisions(self, stop_revision=None, overwrite=False,
3195
"""See InterBranch.update_revisions()."""
3176
"""InterBranch implementation that uses public Branch functions."""
3179
def is_compatible(klass, source, target):
3180
# GenericBranch uses the public API, so always compatible
3184
def _get_branch_formats_to_test(klass):
3185
return [(format_registry.get_default(), format_registry.get_default())]
3188
def unwrap_format(klass, format):
3189
if isinstance(format, remote.RemoteBranchFormat):
3190
format._ensure_real()
3191
return format._custom_format
3195
def copy_content_into(self, revision_id=None):
3196
"""Copy the content of source into target
3198
revision_id: if not None, the revision history in the new branch will
3199
be truncated to end with revision_id.
3201
self.source.update_references(self.target)
3202
self.source._synchronize_history(self.target, revision_id)
3204
parent = self.source.get_parent()
3205
except errors.InaccessibleParent, e:
3206
mutter('parent was not accessible to copy: %s', e)
3209
self.target.set_parent(parent)
3210
if self.source._push_should_merge_tags():
3211
self.source.tags.merge_to(self.target.tags)
3214
def fetch(self, stop_revision=None, limit=None):
3215
if self.target.base == self.source.base:
3196
3217
self.source.lock_read()
3198
other_revno, other_last_revision = self.source.last_revision_info()
3199
stop_revno = None # unknown
3200
if stop_revision is None:
3201
stop_revision = other_last_revision
3202
if _mod_revision.is_null(stop_revision):
3203
# if there are no commits, we're done.
3205
stop_revno = other_revno
3207
# what's the current last revision, before we fetch [and change it
3209
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3210
# we fetch here so that we don't process data twice in the common
3211
# case of having something to pull, and so that the check for
3212
# already merged can operate on the just fetched graph, which will
3213
# be cached in memory.
3214
self.target.fetch(self.source, stop_revision)
3215
# Check to see if one is an ancestor of the other
3218
graph = self.target.repository.get_graph()
3219
if self.target._check_if_descendant_or_diverged(
3220
stop_revision, last_rev, graph, self.source):
3221
# stop_revision is a descendant of last_rev, but we aren't
3222
# overwriting, so we're done.
3224
if stop_revno is None:
3226
graph = self.target.repository.get_graph()
3227
this_revno, this_last_revision = \
3228
self.target.last_revision_info()
3229
stop_revno = graph.find_distance_to_null(stop_revision,
3230
[(other_last_revision, other_revno),
3231
(this_last_revision, this_revno)])
3232
self.target.set_last_revision_info(stop_revno, stop_revision)
3219
fetch_spec_factory = fetch.FetchSpecFactory()
3220
fetch_spec_factory.source_branch = self.source
3221
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3222
fetch_spec_factory.source_repo = self.source.repository
3223
fetch_spec_factory.target_repo = self.target.repository
3224
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3225
fetch_spec_factory.limit = limit
3226
fetch_spec = fetch_spec_factory.make_fetch_spec()
3227
return self.target.repository.fetch(self.source.repository,
3228
fetch_spec=fetch_spec)
3234
3230
self.source.unlock()
3233
def _update_revisions(self, stop_revision=None, overwrite=False,
3235
other_revno, other_last_revision = self.source.last_revision_info()
3236
stop_revno = None # unknown
3237
if stop_revision is None:
3238
stop_revision = other_last_revision
3239
if _mod_revision.is_null(stop_revision):
3240
# if there are no commits, we're done.
3242
stop_revno = other_revno
3244
# what's the current last revision, before we fetch [and change it
3246
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3247
# we fetch here so that we don't process data twice in the common
3248
# case of having something to pull, and so that the check for
3249
# already merged can operate on the just fetched graph, which will
3250
# be cached in memory.
3251
self.fetch(stop_revision=stop_revision)
3252
# Check to see if one is an ancestor of the other
3255
graph = self.target.repository.get_graph()
3256
if self.target._check_if_descendant_or_diverged(
3257
stop_revision, last_rev, graph, self.source):
3258
# stop_revision is a descendant of last_rev, but we aren't
3259
# overwriting, so we're done.
3261
if stop_revno is None:
3263
graph = self.target.repository.get_graph()
3264
this_revno, this_last_revision = \
3265
self.target.last_revision_info()
3266
stop_revno = graph.find_distance_to_null(stop_revision,
3267
[(other_last_revision, other_revno),
3268
(this_last_revision, this_revno)])
3269
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3272
def pull(self, overwrite=False, stop_revision=None,
3273
possible_transports=None, run_hooks=True,
3274
_override_hook_target=None, local=False):
3275
"""Pull from source into self, updating my master if any.
3277
:param run_hooks: Private parameter - if false, this branch
3278
is being called because it's the master of the primary branch,
3279
so it should not run its hooks.
3281
bound_location = self.target.get_bound_location()
3282
if local and not bound_location:
3283
raise errors.LocalRequiresBoundBranch()
3284
master_branch = None
3285
source_is_master = False
3287
# bound_location comes from a config file, some care has to be
3288
# taken to relate it to source.user_url
3289
normalized = urlutils.normalize_url(bound_location)
3291
relpath = self.source.user_transport.relpath(normalized)
3292
source_is_master = (relpath == '')
3293
except (errors.PathNotChild, errors.InvalidURL):
3294
source_is_master = False
3295
if not local and bound_location and not source_is_master:
3296
# not pulling from master, so we need to update master.
3297
master_branch = self.target.get_master_branch(possible_transports)
3298
master_branch.lock_write()
3301
# pull from source into master.
3302
master_branch.pull(self.source, overwrite, stop_revision,
3304
return self._pull(overwrite,
3305
stop_revision, _hook_master=master_branch,
3306
run_hooks=run_hooks,
3307
_override_hook_target=_override_hook_target,
3308
merge_tags_to_master=not source_is_master)
3311
master_branch.unlock()
3313
def push(self, overwrite=False, stop_revision=None, lossy=False,
3314
_override_hook_source_branch=None):
3315
"""See InterBranch.push.
3317
This is the basic concrete implementation of push()
3319
:param _override_hook_source_branch: If specified, run the hooks
3320
passing this Branch as the source, rather than self. This is for
3321
use of RemoteBranch, where push is delegated to the underlying
3325
raise errors.LossyPushToSameVCS(self.source, self.target)
3326
# TODO: Public option to disable running hooks - should be trivial but
3329
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3330
op.add_cleanup(self.source.lock_read().unlock)
3331
op.add_cleanup(self.target.lock_write().unlock)
3332
return op.run(overwrite, stop_revision,
3333
_override_hook_source_branch=_override_hook_source_branch)
3335
def _basic_push(self, overwrite, stop_revision):
3336
"""Basic implementation of push without bound branches or hooks.
3338
Must be called with source read locked and target write locked.
3340
result = BranchPushResult()
3341
result.source_branch = self.source
3342
result.target_branch = self.target
3343
result.old_revno, result.old_revid = self.target.last_revision_info()
3344
self.source.update_references(self.target)
3345
overwrite = _fix_overwrite_type(overwrite)
3346
if result.old_revid != stop_revision:
3347
# We assume that during 'push' this repository is closer than
3349
graph = self.source.repository.get_graph(self.target.repository)
3350
self._update_revisions(stop_revision,
3351
overwrite=("history" in overwrite),
3353
if self.source._push_should_merge_tags():
3354
result.tag_updates, result.tag_conflicts = (
3355
self.source.tags.merge_to(
3356
self.target.tags, "tags" in overwrite))
3357
result.new_revno, result.new_revid = self.target.last_revision_info()
3360
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3361
_override_hook_source_branch=None):
3362
"""Push from source into target, and into target's master if any.
3365
if _override_hook_source_branch:
3366
result.source_branch = _override_hook_source_branch
3367
for hook in Branch.hooks['post_push']:
3370
bound_location = self.target.get_bound_location()
3371
if bound_location and self.target.base != bound_location:
3372
# there is a master branch.
3374
# XXX: Why the second check? Is it even supported for a branch to
3375
# be bound to itself? -- mbp 20070507
3376
master_branch = self.target.get_master_branch()
3377
master_branch.lock_write()
3378
operation.add_cleanup(master_branch.unlock)
3379
# push into the master from the source branch.
3380
master_inter = InterBranch.get(self.source, master_branch)
3381
master_inter._basic_push(overwrite, stop_revision)
3382
# and push into the target branch from the source. Note that
3383
# we push from the source branch again, because it's considered
3384
# the highest bandwidth repository.
3385
result = self._basic_push(overwrite, stop_revision)
3386
result.master_branch = master_branch
3387
result.local_branch = self.target
3389
master_branch = None
3391
result = self._basic_push(overwrite, stop_revision)
3392
# TODO: Why set master_branch and local_branch if there's no
3393
# binding? Maybe cleaner to just leave them unset? -- mbp
3395
result.master_branch = self.target
3396
result.local_branch = None
3400
def _pull(self, overwrite=False, stop_revision=None,
3237
3401
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3402
_override_hook_target=None, local=False,
3403
merge_tags_to_master=True):
3239
3404
"""See Branch.pull.
3406
This function is the core worker, used by GenericInterBranch.pull to
3407
avoid duplication when pulling source->master and source->local.
3241
3409
:param _hook_master: Private parameter - set the branch to
3242
3410
be supplied as the master to pull hooks.
3243
3411
:param run_hooks: Private parameter - if false, this branch
3244
3412
is being called because it's the master of the primary branch,
3245
3413
so it should not run its hooks.
3414
is being called because it's the master of the primary branch,
3415
so it should not run its hooks.
3246
3416
:param _override_hook_target: Private parameter - set the branch to be
3247
3417
supplied as the target_branch to pull hooks.
3248
3418
:param local: Only update the local branch, and not the bound branch.
3288
3462
self.source.unlock()
3291
def push(self, overwrite=False, stop_revision=None,
3292
_override_hook_source_branch=None):
3293
"""See InterBranch.push.
3295
This is the basic concrete implementation of push()
3297
:param _override_hook_source_branch: If specified, run
3298
the hooks passing this Branch as the source, rather than self.
3299
This is for use of RemoteBranch, where push is delegated to the
3300
underlying vfs-based Branch.
3302
# TODO: Public option to disable running hooks - should be trivial but
3304
self.source.lock_read()
3306
return _run_with_write_locked_target(
3307
self.target, self._push_with_bound_branches, overwrite,
3309
_override_hook_source_branch=_override_hook_source_branch)
3311
self.source.unlock()
3313
def _push_with_bound_branches(self, overwrite, stop_revision,
3314
_override_hook_source_branch=None):
3315
"""Push from source into target, and into target's master if any.
3318
if _override_hook_source_branch:
3319
result.source_branch = _override_hook_source_branch
3320
for hook in Branch.hooks['post_push']:
3323
bound_location = self.target.get_bound_location()
3324
if bound_location and self.target.base != bound_location:
3325
# there is a master branch.
3327
# XXX: Why the second check? Is it even supported for a branch to
3328
# be bound to itself? -- mbp 20070507
3329
master_branch = self.target.get_master_branch()
3330
master_branch.lock_write()
3332
# push into the master from the source branch.
3333
self.source._basic_push(master_branch, overwrite, stop_revision)
3334
# and push into the target branch from the source. Note that we
3335
# push from the source branch again, because its considered the
3336
# highest bandwidth repository.
3337
result = self.source._basic_push(self.target, overwrite,
3339
result.master_branch = master_branch
3340
result.local_branch = self.target
3344
master_branch.unlock()
3347
result = self.source._basic_push(self.target, overwrite,
3349
# TODO: Why set master_branch and local_branch if there's no
3350
# binding? Maybe cleaner to just leave them unset? -- mbp
3352
result.master_branch = self.target
3353
result.local_branch = None
3358
def is_compatible(self, source, target):
3359
# GenericBranch uses the public API, so always compatible
3363
class InterToBranch5(GenericInterBranch):
3366
def _get_branch_formats_to_test():
3367
return BranchFormat._default_format, BzrBranchFormat5()
3369
def pull(self, overwrite=False, stop_revision=None,
3370
possible_transports=None, run_hooks=True,
3371
_override_hook_target=None, local=False):
3372
"""Pull from source into self, updating my master if any.
3374
:param run_hooks: Private parameter - if false, this branch
3375
is being called because it's the master of the primary branch,
3376
so it should not run its hooks.
3378
bound_location = self.target.get_bound_location()
3379
if local and not bound_location:
3380
raise errors.LocalRequiresBoundBranch()
3381
master_branch = None
3382
if not local and bound_location and self.source.user_url != bound_location:
3383
# not pulling from master, so we need to update master.
3384
master_branch = self.target.get_master_branch(possible_transports)
3385
master_branch.lock_write()
3388
# pull from source into master.
3389
master_branch.pull(self.source, overwrite, stop_revision,
3391
return super(InterToBranch5, self).pull(overwrite,
3392
stop_revision, _hook_master=master_branch,
3393
run_hooks=run_hooks,
3394
_override_hook_target=_override_hook_target)
3397
master_branch.unlock()
3400
3466
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
