878
792
old_repository = self.repository
879
793
if len(old_repository._fallback_repositories) != 1:
880
794
raise AssertionError("can't cope with fallback repositories "
881
"of %r (fallbacks: %r)" % (old_repository,
882
old_repository._fallback_repositories))
883
# Open the new repository object.
884
# Repositories don't offer an interface to remove fallback
885
# repositories today; take the conceptually simpler option and just
886
# reopen it. We reopen it starting from the URL so that we
887
# get a separate connection for RemoteRepositories and can
888
# stream from one of them to the other. This does mean doing
889
# separate SSH connection setup, but unstacking is not a
890
# common operation so it's tolerable.
891
new_bzrdir = controldir.ControlDir.open(
892
self.bzrdir.root_transport.base)
893
new_repository = new_bzrdir.find_repository()
894
if new_repository._fallback_repositories:
895
raise AssertionError("didn't expect %r to have "
896
"fallback_repositories"
897
% (self.repository,))
898
# Replace self.repository with the new repository.
899
# Do our best to transfer the lock state (i.e. lock-tokens and
900
# lock count) of self.repository to the new repository.
901
lock_token = old_repository.lock_write().repository_token
902
self.repository = new_repository
903
if isinstance(self, remote.RemoteBranch):
904
# Remote branches can have a second reference to the old
905
# repository that need to be replaced.
906
if self._real_branch is not None:
907
self._real_branch.repository = new_repository
908
self.repository.lock_write(token=lock_token)
909
if lock_token is not None:
910
old_repository.leave_lock_in_place()
795
"of %r" % (self.repository,))
796
# unlock it, including unlocking the fallback
911
797
old_repository.unlock()
912
if lock_token is not None:
913
# XXX: self.repository.leave_lock_in_place() before this
914
# function will not be preserved. Fortunately that doesn't
915
# affect the current default format (2a), and would be a
916
# corner-case anyway.
917
# - Andrew Bennetts, 2010/06/30
918
self.repository.dont_leave_lock_in_place()
922
old_repository.unlock()
923
except errors.LockNotHeld:
926
if old_lock_count == 0:
927
raise AssertionError(
928
'old_repository should have been locked at least once.')
929
for i in range(old_lock_count-1):
798
old_repository.lock_read()
800
# Repositories don't offer an interface to remove fallback
801
# repositories today; take the conceptually simpler option and just
802
# reopen it. We reopen it starting from the URL so that we
803
# get a separate connection for RemoteRepositories and can
804
# stream from one of them to the other. This does mean doing
805
# separate SSH connection setup, but unstacking is not a
806
# common operation so it's tolerable.
807
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
808
new_repository = new_bzrdir.find_repository()
809
self.repository = new_repository
810
if self.repository._fallback_repositories:
811
raise AssertionError("didn't expect %r to have "
812
"fallback_repositories"
813
% (self.repository,))
814
# this is not paired with an unlock because it's just restoring
815
# the previous state; the lock's released when set_stacked_on_url
930
817
self.repository.lock_write()
931
# Fetch from the old repository into the new.
932
old_repository.lock_read()
934
818
# XXX: If you unstack a branch while it has a working tree
935
819
# with a pending merge, the pending-merged revisions will no
936
820
# longer be present. You can (probably) revert and remerge.
938
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
939
except errors.TagsNotSupported:
940
tags_to_fetch = set()
941
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
942
old_repository, required_ids=[self.last_revision()],
943
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
944
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
822
# XXX: This only fetches up to the tip of the repository; it
823
# doesn't bring across any tags. That's fairly consistent
824
# with how branch works, but perhaps not ideal.
825
self.repository.fetch(old_repository,
826
revision_id=self.last_revision(),
946
829
old_repository.unlock()
1055
927
:return: A tuple (revno, revision_id).
1057
929
if self._last_revision_info_cache is None:
1058
self._last_revision_info_cache = self._read_last_revision_info()
930
self._last_revision_info_cache = self._last_revision_info()
1059
931
return self._last_revision_info_cache
1061
def _read_last_revision_info(self):
1062
raise NotImplementedError(self._read_last_revision_info)
1064
@deprecated_method(deprecated_in((2, 4, 0)))
933
def _last_revision_info(self):
934
rh = self.revision_history()
937
return (revno, rh[-1])
939
return (0, _mod_revision.NULL_REVISION)
941
@deprecated_method(deprecated_in((1, 6, 0)))
942
def missing_revisions(self, other, stop_revision=None):
943
"""Return a list of new revisions that would perfectly fit.
945
If self and other have not diverged, return a list of the revisions
946
present in other, but missing from self.
948
self_history = self.revision_history()
949
self_len = len(self_history)
950
other_history = other.revision_history()
951
other_len = len(other_history)
952
common_index = min(self_len, other_len) -1
953
if common_index >= 0 and \
954
self_history[common_index] != other_history[common_index]:
955
raise errors.DivergedBranches(self, other)
957
if stop_revision is None:
958
stop_revision = other_len
960
if stop_revision > other_len:
961
raise errors.NoSuchRevision(self, stop_revision)
962
return other_history[self_len:stop_revision]
965
def update_revisions(self, other, stop_revision=None, overwrite=False,
967
"""Pull in new perfect-fit revisions.
969
:param other: Another Branch to pull from
970
:param stop_revision: Updated until the given revision
971
:param overwrite: Always set the branch pointer, rather than checking
972
to see if it is a proper descendant.
973
:param graph: A Graph object that can be used to query history
974
information. This can be None.
977
return InterBranch.get(other, self).update_revisions(stop_revision,
1065
980
def import_last_revision_info(self, source_repo, revno, revid):
1066
981
"""Set the last revision info, importing from another repo if necessary.
983
This is used by the bound branch code to upload a revision to
984
the master branch first before updating the tip of the local branch.
1068
986
:param source_repo: Source repository to optionally fetch from
1069
987
:param revno: Revision number of the new tip
1070
988
:param revid: Revision id of the new tip
1607
1517
return not (self == other)
1610
@deprecated_method(deprecated_in((2, 4, 0)))
1520
def find_format(klass, a_bzrdir, name=None):
1521
"""Return the format for the branch object in a_bzrdir."""
1523
transport = a_bzrdir.get_branch_transport(None, name=name)
1524
format_string = transport.get_bytes("format")
1525
return klass._formats[format_string]
1526
except errors.NoSuchFile:
1527
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1529
raise errors.UnknownFormatError(format=format_string, kind='branch')
1611
1532
def get_default_format(klass):
1612
1533
"""Return the current default format."""
1613
return format_registry.get_default()
1616
@deprecated_method(deprecated_in((2, 4, 0)))
1617
def get_formats(klass):
1618
"""Get all the known formats.
1620
Warning: This triggers a load of all lazy registered formats: do not
1621
use except when that is desireed.
1623
return format_registry._get_all()
1625
def get_reference(self, controldir, name=None):
1626
"""Get the target reference of the branch in controldir.
1534
return klass._default_format
1536
def get_reference(self, a_bzrdir, name=None):
1537
"""Get the target reference of the branch in a_bzrdir.
1628
1539
format probing must have been completed before calling
1629
1540
this method - it is assumed that the format of the branch
1630
in controldir is correct.
1541
in a_bzrdir is correct.
1632
:param controldir: The controldir to get the branch data from.
1543
:param a_bzrdir: The bzrdir to get the branch data from.
1633
1544
:param name: Name of the colocated branch to fetch
1634
1545
:return: None if the branch is not a reference branch.
1639
def set_reference(self, controldir, name, to_branch):
1640
"""Set the target reference of the branch in controldir.
1550
def set_reference(self, a_bzrdir, name, to_branch):
1551
"""Set the target reference of the branch in a_bzrdir.
1642
1553
format probing must have been completed before calling
1643
1554
this method - it is assumed that the format of the branch
1644
in controldir is correct.
1555
in a_bzrdir is correct.
1646
:param controldir: The controldir to set the branch reference for.
1557
:param a_bzrdir: The bzrdir to set the branch reference for.
1647
1558
:param name: Name of colocated branch to set, None for default
1648
1559
:param to_branch: branch that the checkout is to reference
1650
1561
raise NotImplementedError(self.set_reference)
1563
def get_format_string(self):
1564
"""Return the ASCII format string that identifies this format."""
1565
raise NotImplementedError(self.get_format_string)
1652
1567
def get_format_description(self):
1653
1568
"""Return the short format description for this format."""
1654
1569
raise NotImplementedError(self.get_format_description)
1656
def _run_post_branch_init_hooks(self, controldir, name, branch):
1571
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1657
1572
hooks = Branch.hooks['post_branch_init']
1660
params = BranchInitHookParams(self, controldir, name, branch)
1575
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1661
1576
for hook in hooks:
1664
def initialize(self, controldir, name=None, repository=None,
1665
append_revisions_only=None):
1666
"""Create a branch of this format in controldir.
1579
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1580
lock_type='metadir', set_format=True):
1581
"""Initialize a branch in a bzrdir, with specified files
1583
:param a_bzrdir: The bzrdir to initialize the branch in
1584
:param utf8_files: The files to create as a list of
1585
(filename, content) tuples
1586
:param name: Name of colocated branch to create, if any
1587
:param set_format: If True, set the format with
1588
self.get_format_string. (BzrBranch4 has its format set
1590
:return: a branch in this format
1592
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1593
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1595
'metadir': ('lock', lockdir.LockDir),
1596
'branch4': ('branch-lock', lockable_files.TransportLock),
1598
lock_name, lock_class = lock_map[lock_type]
1599
control_files = lockable_files.LockableFiles(branch_transport,
1600
lock_name, lock_class)
1601
control_files.create_lock()
1603
control_files.lock_write()
1604
except errors.LockContention:
1605
if lock_type != 'branch4':
1611
utf8_files += [('format', self.get_format_string())]
1613
for (filename, content) in utf8_files:
1614
branch_transport.put_bytes(
1616
mode=a_bzrdir._get_file_mode())
1619
control_files.unlock()
1620
branch = self.open(a_bzrdir, name, _found=True)
1621
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1624
def initialize(self, a_bzrdir, name=None):
1625
"""Create a branch of this format in a_bzrdir.
1668
1627
:param name: Name of the colocated branch to create.
1670
1629
raise NotImplementedError(self.initialize)
1831
1745
"basis revision. hooks MUST NOT modify this delta. "
1832
1746
" future_tree is an in-memory tree obtained from "
1833
1747
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1835
self.add_hook('post_commit',
1748
"tree.", (0,91), None))
1749
self.create_hook(HookPoint('post_commit',
1836
1750
"Called in the bzr client after a commit has completed. "
1837
1751
"post_commit is called with (local, master, old_revno, old_revid, "
1838
1752
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1839
"commit to a branch.", (0, 15))
1840
self.add_hook('post_uncommit',
1753
"commit to a branch.", (0, 15), None))
1754
self.create_hook(HookPoint('post_uncommit',
1841
1755
"Called in the bzr client after an uncommit completes. "
1842
1756
"post_uncommit is called with (local, master, old_revno, "
1843
1757
"old_revid, new_revno, new_revid) where local is the local branch "
1844
1758
"or None, master is the target branch, and an empty branch "
1845
"receives new_revno of 0, new_revid of None.", (0, 15))
1846
self.add_hook('pre_change_branch_tip',
1759
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1760
self.create_hook(HookPoint('pre_change_branch_tip',
1847
1761
"Called in bzr client and server before a change to the tip of a "
1848
1762
"branch is made. pre_change_branch_tip is called with a "
1849
1763
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1850
"commit, uncommit will all trigger this hook.", (1, 6))
1851
self.add_hook('post_change_branch_tip',
1764
"commit, uncommit will all trigger this hook.", (1, 6), None))
1765
self.create_hook(HookPoint('post_change_branch_tip',
1852
1766
"Called in bzr client and server after a change to the tip of a "
1853
1767
"branch is made. post_change_branch_tip is called with a "
1854
1768
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1855
"commit, uncommit will all trigger this hook.", (1, 4))
1856
self.add_hook('transform_fallback_location',
1769
"commit, uncommit will all trigger this hook.", (1, 4), None))
1770
self.create_hook(HookPoint('transform_fallback_location',
1857
1771
"Called when a stacked branch is activating its fallback "
1858
1772
"locations. transform_fallback_location is called with (branch, "
1859
1773
"url), and should return a new url. Returning the same url "
1999
1918
self.revision_id)
2002
class BranchFormatMetadir(bzrdir.BzrDirMetaComponentFormat, BranchFormat):
2003
"""Base class for branch formats that live in meta directories.
1921
class BzrBranchFormat4(BranchFormat):
1922
"""Bzr branch format 4.
1925
- a revision-history file.
1926
- a branch-lock lock file [ to be shared with the bzrdir ]
1929
def get_format_description(self):
1930
"""See BranchFormat.get_format_description()."""
1931
return "Branch format 4"
1933
def initialize(self, a_bzrdir, name=None):
1934
"""Create a branch of this format in a_bzrdir."""
1935
utf8_files = [('revision-history', ''),
1936
('branch-name', ''),
1938
return self._initialize_helper(a_bzrdir, utf8_files, name=name,
1939
lock_type='branch4', set_format=False)
2006
1941
def __init__(self):
2007
BranchFormat.__init__(self)
2008
bzrdir.BzrDirMetaComponentFormat.__init__(self)
2011
def find_format(klass, controldir, name=None):
2012
"""Return the format for the branch object in controldir."""
2014
transport = controldir.get_branch_transport(None, name=name)
2015
except errors.NoSuchFile:
2016
raise errors.NotBranchError(path=name, bzrdir=controldir)
2018
format_string = transport.get_bytes("format")
2019
except errors.NoSuchFile:
2020
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
2021
return klass._find_format(format_registry, 'branch', format_string)
1942
super(BzrBranchFormat4, self).__init__()
1943
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1945
def network_name(self):
1946
"""The network name for this format is the control dirs disk label."""
1947
return self._matchingbzrdir.get_format_string()
1949
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1950
"""See BranchFormat.open()."""
1952
# we are being called directly and must probe.
1953
raise NotImplementedError
1954
return BzrBranch(_format=self,
1955
_control_files=a_bzrdir._control_files,
1958
_repository=a_bzrdir.open_repository())
1961
return "Bazaar-NG branch format 4"
1964
class BranchFormatMetadir(BranchFormat):
1965
"""Common logic for meta-dir based branch formats."""
2023
1967
def _branch_class(self):
2024
1968
"""What class to instantiate on open calls."""
2025
1969
raise NotImplementedError(self._branch_class)
2027
def _get_initial_config(self, append_revisions_only=None):
2028
if append_revisions_only:
2029
return "append_revisions_only = True\n"
2031
# Avoid writing anything if append_revisions_only is disabled,
2032
# as that is the default.
2035
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
2037
"""Initialize a branch in a bzrdir, with specified files
2039
:param a_bzrdir: The bzrdir to initialize the branch in
2040
:param utf8_files: The files to create as a list of
2041
(filename, content) tuples
2042
:param name: Name of colocated branch to create, if any
2043
:return: a branch in this format
1971
def network_name(self):
1972
"""A simple byte string uniquely identifying this format for RPC calls.
1974
Metadir branch formats use their format string.
2045
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2046
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2047
control_files = lockable_files.LockableFiles(branch_transport,
2048
'lock', lockdir.LockDir)
2049
control_files.create_lock()
2050
control_files.lock_write()
2052
utf8_files += [('format', self.get_format_string())]
2053
for (filename, content) in utf8_files:
2054
branch_transport.put_bytes(
2056
mode=a_bzrdir._get_file_mode())
2058
control_files.unlock()
2059
branch = self.open(a_bzrdir, name, _found=True,
2060
found_repository=repository)
2061
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1976
return self.get_format_string()
2064
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2065
found_repository=None, possible_transports=None):
1978
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
2066
1979
"""See BranchFormat.open()."""
2068
format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
1981
format = BranchFormat.find_format(a_bzrdir, name=name)
2069
1982
if format.__class__ != self.__class__:
2070
1983
raise AssertionError("wrong format %r found for %r" %
2071
1984
(format, self))
2557
2430
"""See Branch.print_file."""
2558
2431
return self.repository.print_file(file, revision_id)
2433
def _write_revision_history(self, history):
2434
"""Factored out of set_revision_history.
2436
This performs the actual writing to disk.
2437
It is intended to be called by BzrBranch5.set_revision_history."""
2438
self._transport.put_bytes(
2439
'revision-history', '\n'.join(history),
2440
mode=self.bzrdir._get_file_mode())
2443
def set_revision_history(self, rev_history):
2444
"""See Branch.set_revision_history."""
2445
if 'evil' in debug.debug_flags:
2446
mutter_callsite(3, "set_revision_history scales with history.")
2447
check_not_reserved_id = _mod_revision.check_not_reserved_id
2448
for rev_id in rev_history:
2449
check_not_reserved_id(rev_id)
2450
if Branch.hooks['post_change_branch_tip']:
2451
# Don't calculate the last_revision_info() if there are no hooks
2453
old_revno, old_revid = self.last_revision_info()
2454
if len(rev_history) == 0:
2455
revid = _mod_revision.NULL_REVISION
2457
revid = rev_history[-1]
2458
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2459
self._write_revision_history(rev_history)
2460
self._clear_cached_state()
2461
self._cache_revision_history(rev_history)
2462
for hook in Branch.hooks['set_rh']:
2463
hook(self, rev_history)
2464
if Branch.hooks['post_change_branch_tip']:
2465
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2467
def _synchronize_history(self, destination, revision_id):
2468
"""Synchronize last revision and revision history between branches.
2470
This version is most efficient when the destination is also a
2471
BzrBranch5, but works for BzrBranch6 as long as the revision
2472
history is the true lefthand parent history, and all of the revisions
2473
are in the destination's repository. If not, set_revision_history
2476
:param destination: The branch to copy the history into
2477
:param revision_id: The revision-id to truncate history at. May
2478
be None to copy complete history.
2480
if not isinstance(destination._format, BzrBranchFormat5):
2481
super(BzrBranch, self)._synchronize_history(
2482
destination, revision_id)
2484
if revision_id == _mod_revision.NULL_REVISION:
2487
new_history = self.revision_history()
2488
if revision_id is not None and new_history != []:
2490
new_history = new_history[:new_history.index(revision_id) + 1]
2492
rev = self.repository.get_revision(revision_id)
2493
new_history = rev.get_history(self.repository)[1:]
2494
destination.set_revision_history(new_history)
2560
2496
@needs_write_lock
2561
2497
def set_last_revision_info(self, revno, revision_id):
2562
if not revision_id or not isinstance(revision_id, basestring):
2563
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2498
"""Set the last revision of this branch.
2500
The caller is responsible for checking that the revno is correct
2501
for this revision id.
2503
It may be possible to set the branch last revision to an id not
2504
present in the repository. However, branches can also be
2505
configured to check constraints on history, in which case this may not
2564
2508
revision_id = _mod_revision.ensure_null(revision_id)
2565
old_revno, old_revid = self.last_revision_info()
2566
if self.get_append_revisions_only():
2567
self._check_history_violation(revision_id)
2568
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2569
self._write_last_revision_info(revno, revision_id)
2570
self._clear_cached_state()
2571
self._last_revision_info_cache = revno, revision_id
2572
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2509
# this old format stores the full history, but this api doesn't
2510
# provide it, so we must generate, and might as well check it's
2512
history = self._lefthand_history(revision_id)
2513
if len(history) != revno:
2514
raise AssertionError('%d != %d' % (len(history), revno))
2515
self.set_revision_history(history)
2517
def _gen_revision_history(self):
2518
history = self._transport.get_bytes('revision-history').split('\n')
2519
if history[-1:] == ['']:
2520
# There shouldn't be a trailing newline, but just in case.
2525
def generate_revision_history(self, revision_id, last_rev=None,
2527
"""Create a new revision history that will finish with revision_id.
2529
:param revision_id: the new tip to use.
2530
:param last_rev: The previous last_revision. If not None, then this
2531
must be a ancestory of revision_id, or DivergedBranches is raised.
2532
:param other_branch: The other branch that DivergedBranches should
2533
raise with respect to.
2535
self.set_revision_history(self._lefthand_history(revision_id,
2536
last_rev, other_branch))
2574
2538
def basis_tree(self):
2575
2539
"""See Branch.basis_tree."""
2696
def _read_last_revision_info(self):
2697
revision_string = self._transport.get_bytes('last-revision')
2698
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2699
revision_id = cache_utf8.get_cached_utf8(revision_id)
2701
return revno, revision_id
2703
def _write_last_revision_info(self, revno, revision_id):
2704
"""Simply write out the revision id, with no checks.
2706
Use set_last_revision_info to perform this safely.
2708
Does not update the revision_history cache.
2710
revision_id = _mod_revision.ensure_null(revision_id)
2711
out_string = '%d %s\n' % (revno, revision_id)
2712
self._transport.put_bytes('last-revision', out_string,
2713
mode=self.bzrdir._get_file_mode())
2716
class FullHistoryBzrBranch(BzrBranch):
2717
"""Bzr branch which contains the full revision history."""
2720
def set_last_revision_info(self, revno, revision_id):
2721
if not revision_id or not isinstance(revision_id, basestring):
2722
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2723
revision_id = _mod_revision.ensure_null(revision_id)
2724
# this old format stores the full history, but this api doesn't
2725
# provide it, so we must generate, and might as well check it's
2727
history = self._lefthand_history(revision_id)
2728
if len(history) != revno:
2729
raise AssertionError('%d != %d' % (len(history), revno))
2730
self._set_revision_history(history)
2732
def _read_last_revision_info(self):
2733
rh = self._revision_history()
2736
return (revno, rh[-1])
2738
return (0, _mod_revision.NULL_REVISION)
2740
@deprecated_method(deprecated_in((2, 4, 0)))
2742
def set_revision_history(self, rev_history):
2743
"""See Branch.set_revision_history."""
2744
self._set_revision_history(rev_history)
2746
def _set_revision_history(self, rev_history):
2747
if 'evil' in debug.debug_flags:
2748
mutter_callsite(3, "set_revision_history scales with history.")
2749
check_not_reserved_id = _mod_revision.check_not_reserved_id
2750
for rev_id in rev_history:
2751
check_not_reserved_id(rev_id)
2752
if Branch.hooks['post_change_branch_tip']:
2753
# Don't calculate the last_revision_info() if there are no hooks
2755
old_revno, old_revid = self.last_revision_info()
2756
if len(rev_history) == 0:
2757
revid = _mod_revision.NULL_REVISION
2759
revid = rev_history[-1]
2760
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2761
self._write_revision_history(rev_history)
2762
self._clear_cached_state()
2763
self._cache_revision_history(rev_history)
2764
for hook in Branch.hooks['set_rh']:
2765
hook(self, rev_history)
2766
if Branch.hooks['post_change_branch_tip']:
2767
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2769
def _write_revision_history(self, history):
2770
"""Factored out of set_revision_history.
2772
This performs the actual writing to disk.
2773
It is intended to be called by set_revision_history."""
2774
self._transport.put_bytes(
2775
'revision-history', '\n'.join(history),
2776
mode=self.bzrdir._get_file_mode())
2778
def _gen_revision_history(self):
2779
history = self._transport.get_bytes('revision-history').split('\n')
2780
if history[-1:] == ['']:
2781
# There shouldn't be a trailing newline, but just in case.
2785
def _synchronize_history(self, destination, revision_id):
2786
if not isinstance(destination, FullHistoryBzrBranch):
2787
super(BzrBranch, self)._synchronize_history(
2788
destination, revision_id)
2790
if revision_id == _mod_revision.NULL_REVISION:
2793
new_history = self._revision_history()
2794
if revision_id is not None and new_history != []:
2796
new_history = new_history[:new_history.index(revision_id) + 1]
2798
rev = self.repository.get_revision(revision_id)
2799
new_history = rev.get_history(self.repository)[1:]
2800
destination._set_revision_history(new_history)
2803
def generate_revision_history(self, revision_id, last_rev=None,
2805
"""Create a new revision history that will finish with revision_id.
2807
:param revision_id: the new tip to use.
2808
:param last_rev: The previous last_revision. If not None, then this
2809
must be a ancestory of revision_id, or DivergedBranches is raised.
2810
:param other_branch: The other branch that DivergedBranches should
2811
raise with respect to.
2813
self._set_revision_history(self._lefthand_history(revision_id,
2814
last_rev, other_branch))
2817
class BzrBranch5(FullHistoryBzrBranch):
2818
"""A format 5 branch. This supports new features over plain branches.
2820
It has support for a master_branch which is the data for bound branches.
2824
class BzrBranch8(BzrBranch):
2688
class BzrBranch8(BzrBranch5):
2825
2689
"""A branch that stores tree-reference locations."""
2827
def _open_hook(self, possible_transports=None):
2691
def _open_hook(self):
2828
2692
if self._ignore_fallbacks:
2830
if possible_transports is None:
2831
possible_transports = [self.bzrdir.root_transport]
2833
2695
url = self.get_stacked_on_url()
2834
2696
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2856
2717
self._last_revision_info_cache = None
2857
2718
self._reference_info = None
2720
def _last_revision_info(self):
2721
revision_string = self._transport.get_bytes('last-revision')
2722
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2723
revision_id = cache_utf8.get_cached_utf8(revision_id)
2725
return revno, revision_id
2727
def _write_last_revision_info(self, revno, revision_id):
2728
"""Simply write out the revision id, with no checks.
2730
Use set_last_revision_info to perform this safely.
2732
Does not update the revision_history cache.
2733
Intended to be called by set_last_revision_info and
2734
_write_revision_history.
2736
revision_id = _mod_revision.ensure_null(revision_id)
2737
out_string = '%d %s\n' % (revno, revision_id)
2738
self._transport.put_bytes('last-revision', out_string,
2739
mode=self.bzrdir._get_file_mode())
2742
def set_last_revision_info(self, revno, revision_id):
2743
revision_id = _mod_revision.ensure_null(revision_id)
2744
old_revno, old_revid = self.last_revision_info()
2745
if self._get_append_revisions_only():
2746
self._check_history_violation(revision_id)
2747
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2748
self._write_last_revision_info(revno, revision_id)
2749
self._clear_cached_state()
2750
self._last_revision_info_cache = revno, revision_id
2751
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2753
def _synchronize_history(self, destination, revision_id):
2754
"""Synchronize last revision and revision history between branches.
2756
:see: Branch._synchronize_history
2758
# XXX: The base Branch has a fast implementation of this method based
2759
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2760
# that uses set_revision_history. This class inherits from BzrBranch5,
2761
# but wants the fast implementation, so it calls
2762
# Branch._synchronize_history directly.
2763
Branch._synchronize_history(self, destination, revision_id)
2859
2765
def _check_history_violation(self, revision_id):
2860
current_revid = self.last_revision()
2861
last_revision = _mod_revision.ensure_null(current_revid)
2766
last_revision = _mod_revision.ensure_null(self.last_revision())
2862
2767
if _mod_revision.is_null(last_revision):
2864
graph = self.repository.get_graph()
2865
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2866
if lh_ancestor == current_revid:
2868
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2769
if last_revision not in self._lefthand_history(revision_id):
2770
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2870
2772
def _gen_revision_history(self):
2871
2773
"""Generate the revision history from last revision
3292
3225
raise NotImplementedError(self.push)
3295
def copy_content_into(self, revision_id=None):
3296
"""Copy the content of source into target
3298
revision_id: if not None, the revision history in the new branch will
3299
be truncated to end with revision_id.
3301
raise NotImplementedError(self.copy_content_into)
3304
def fetch(self, stop_revision=None, limit=None):
3307
:param stop_revision: Last revision to fetch
3308
:param limit: Optional rough limit of revisions to fetch
3310
raise NotImplementedError(self.fetch)
3313
3228
class GenericInterBranch(InterBranch):
3314
"""InterBranch implementation that uses public Branch functions."""
3317
def is_compatible(klass, source, target):
3318
# GenericBranch uses the public API, so always compatible
3322
def _get_branch_formats_to_test(klass):
3323
return [(format_registry.get_default(), format_registry.get_default())]
3326
def unwrap_format(klass, format):
3327
if isinstance(format, remote.RemoteBranchFormat):
3328
format._ensure_real()
3329
return format._custom_format
3333
def copy_content_into(self, revision_id=None):
3334
"""Copy the content of source into target
3336
revision_id: if not None, the revision history in the new branch will
3337
be truncated to end with revision_id.
3339
self.source.update_references(self.target)
3340
self.source._synchronize_history(self.target, revision_id)
3342
parent = self.source.get_parent()
3343
except errors.InaccessibleParent, e:
3344
mutter('parent was not accessible to copy: %s', e)
3347
self.target.set_parent(parent)
3348
if self.source._push_should_merge_tags():
3349
self.source.tags.merge_to(self.target.tags)
3352
def fetch(self, stop_revision=None, limit=None):
3353
if self.target.base == self.source.base:
3229
"""InterBranch implementation that uses public Branch functions.
3233
def _get_branch_formats_to_test():
3234
return BranchFormat._default_format, BranchFormat._default_format
3236
def update_revisions(self, stop_revision=None, overwrite=False,
3238
"""See InterBranch.update_revisions()."""
3355
3239
self.source.lock_read()
3357
fetch_spec_factory = fetch.FetchSpecFactory()
3358
fetch_spec_factory.source_branch = self.source
3359
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3360
fetch_spec_factory.source_repo = self.source.repository
3361
fetch_spec_factory.target_repo = self.target.repository
3362
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3363
fetch_spec_factory.limit = limit
3364
fetch_spec = fetch_spec_factory.make_fetch_spec()
3365
return self.target.repository.fetch(self.source.repository,
3366
fetch_spec=fetch_spec)
3241
other_revno, other_last_revision = self.source.last_revision_info()
3242
stop_revno = None # unknown
3243
if stop_revision is None:
3244
stop_revision = other_last_revision
3245
if _mod_revision.is_null(stop_revision):
3246
# if there are no commits, we're done.
3248
stop_revno = other_revno
3250
# what's the current last revision, before we fetch [and change it
3252
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3253
# we fetch here so that we don't process data twice in the common
3254
# case of having something to pull, and so that the check for
3255
# already merged can operate on the just fetched graph, which will
3256
# be cached in memory.
3257
self.target.fetch(self.source, stop_revision)
3258
# Check to see if one is an ancestor of the other
3261
graph = self.target.repository.get_graph()
3262
if self.target._check_if_descendant_or_diverged(
3263
stop_revision, last_rev, graph, self.source):
3264
# stop_revision is a descendant of last_rev, but we aren't
3265
# overwriting, so we're done.
3267
if stop_revno is None:
3269
graph = self.target.repository.get_graph()
3270
this_revno, this_last_revision = \
3271
self.target.last_revision_info()
3272
stop_revno = graph.find_distance_to_null(stop_revision,
3273
[(other_last_revision, other_revno),
3274
(this_last_revision, this_revno)])
3275
self.target.set_last_revision_info(stop_revno, stop_revision)
3368
3277
self.source.unlock()
3371
def _update_revisions(self, stop_revision=None, overwrite=False,
3373
other_revno, other_last_revision = self.source.last_revision_info()
3374
stop_revno = None # unknown
3375
if stop_revision is None:
3376
stop_revision = other_last_revision
3377
if _mod_revision.is_null(stop_revision):
3378
# if there are no commits, we're done.
3380
stop_revno = other_revno
3382
# what's the current last revision, before we fetch [and change it
3384
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3385
# we fetch here so that we don't process data twice in the common
3386
# case of having something to pull, and so that the check for
3387
# already merged can operate on the just fetched graph, which will
3388
# be cached in memory.
3389
self.fetch(stop_revision=stop_revision)
3390
# Check to see if one is an ancestor of the other
3393
graph = self.target.repository.get_graph()
3394
if self.target._check_if_descendant_or_diverged(
3395
stop_revision, last_rev, graph, self.source):
3396
# stop_revision is a descendant of last_rev, but we aren't
3397
# overwriting, so we're done.
3399
if stop_revno is None:
3401
graph = self.target.repository.get_graph()
3402
this_revno, this_last_revision = \
3403
self.target.last_revision_info()
3404
stop_revno = graph.find_distance_to_null(stop_revision,
3405
[(other_last_revision, other_revno),
3406
(this_last_revision, this_revno)])
3407
self.target.set_last_revision_info(stop_revno, stop_revision)
3410
3279
def pull(self, overwrite=False, stop_revision=None,
3411
possible_transports=None, run_hooks=True,
3412
_override_hook_target=None, local=False):
3413
"""Pull from source into self, updating my master if any.
3415
:param run_hooks: Private parameter - if false, this branch
3416
is being called because it's the master of the primary branch,
3417
so it should not run its hooks.
3419
bound_location = self.target.get_bound_location()
3420
if local and not bound_location:
3421
raise errors.LocalRequiresBoundBranch()
3422
master_branch = None
3423
source_is_master = False
3425
# bound_location comes from a config file, some care has to be
3426
# taken to relate it to source.user_url
3427
normalized = urlutils.normalize_url(bound_location)
3429
relpath = self.source.user_transport.relpath(normalized)
3430
source_is_master = (relpath == '')
3431
except (errors.PathNotChild, errors.InvalidURL):
3432
source_is_master = False
3433
if not local and bound_location and not source_is_master:
3434
# not pulling from master, so we need to update master.
3435
master_branch = self.target.get_master_branch(possible_transports)
3436
master_branch.lock_write()
3439
# pull from source into master.
3440
master_branch.pull(self.source, overwrite, stop_revision,
3442
return self._pull(overwrite,
3443
stop_revision, _hook_master=master_branch,
3444
run_hooks=run_hooks,
3445
_override_hook_target=_override_hook_target,
3446
merge_tags_to_master=not source_is_master)
3449
master_branch.unlock()
3451
def push(self, overwrite=False, stop_revision=None, lossy=False,
3452
_override_hook_source_branch=None):
3453
"""See InterBranch.push.
3455
This is the basic concrete implementation of push()
3457
:param _override_hook_source_branch: If specified, run the hooks
3458
passing this Branch as the source, rather than self. This is for
3459
use of RemoteBranch, where push is delegated to the underlying
3463
raise errors.LossyPushToSameVCS(self.source, self.target)
3464
# TODO: Public option to disable running hooks - should be trivial but
3467
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3468
op.add_cleanup(self.source.lock_read().unlock)
3469
op.add_cleanup(self.target.lock_write().unlock)
3470
return op.run(overwrite, stop_revision,
3471
_override_hook_source_branch=_override_hook_source_branch)
3473
def _basic_push(self, overwrite, stop_revision):
3474
"""Basic implementation of push without bound branches or hooks.
3476
Must be called with source read locked and target write locked.
3478
result = BranchPushResult()
3479
result.source_branch = self.source
3480
result.target_branch = self.target
3481
result.old_revno, result.old_revid = self.target.last_revision_info()
3482
self.source.update_references(self.target)
3483
if result.old_revid != stop_revision:
3484
# We assume that during 'push' this repository is closer than
3486
graph = self.source.repository.get_graph(self.target.repository)
3487
self._update_revisions(stop_revision, overwrite=overwrite,
3489
if self.source._push_should_merge_tags():
3490
result.tag_updates, result.tag_conflicts = (
3491
self.source.tags.merge_to(self.target.tags, overwrite))
3492
result.new_revno, result.new_revid = self.target.last_revision_info()
3495
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3496
_override_hook_source_branch=None):
3497
"""Push from source into target, and into target's master if any.
3500
if _override_hook_source_branch:
3501
result.source_branch = _override_hook_source_branch
3502
for hook in Branch.hooks['post_push']:
3505
bound_location = self.target.get_bound_location()
3506
if bound_location and self.target.base != bound_location:
3507
# there is a master branch.
3509
# XXX: Why the second check? Is it even supported for a branch to
3510
# be bound to itself? -- mbp 20070507
3511
master_branch = self.target.get_master_branch()
3512
master_branch.lock_write()
3513
operation.add_cleanup(master_branch.unlock)
3514
# push into the master from the source branch.
3515
master_inter = InterBranch.get(self.source, master_branch)
3516
master_inter._basic_push(overwrite, stop_revision)
3517
# and push into the target branch from the source. Note that
3518
# we push from the source branch again, because it's considered
3519
# the highest bandwidth repository.
3520
result = self._basic_push(overwrite, stop_revision)
3521
result.master_branch = master_branch
3522
result.local_branch = self.target
3524
master_branch = None
3526
result = self._basic_push(overwrite, stop_revision)
3527
# TODO: Why set master_branch and local_branch if there's no
3528
# binding? Maybe cleaner to just leave them unset? -- mbp
3530
result.master_branch = self.target
3531
result.local_branch = None
3535
def _pull(self, overwrite=False, stop_revision=None,
3536
3280
possible_transports=None, _hook_master=None, run_hooks=True,
3537
_override_hook_target=None, local=False,
3538
merge_tags_to_master=True):
3281
_override_hook_target=None, local=False):
3539
3282
"""See Branch.pull.
3541
This function is the core worker, used by GenericInterBranch.pull to
3542
avoid duplication when pulling source->master and source->local.
3544
3284
:param _hook_master: Private parameter - set the branch to
3545
3285
be supplied as the master to pull hooks.
3546
3286
:param run_hooks: Private parameter - if false, this branch
3547
3287
is being called because it's the master of the primary branch,
3548
3288
so it should not run its hooks.
3549
is being called because it's the master of the primary branch,
3550
so it should not run its hooks.
3551
3289
:param _override_hook_target: Private parameter - set the branch to be
3552
3290
supplied as the target_branch to pull hooks.
3553
3291
:param local: Only update the local branch, and not the bound branch.
3594
3331
self.source.unlock()
3334
def push(self, overwrite=False, stop_revision=None,
3335
_override_hook_source_branch=None):
3336
"""See InterBranch.push.
3338
This is the basic concrete implementation of push()
3340
:param _override_hook_source_branch: If specified, run
3341
the hooks passing this Branch as the source, rather than self.
3342
This is for use of RemoteBranch, where push is delegated to the
3343
underlying vfs-based Branch.
3345
# TODO: Public option to disable running hooks - should be trivial but
3347
self.source.lock_read()
3349
return _run_with_write_locked_target(
3350
self.target, self._push_with_bound_branches, overwrite,
3352
_override_hook_source_branch=_override_hook_source_branch)
3354
self.source.unlock()
3356
def _push_with_bound_branches(self, overwrite, stop_revision,
3357
_override_hook_source_branch=None):
3358
"""Push from source into target, and into target's master if any.
3361
if _override_hook_source_branch:
3362
result.source_branch = _override_hook_source_branch
3363
for hook in Branch.hooks['post_push']:
3366
bound_location = self.target.get_bound_location()
3367
if bound_location and self.target.base != bound_location:
3368
# there is a master branch.
3370
# XXX: Why the second check? Is it even supported for a branch to
3371
# be bound to itself? -- mbp 20070507
3372
master_branch = self.target.get_master_branch()
3373
master_branch.lock_write()
3375
# push into the master from the source branch.
3376
self.source._basic_push(master_branch, overwrite, stop_revision)
3377
# and push into the target branch from the source. Note that we
3378
# push from the source branch again, because its considered the
3379
# highest bandwidth repository.
3380
result = self.source._basic_push(self.target, overwrite,
3382
result.master_branch = master_branch
3383
result.local_branch = self.target
3387
master_branch.unlock()
3390
result = self.source._basic_push(self.target, overwrite,
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
3401
def is_compatible(self, source, target):
3402
# GenericBranch uses the public API, so always compatible
3406
class InterToBranch5(GenericInterBranch):
3409
def _get_branch_formats_to_test():
3410
return BranchFormat._default_format, BzrBranchFormat5()
3412
def pull(self, overwrite=False, stop_revision=None,
3413
possible_transports=None, run_hooks=True,
3414
_override_hook_target=None, local=False):
3415
"""Pull from source into self, updating my master if any.
3417
:param run_hooks: Private parameter - if false, this branch
3418
is being called because it's the master of the primary branch,
3419
so it should not run its hooks.
3421
bound_location = self.target.get_bound_location()
3422
if local and not bound_location:
3423
raise errors.LocalRequiresBoundBranch()
3424
master_branch = None
3425
if not local and bound_location and self.source.user_url != bound_location:
3426
# not pulling from master, so we need to update master.
3427
master_branch = self.target.get_master_branch(possible_transports)
3428
master_branch.lock_write()
3431
# pull from source into master.
3432
master_branch.pull(self.source, overwrite, stop_revision,
3434
return super(InterToBranch5, self).pull(overwrite,
3435
stop_revision, _hook_master=master_branch,
3436
run_hooks=run_hooks,
3437
_override_hook_target=_override_hook_target)
3440
master_branch.unlock()
3598
3443
InterBranch.register_optimiser(GenericInterBranch)
3444
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
