855
724
old_repository = self.repository
856
725
if len(old_repository._fallback_repositories) != 1:
857
726
raise AssertionError("can't cope with fallback repositories "
858
"of %r (fallbacks: %r)" % (old_repository,
859
old_repository._fallback_repositories))
860
# Open the new repository object.
861
# Repositories don't offer an interface to remove fallback
862
# repositories today; take the conceptually simpler option and just
863
# reopen it. We reopen it starting from the URL so that we
864
# get a separate connection for RemoteRepositories and can
865
# stream from one of them to the other. This does mean doing
866
# separate SSH connection setup, but unstacking is not a
867
# common operation so it's tolerable.
868
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
869
new_repository = new_bzrdir.find_repository()
870
if new_repository._fallback_repositories:
871
raise AssertionError("didn't expect %r to have "
872
"fallback_repositories"
873
% (self.repository,))
874
# Replace self.repository with the new repository.
875
# Do our best to transfer the lock state (i.e. lock-tokens and
876
# lock count) of self.repository to the new repository.
877
lock_token = old_repository.lock_write().repository_token
878
self.repository = new_repository
879
if isinstance(self, remote.RemoteBranch):
880
# Remote branches can have a second reference to the old
881
# repository that need to be replaced.
882
if self._real_branch is not None:
883
self._real_branch.repository = new_repository
884
self.repository.lock_write(token=lock_token)
885
if lock_token is not None:
886
old_repository.leave_lock_in_place()
727
"of %r" % (self.repository,))
728
# unlock it, including unlocking the fallback
887
729
old_repository.unlock()
888
if lock_token is not None:
889
# XXX: self.repository.leave_lock_in_place() before this
890
# function will not be preserved. Fortunately that doesn't
891
# affect the current default format (2a), and would be a
892
# corner-case anyway.
893
# - Andrew Bennetts, 2010/06/30
894
self.repository.dont_leave_lock_in_place()
898
old_repository.unlock()
899
except errors.LockNotHeld:
902
if old_lock_count == 0:
903
raise AssertionError(
904
'old_repository should have been locked at least once.')
905
for i in range(old_lock_count-1):
730
old_repository.lock_read()
732
# Repositories don't offer an interface to remove fallback
733
# repositories today; take the conceptually simpler option and just
734
# reopen it. We reopen it starting from the URL so that we
735
# get a separate connection for RemoteRepositories and can
736
# stream from one of them to the other. This does mean doing
737
# separate SSH connection setup, but unstacking is not a
738
# common operation so it's tolerable.
739
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
740
new_repository = new_bzrdir.find_repository()
741
self.repository = new_repository
742
if self.repository._fallback_repositories:
743
raise AssertionError("didn't expect %r to have "
744
"fallback_repositories"
745
% (self.repository,))
746
# this is not paired with an unlock because it's just restoring
747
# the previous state; the lock's released when set_stacked_on_url
906
749
self.repository.lock_write()
907
# Fetch from the old repository into the new.
908
old_repository.lock_read()
910
750
# XXX: If you unstack a branch while it has a working tree
911
751
# with a pending merge, the pending-merged revisions will no
912
752
# longer be present. You can (probably) revert and remerge.
914
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
915
except errors.TagsNotSupported:
916
tags_to_fetch = set()
917
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
918
old_repository, required_ids=[self.last_revision()],
919
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
920
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
754
# XXX: This only fetches up to the tip of the repository; it
755
# doesn't bring across any tags. That's fairly consistent
756
# with how branch works, but perhaps not ideal.
757
self.repository.fetch(old_repository,
758
revision_id=self.last_revision(),
922
761
old_repository.unlock()
1027
859
:return: A tuple (revno, revision_id).
1029
861
if self._last_revision_info_cache is None:
1030
self._last_revision_info_cache = self._read_last_revision_info()
862
self._last_revision_info_cache = self._last_revision_info()
1031
863
return self._last_revision_info_cache
1033
def _read_last_revision_info(self):
1034
raise NotImplementedError(self._read_last_revision_info)
1036
@deprecated_method(deprecated_in((2, 4, 0)))
865
def _last_revision_info(self):
866
rh = self.revision_history()
869
return (revno, rh[-1])
871
return (0, _mod_revision.NULL_REVISION)
873
@deprecated_method(deprecated_in((1, 6, 0)))
874
def missing_revisions(self, other, stop_revision=None):
875
"""Return a list of new revisions that would perfectly fit.
877
If self and other have not diverged, return a list of the revisions
878
present in other, but missing from self.
880
self_history = self.revision_history()
881
self_len = len(self_history)
882
other_history = other.revision_history()
883
other_len = len(other_history)
884
common_index = min(self_len, other_len) -1
885
if common_index >= 0 and \
886
self_history[common_index] != other_history[common_index]:
887
raise errors.DivergedBranches(self, other)
889
if stop_revision is None:
890
stop_revision = other_len
892
if stop_revision > other_len:
893
raise errors.NoSuchRevision(self, stop_revision)
894
return other_history[self_len:stop_revision]
897
def update_revisions(self, other, stop_revision=None, overwrite=False,
899
"""Pull in new perfect-fit revisions.
901
:param other: Another Branch to pull from
902
:param stop_revision: Updated until the given revision
903
:param overwrite: Always set the branch pointer, rather than checking
904
to see if it is a proper descendant.
905
:param graph: A Graph object that can be used to query history
906
information. This can be None.
909
return InterBranch.get(other, self).update_revisions(stop_revision,
1037
912
def import_last_revision_info(self, source_repo, revno, revid):
1038
913
"""Set the last revision info, importing from another repo if necessary.
915
This is used by the bound branch code to upload a revision to
916
the master branch first before updating the tip of the local branch.
1040
918
:param source_repo: Source repository to optionally fetch from
1041
919
:param revno: Revision number of the new tip
1042
920
:param revid: Revision id of the new tip
1813
1653
"basis revision. hooks MUST NOT modify this delta. "
1814
1654
" future_tree is an in-memory tree obtained from "
1815
1655
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1817
self.add_hook('post_commit',
1656
"tree.", (0,91), None))
1657
self.create_hook(HookPoint('post_commit',
1818
1658
"Called in the bzr client after a commit has completed. "
1819
1659
"post_commit is called with (local, master, old_revno, old_revid, "
1820
1660
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1821
"commit to a branch.", (0, 15))
1822
self.add_hook('post_uncommit',
1661
"commit to a branch.", (0, 15), None))
1662
self.create_hook(HookPoint('post_uncommit',
1823
1663
"Called in the bzr client after an uncommit completes. "
1824
1664
"post_uncommit is called with (local, master, old_revno, "
1825
1665
"old_revid, new_revno, new_revid) where local is the local branch "
1826
1666
"or None, master is the target branch, and an empty branch "
1827
"receives new_revno of 0, new_revid of None.", (0, 15))
1828
self.add_hook('pre_change_branch_tip',
1667
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1668
self.create_hook(HookPoint('pre_change_branch_tip',
1829
1669
"Called in bzr client and server before a change to the tip of a "
1830
1670
"branch is made. pre_change_branch_tip is called with a "
1831
1671
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1832
"commit, uncommit will all trigger this hook.", (1, 6))
1833
self.add_hook('post_change_branch_tip',
1672
"commit, uncommit will all trigger this hook.", (1, 6), None))
1673
self.create_hook(HookPoint('post_change_branch_tip',
1834
1674
"Called in bzr client and server after a change to the tip of a "
1835
1675
"branch is made. post_change_branch_tip is called with a "
1836
1676
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1837
"commit, uncommit will all trigger this hook.", (1, 4))
1838
self.add_hook('transform_fallback_location',
1677
"commit, uncommit will all trigger this hook.", (1, 4), None))
1678
self.create_hook(HookPoint('transform_fallback_location',
1839
1679
"Called when a stacked branch is activating its fallback "
1840
1680
"locations. transform_fallback_location is called with (branch, "
1841
1681
"url), and should return a new url. Returning the same url "
1908
1731
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1911
class BranchInitHookParams(object):
1912
"""Object holding parameters passed to `*_branch_init` hooks.
1914
There are 4 fields that hooks may wish to access:
1916
:ivar format: the branch format
1917
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1918
:ivar name: name of colocated branch, if any (or None)
1919
:ivar branch: the branch created
1921
Note that for lightweight checkouts, the bzrdir and format fields refer to
1922
the checkout, hence they are different from the corresponding fields in
1923
branch, which refer to the original branch.
1926
def __init__(self, format, a_bzrdir, name, branch):
1927
"""Create a group of BranchInitHook parameters.
1929
:param format: the branch format
1930
:param a_bzrdir: the BzrDir where the branch will be/has been
1932
:param name: name of colocated branch, if any (or None)
1933
:param branch: the branch created
1935
Note that for lightweight checkouts, the bzrdir and format fields refer
1936
to the checkout, hence they are different from the corresponding fields
1937
in branch, which refer to the original branch.
1939
self.format = format
1940
self.bzrdir = a_bzrdir
1942
self.branch = branch
1944
def __eq__(self, other):
1945
return self.__dict__ == other.__dict__
1948
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1951
class SwitchHookParams(object):
1952
"""Object holding parameters passed to `*_switch` hooks.
1954
There are 4 fields that hooks may wish to access:
1956
:ivar control_dir: BzrDir of the checkout to change
1957
:ivar to_branch: branch that the checkout is to reference
1958
:ivar force: skip the check for local commits in a heavy checkout
1959
:ivar revision_id: revision ID to switch to (or None)
1962
def __init__(self, control_dir, to_branch, force, revision_id):
1963
"""Create a group of SwitchHook parameters.
1965
:param control_dir: BzrDir of the checkout to change
1966
:param to_branch: branch that the checkout is to reference
1967
:param force: skip the check for local commits in a heavy checkout
1968
:param revision_id: revision ID to switch to (or None)
1970
self.control_dir = control_dir
1971
self.to_branch = to_branch
1973
self.revision_id = revision_id
1975
def __eq__(self, other):
1976
return self.__dict__ == other.__dict__
1979
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1980
self.control_dir, self.to_branch,
1734
class BzrBranchFormat4(BranchFormat):
1735
"""Bzr branch format 4.
1738
- a revision-history file.
1739
- a branch-lock lock file [ to be shared with the bzrdir ]
1742
def get_format_description(self):
1743
"""See BranchFormat.get_format_description()."""
1744
return "Branch format 4"
1746
def initialize(self, a_bzrdir):
1747
"""Create a branch of this format in a_bzrdir."""
1748
utf8_files = [('revision-history', ''),
1749
('branch-name', ''),
1751
return self._initialize_helper(a_bzrdir, utf8_files,
1752
lock_type='branch4', set_format=False)
1755
super(BzrBranchFormat4, self).__init__()
1756
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1758
def network_name(self):
1759
"""The network name for this format is the control dirs disk label."""
1760
return self._matchingbzrdir.get_format_string()
1762
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1763
"""See BranchFormat.open()."""
1765
# we are being called directly and must probe.
1766
raise NotImplementedError
1767
return BzrBranch(_format=self,
1768
_control_files=a_bzrdir._control_files,
1770
_repository=a_bzrdir.open_repository())
1773
return "Bazaar-NG branch format 4"
1984
1776
class BranchFormatMetadir(BranchFormat):
2501
2199
"""See Branch.print_file."""
2502
2200
return self.repository.print_file(file, revision_id)
2202
def _write_revision_history(self, history):
2203
"""Factored out of set_revision_history.
2205
This performs the actual writing to disk.
2206
It is intended to be called by BzrBranch5.set_revision_history."""
2207
self._transport.put_bytes(
2208
'revision-history', '\n'.join(history),
2209
mode=self.bzrdir._get_file_mode())
2212
def set_revision_history(self, rev_history):
2213
"""See Branch.set_revision_history."""
2214
if 'evil' in debug.debug_flags:
2215
mutter_callsite(3, "set_revision_history scales with history.")
2216
check_not_reserved_id = _mod_revision.check_not_reserved_id
2217
for rev_id in rev_history:
2218
check_not_reserved_id(rev_id)
2219
if Branch.hooks['post_change_branch_tip']:
2220
# Don't calculate the last_revision_info() if there are no hooks
2222
old_revno, old_revid = self.last_revision_info()
2223
if len(rev_history) == 0:
2224
revid = _mod_revision.NULL_REVISION
2226
revid = rev_history[-1]
2227
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2228
self._write_revision_history(rev_history)
2229
self._clear_cached_state()
2230
self._cache_revision_history(rev_history)
2231
for hook in Branch.hooks['set_rh']:
2232
hook(self, rev_history)
2233
if Branch.hooks['post_change_branch_tip']:
2234
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2236
def _synchronize_history(self, destination, revision_id):
2237
"""Synchronize last revision and revision history between branches.
2239
This version is most efficient when the destination is also a
2240
BzrBranch5, but works for BzrBranch6 as long as the revision
2241
history is the true lefthand parent history, and all of the revisions
2242
are in the destination's repository. If not, set_revision_history
2245
:param destination: The branch to copy the history into
2246
:param revision_id: The revision-id to truncate history at. May
2247
be None to copy complete history.
2249
if not isinstance(destination._format, BzrBranchFormat5):
2250
super(BzrBranch, self)._synchronize_history(
2251
destination, revision_id)
2253
if revision_id == _mod_revision.NULL_REVISION:
2256
new_history = self.revision_history()
2257
if revision_id is not None and new_history != []:
2259
new_history = new_history[:new_history.index(revision_id) + 1]
2261
rev = self.repository.get_revision(revision_id)
2262
new_history = rev.get_history(self.repository)[1:]
2263
destination.set_revision_history(new_history)
2504
2265
@needs_write_lock
2505
2266
def set_last_revision_info(self, revno, revision_id):
2506
if not revision_id or not isinstance(revision_id, basestring):
2507
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2267
"""Set the last revision of this branch.
2269
The caller is responsible for checking that the revno is correct
2270
for this revision id.
2272
It may be possible to set the branch last revision to an id not
2273
present in the repository. However, branches can also be
2274
configured to check constraints on history, in which case this may not
2508
2277
revision_id = _mod_revision.ensure_null(revision_id)
2509
old_revno, old_revid = self.last_revision_info()
2510
if self._get_append_revisions_only():
2511
self._check_history_violation(revision_id)
2512
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2513
self._write_last_revision_info(revno, revision_id)
2514
self._clear_cached_state()
2515
self._last_revision_info_cache = revno, revision_id
2516
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2278
# this old format stores the full history, but this api doesn't
2279
# provide it, so we must generate, and might as well check it's
2281
history = self._lefthand_history(revision_id)
2282
if len(history) != revno:
2283
raise AssertionError('%d != %d' % (len(history), revno))
2284
self.set_revision_history(history)
2286
def _gen_revision_history(self):
2287
history = self._transport.get_bytes('revision-history').split('\n')
2288
if history[-1:] == ['']:
2289
# There shouldn't be a trailing newline, but just in case.
2294
def generate_revision_history(self, revision_id, last_rev=None,
2296
"""Create a new revision history that will finish with revision_id.
2298
:param revision_id: the new tip to use.
2299
:param last_rev: The previous last_revision. If not None, then this
2300
must be a ancestory of revision_id, or DivergedBranches is raised.
2301
:param other_branch: The other branch that DivergedBranches should
2302
raise with respect to.
2304
self.set_revision_history(self._lefthand_history(revision_id,
2305
last_rev, other_branch))
2518
2307
def basis_tree(self):
2519
2308
"""See Branch.basis_tree."""
2640
def _read_last_revision_info(self):
2641
revision_string = self._transport.get_bytes('last-revision')
2642
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2643
revision_id = cache_utf8.get_cached_utf8(revision_id)
2645
return revno, revision_id
2647
def _write_last_revision_info(self, revno, revision_id):
2648
"""Simply write out the revision id, with no checks.
2650
Use set_last_revision_info to perform this safely.
2652
Does not update the revision_history cache.
2654
revision_id = _mod_revision.ensure_null(revision_id)
2655
out_string = '%d %s\n' % (revno, revision_id)
2656
self._transport.put_bytes('last-revision', out_string,
2657
mode=self.bzrdir._get_file_mode())
2660
class FullHistoryBzrBranch(BzrBranch):
2661
"""Bzr branch which contains the full revision history."""
2664
def set_last_revision_info(self, revno, revision_id):
2665
if not revision_id or not isinstance(revision_id, basestring):
2666
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2667
revision_id = _mod_revision.ensure_null(revision_id)
2668
# this old format stores the full history, but this api doesn't
2669
# provide it, so we must generate, and might as well check it's
2671
history = self._lefthand_history(revision_id)
2672
if len(history) != revno:
2673
raise AssertionError('%d != %d' % (len(history), revno))
2674
self._set_revision_history(history)
2676
def _read_last_revision_info(self):
2677
rh = self.revision_history()
2680
return (revno, rh[-1])
2682
return (0, _mod_revision.NULL_REVISION)
2684
@deprecated_method(deprecated_in((2, 4, 0)))
2686
def set_revision_history(self, rev_history):
2687
"""See Branch.set_revision_history."""
2688
self._set_revision_history(rev_history)
2690
def _set_revision_history(self, rev_history):
2691
if 'evil' in debug.debug_flags:
2692
mutter_callsite(3, "set_revision_history scales with history.")
2693
check_not_reserved_id = _mod_revision.check_not_reserved_id
2694
for rev_id in rev_history:
2695
check_not_reserved_id(rev_id)
2696
if Branch.hooks['post_change_branch_tip']:
2697
# Don't calculate the last_revision_info() if there are no hooks
2699
old_revno, old_revid = self.last_revision_info()
2700
if len(rev_history) == 0:
2701
revid = _mod_revision.NULL_REVISION
2703
revid = rev_history[-1]
2704
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2705
self._write_revision_history(rev_history)
2706
self._clear_cached_state()
2707
self._cache_revision_history(rev_history)
2708
for hook in Branch.hooks['set_rh']:
2709
hook(self, rev_history)
2710
if Branch.hooks['post_change_branch_tip']:
2711
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2713
def _write_revision_history(self, history):
2714
"""Factored out of set_revision_history.
2716
This performs the actual writing to disk.
2717
It is intended to be called by set_revision_history."""
2718
self._transport.put_bytes(
2719
'revision-history', '\n'.join(history),
2720
mode=self.bzrdir._get_file_mode())
2722
def _gen_revision_history(self):
2723
history = self._transport.get_bytes('revision-history').split('\n')
2724
if history[-1:] == ['']:
2725
# There shouldn't be a trailing newline, but just in case.
2729
def _synchronize_history(self, destination, revision_id):
2730
if not isinstance(destination, FullHistoryBzrBranch):
2731
super(BzrBranch, self)._synchronize_history(
2732
destination, revision_id)
2734
if revision_id == _mod_revision.NULL_REVISION:
2737
new_history = self.revision_history()
2738
if revision_id is not None and new_history != []:
2740
new_history = new_history[:new_history.index(revision_id) + 1]
2742
rev = self.repository.get_revision(revision_id)
2743
new_history = rev.get_history(self.repository)[1:]
2744
destination._set_revision_history(new_history)
2747
def generate_revision_history(self, revision_id, last_rev=None,
2749
"""Create a new revision history that will finish with revision_id.
2751
:param revision_id: the new tip to use.
2752
:param last_rev: The previous last_revision. If not None, then this
2753
must be a ancestory of revision_id, or DivergedBranches is raised.
2754
:param other_branch: The other branch that DivergedBranches should
2755
raise with respect to.
2757
self._set_revision_history(self._lefthand_history(revision_id,
2758
last_rev, other_branch))
2761
class BzrBranch5(FullHistoryBzrBranch):
2762
"""A format 5 branch. This supports new features over plain branches.
2764
It has support for a master_branch which is the data for bound branches.
2768
class BzrBranch8(BzrBranch):
2457
class BzrBranch8(BzrBranch5):
2769
2458
"""A branch that stores tree-reference locations."""
2771
2460
def _open_hook(self):
2797
2486
self._last_revision_info_cache = None
2798
2487
self._reference_info = None
2489
def _last_revision_info(self):
2490
revision_string = self._transport.get_bytes('last-revision')
2491
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2492
revision_id = cache_utf8.get_cached_utf8(revision_id)
2494
return revno, revision_id
2496
def _write_last_revision_info(self, revno, revision_id):
2497
"""Simply write out the revision id, with no checks.
2499
Use set_last_revision_info to perform this safely.
2501
Does not update the revision_history cache.
2502
Intended to be called by set_last_revision_info and
2503
_write_revision_history.
2505
revision_id = _mod_revision.ensure_null(revision_id)
2506
out_string = '%d %s\n' % (revno, revision_id)
2507
self._transport.put_bytes('last-revision', out_string,
2508
mode=self.bzrdir._get_file_mode())
2511
def set_last_revision_info(self, revno, revision_id):
2512
revision_id = _mod_revision.ensure_null(revision_id)
2513
old_revno, old_revid = self.last_revision_info()
2514
if self._get_append_revisions_only():
2515
self._check_history_violation(revision_id)
2516
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2517
self._write_last_revision_info(revno, revision_id)
2518
self._clear_cached_state()
2519
self._last_revision_info_cache = revno, revision_id
2520
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2522
def _synchronize_history(self, destination, revision_id):
2523
"""Synchronize last revision and revision history between branches.
2525
:see: Branch._synchronize_history
2527
# XXX: The base Branch has a fast implementation of this method based
2528
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2529
# that uses set_revision_history. This class inherits from BzrBranch5,
2530
# but wants the fast implementation, so it calls
2531
# Branch._synchronize_history directly.
2532
Branch._synchronize_history(self, destination, revision_id)
2800
2534
def _check_history_violation(self, revision_id):
2801
current_revid = self.last_revision()
2802
last_revision = _mod_revision.ensure_null(current_revid)
2535
last_revision = _mod_revision.ensure_null(self.last_revision())
2803
2536
if _mod_revision.is_null(last_revision):
2805
graph = self.repository.get_graph()
2806
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2807
if lh_ancestor == current_revid:
2809
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2538
if last_revision not in self._lefthand_history(revision_id):
2539
raise errors.AppendRevisionsOnlyViolation(self.base)
2811
2541
def _gen_revision_history(self):
2812
2542
"""Generate the revision history from last revision
3217
2994
raise NotImplementedError(self.push)
3220
def copy_content_into(self, revision_id=None):
3221
"""Copy the content of source into target
3223
revision_id: if not None, the revision history in the new branch will
3224
be truncated to end with revision_id.
3226
raise NotImplementedError(self.copy_content_into)
3229
def fetch(self, stop_revision=None, limit=None):
3232
:param stop_revision: Last revision to fetch
3233
:param limit: Optional rough limit of revisions to fetch
3235
raise NotImplementedError(self.fetch)
3238
2997
class GenericInterBranch(InterBranch):
3239
"""InterBranch implementation that uses public Branch functions."""
3242
def is_compatible(klass, source, target):
3243
# GenericBranch uses the public API, so always compatible
3247
def _get_branch_formats_to_test(klass):
3248
return [(format_registry.get_default(), format_registry.get_default())]
3251
def unwrap_format(klass, format):
3252
if isinstance(format, remote.RemoteBranchFormat):
3253
format._ensure_real()
3254
return format._custom_format
3258
def copy_content_into(self, revision_id=None):
3259
"""Copy the content of source into target
3261
revision_id: if not None, the revision history in the new branch will
3262
be truncated to end with revision_id.
3264
self.source.update_references(self.target)
3265
self.source._synchronize_history(self.target, revision_id)
3267
parent = self.source.get_parent()
3268
except errors.InaccessibleParent, e:
3269
mutter('parent was not accessible to copy: %s', e)
3272
self.target.set_parent(parent)
3273
if self.source._push_should_merge_tags():
3274
self.source.tags.merge_to(self.target.tags)
3277
def fetch(self, stop_revision=None, limit=None):
3278
if self.target.base == self.source.base:
2998
"""InterBranch implementation that uses public Branch functions.
3002
def _get_branch_formats_to_test():
3003
return BranchFormat._default_format, BranchFormat._default_format
3005
def update_revisions(self, stop_revision=None, overwrite=False,
3007
"""See InterBranch.update_revisions()."""
3280
3008
self.source.lock_read()
3282
fetch_spec_factory = fetch.FetchSpecFactory()
3283
fetch_spec_factory.source_branch = self.source
3284
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3285
fetch_spec_factory.source_repo = self.source.repository
3286
fetch_spec_factory.target_repo = self.target.repository
3287
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3288
fetch_spec_factory.limit = limit
3289
fetch_spec = fetch_spec_factory.make_fetch_spec()
3290
return self.target.repository.fetch(self.source.repository,
3291
fetch_spec=fetch_spec)
3010
other_revno, other_last_revision = self.source.last_revision_info()
3011
stop_revno = None # unknown
3012
if stop_revision is None:
3013
stop_revision = other_last_revision
3014
if _mod_revision.is_null(stop_revision):
3015
# if there are no commits, we're done.
3017
stop_revno = other_revno
3019
# what's the current last revision, before we fetch [and change it
3021
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3022
# we fetch here so that we don't process data twice in the common
3023
# case of having something to pull, and so that the check for
3024
# already merged can operate on the just fetched graph, which will
3025
# be cached in memory.
3026
self.target.fetch(self.source, stop_revision)
3027
# Check to see if one is an ancestor of the other
3030
graph = self.target.repository.get_graph()
3031
if self.target._check_if_descendant_or_diverged(
3032
stop_revision, last_rev, graph, self.source):
3033
# stop_revision is a descendant of last_rev, but we aren't
3034
# overwriting, so we're done.
3036
if stop_revno is None:
3038
graph = self.target.repository.get_graph()
3039
this_revno, this_last_revision = \
3040
self.target.last_revision_info()
3041
stop_revno = graph.find_distance_to_null(stop_revision,
3042
[(other_last_revision, other_revno),
3043
(this_last_revision, this_revno)])
3044
self.target.set_last_revision_info(stop_revno, stop_revision)
3293
3046
self.source.unlock()
3296
def _update_revisions(self, stop_revision=None, overwrite=False,
3298
other_revno, other_last_revision = self.source.last_revision_info()
3299
stop_revno = None # unknown
3300
if stop_revision is None:
3301
stop_revision = other_last_revision
3302
if _mod_revision.is_null(stop_revision):
3303
# if there are no commits, we're done.
3305
stop_revno = other_revno
3307
# what's the current last revision, before we fetch [and change it
3309
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3310
# we fetch here so that we don't process data twice in the common
3311
# case of having something to pull, and so that the check for
3312
# already merged can operate on the just fetched graph, which will
3313
# be cached in memory.
3314
self.fetch(stop_revision=stop_revision)
3315
# Check to see if one is an ancestor of the other
3318
graph = self.target.repository.get_graph()
3319
if self.target._check_if_descendant_or_diverged(
3320
stop_revision, last_rev, graph, self.source):
3321
# stop_revision is a descendant of last_rev, but we aren't
3322
# overwriting, so we're done.
3324
if stop_revno is None:
3326
graph = self.target.repository.get_graph()
3327
this_revno, this_last_revision = \
3328
self.target.last_revision_info()
3329
stop_revno = graph.find_distance_to_null(stop_revision,
3330
[(other_last_revision, other_revno),
3331
(this_last_revision, this_revno)])
3332
self.target.set_last_revision_info(stop_revno, stop_revision)
3335
3048
def pull(self, overwrite=False, stop_revision=None,
3336
possible_transports=None, run_hooks=True,
3337
_override_hook_target=None, local=False):
3338
"""Pull from source into self, updating my master if any.
3340
:param run_hooks: Private parameter - if false, this branch
3341
is being called because it's the master of the primary branch,
3342
so it should not run its hooks.
3344
bound_location = self.target.get_bound_location()
3345
if local and not bound_location:
3346
raise errors.LocalRequiresBoundBranch()
3347
master_branch = None
3348
source_is_master = False
3350
# bound_location comes from a config file, some care has to be
3351
# taken to relate it to source.user_url
3352
normalized = urlutils.normalize_url(bound_location)
3354
relpath = self.source.user_transport.relpath(normalized)
3355
source_is_master = (relpath == '')
3356
except (errors.PathNotChild, errors.InvalidURL):
3357
source_is_master = False
3358
if not local and bound_location and not source_is_master:
3359
# not pulling from master, so we need to update master.
3360
master_branch = self.target.get_master_branch(possible_transports)
3361
master_branch.lock_write()
3364
# pull from source into master.
3365
master_branch.pull(self.source, overwrite, stop_revision,
3367
return self._pull(overwrite,
3368
stop_revision, _hook_master=master_branch,
3369
run_hooks=run_hooks,
3370
_override_hook_target=_override_hook_target,
3371
merge_tags_to_master=not source_is_master)
3374
master_branch.unlock()
3376
def push(self, overwrite=False, stop_revision=None, lossy=False,
3377
_override_hook_source_branch=None):
3378
"""See InterBranch.push.
3380
This is the basic concrete implementation of push()
3382
:param _override_hook_source_branch: If specified, run the hooks
3383
passing this Branch as the source, rather than self. This is for
3384
use of RemoteBranch, where push is delegated to the underlying
3388
raise errors.LossyPushToSameVCS(self.source, self.target)
3389
# TODO: Public option to disable running hooks - should be trivial but
3392
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3393
op.add_cleanup(self.source.lock_read().unlock)
3394
op.add_cleanup(self.target.lock_write().unlock)
3395
return op.run(overwrite, stop_revision,
3396
_override_hook_source_branch=_override_hook_source_branch)
3398
def _basic_push(self, overwrite, stop_revision):
3399
"""Basic implementation of push without bound branches or hooks.
3401
Must be called with source read locked and target write locked.
3403
result = BranchPushResult()
3404
result.source_branch = self.source
3405
result.target_branch = self.target
3406
result.old_revno, result.old_revid = self.target.last_revision_info()
3407
self.source.update_references(self.target)
3408
if result.old_revid != stop_revision:
3409
# We assume that during 'push' this repository is closer than
3411
graph = self.source.repository.get_graph(self.target.repository)
3412
self._update_revisions(stop_revision, overwrite=overwrite,
3414
if self.source._push_should_merge_tags():
3415
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3417
result.new_revno, result.new_revid = self.target.last_revision_info()
3420
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3421
_override_hook_source_branch=None):
3422
"""Push from source into target, and into target's master if any.
3425
if _override_hook_source_branch:
3426
result.source_branch = _override_hook_source_branch
3427
for hook in Branch.hooks['post_push']:
3430
bound_location = self.target.get_bound_location()
3431
if bound_location and self.target.base != bound_location:
3432
# there is a master branch.
3434
# XXX: Why the second check? Is it even supported for a branch to
3435
# be bound to itself? -- mbp 20070507
3436
master_branch = self.target.get_master_branch()
3437
master_branch.lock_write()
3438
operation.add_cleanup(master_branch.unlock)
3439
# push into the master from the source branch.
3440
master_inter = InterBranch.get(self.source, master_branch)
3441
master_inter._basic_push(overwrite, stop_revision)
3442
# and push into the target branch from the source. Note that
3443
# we push from the source branch again, because it's considered
3444
# the highest bandwidth repository.
3445
result = self._basic_push(overwrite, stop_revision)
3446
result.master_branch = master_branch
3447
result.local_branch = self.target
3449
master_branch = None
3451
result = self._basic_push(overwrite, stop_revision)
3452
# TODO: Why set master_branch and local_branch if there's no
3453
# binding? Maybe cleaner to just leave them unset? -- mbp
3455
result.master_branch = self.target
3456
result.local_branch = None
3460
def _pull(self, overwrite=False, stop_revision=None,
3461
3049
possible_transports=None, _hook_master=None, run_hooks=True,
3462
_override_hook_target=None, local=False,
3463
merge_tags_to_master=True):
3050
_override_hook_target=None, local=False):
3464
3051
"""See Branch.pull.
3466
This function is the core worker, used by GenericInterBranch.pull to
3467
avoid duplication when pulling source->master and source->local.
3469
3053
:param _hook_master: Private parameter - set the branch to
3470
3054
be supplied as the master to pull hooks.
3471
3055
:param run_hooks: Private parameter - if false, this branch
3472
3056
is being called because it's the master of the primary branch,
3473
3057
so it should not run its hooks.
3474
is being called because it's the master of the primary branch,
3475
so it should not run its hooks.
3476
3058
:param _override_hook_target: Private parameter - set the branch to be
3477
3059
supplied as the target_branch to pull hooks.
3478
3060
:param local: Only update the local branch, and not the bound branch.
3518
3100
self.source.unlock()
3103
def push(self, overwrite=False, stop_revision=None,
3104
_override_hook_source_branch=None):
3105
"""See InterBranch.push.
3107
This is the basic concrete implementation of push()
3109
:param _override_hook_source_branch: If specified, run
3110
the hooks passing this Branch as the source, rather than self.
3111
This is for use of RemoteBranch, where push is delegated to the
3112
underlying vfs-based Branch.
3114
# TODO: Public option to disable running hooks - should be trivial but
3116
self.source.lock_read()
3118
return _run_with_write_locked_target(
3119
self.target, self._push_with_bound_branches, overwrite,
3121
_override_hook_source_branch=_override_hook_source_branch)
3123
self.source.unlock()
3125
def _push_with_bound_branches(self, overwrite, stop_revision,
3126
_override_hook_source_branch=None):
3127
"""Push from source into target, and into target's master if any.
3130
if _override_hook_source_branch:
3131
result.source_branch = _override_hook_source_branch
3132
for hook in Branch.hooks['post_push']:
3135
bound_location = self.target.get_bound_location()
3136
if bound_location and self.target.base != bound_location:
3137
# there is a master branch.
3139
# XXX: Why the second check? Is it even supported for a branch to
3140
# be bound to itself? -- mbp 20070507
3141
master_branch = self.target.get_master_branch()
3142
master_branch.lock_write()
3144
# push into the master from the source branch.
3145
self.source._basic_push(master_branch, overwrite, stop_revision)
3146
# and push into the target branch from the source. Note that we
3147
# push from the source branch again, because its considered the
3148
# highest bandwidth repository.
3149
result = self.source._basic_push(self.target, overwrite,
3151
result.master_branch = master_branch
3152
result.local_branch = self.target
3156
master_branch.unlock()
3159
result = self.source._basic_push(self.target, overwrite,
3161
# TODO: Why set master_branch and local_branch if there's no
3162
# binding? Maybe cleaner to just leave them unset? -- mbp
3164
result.master_branch = self.target
3165
result.local_branch = None
3170
def is_compatible(self, source, target):
3171
# GenericBranch uses the public API, so always compatible
3175
class InterToBranch5(GenericInterBranch):
3178
def _get_branch_formats_to_test():
3179
return BranchFormat._default_format, BzrBranchFormat5()
3181
def pull(self, overwrite=False, stop_revision=None,
3182
possible_transports=None, run_hooks=True,
3183
_override_hook_target=None, local=False):
3184
"""Pull from source into self, updating my master if any.
3186
:param run_hooks: Private parameter - if false, this branch
3187
is being called because it's the master of the primary branch,
3188
so it should not run its hooks.
3190
bound_location = self.target.get_bound_location()
3191
if local and not bound_location:
3192
raise errors.LocalRequiresBoundBranch()
3193
master_branch = None
3194
if not local and bound_location and self.source.base != bound_location:
3195
# not pulling from master, so we need to update master.
3196
master_branch = self.target.get_master_branch(possible_transports)
3197
master_branch.lock_write()
3200
# pull from source into master.
3201
master_branch.pull(self.source, overwrite, stop_revision,
3203
return super(InterToBranch5, self).pull(overwrite,
3204
stop_revision, _hook_master=master_branch,
3205
run_hooks=run_hooks,
3206
_override_hook_target=_override_hook_target)
3209
master_branch.unlock()
3522
3212
InterBranch.register_optimiser(GenericInterBranch)
3213
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
