782
861
old_repository = self.repository
783
862
if len(old_repository._fallback_repositories) != 1:
784
863
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
864
"of %r (fallbacks: %r)" % (old_repository,
865
old_repository._fallback_repositories))
866
# Open the new repository object.
867
# Repositories don't offer an interface to remove fallback
868
# repositories today; take the conceptually simpler option and just
869
# reopen it. We reopen it starting from the URL so that we
870
# get a separate connection for RemoteRepositories and can
871
# stream from one of them to the other. This does mean doing
872
# separate SSH connection setup, but unstacking is not a
873
# common operation so it's tolerable.
874
new_bzrdir = controldir.ControlDir.open(
875
self.bzrdir.root_transport.base)
876
new_repository = new_bzrdir.find_repository()
877
if new_repository._fallback_repositories:
878
raise AssertionError("didn't expect %r to have "
879
"fallback_repositories"
880
% (self.repository,))
881
# Replace self.repository with the new repository.
882
# Do our best to transfer the lock state (i.e. lock-tokens and
883
# lock count) of self.repository to the new repository.
884
lock_token = old_repository.lock_write().repository_token
885
self.repository = new_repository
886
if isinstance(self, remote.RemoteBranch):
887
# Remote branches can have a second reference to the old
888
# repository that need to be replaced.
889
if self._real_branch is not None:
890
self._real_branch.repository = new_repository
891
self.repository.lock_write(token=lock_token)
892
if lock_token is not None:
893
old_repository.leave_lock_in_place()
787
894
old_repository.unlock()
895
if lock_token is not None:
896
# XXX: self.repository.leave_lock_in_place() before this
897
# function will not be preserved. Fortunately that doesn't
898
# affect the current default format (2a), and would be a
899
# corner-case anyway.
900
# - Andrew Bennetts, 2010/06/30
901
self.repository.dont_leave_lock_in_place()
905
old_repository.unlock()
906
except errors.LockNotHeld:
909
if old_lock_count == 0:
910
raise AssertionError(
911
'old_repository should have been locked at least once.')
912
for i in range(old_lock_count-1):
913
self.repository.lock_write()
914
# Fetch from the old repository into the new.
788
915
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
917
# XXX: If you unstack a branch while it has a working tree
809
918
# with a pending merge, the pending-merged revisions will no
810
919
# 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(),
921
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
922
except errors.TagsNotSupported:
923
tags_to_fetch = set()
924
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
925
old_repository, required_ids=[self.last_revision()],
926
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
927
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
929
old_repository.unlock()
917
1028
:return: A tuple (revno, revision_id).
919
1030
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1031
self._last_revision_info_cache = self._read_last_revision_info()
921
1032
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):
1034
def _read_last_revision_info(self):
1035
raise NotImplementedError(self._read_last_revision_info)
1037
def import_last_revision_info_and_tags(self, source, revno, revid,
971
1039
"""Set the last revision info, importing from another repo if necessary.
973
1041
This is used by the bound branch code to upload a revision to
974
1042
the master branch first before updating the tip of the local branch.
1043
Revisions referenced by source's tags are also transferred.
976
:param source_repo: Source repository to optionally fetch from
1045
:param source: Source branch to optionally fetch from
977
1046
:param revno: Revision number of the new tip
978
1047
:param revid: Revision id of the new tip
1048
:param lossy: Whether to discard metadata that can not be
1049
natively represented
1050
:return: Tuple with the new revision number and revision id
1051
(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)
1053
if not self.repository.has_same_location(source.repository):
1054
self.fetch(source, revid)
982
1055
self.set_last_revision_info(revno, revid)
1056
return (revno, revid)
984
1058
def revision_id_to_revno(self, revision_id):
985
1059
"""Given a revision id, return its revno"""
986
1060
if _mod_revision.is_null(revision_id):
988
history = self.revision_history()
1062
history = self._revision_history()
990
1064
return history.index(revision_id) + 1
991
1065
except ValueError:
1490
1571
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
1574
def __eq__(self, other):
1502
1575
return self.__class__ is other.__class__
1504
1577
def __ne__(self, other):
1505
1578
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.
1580
def get_reference(self, controldir, name=None):
1581
"""Get the target reference of the branch in controldir.
1527
1583
format probing must have been completed before calling
1528
1584
this method - it is assumed that the format of the branch
1529
in a_bzrdir is correct.
1585
in controldir is correct.
1531
:param a_bzrdir: The bzrdir to get the branch data from.
1587
:param controldir: The controldir to get the branch data from.
1588
:param name: Name of the colocated branch to fetch
1532
1589
: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.
1594
def set_reference(self, controldir, name, to_branch):
1595
"""Set the target reference of the branch in controldir.
1540
1597
format probing must have been completed before calling
1541
1598
this method - it is assumed that the format of the branch
1542
in a_bzrdir is correct.
1599
in controldir is correct.
1544
:param a_bzrdir: The bzrdir to set the branch reference for.
1601
:param controldir: The controldir to set the branch reference for.
1602
:param name: Name of colocated branch to set, None for default
1545
1603
:param to_branch: branch that the checkout is to reference
1547
1605
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
1607
def get_format_description(self):
1554
1608
"""Return the short format description for this format."""
1555
1609
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1611
def _run_post_branch_init_hooks(self, controldir, name, branch):
1558
1612
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1615
params = BranchInitHookParams(self, controldir, name, branch)
1562
1616
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.
1619
def initialize(self, controldir, name=None, repository=None,
1620
append_revisions_only=None):
1621
"""Create a branch of this format in controldir.
1613
1623
:param name: Name of the colocated branch to create.
1615
1625
raise NotImplementedError(self.initialize)
1731
1760
"basis revision. hooks MUST NOT modify this delta. "
1732
1761
" future_tree is an in-memory tree obtained from "
1733
1762
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1764
self.add_hook('post_commit',
1736
1765
"Called in the bzr client after a commit has completed. "
1737
1766
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1767
"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',
1768
"commit to a branch.", (0, 15))
1769
self.add_hook('post_uncommit',
1741
1770
"Called in the bzr client after an uncommit completes. "
1742
1771
"post_uncommit is called with (local, master, old_revno, "
1743
1772
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1773
"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',
1774
"receives new_revno of 0, new_revid of None.", (0, 15))
1775
self.add_hook('pre_change_branch_tip',
1747
1776
"Called in bzr client and server before a change to the tip of a "
1748
1777
"branch is made. pre_change_branch_tip is called with a "
1749
1778
"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',
1779
"commit, uncommit will all trigger this hook.", (1, 6))
1780
self.add_hook('post_change_branch_tip',
1752
1781
"Called in bzr client and server after a change to the tip of a "
1753
1782
"branch is made. post_change_branch_tip is called with a "
1754
1783
"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',
1784
"commit, uncommit will all trigger this hook.", (1, 4))
1785
self.add_hook('transform_fallback_location',
1757
1786
"Called when a stacked branch is activating its fallback "
1758
1787
"locations. transform_fallback_location is called with (branch, "
1759
1788
"url), and should return a new url. Returning the same url "
1904
1928
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 ]
1931
class BranchFormatMetadir(bzrdir.BzrFormat, BranchFormat):
1932
"""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
1935
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."""
1936
BranchFormat.__init__(self)
1937
bzrdir.BzrFormat.__init__(self)
1940
def find_format(klass, controldir, name=None):
1941
"""Return the format for the branch object in controldir."""
1943
transport = controldir.get_branch_transport(None, name=name)
1944
except errors.NoSuchFile:
1945
raise errors.NotBranchError(path=name, bzrdir=controldir)
1947
format_string = transport.get_bytes("format")
1948
except errors.NoSuchFile:
1949
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1950
return klass._find_format(format_registry, 'branch', format_string)
1953
1952
def _branch_class(self):
1954
1953
"""What class to instantiate on open calls."""
1955
1954
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.
1956
def _get_initial_config(self, append_revisions_only=None):
1957
if append_revisions_only:
1958
return "append_revisions_only = True\n"
1960
# Avoid writing anything if append_revisions_only is disabled,
1961
# as that is the default.
1964
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1966
"""Initialize a branch in a control dir, with specified files
1968
:param a_bzrdir: The bzrdir to initialize the branch in
1969
:param utf8_files: The files to create as a list of
1970
(filename, content) tuples
1971
:param name: Name of colocated branch to create, if any
1972
:return: a branch in this format
1962
return self.get_format_string()
1975
name = a_bzrdir._get_selected_branch()
1976
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1977
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1978
control_files = lockable_files.LockableFiles(branch_transport,
1979
'lock', lockdir.LockDir)
1980
control_files.create_lock()
1981
control_files.lock_write()
1983
utf8_files += [('format', self.as_string())]
1984
for (filename, content) in utf8_files:
1985
branch_transport.put_bytes(
1987
mode=a_bzrdir._get_file_mode())
1989
control_files.unlock()
1990
branch = self.open(a_bzrdir, name, _found=True,
1991
found_repository=repository)
1992
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1964
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1995
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
1996
found_repository=None, possible_transports=None):
1965
1997
"""See BranchFormat.open()."""
1999
name = a_bzrdir._get_selected_branch()
1967
format = BranchFormat.find_format(a_bzrdir, name=name)
2001
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
1968
2002
if format.__class__ != self.__class__:
1969
2003
raise AssertionError("wrong format %r found for %r" %
1970
2004
(format, self))
2157
2222
"""See BranchFormat.get_format_description()."""
2158
2223
return "Checkout reference format 1"
2160
def get_reference(self, a_bzrdir):
2225
def get_reference(self, a_bzrdir, name=None):
2161
2226
"""See BranchFormat.get_reference()."""
2162
transport = a_bzrdir.get_branch_transport(None)
2227
transport = a_bzrdir.get_branch_transport(None, name=name)
2163
2228
return transport.get_bytes('location')
2165
def set_reference(self, a_bzrdir, to_branch):
2230
def set_reference(self, a_bzrdir, name, to_branch):
2166
2231
"""See BranchFormat.set_reference()."""
2167
transport = a_bzrdir.get_branch_transport(None)
2232
transport = a_bzrdir.get_branch_transport(None, name=name)
2168
2233
location = transport.put_bytes('location', to_branch.base)
2170
def initialize(self, a_bzrdir, name=None, target_branch=None):
2235
def initialize(self, a_bzrdir, name=None, target_branch=None,
2236
repository=None, append_revisions_only=None):
2171
2237
"""Create a branch of this format in a_bzrdir."""
2172
2238
if target_branch is None:
2173
2239
# this format does not implement branch itself, thus the implicit
2174
2240
# creation contract must see it as uninitializable
2175
2241
raise errors.UninitializableFormat(self)
2176
2242
mutter('creating branch reference in %s', a_bzrdir.user_url)
2243
if a_bzrdir._format.fixed_components:
2244
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2246
name = a_bzrdir._get_selected_branch()
2177
2247
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2178
2248
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,
2249
target_branch.user_url)
2250
branch_transport.put_bytes('format', self.as_string())
2251
branch = self.open(a_bzrdir, name, _found=True,
2183
2252
possible_transports=[target_branch.bzrdir.root_transport])
2184
2253
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
2256
def _make_reference_clone_function(format, a_branch):
2193
2257
"""Create a clone() routine for a branch dynamically."""
2194
2258
def clone(to_bzrdir, revision_id=None,
2387
2506
"""See Branch.print_file."""
2388
2507
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
2509
@needs_write_lock
2454
2510
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
2511
if not revision_id or not isinstance(revision_id, basestring):
2512
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2513
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))
2514
old_revno, old_revid = self.last_revision_info()
2515
if self.get_append_revisions_only():
2516
self._check_history_violation(revision_id)
2517
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2518
self._write_last_revision_info(revno, revision_id)
2519
self._clear_cached_state()
2520
self._last_revision_info_cache = revno, revision_id
2521
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2523
def basis_tree(self):
2496
2524
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2645
def _read_last_revision_info(self):
2646
revision_string = self._transport.get_bytes('last-revision')
2647
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2648
revision_id = cache_utf8.get_cached_utf8(revision_id)
2650
return revno, revision_id
2652
def _write_last_revision_info(self, revno, revision_id):
2653
"""Simply write out the revision id, with no checks.
2655
Use set_last_revision_info to perform this safely.
2657
Does not update the revision_history cache.
2659
revision_id = _mod_revision.ensure_null(revision_id)
2660
out_string = '%d %s\n' % (revno, revision_id)
2661
self._transport.put_bytes('last-revision', out_string,
2662
mode=self.bzrdir._get_file_mode())
2665
def update_feature_flags(self, updated_flags):
2666
"""Update the feature flags for this branch.
2668
:param updated_flags: Dictionary mapping feature names to necessities
2669
A necessity can be None to indicate the feature should be removed
2671
self._format._update_feature_flags(updated_flags)
2672
self.control_transport.put_bytes('format', self._format.as_string())
2675
class FullHistoryBzrBranch(BzrBranch):
2676
"""Bzr branch which contains the full revision history."""
2679
def set_last_revision_info(self, revno, revision_id):
2680
if not revision_id or not isinstance(revision_id, basestring):
2681
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2682
revision_id = _mod_revision.ensure_null(revision_id)
2683
# this old format stores the full history, but this api doesn't
2684
# provide it, so we must generate, and might as well check it's
2686
history = self._lefthand_history(revision_id)
2687
if len(history) != revno:
2688
raise AssertionError('%d != %d' % (len(history), revno))
2689
self._set_revision_history(history)
2691
def _read_last_revision_info(self):
2692
rh = self._revision_history()
2695
return (revno, rh[-1])
2697
return (0, _mod_revision.NULL_REVISION)
2699
def _set_revision_history(self, rev_history):
2700
if 'evil' in debug.debug_flags:
2701
mutter_callsite(3, "set_revision_history scales with history.")
2702
check_not_reserved_id = _mod_revision.check_not_reserved_id
2703
for rev_id in rev_history:
2704
check_not_reserved_id(rev_id)
2705
if Branch.hooks['post_change_branch_tip']:
2706
# Don't calculate the last_revision_info() if there are no hooks
2708
old_revno, old_revid = self.last_revision_info()
2709
if len(rev_history) == 0:
2710
revid = _mod_revision.NULL_REVISION
2712
revid = rev_history[-1]
2713
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2714
self._write_revision_history(rev_history)
2715
self._clear_cached_state()
2716
self._cache_revision_history(rev_history)
2717
if Branch.hooks['post_change_branch_tip']:
2718
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2720
def _write_revision_history(self, history):
2721
"""Factored out of set_revision_history.
2723
This performs the actual writing to disk.
2724
It is intended to be called by set_revision_history."""
2725
self._transport.put_bytes(
2726
'revision-history', '\n'.join(history),
2727
mode=self.bzrdir._get_file_mode())
2729
def _gen_revision_history(self):
2730
history = self._transport.get_bytes('revision-history').split('\n')
2731
if history[-1:] == ['']:
2732
# There shouldn't be a trailing newline, but just in case.
2736
def _synchronize_history(self, destination, revision_id):
2737
if not isinstance(destination, FullHistoryBzrBranch):
2738
super(BzrBranch, self)._synchronize_history(
2739
destination, revision_id)
2741
if revision_id == _mod_revision.NULL_REVISION:
2744
new_history = self._revision_history()
2745
if revision_id is not None and new_history != []:
2747
new_history = new_history[:new_history.index(revision_id) + 1]
2749
rev = self.repository.get_revision(revision_id)
2750
new_history = rev.get_history(self.repository)[1:]
2751
destination._set_revision_history(new_history)
2754
def generate_revision_history(self, revision_id, last_rev=None,
2756
"""Create a new revision history that will finish with revision_id.
2758
:param revision_id: the new tip to use.
2759
:param last_rev: The previous last_revision. If not None, then this
2760
must be a ancestory of revision_id, or DivergedBranches is raised.
2761
:param other_branch: The other branch that DivergedBranches should
2762
raise with respect to.
2764
self._set_revision_history(self._lefthand_history(revision_id,
2765
last_rev, other_branch))
2768
class BzrBranch5(FullHistoryBzrBranch):
2769
"""A format 5 branch. This supports new features over plain branches.
2771
It has support for a master_branch which is the data for bound branches.
2775
class BzrBranch8(BzrBranch):
2646
2776
"""A branch that stores tree-reference locations."""
2648
def _open_hook(self):
2778
def _open_hook(self, possible_transports=None):
2649
2779
if self._ignore_fallbacks:
2781
if possible_transports is None:
2782
possible_transports = [self.bzrdir.root_transport]
2652
2784
url = self.get_stacked_on_url()
2653
2785
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2674
2807
self._last_revision_info_cache = None
2675
2808
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
2810
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2811
current_revid = self.last_revision()
2812
last_revision = _mod_revision.ensure_null(current_revid)
2724
2813
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)
2815
graph = self.repository.get_graph()
2816
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2817
if lh_ancestor == current_revid:
2819
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2821
def _gen_revision_history(self):
2730
2822
"""Generate the revision history from last revision
3182
3235
raise NotImplementedError(self.push)
3238
def copy_content_into(self, revision_id=None):
3239
"""Copy the content of source into target
3241
revision_id: if not None, the revision history in the new branch will
3242
be truncated to end with revision_id.
3244
raise NotImplementedError(self.copy_content_into)
3247
def fetch(self, stop_revision=None, limit=None):
3250
:param stop_revision: Last revision to fetch
3251
:param limit: Optional rough limit of revisions to fetch
3253
raise NotImplementedError(self.fetch)
3256
def _fix_overwrite_type(overwrite):
3257
if isinstance(overwrite, bool):
3259
return ["history", "tags"]
3185
3265
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()."""
3266
"""InterBranch implementation that uses public Branch functions."""
3269
def is_compatible(klass, source, target):
3270
# GenericBranch uses the public API, so always compatible
3274
def _get_branch_formats_to_test(klass):
3275
return [(format_registry.get_default(), format_registry.get_default())]
3278
def unwrap_format(klass, format):
3279
if isinstance(format, remote.RemoteBranchFormat):
3280
format._ensure_real()
3281
return format._custom_format
3285
def copy_content_into(self, revision_id=None):
3286
"""Copy the content of source into target
3288
revision_id: if not None, the revision history in the new branch will
3289
be truncated to end with revision_id.
3291
self.source.update_references(self.target)
3292
self.source._synchronize_history(self.target, revision_id)
3294
parent = self.source.get_parent()
3295
except errors.InaccessibleParent, e:
3296
mutter('parent was not accessible to copy: %s', e)
3299
self.target.set_parent(parent)
3300
if self.source._push_should_merge_tags():
3301
self.source.tags.merge_to(self.target.tags)
3304
def fetch(self, stop_revision=None, limit=None):
3305
if self.target.base == self.source.base:
3196
3307
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)
3309
fetch_spec_factory = fetch.FetchSpecFactory()
3310
fetch_spec_factory.source_branch = self.source
3311
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3312
fetch_spec_factory.source_repo = self.source.repository
3313
fetch_spec_factory.target_repo = self.target.repository
3314
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3315
fetch_spec_factory.limit = limit
3316
fetch_spec = fetch_spec_factory.make_fetch_spec()
3317
return self.target.repository.fetch(self.source.repository,
3318
fetch_spec=fetch_spec)
3234
3320
self.source.unlock()
3323
def _update_revisions(self, stop_revision=None, overwrite=False,
3325
other_revno, other_last_revision = self.source.last_revision_info()
3326
stop_revno = None # unknown
3327
if stop_revision is None:
3328
stop_revision = other_last_revision
3329
if _mod_revision.is_null(stop_revision):
3330
# if there are no commits, we're done.
3332
stop_revno = other_revno
3334
# what's the current last revision, before we fetch [and change it
3336
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3337
# we fetch here so that we don't process data twice in the common
3338
# case of having something to pull, and so that the check for
3339
# already merged can operate on the just fetched graph, which will
3340
# be cached in memory.
3341
self.fetch(stop_revision=stop_revision)
3342
# Check to see if one is an ancestor of the other
3345
graph = self.target.repository.get_graph()
3346
if self.target._check_if_descendant_or_diverged(
3347
stop_revision, last_rev, graph, self.source):
3348
# stop_revision is a descendant of last_rev, but we aren't
3349
# overwriting, so we're done.
3351
if stop_revno is None:
3353
graph = self.target.repository.get_graph()
3354
this_revno, this_last_revision = \
3355
self.target.last_revision_info()
3356
stop_revno = graph.find_distance_to_null(stop_revision,
3357
[(other_last_revision, other_revno),
3358
(this_last_revision, this_revno)])
3359
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3362
def pull(self, overwrite=False, stop_revision=None,
3363
possible_transports=None, run_hooks=True,
3364
_override_hook_target=None, local=False):
3365
"""Pull from source into self, updating my master if any.
3367
:param run_hooks: Private parameter - if false, this branch
3368
is being called because it's the master of the primary branch,
3369
so it should not run its hooks.
3371
bound_location = self.target.get_bound_location()
3372
if local and not bound_location:
3373
raise errors.LocalRequiresBoundBranch()
3374
master_branch = None
3375
source_is_master = False
3377
# bound_location comes from a config file, some care has to be
3378
# taken to relate it to source.user_url
3379
normalized = urlutils.normalize_url(bound_location)
3381
relpath = self.source.user_transport.relpath(normalized)
3382
source_is_master = (relpath == '')
3383
except (errors.PathNotChild, errors.InvalidURL):
3384
source_is_master = False
3385
if not local and bound_location and not source_is_master:
3386
# not pulling from master, so we need to update master.
3387
master_branch = self.target.get_master_branch(possible_transports)
3388
master_branch.lock_write()
3391
# pull from source into master.
3392
master_branch.pull(self.source, overwrite, stop_revision,
3394
return self._pull(overwrite,
3395
stop_revision, _hook_master=master_branch,
3396
run_hooks=run_hooks,
3397
_override_hook_target=_override_hook_target,
3398
merge_tags_to_master=not source_is_master)
3401
master_branch.unlock()
3403
def push(self, overwrite=False, stop_revision=None, lossy=False,
3404
_override_hook_source_branch=None):
3405
"""See InterBranch.push.
3407
This is the basic concrete implementation of push()
3409
:param _override_hook_source_branch: If specified, run the hooks
3410
passing this Branch as the source, rather than self. This is for
3411
use of RemoteBranch, where push is delegated to the underlying
3415
raise errors.LossyPushToSameVCS(self.source, self.target)
3416
# TODO: Public option to disable running hooks - should be trivial but
3419
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3420
op.add_cleanup(self.source.lock_read().unlock)
3421
op.add_cleanup(self.target.lock_write().unlock)
3422
return op.run(overwrite, stop_revision,
3423
_override_hook_source_branch=_override_hook_source_branch)
3425
def _basic_push(self, overwrite, stop_revision):
3426
"""Basic implementation of push without bound branches or hooks.
3428
Must be called with source read locked and target write locked.
3430
result = BranchPushResult()
3431
result.source_branch = self.source
3432
result.target_branch = self.target
3433
result.old_revno, result.old_revid = self.target.last_revision_info()
3434
self.source.update_references(self.target)
3435
overwrite = _fix_overwrite_type(overwrite)
3436
if result.old_revid != stop_revision:
3437
# We assume that during 'push' this repository is closer than
3439
graph = self.source.repository.get_graph(self.target.repository)
3440
self._update_revisions(stop_revision,
3441
overwrite=("history" in overwrite),
3443
if self.source._push_should_merge_tags():
3444
result.tag_updates, result.tag_conflicts = (
3445
self.source.tags.merge_to(
3446
self.target.tags, "tags" in overwrite))
3447
result.new_revno, result.new_revid = self.target.last_revision_info()
3450
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3451
_override_hook_source_branch=None):
3452
"""Push from source into target, and into target's master if any.
3455
if _override_hook_source_branch:
3456
result.source_branch = _override_hook_source_branch
3457
for hook in Branch.hooks['post_push']:
3460
bound_location = self.target.get_bound_location()
3461
if bound_location and self.target.base != bound_location:
3462
# there is a master branch.
3464
# XXX: Why the second check? Is it even supported for a branch to
3465
# be bound to itself? -- mbp 20070507
3466
master_branch = self.target.get_master_branch()
3467
master_branch.lock_write()
3468
operation.add_cleanup(master_branch.unlock)
3469
# push into the master from the source branch.
3470
master_inter = InterBranch.get(self.source, master_branch)
3471
master_inter._basic_push(overwrite, stop_revision)
3472
# and push into the target branch from the source. Note that
3473
# we push from the source branch again, because it's considered
3474
# the highest bandwidth repository.
3475
result = self._basic_push(overwrite, stop_revision)
3476
result.master_branch = master_branch
3477
result.local_branch = self.target
3479
master_branch = None
3481
result = self._basic_push(overwrite, stop_revision)
3482
# TODO: Why set master_branch and local_branch if there's no
3483
# binding? Maybe cleaner to just leave them unset? -- mbp
3485
result.master_branch = self.target
3486
result.local_branch = None
3490
def _pull(self, overwrite=False, stop_revision=None,
3237
3491
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3492
_override_hook_target=None, local=False,
3493
merge_tags_to_master=True):
3239
3494
"""See Branch.pull.
3496
This function is the core worker, used by GenericInterBranch.pull to
3497
avoid duplication when pulling source->master and source->local.
3241
3499
:param _hook_master: Private parameter - set the branch to
3242
3500
be supplied as the master to pull hooks.
3243
3501
:param run_hooks: Private parameter - if false, this branch
3244
3502
is being called because it's the master of the primary branch,
3245
3503
so it should not run its hooks.
3504
is being called because it's the master of the primary branch,
3505
so it should not run its hooks.
3246
3506
:param _override_hook_target: Private parameter - set the branch to be
3247
3507
supplied as the target_branch to pull hooks.
3248
3508
:param local: Only update the local branch, and not the bound branch.
3288
3552
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
3556
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
