716
746
"""Print `file` to stdout."""
717
747
raise NotImplementedError(self.print_file)
749
@deprecated_method(deprecated_in((2, 4, 0)))
719
750
def set_revision_history(self, rev_history):
720
raise NotImplementedError(self.set_revision_history)
751
"""See Branch.set_revision_history."""
752
self._set_revision_history(rev_history)
755
def _set_revision_history(self, rev_history):
756
if len(rev_history) == 0:
757
revid = _mod_revision.NULL_REVISION
759
revid = rev_history[-1]
760
if rev_history != self._lefthand_history(revid):
761
raise errors.NotLefthandHistory(rev_history)
762
self.set_last_revision_info(len(rev_history), revid)
763
self._cache_revision_history(rev_history)
764
for hook in Branch.hooks['set_rh']:
765
hook(self, rev_history)
768
def set_last_revision_info(self, revno, revision_id):
769
"""Set the last revision of this branch.
771
The caller is responsible for checking that the revno is correct
772
for this revision id.
774
It may be possible to set the branch last revision to an id not
775
present in the repository. However, branches can also be
776
configured to check constraints on history, in which case this may not
779
raise NotImplementedError(self.last_revision_info)
782
def generate_revision_history(self, revision_id, last_rev=None,
784
"""See Branch.generate_revision_history"""
785
# FIXME: This shouldn't have to fetch the entire history
786
history = self._lefthand_history(revision_id, last_rev, other_branch)
788
self.set_last_revision_info(revno, revision_id)
789
self._cache_revision_history(history)
722
791
@needs_write_lock
723
792
def set_parent(self, url):
782
851
old_repository = self.repository
783
852
if len(old_repository._fallback_repositories) != 1:
784
853
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
854
"of %r (fallbacks: %r)" % (old_repository,
855
old_repository._fallback_repositories))
856
# Open the new repository object.
857
# Repositories don't offer an interface to remove fallback
858
# repositories today; take the conceptually simpler option and just
859
# reopen it. We reopen it starting from the URL so that we
860
# get a separate connection for RemoteRepositories and can
861
# stream from one of them to the other. This does mean doing
862
# separate SSH connection setup, but unstacking is not a
863
# common operation so it's tolerable.
864
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
865
new_repository = new_bzrdir.find_repository()
866
if new_repository._fallback_repositories:
867
raise AssertionError("didn't expect %r to have "
868
"fallback_repositories"
869
% (self.repository,))
870
# Replace self.repository with the new repository.
871
# Do our best to transfer the lock state (i.e. lock-tokens and
872
# lock count) of self.repository to the new repository.
873
lock_token = old_repository.lock_write().repository_token
874
self.repository = new_repository
875
if isinstance(self, remote.RemoteBranch):
876
# Remote branches can have a second reference to the old
877
# repository that need to be replaced.
878
if self._real_branch is not None:
879
self._real_branch.repository = new_repository
880
self.repository.lock_write(token=lock_token)
881
if lock_token is not None:
882
old_repository.leave_lock_in_place()
787
883
old_repository.unlock()
884
if lock_token is not None:
885
# XXX: self.repository.leave_lock_in_place() before this
886
# function will not be preserved. Fortunately that doesn't
887
# affect the current default format (2a), and would be a
888
# corner-case anyway.
889
# - Andrew Bennetts, 2010/06/30
890
self.repository.dont_leave_lock_in_place()
894
old_repository.unlock()
895
except errors.LockNotHeld:
898
if old_lock_count == 0:
899
raise AssertionError(
900
'old_repository should have been locked at least once.')
901
for i in range(old_lock_count-1):
902
self.repository.lock_write()
903
# Fetch from the old repository into the new.
788
904
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
906
# XXX: If you unstack a branch while it has a working tree
809
907
# with a pending merge, the pending-merged revisions will no
810
908
# 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(),
910
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
911
except errors.TagsNotSupported:
912
tags_to_fetch = set()
913
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
914
old_repository, required_ids=[self.last_revision()],
915
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
916
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
918
old_repository.unlock()
917
1022
:return: A tuple (revno, revision_id).
919
1024
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1025
self._last_revision_info_cache = self._read_last_revision_info()
921
1026
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]
1028
def _read_last_revision_info(self):
1029
raise NotImplementedError(self._read_last_revision_info)
955
1031
def update_revisions(self, other, stop_revision=None, overwrite=False,
957
1033
"""Pull in new perfect-fit revisions.
959
1035
:param other: Another Branch to pull from
1562
1673
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):
1676
def initialize(self, a_bzrdir, name=None, repository=None):
1611
1677
"""Create a branch of this format in a_bzrdir.
1613
1679
:param name: Name of the colocated branch to create.
1704
1807
These are all empty initially, because by default nothing should get
1707
Hooks.__init__(self)
1708
self.create_hook(HookPoint('set_rh',
1810
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1811
self.add_hook('set_rh',
1709
1812
"Invoked whenever the revision history has been set via "
1710
1813
"set_revision_history. The api signature is (branch, "
1711
1814
"revision_history), and the branch will be write-locked. "
1712
1815
"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',
1816
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1817
self.add_hook('open',
1715
1818
"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',
1819
"branch is opened.", (1, 8))
1820
self.add_hook('post_push',
1718
1821
"Called after a push operation completes. post_push is called "
1719
1822
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1720
"bzr client.", (0, 15), None))
1721
self.create_hook(HookPoint('post_pull',
1823
"bzr client.", (0, 15))
1824
self.add_hook('post_pull',
1722
1825
"Called after a pull operation completes. post_pull is called "
1723
1826
"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 "
1827
"bzr client.", (0, 15))
1828
self.add_hook('pre_commit',
1829
"Called after a commit is calculated but before it is "
1727
1830
"completed. pre_commit is called with (local, master, old_revno, "
1728
1831
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1729
1832
"). old_revid is NULL_REVISION for the first commit to a branch, "
1731
1834
"basis revision. hooks MUST NOT modify this delta. "
1732
1835
" future_tree is an in-memory tree obtained from "
1733
1836
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1838
self.add_hook('post_commit',
1736
1839
"Called in the bzr client after a commit has completed. "
1737
1840
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1841
"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',
1842
"commit to a branch.", (0, 15))
1843
self.add_hook('post_uncommit',
1741
1844
"Called in the bzr client after an uncommit completes. "
1742
1845
"post_uncommit is called with (local, master, old_revno, "
1743
1846
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1847
"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',
1848
"receives new_revno of 0, new_revid of None.", (0, 15))
1849
self.add_hook('pre_change_branch_tip',
1747
1850
"Called in bzr client and server before a change to the tip of a "
1748
1851
"branch is made. pre_change_branch_tip is called with a "
1749
1852
"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',
1853
"commit, uncommit will all trigger this hook.", (1, 6))
1854
self.add_hook('post_change_branch_tip',
1752
1855
"Called in bzr client and server after a change to the tip of a "
1753
1856
"branch is made. post_change_branch_tip is called with a "
1754
1857
"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',
1858
"commit, uncommit will all trigger this hook.", (1, 4))
1859
self.add_hook('transform_fallback_location',
1757
1860
"Called when a stacked branch is activating its fallback "
1758
1861
"locations. transform_fallback_location is called with (branch, "
1759
1862
"url), and should return a new url. Returning the same url "
1764
1867
"fallback locations have not been activated. When there are "
1765
1868
"multiple hooks installed for transform_fallback_location, "
1766
1869
"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."
1870
"The order is however undefined.", (1, 9))
1871
self.add_hook('automatic_tag_name',
1872
"Called to determine an automatic tag name for a revision. "
1770
1873
"automatic_tag_name is called with (branch, revision_id) and "
1771
1874
"should return a tag name or None if no tag name could be "
1772
1875
"determined. The first non-None tag name returned will be used.",
1774
self.create_hook(HookPoint('post_branch_init',
1877
self.add_hook('post_branch_init',
1775
1878
"Called after new branch initialization completes. "
1776
1879
"post_branch_init is called with a "
1777
1880
"bzrlib.branch.BranchInitHookParams. "
1778
1881
"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',
1882
"lightweight) will all trigger this hook.", (2, 2))
1883
self.add_hook('post_switch',
1781
1884
"Called after a checkout switches branch. "
1782
1885
"post_switch is called with a "
1783
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1886
"bzrlib.branch.SwitchHookParams.", (2, 2))
2387
2522
"""See Branch.print_file."""
2388
2523
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
2525
@needs_write_lock
2454
2526
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
2527
if not revision_id or not isinstance(revision_id, basestring):
2528
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2529
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))
2530
old_revno, old_revid = self.last_revision_info()
2531
if self._get_append_revisions_only():
2532
self._check_history_violation(revision_id)
2533
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2534
self._write_last_revision_info(revno, revision_id)
2535
self._clear_cached_state()
2536
self._last_revision_info_cache = revno, revision_id
2537
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2539
def basis_tree(self):
2496
2540
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2682
def _read_last_revision_info(self):
2683
revision_string = self._transport.get_bytes('last-revision')
2684
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2685
revision_id = cache_utf8.get_cached_utf8(revision_id)
2687
return revno, revision_id
2689
def _write_last_revision_info(self, revno, revision_id):
2690
"""Simply write out the revision id, with no checks.
2692
Use set_last_revision_info to perform this safely.
2694
Does not update the revision_history cache.
2696
revision_id = _mod_revision.ensure_null(revision_id)
2697
out_string = '%d %s\n' % (revno, revision_id)
2698
self._transport.put_bytes('last-revision', out_string,
2699
mode=self.bzrdir._get_file_mode())
2702
class FullHistoryBzrBranch(BzrBranch):
2703
"""Bzr branch which contains the full revision history."""
2706
def set_last_revision_info(self, revno, revision_id):
2707
if not revision_id or not isinstance(revision_id, basestring):
2708
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2709
revision_id = _mod_revision.ensure_null(revision_id)
2710
# this old format stores the full history, but this api doesn't
2711
# provide it, so we must generate, and might as well check it's
2713
history = self._lefthand_history(revision_id)
2714
if len(history) != revno:
2715
raise AssertionError('%d != %d' % (len(history), revno))
2716
self._set_revision_history(history)
2718
def _read_last_revision_info(self):
2719
rh = self.revision_history()
2722
return (revno, rh[-1])
2724
return (0, _mod_revision.NULL_REVISION)
2726
@deprecated_method(deprecated_in((2, 4, 0)))
2728
def set_revision_history(self, rev_history):
2729
"""See Branch.set_revision_history."""
2730
self._set_revision_history(rev_history)
2732
def _set_revision_history(self, rev_history):
2733
if 'evil' in debug.debug_flags:
2734
mutter_callsite(3, "set_revision_history scales with history.")
2735
check_not_reserved_id = _mod_revision.check_not_reserved_id
2736
for rev_id in rev_history:
2737
check_not_reserved_id(rev_id)
2738
if Branch.hooks['post_change_branch_tip']:
2739
# Don't calculate the last_revision_info() if there are no hooks
2741
old_revno, old_revid = self.last_revision_info()
2742
if len(rev_history) == 0:
2743
revid = _mod_revision.NULL_REVISION
2745
revid = rev_history[-1]
2746
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2747
self._write_revision_history(rev_history)
2748
self._clear_cached_state()
2749
self._cache_revision_history(rev_history)
2750
for hook in Branch.hooks['set_rh']:
2751
hook(self, rev_history)
2752
if Branch.hooks['post_change_branch_tip']:
2753
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2755
def _write_revision_history(self, history):
2756
"""Factored out of set_revision_history.
2758
This performs the actual writing to disk.
2759
It is intended to be called by set_revision_history."""
2760
self._transport.put_bytes(
2761
'revision-history', '\n'.join(history),
2762
mode=self.bzrdir._get_file_mode())
2764
def _gen_revision_history(self):
2765
history = self._transport.get_bytes('revision-history').split('\n')
2766
if history[-1:] == ['']:
2767
# There shouldn't be a trailing newline, but just in case.
2771
def _synchronize_history(self, destination, revision_id):
2772
if not isinstance(destination, FullHistoryBzrBranch):
2773
super(BzrBranch, self)._synchronize_history(
2774
destination, revision_id)
2776
if revision_id == _mod_revision.NULL_REVISION:
2779
new_history = self.revision_history()
2780
if revision_id is not None and new_history != []:
2782
new_history = new_history[:new_history.index(revision_id) + 1]
2784
rev = self.repository.get_revision(revision_id)
2785
new_history = rev.get_history(self.repository)[1:]
2786
destination._set_revision_history(new_history)
2789
def generate_revision_history(self, revision_id, last_rev=None,
2791
"""Create a new revision history that will finish with revision_id.
2793
:param revision_id: the new tip to use.
2794
:param last_rev: The previous last_revision. If not None, then this
2795
must be a ancestory of revision_id, or DivergedBranches is raised.
2796
:param other_branch: The other branch that DivergedBranches should
2797
raise with respect to.
2799
self._set_revision_history(self._lefthand_history(revision_id,
2800
last_rev, other_branch))
2803
class BzrBranch5(FullHistoryBzrBranch):
2804
"""A format 5 branch. This supports new features over plain branches.
2806
It has support for a master_branch which is the data for bound branches.
2810
class BzrBranch8(BzrBranch):
2646
2811
"""A branch that stores tree-reference locations."""
2648
2813
def _open_hook(self):
2674
2839
self._last_revision_info_cache = None
2675
2840
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
2842
def _check_history_violation(self, revision_id):
2723
2843
last_revision = _mod_revision.ensure_null(self.last_revision())
2724
2844
if _mod_revision.is_null(last_revision):
3182
3298
raise NotImplementedError(self.push)
3301
def copy_content_into(self, revision_id=None):
3302
"""Copy the content of source into target
3304
revision_id: if not None, the revision history in the new branch will
3305
be truncated to end with revision_id.
3307
raise NotImplementedError(self.copy_content_into)
3310
def fetch(self, stop_revision=None):
3313
:param stop_revision: Last revision to fetch
3315
raise NotImplementedError(self.fetch)
3185
3318
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
3319
"""InterBranch implementation that uses public Branch functions."""
3322
def is_compatible(klass, source, target):
3323
# GenericBranch uses the public API, so always compatible
3327
def _get_branch_formats_to_test(klass):
3328
return [(format_registry.get_default(), format_registry.get_default())]
3331
def unwrap_format(klass, format):
3332
if isinstance(format, remote.RemoteBranchFormat):
3333
format._ensure_real()
3334
return format._custom_format
3338
def copy_content_into(self, revision_id=None):
3339
"""Copy the content of source into target
3341
revision_id: if not None, the revision history in the new branch will
3342
be truncated to end with revision_id.
3344
self.source.update_references(self.target)
3345
self.source._synchronize_history(self.target, revision_id)
3347
parent = self.source.get_parent()
3348
except errors.InaccessibleParent, e:
3349
mutter('parent was not accessible to copy: %s', e)
3352
self.target.set_parent(parent)
3353
if self.source._push_should_merge_tags():
3354
self.source.tags.merge_to(self.target.tags)
3357
def fetch(self, stop_revision=None):
3358
if self.target.base == self.source.base:
3360
self.source.lock_read()
3362
fetch_spec_factory = fetch.FetchSpecFactory()
3363
fetch_spec_factory.source_branch = self.source
3364
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3365
fetch_spec_factory.source_repo = self.source.repository
3366
fetch_spec_factory.target_repo = self.target.repository
3367
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3368
fetch_spec = fetch_spec_factory.make_fetch_spec()
3369
return self.target.repository.fetch(self.source.repository,
3370
fetch_spec=fetch_spec)
3372
self.source.unlock()
3193
3375
def update_revisions(self, stop_revision=None, overwrite=False,
3195
3377
"""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()
3378
other_revno, other_last_revision = self.source.last_revision_info()
3379
stop_revno = None # unknown
3380
if stop_revision is None:
3381
stop_revision = other_last_revision
3382
if _mod_revision.is_null(stop_revision):
3383
# if there are no commits, we're done.
3385
stop_revno = other_revno
3387
# what's the current last revision, before we fetch [and change it
3389
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3390
# we fetch here so that we don't process data twice in the common
3391
# case of having something to pull, and so that the check for
3392
# already merged can operate on the just fetched graph, which will
3393
# be cached in memory.
3394
self.fetch(stop_revision=stop_revision)
3395
# Check to see if one is an ancestor of the other
3398
graph = self.target.repository.get_graph()
3399
if self.target._check_if_descendant_or_diverged(
3400
stop_revision, last_rev, graph, self.source):
3401
# stop_revision is a descendant of last_rev, but we aren't
3402
# overwriting, so we're done.
3404
if stop_revno is None:
3406
graph = self.target.repository.get_graph()
3407
this_revno, this_last_revision = \
3408
self.target.last_revision_info()
3409
stop_revno = graph.find_distance_to_null(stop_revision,
3410
[(other_last_revision, other_revno),
3411
(this_last_revision, this_revno)])
3412
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3415
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3416
possible_transports=None, run_hooks=True,
3238
3417
_override_hook_target=None, local=False):
3418
"""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
3420
:param run_hooks: Private parameter - if false, this branch
3244
3421
is being called because it's the master of the primary branch,
3245
3422
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.
3424
bound_location = self.target.get_bound_location()
3425
if local and not bound_location:
3252
3426
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()
3427
master_branch = None
3428
source_is_master = (self.source.user_url == bound_location)
3429
if not local and bound_location and not source_is_master:
3430
# not pulling from master, so we need to update master.
3431
master_branch = self.target.get_master_branch(possible_transports)
3432
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']:
3435
# pull from source into master.
3436
master_branch.pull(self.source, overwrite, stop_revision,
3438
return self._pull(overwrite,
3439
stop_revision, _hook_master=master_branch,
3440
run_hooks=run_hooks,
3441
_override_hook_target=_override_hook_target,
3442
merge_tags_to_master=not source_is_master)
3288
self.source.unlock()
3445
master_branch.unlock()
3291
3447
def push(self, overwrite=False, stop_revision=None,
3292
3448
_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.
3513
def _pull(self, overwrite=False, stop_revision=None,
3514
possible_transports=None, _hook_master=None, run_hooks=True,
3515
_override_hook_target=None, local=False,
3516
merge_tags_to_master=True):
3519
This function is the core worker, used by GenericInterBranch.pull to
3520
avoid duplication when pulling source->master and source->local.
3522
:param _hook_master: Private parameter - set the branch to
3523
be supplied as the master to pull hooks.
3374
3524
:param run_hooks: Private parameter - if false, this branch
3375
3525
is being called because it's the master of the primary branch,
3376
3526
so it should not run its hooks.
3527
is being called because it's the master of the primary branch,
3528
so it should not run its hooks.
3529
:param _override_hook_target: Private parameter - set the branch to be
3530
supplied as the target_branch to pull hooks.
3531
: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:
3533
# This type of branch can't be bound.
3380
3535
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()
3536
result = PullResult()
3537
result.source_branch = self.source
3538
if _override_hook_target is None:
3539
result.target_branch = self.target
3541
result.target_branch = _override_hook_target
3542
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)
3544
# We assume that during 'pull' the target repository is closer than
3546
self.source.update_references(self.target)
3547
graph = self.target.repository.get_graph(self.source.repository)
3548
# TODO: Branch formats should have a flag that indicates
3549
# that revno's are expensive, and pull() should honor that flag.
3551
result.old_revno, result.old_revid = \
3552
self.target.last_revision_info()
3553
self.target.update_revisions(self.source, stop_revision,
3554
overwrite=overwrite, graph=graph)
3555
# TODO: The old revid should be specified when merging tags,
3556
# so a tags implementation that versions tags can only
3557
# pull in the most recent changes. -- JRV20090506
3558
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3559
overwrite, ignore_master=not merge_tags_to_master)
3560
result.new_revno, result.new_revid = self.target.last_revision_info()
3562
result.master_branch = _hook_master
3563
result.local_branch = result.target_branch
3565
result.master_branch = result.target_branch
3566
result.local_branch = None
3568
for hook in Branch.hooks['post_pull']:
3397
master_branch.unlock()
3571
self.source.unlock()
3400
3575
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
