782
849
old_repository = self.repository
783
850
if len(old_repository._fallback_repositories) != 1:
784
851
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
852
"of %r (fallbacks: %r)" % (old_repository,
853
old_repository._fallback_repositories))
854
# Open the new repository object.
855
# Repositories don't offer an interface to remove fallback
856
# repositories today; take the conceptually simpler option and just
857
# reopen it. We reopen it starting from the URL so that we
858
# get a separate connection for RemoteRepositories and can
859
# stream from one of them to the other. This does mean doing
860
# separate SSH connection setup, but unstacking is not a
861
# common operation so it's tolerable.
862
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
863
new_repository = new_bzrdir.find_repository()
864
if new_repository._fallback_repositories:
865
raise AssertionError("didn't expect %r to have "
866
"fallback_repositories"
867
% (self.repository,))
868
# Replace self.repository with the new repository.
869
# Do our best to transfer the lock state (i.e. lock-tokens and
870
# lock count) of self.repository to the new repository.
871
lock_token = old_repository.lock_write().repository_token
872
self.repository = new_repository
873
if isinstance(self, remote.RemoteBranch):
874
# Remote branches can have a second reference to the old
875
# repository that need to be replaced.
876
if self._real_branch is not None:
877
self._real_branch.repository = new_repository
878
self.repository.lock_write(token=lock_token)
879
if lock_token is not None:
880
old_repository.leave_lock_in_place()
787
881
old_repository.unlock()
882
if lock_token is not None:
883
# XXX: self.repository.leave_lock_in_place() before this
884
# function will not be preserved. Fortunately that doesn't
885
# affect the current default format (2a), and would be a
886
# corner-case anyway.
887
# - Andrew Bennetts, 2010/06/30
888
self.repository.dont_leave_lock_in_place()
892
old_repository.unlock()
893
except errors.LockNotHeld:
896
if old_lock_count == 0:
897
raise AssertionError(
898
'old_repository should have been locked at least once.')
899
for i in range(old_lock_count-1):
900
self.repository.lock_write()
901
# Fetch from the old repository into the new.
788
902
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
904
# XXX: If you unstack a branch while it has a working tree
809
905
# with a pending merge, the pending-merged revisions will no
810
906
# 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(),
908
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
909
except errors.TagsNotSupported:
910
tags_to_fetch = set()
911
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
912
old_repository, required_ids=[self.last_revision()],
913
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
914
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
916
old_repository.unlock()
917
1020
:return: A tuple (revno, revision_id).
919
1022
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1023
self._last_revision_info_cache = self._read_last_revision_info()
921
1024
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]
1026
def _read_last_revision_info(self):
1027
raise NotImplementedError(self._read_last_revision_info)
955
1029
def update_revisions(self, other, stop_revision=None, overwrite=False,
1030
graph=None, fetch_tags=True):
957
1031
"""Pull in new perfect-fit revisions.
959
1033
:param other: Another Branch to pull from
1562
1680
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):
1683
def initialize(self, a_bzrdir, name=None, repository=None):
1611
1684
"""Create a branch of this format in a_bzrdir.
1613
1686
:param name: Name of the colocated branch to create.
1704
1814
These are all empty initially, because by default nothing should get
1707
Hooks.__init__(self)
1708
self.create_hook(HookPoint('set_rh',
1817
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1818
self.add_hook('set_rh',
1709
1819
"Invoked whenever the revision history has been set via "
1710
1820
"set_revision_history. The api signature is (branch, "
1711
1821
"revision_history), and the branch will be write-locked. "
1712
1822
"The set_rh hook can be expensive for bzr to trigger, a better "
1713
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1714
self.create_hook(HookPoint('open',
1823
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1824
self.add_hook('open',
1715
1825
"Called with the Branch object that has been opened after a "
1716
"branch is opened.", (1, 8), None))
1717
self.create_hook(HookPoint('post_push',
1826
"branch is opened.", (1, 8))
1827
self.add_hook('post_push',
1718
1828
"Called after a push operation completes. post_push is called "
1719
1829
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1720
"bzr client.", (0, 15), None))
1721
self.create_hook(HookPoint('post_pull',
1830
"bzr client.", (0, 15))
1831
self.add_hook('post_pull',
1722
1832
"Called after a pull operation completes. post_pull is called "
1723
1833
"with a bzrlib.branch.PullResult object and only runs in the "
1724
"bzr client.", (0, 15), None))
1725
self.create_hook(HookPoint('pre_commit',
1726
"Called after a commit is calculated but before it is is "
1834
"bzr client.", (0, 15))
1835
self.add_hook('pre_commit',
1836
"Called after a commit is calculated but before it is "
1727
1837
"completed. pre_commit is called with (local, master, old_revno, "
1728
1838
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1729
1839
"). old_revid is NULL_REVISION for the first commit to a branch, "
1731
1841
"basis revision. hooks MUST NOT modify this delta. "
1732
1842
" future_tree is an in-memory tree obtained from "
1733
1843
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1845
self.add_hook('post_commit',
1736
1846
"Called in the bzr client after a commit has completed. "
1737
1847
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1848
"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',
1849
"commit to a branch.", (0, 15))
1850
self.add_hook('post_uncommit',
1741
1851
"Called in the bzr client after an uncommit completes. "
1742
1852
"post_uncommit is called with (local, master, old_revno, "
1743
1853
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1854
"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',
1855
"receives new_revno of 0, new_revid of None.", (0, 15))
1856
self.add_hook('pre_change_branch_tip',
1747
1857
"Called in bzr client and server before a change to the tip of a "
1748
1858
"branch is made. pre_change_branch_tip is called with a "
1749
1859
"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',
1860
"commit, uncommit will all trigger this hook.", (1, 6))
1861
self.add_hook('post_change_branch_tip',
1752
1862
"Called in bzr client and server after a change to the tip of a "
1753
1863
"branch is made. post_change_branch_tip is called with a "
1754
1864
"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',
1865
"commit, uncommit will all trigger this hook.", (1, 4))
1866
self.add_hook('transform_fallback_location',
1757
1867
"Called when a stacked branch is activating its fallback "
1758
1868
"locations. transform_fallback_location is called with (branch, "
1759
1869
"url), and should return a new url. Returning the same url "
1764
1874
"fallback locations have not been activated. When there are "
1765
1875
"multiple hooks installed for transform_fallback_location, "
1766
1876
"all are called with the url returned from the previous hook."
1767
"The order is however undefined.", (1, 9), None))
1768
self.create_hook(HookPoint('automatic_tag_name',
1769
"Called to determine an automatic tag name for a revision."
1877
"The order is however undefined.", (1, 9))
1878
self.add_hook('automatic_tag_name',
1879
"Called to determine an automatic tag name for a revision. "
1770
1880
"automatic_tag_name is called with (branch, revision_id) and "
1771
1881
"should return a tag name or None if no tag name could be "
1772
1882
"determined. The first non-None tag name returned will be used.",
1774
self.create_hook(HookPoint('post_branch_init',
1884
self.add_hook('post_branch_init',
1775
1885
"Called after new branch initialization completes. "
1776
1886
"post_branch_init is called with a "
1777
1887
"bzrlib.branch.BranchInitHookParams. "
1778
1888
"Note that init, branch and checkout (both heavyweight and "
1779
"lightweight) will all trigger this hook.", (2, 2), None))
1780
self.create_hook(HookPoint('post_switch',
1889
"lightweight) will all trigger this hook.", (2, 2))
1890
self.add_hook('post_switch',
1781
1891
"Called after a checkout switches branch. "
1782
1892
"post_switch is called with a "
1783
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1893
"bzrlib.branch.SwitchHookParams.", (2, 2))
2387
2529
"""See Branch.print_file."""
2388
2530
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
2532
@needs_write_lock
2454
2533
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
2465
2534
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))
2535
old_revno, old_revid = self.last_revision_info()
2536
if self._get_append_revisions_only():
2537
self._check_history_violation(revision_id)
2538
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2539
self._write_last_revision_info(revno, revision_id)
2540
self._clear_cached_state()
2541
self._last_revision_info_cache = revno, revision_id
2542
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2544
def basis_tree(self):
2496
2545
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2687
def _read_last_revision_info(self):
2688
revision_string = self._transport.get_bytes('last-revision')
2689
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2690
revision_id = cache_utf8.get_cached_utf8(revision_id)
2692
return revno, revision_id
2694
def _write_last_revision_info(self, revno, revision_id):
2695
"""Simply write out the revision id, with no checks.
2697
Use set_last_revision_info to perform this safely.
2699
Does not update the revision_history cache.
2701
revision_id = _mod_revision.ensure_null(revision_id)
2702
out_string = '%d %s\n' % (revno, revision_id)
2703
self._transport.put_bytes('last-revision', out_string,
2704
mode=self.bzrdir._get_file_mode())
2707
class FullHistoryBzrBranch(BzrBranch):
2708
"""Bzr branch which contains the full revision history."""
2711
def set_last_revision_info(self, revno, revision_id):
2712
revision_id = _mod_revision.ensure_null(revision_id)
2713
# this old format stores the full history, but this api doesn't
2714
# provide it, so we must generate, and might as well check it's
2716
history = self._lefthand_history(revision_id)
2717
if len(history) != revno:
2718
raise AssertionError('%d != %d' % (len(history), revno))
2719
self._set_revision_history(history)
2721
def _read_last_revision_info(self):
2722
rh = self.revision_history()
2725
return (revno, rh[-1])
2727
return (0, _mod_revision.NULL_REVISION)
2729
@deprecated_method(deprecated_in((2, 4, 0)))
2731
def set_revision_history(self, rev_history):
2732
"""See Branch.set_revision_history."""
2733
self._set_revision_history(rev_history)
2734
for hook in Branch.hooks['set_rh']:
2735
hook(self, rev_history)
2737
def _set_revision_history(self, rev_history):
2738
if 'evil' in debug.debug_flags:
2739
mutter_callsite(3, "set_revision_history scales with history.")
2740
check_not_reserved_id = _mod_revision.check_not_reserved_id
2741
for rev_id in rev_history:
2742
check_not_reserved_id(rev_id)
2743
if Branch.hooks['post_change_branch_tip']:
2744
# Don't calculate the last_revision_info() if there are no hooks
2746
old_revno, old_revid = self.last_revision_info()
2747
if len(rev_history) == 0:
2748
revid = _mod_revision.NULL_REVISION
2750
revid = rev_history[-1]
2751
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2752
self._write_revision_history(rev_history)
2753
self._clear_cached_state()
2754
self._cache_revision_history(rev_history)
2755
for hook in Branch.hooks['set_rh']:
2756
hook(self, rev_history)
2757
if Branch.hooks['post_change_branch_tip']:
2758
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2760
def _write_revision_history(self, history):
2761
"""Factored out of set_revision_history.
2763
This performs the actual writing to disk.
2764
It is intended to be called by set_revision_history."""
2765
self._transport.put_bytes(
2766
'revision-history', '\n'.join(history),
2767
mode=self.bzrdir._get_file_mode())
2769
def _gen_revision_history(self):
2770
history = self._transport.get_bytes('revision-history').split('\n')
2771
if history[-1:] == ['']:
2772
# There shouldn't be a trailing newline, but just in case.
2776
def _synchronize_history(self, destination, revision_id):
2777
if not isinstance(destination._format, FullHistoryBzrBranch):
2778
super(BzrBranch, self)._synchronize_history(
2779
destination, revision_id)
2781
if revision_id == _mod_revision.NULL_REVISION:
2784
new_history = self.revision_history()
2785
if revision_id is not None and new_history != []:
2787
new_history = new_history[:new_history.index(revision_id) + 1]
2789
rev = self.repository.get_revision(revision_id)
2790
new_history = rev.get_history(self.repository)[1:]
2791
destination._set_revision_history(new_history)
2794
def generate_revision_history(self, revision_id, last_rev=None,
2796
"""Create a new revision history that will finish with revision_id.
2798
:param revision_id: the new tip to use.
2799
:param last_rev: The previous last_revision. If not None, then this
2800
must be a ancestory of revision_id, or DivergedBranches is raised.
2801
:param other_branch: The other branch that DivergedBranches should
2802
raise with respect to.
2804
self._set_revision_history(self._lefthand_history(revision_id,
2805
last_rev, other_branch))
2808
class BzrBranch5(FullHistoryBzrBranch):
2809
"""A format 5 branch. This supports new features over plain branches.
2811
It has support for a master_branch which is the data for bound branches.
2815
class BzrBranch8(BzrBranch):
2646
2816
"""A branch that stores tree-reference locations."""
2648
2818
def _open_hook(self):
2674
2844
self._last_revision_info_cache = None
2675
2845
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
2847
def _check_history_violation(self, revision_id):
2723
2848
last_revision = _mod_revision.ensure_null(self.last_revision())
2724
2849
if _mod_revision.is_null(last_revision):
3182
3321
raise NotImplementedError(self.push)
3324
def copy_content_into(self, revision_id=None):
3325
"""Copy the content of source into target
3327
revision_id: if not None, the revision history in the new branch will
3328
be truncated to end with revision_id.
3330
raise NotImplementedError(self.copy_content_into)
3333
def fetch(self, stop_revision=None, fetch_spec=None):
3336
:param stop_revision: Last revision to fetch
3337
:param fetch_spec: Fetch spec.
3339
raise NotImplementedError(self.fetch)
3185
3342
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
3343
"""InterBranch implementation that uses public Branch functions."""
3346
def is_compatible(klass, source, target):
3347
# GenericBranch uses the public API, so always compatible
3351
def _get_branch_formats_to_test(klass):
3352
return [(format_registry.get_default(), format_registry.get_default())]
3355
def unwrap_format(klass, format):
3356
if isinstance(format, remote.RemoteBranchFormat):
3357
format._ensure_real()
3358
return format._custom_format
3362
def copy_content_into(self, revision_id=None):
3363
"""Copy the content of source into target
3365
revision_id: if not None, the revision history in the new branch will
3366
be truncated to end with revision_id.
3368
self.source.update_references(self.target)
3369
self.source._synchronize_history(self.target, revision_id)
3371
parent = self.source.get_parent()
3372
except errors.InaccessibleParent, e:
3373
mutter('parent was not accessible to copy: %s', e)
3376
self.target.set_parent(parent)
3377
if self.source._push_should_merge_tags():
3378
self.source.tags.merge_to(self.target.tags)
3381
def fetch(self, stop_revision=None, fetch_spec=None):
3382
if fetch_spec is not None and stop_revision is not None:
3383
raise AssertionError(
3384
"fetch_spec and last_revision are mutually exclusive.")
3385
if self.target.base == self.source.base:
3387
self.source.lock_read()
3389
if stop_revision is None and fetch_spec is None:
3390
stop_revision = self.source.last_revision()
3391
stop_revision = _mod_revision.ensure_null(stop_revision)
3392
return self.target.repository.fetch(self.source.repository,
3393
revision_id=stop_revision, fetch_spec=fetch_spec)
3395
self.source.unlock()
3193
3398
def update_revisions(self, stop_revision=None, overwrite=False,
3399
graph=None, fetch_tags=True):
3195
3400
"""See InterBranch.update_revisions()."""
3196
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)
3234
self.source.unlock()
3401
other_revno, other_last_revision = self.source.last_revision_info()
3402
stop_revno = None # unknown
3403
if stop_revision is None:
3404
stop_revision = other_last_revision
3405
if _mod_revision.is_null(stop_revision):
3406
# if there are no commits, we're done.
3408
stop_revno = other_revno
3410
# what's the current last revision, before we fetch [and change it
3412
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3413
# we fetch here so that we don't process data twice in the common
3414
# case of having something to pull, and so that the check for
3415
# already merged can operate on the just fetched graph, which will
3416
# be cached in memory.
3418
fetch_spec_factory = fetch.FetchSpecFactory()
3419
fetch_spec_factory.source_branch = self.source
3420
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3421
fetch_spec_factory.source_repo = self.source.repository
3422
fetch_spec_factory.target_repo = self.target.repository
3423
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3424
fetch_spec = fetch_spec_factory.make_fetch_spec()
3426
fetch_spec = _mod_graph.NotInOtherForRevs(self.target.repository,
3427
self.source.repository, revision_ids=[stop_revision]).execute()
3428
self.target.fetch(self.source, fetch_spec=fetch_spec)
3429
# Check to see if one is an ancestor of the other
3432
graph = self.target.repository.get_graph()
3433
if self.target._check_if_descendant_or_diverged(
3434
stop_revision, last_rev, graph, self.source):
3435
# stop_revision is a descendant of last_rev, but we aren't
3436
# overwriting, so we're done.
3438
if stop_revno is None:
3440
graph = self.target.repository.get_graph()
3441
this_revno, this_last_revision = \
3442
self.target.last_revision_info()
3443
stop_revno = graph.find_distance_to_null(stop_revision,
3444
[(other_last_revision, other_revno),
3445
(this_last_revision, this_revno)])
3446
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3449
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3450
possible_transports=None, run_hooks=True,
3238
3451
_override_hook_target=None, local=False):
3452
"""Pull from source into self, updating my master if any.
3241
:param _hook_master: Private parameter - set the branch to
3242
be supplied as the master to pull hooks.
3243
3454
:param run_hooks: Private parameter - if false, this branch
3244
3455
is being called because it's the master of the primary branch,
3245
3456
so it should not run its hooks.
3246
:param _override_hook_target: Private parameter - set the branch to be
3247
supplied as the target_branch to pull hooks.
3248
:param local: Only update the local branch, and not the bound branch.
3250
# This type of branch can't be bound.
3458
bound_location = self.target.get_bound_location()
3459
if local and not bound_location:
3252
3460
raise errors.LocalRequiresBoundBranch()
3253
result = PullResult()
3254
result.source_branch = self.source
3255
if _override_hook_target is None:
3256
result.target_branch = self.target
3258
result.target_branch = _override_hook_target
3259
self.source.lock_read()
3461
master_branch = None
3462
source_is_master = (self.source.user_url == bound_location)
3463
if not local and bound_location and not source_is_master:
3464
# not pulling from master, so we need to update master.
3465
master_branch = self.target.get_master_branch(possible_transports)
3466
master_branch.lock_write()
3261
# We assume that during 'pull' the target repository is closer than
3263
self.source.update_references(self.target)
3264
graph = self.target.repository.get_graph(self.source.repository)
3265
# TODO: Branch formats should have a flag that indicates
3266
# that revno's are expensive, and pull() should honor that flag.
3268
result.old_revno, result.old_revid = \
3269
self.target.last_revision_info()
3270
self.target.update_revisions(self.source, stop_revision,
3271
overwrite=overwrite, graph=graph)
3272
# TODO: The old revid should be specified when merging tags,
3273
# so a tags implementation that versions tags can only
3274
# pull in the most recent changes. -- JRV20090506
3275
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3277
result.new_revno, result.new_revid = self.target.last_revision_info()
3279
result.master_branch = _hook_master
3280
result.local_branch = result.target_branch
3282
result.master_branch = result.target_branch
3283
result.local_branch = None
3285
for hook in Branch.hooks['post_pull']:
3469
# pull from source into master.
3470
master_branch.pull(self.source, overwrite, stop_revision,
3472
return self._pull(overwrite,
3473
stop_revision, _hook_master=master_branch,
3474
run_hooks=run_hooks,
3475
_override_hook_target=_override_hook_target,
3476
merge_tags_to_master=not source_is_master)
3288
self.source.unlock()
3479
master_branch.unlock()
3291
3481
def push(self, overwrite=False, stop_revision=None,
3292
3482
_override_hook_source_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.
3547
def _pull(self, overwrite=False, stop_revision=None,
3548
possible_transports=None, _hook_master=None, run_hooks=True,
3549
_override_hook_target=None, local=False,
3550
merge_tags_to_master=True):
3553
This function is the core worker, used by GenericInterBranch.pull to
3554
avoid duplication when pulling source->master and source->local.
3556
:param _hook_master: Private parameter - set the branch to
3557
be supplied as the master to pull hooks.
3374
3558
:param run_hooks: Private parameter - if false, this branch
3375
3559
is being called because it's the master of the primary branch,
3376
3560
so it should not run its hooks.
3561
is being called because it's the master of the primary branch,
3562
so it should not run its hooks.
3563
:param _override_hook_target: Private parameter - set the branch to be
3564
supplied as the target_branch to pull hooks.
3565
:param local: Only update the local branch, and not the bound branch.
3378
bound_location = self.target.get_bound_location()
3379
if local and not bound_location:
3567
# This type of branch can't be bound.
3380
3569
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()
3570
result = PullResult()
3571
result.source_branch = self.source
3572
if _override_hook_target is None:
3573
result.target_branch = self.target
3575
result.target_branch = _override_hook_target
3576
self.source.lock_read()
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)
3578
# We assume that during 'pull' the target repository is closer than
3580
self.source.update_references(self.target)
3581
graph = self.target.repository.get_graph(self.source.repository)
3582
# TODO: Branch formats should have a flag that indicates
3583
# that revno's are expensive, and pull() should honor that flag.
3585
result.old_revno, result.old_revid = \
3586
self.target.last_revision_info()
3587
self.target.update_revisions(self.source, stop_revision,
3588
overwrite=overwrite, graph=graph)
3589
# TODO: The old revid should be specified when merging tags,
3590
# so a tags implementation that versions tags can only
3591
# pull in the most recent changes. -- JRV20090506
3592
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3593
overwrite, ignore_master=not merge_tags_to_master)
3594
result.new_revno, result.new_revid = self.target.last_revision_info()
3596
result.master_branch = _hook_master
3597
result.local_branch = result.target_branch
3599
result.master_branch = result.target_branch
3600
result.local_branch = None
3602
for hook in Branch.hooks['post_pull']:
3397
master_branch.unlock()
3605
self.source.unlock()
3400
3609
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
