716
745
"""Print `file` to stdout."""
717
746
raise NotImplementedError(self.print_file)
748
@deprecated_method(deprecated_in((2, 4, 0)))
719
749
def set_revision_history(self, rev_history):
720
raise NotImplementedError(self.set_revision_history)
750
"""See Branch.set_revision_history."""
751
self._set_revision_history(rev_history)
754
def _set_revision_history(self, rev_history):
755
if len(rev_history) == 0:
756
revid = _mod_revision.NULL_REVISION
758
revid = rev_history[-1]
759
if rev_history != self._lefthand_history(revid):
760
raise errors.NotLefthandHistory(rev_history)
761
self.set_last_revision_info(len(rev_history), revid)
762
self._cache_revision_history(rev_history)
763
for hook in Branch.hooks['set_rh']:
764
hook(self, rev_history)
767
def set_last_revision_info(self, revno, revision_id):
768
"""Set the last revision of this branch.
770
The caller is responsible for checking that the revno is correct
771
for this revision id.
773
It may be possible to set the branch last revision to an id not
774
present in the repository. However, branches can also be
775
configured to check constraints on history, in which case this may not
778
raise NotImplementedError(self.last_revision_info)
781
def generate_revision_history(self, revision_id, last_rev=None,
783
"""See Branch.generate_revision_history"""
784
graph = self.repository.get_graph()
785
known_revision_ids = [
786
self.last_revision_info(),
787
(_mod_revision.NULL_REVISION, 0),
789
if last_rev is not None:
790
if not graph.is_ancestor(last_rev, revision_id):
791
# our previous tip is not merged into stop_revision
792
raise errors.DivergedBranches(self, other_branch)
793
revno = graph.find_distance_to_null(revision_id, known_revision_ids)
794
self.set_last_revision_info(revno, revision_id)
722
796
@needs_write_lock
723
797
def set_parent(self, url):
782
856
old_repository = self.repository
783
857
if len(old_repository._fallback_repositories) != 1:
784
858
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
859
"of %r (fallbacks: %r)" % (old_repository,
860
old_repository._fallback_repositories))
861
# Open the new repository object.
862
# Repositories don't offer an interface to remove fallback
863
# repositories today; take the conceptually simpler option and just
864
# reopen it. We reopen it starting from the URL so that we
865
# get a separate connection for RemoteRepositories and can
866
# stream from one of them to the other. This does mean doing
867
# separate SSH connection setup, but unstacking is not a
868
# common operation so it's tolerable.
869
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
870
new_repository = new_bzrdir.find_repository()
871
if new_repository._fallback_repositories:
872
raise AssertionError("didn't expect %r to have "
873
"fallback_repositories"
874
% (self.repository,))
875
# Replace self.repository with the new repository.
876
# Do our best to transfer the lock state (i.e. lock-tokens and
877
# lock count) of self.repository to the new repository.
878
lock_token = old_repository.lock_write().repository_token
879
self.repository = new_repository
880
if isinstance(self, remote.RemoteBranch):
881
# Remote branches can have a second reference to the old
882
# repository that need to be replaced.
883
if self._real_branch is not None:
884
self._real_branch.repository = new_repository
885
self.repository.lock_write(token=lock_token)
886
if lock_token is not None:
887
old_repository.leave_lock_in_place()
787
888
old_repository.unlock()
889
if lock_token is not None:
890
# XXX: self.repository.leave_lock_in_place() before this
891
# function will not be preserved. Fortunately that doesn't
892
# affect the current default format (2a), and would be a
893
# corner-case anyway.
894
# - Andrew Bennetts, 2010/06/30
895
self.repository.dont_leave_lock_in_place()
899
old_repository.unlock()
900
except errors.LockNotHeld:
903
if old_lock_count == 0:
904
raise AssertionError(
905
'old_repository should have been locked at least once.')
906
for i in range(old_lock_count-1):
907
self.repository.lock_write()
908
# Fetch from the old repository into the new.
788
909
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
911
# XXX: If you unstack a branch while it has a working tree
809
912
# with a pending merge, the pending-merged revisions will no
810
913
# 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(),
915
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
916
except errors.TagsNotSupported:
917
tags_to_fetch = set()
918
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
919
old_repository, required_ids=[self.last_revision()],
920
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
921
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
923
old_repository.unlock()
917
1027
:return: A tuple (revno, revision_id).
919
1029
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1030
self._last_revision_info_cache = self._read_last_revision_info()
921
1031
return self._last_revision_info_cache
923
def _last_revision_info(self):
924
rh = self.revision_history()
927
return (revno, rh[-1])
929
return (0, _mod_revision.NULL_REVISION)
931
@deprecated_method(deprecated_in((1, 6, 0)))
932
def missing_revisions(self, other, stop_revision=None):
933
"""Return a list of new revisions that would perfectly fit.
935
If self and other have not diverged, return a list of the revisions
936
present in other, but missing from self.
938
self_history = self.revision_history()
939
self_len = len(self_history)
940
other_history = other.revision_history()
941
other_len = len(other_history)
942
common_index = min(self_len, other_len) -1
943
if common_index >= 0 and \
944
self_history[common_index] != other_history[common_index]:
945
raise errors.DivergedBranches(self, other)
947
if stop_revision is None:
948
stop_revision = other_len
950
if stop_revision > other_len:
951
raise errors.NoSuchRevision(self, stop_revision)
952
return other_history[self_len:stop_revision]
955
def update_revisions(self, other, stop_revision=None, overwrite=False,
957
"""Pull in new perfect-fit revisions.
959
:param other: Another Branch to pull from
960
:param stop_revision: Updated until the given revision
961
:param overwrite: Always set the branch pointer, rather than checking
962
to see if it is a proper descendant.
963
:param graph: A Graph object that can be used to query history
964
information. This can be None.
967
return InterBranch.get(other, self).update_revisions(stop_revision,
1033
def _read_last_revision_info(self):
1034
raise NotImplementedError(self._read_last_revision_info)
1036
@deprecated_method(deprecated_in((2, 4, 0)))
970
1037
def import_last_revision_info(self, source_repo, revno, revid):
971
1038
"""Set the last revision info, importing from another repo if necessary.
973
This is used by the bound branch code to upload a revision to
974
the master branch first before updating the tip of the local branch.
976
1040
:param source_repo: Source repository to optionally fetch from
977
1041
:param revno: Revision number of the new tip
978
1042
:param revid: Revision id of the new tip
1019
1103
stop_revision=stop_revision,
1020
1104
possible_transports=possible_transports, *args, **kwargs)
1022
def push(self, target, overwrite=False, stop_revision=None, *args,
1106
def push(self, target, overwrite=False, stop_revision=None, lossy=False,
1024
1108
"""Mirror this branch into target.
1026
1110
This branch is considered to be 'local', having low latency.
1028
1112
return InterBranch.get(self, target).push(overwrite, stop_revision,
1031
def lossy_push(self, target, stop_revision=None):
1032
"""Push deltas into another branch.
1034
:note: This does not, like push, retain the revision ids from
1035
the source branch and will, rather than adding bzr-specific
1036
metadata, push only those semantics of the revision that can be
1037
natively represented by this branch' VCS.
1039
:param target: Target branch
1040
:param stop_revision: Revision to push, defaults to last revision.
1041
:return: BranchPushResult with an extra member revidmap:
1042
A dictionary mapping revision ids from the target branch
1043
to new revision ids in the target branch, for each
1044
revision that was pushed.
1046
inter = InterBranch.get(self, target)
1047
lossy_push = getattr(inter, "lossy_push", None)
1048
if lossy_push is None:
1049
raise errors.LossyPushToSameVCS(self, target)
1050
return lossy_push(stop_revision)
1113
lossy, *args, **kwargs)
1052
1115
def basis_tree(self):
1053
1116
"""Return `Tree` object for last revision."""
1562
1646
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):
1649
def initialize(self, a_bzrdir, name=None, repository=None):
1611
1650
"""Create a branch of this format in a_bzrdir.
1613
1652
:param name: Name of the colocated branch to create.
1704
1780
These are all empty initially, because by default nothing should get
1707
Hooks.__init__(self)
1708
self.create_hook(HookPoint('set_rh',
1783
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1784
self.add_hook('set_rh',
1709
1785
"Invoked whenever the revision history has been set via "
1710
1786
"set_revision_history. The api signature is (branch, "
1711
1787
"revision_history), and the branch will be write-locked. "
1712
1788
"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',
1789
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1790
self.add_hook('open',
1715
1791
"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',
1792
"branch is opened.", (1, 8))
1793
self.add_hook('post_push',
1718
1794
"Called after a push operation completes. post_push is called "
1719
1795
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1720
"bzr client.", (0, 15), None))
1721
self.create_hook(HookPoint('post_pull',
1796
"bzr client.", (0, 15))
1797
self.add_hook('post_pull',
1722
1798
"Called after a pull operation completes. post_pull is called "
1723
1799
"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 "
1800
"bzr client.", (0, 15))
1801
self.add_hook('pre_commit',
1802
"Called after a commit is calculated but before it is "
1727
1803
"completed. pre_commit is called with (local, master, old_revno, "
1728
1804
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1729
1805
"). old_revid is NULL_REVISION for the first commit to a branch, "
1731
1807
"basis revision. hooks MUST NOT modify this delta. "
1732
1808
" future_tree is an in-memory tree obtained from "
1733
1809
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1811
self.add_hook('post_commit',
1736
1812
"Called in the bzr client after a commit has completed. "
1737
1813
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1814
"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',
1815
"commit to a branch.", (0, 15))
1816
self.add_hook('post_uncommit',
1741
1817
"Called in the bzr client after an uncommit completes. "
1742
1818
"post_uncommit is called with (local, master, old_revno, "
1743
1819
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1820
"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',
1821
"receives new_revno of 0, new_revid of None.", (0, 15))
1822
self.add_hook('pre_change_branch_tip',
1747
1823
"Called in bzr client and server before a change to the tip of a "
1748
1824
"branch is made. pre_change_branch_tip is called with a "
1749
1825
"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',
1826
"commit, uncommit will all trigger this hook.", (1, 6))
1827
self.add_hook('post_change_branch_tip',
1752
1828
"Called in bzr client and server after a change to the tip of a "
1753
1829
"branch is made. post_change_branch_tip is called with a "
1754
1830
"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',
1831
"commit, uncommit will all trigger this hook.", (1, 4))
1832
self.add_hook('transform_fallback_location',
1757
1833
"Called when a stacked branch is activating its fallback "
1758
1834
"locations. transform_fallback_location is called with (branch, "
1759
1835
"url), and should return a new url. Returning the same url "
1764
1840
"fallback locations have not been activated. When there are "
1765
1841
"multiple hooks installed for transform_fallback_location, "
1766
1842
"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."
1843
"The order is however undefined.", (1, 9))
1844
self.add_hook('automatic_tag_name',
1845
"Called to determine an automatic tag name for a revision. "
1770
1846
"automatic_tag_name is called with (branch, revision_id) and "
1771
1847
"should return a tag name or None if no tag name could be "
1772
1848
"determined. The first non-None tag name returned will be used.",
1774
self.create_hook(HookPoint('post_branch_init',
1850
self.add_hook('post_branch_init',
1775
1851
"Called after new branch initialization completes. "
1776
1852
"post_branch_init is called with a "
1777
1853
"bzrlib.branch.BranchInitHookParams. "
1778
1854
"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',
1855
"lightweight) will all trigger this hook.", (2, 2))
1856
self.add_hook('post_switch',
1781
1857
"Called after a checkout switches branch. "
1782
1858
"post_switch is called with a "
1783
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1859
"bzrlib.branch.SwitchHookParams.", (2, 2))
2387
2495
"""See Branch.print_file."""
2388
2496
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
2498
@needs_write_lock
2454
2499
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
2500
if not revision_id or not isinstance(revision_id, basestring):
2501
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2502
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))
2503
old_revno, old_revid = self.last_revision_info()
2504
if self._get_append_revisions_only():
2505
self._check_history_violation(revision_id)
2506
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2507
self._write_last_revision_info(revno, revision_id)
2508
self._clear_cached_state()
2509
self._last_revision_info_cache = revno, revision_id
2510
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2512
def basis_tree(self):
2496
2513
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2634
def _read_last_revision_info(self):
2635
revision_string = self._transport.get_bytes('last-revision')
2636
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2637
revision_id = cache_utf8.get_cached_utf8(revision_id)
2639
return revno, revision_id
2641
def _write_last_revision_info(self, revno, revision_id):
2642
"""Simply write out the revision id, with no checks.
2644
Use set_last_revision_info to perform this safely.
2646
Does not update the revision_history cache.
2648
revision_id = _mod_revision.ensure_null(revision_id)
2649
out_string = '%d %s\n' % (revno, revision_id)
2650
self._transport.put_bytes('last-revision', out_string,
2651
mode=self.bzrdir._get_file_mode())
2654
class FullHistoryBzrBranch(BzrBranch):
2655
"""Bzr branch which contains the full revision history."""
2658
def set_last_revision_info(self, revno, revision_id):
2659
if not revision_id or not isinstance(revision_id, basestring):
2660
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2661
revision_id = _mod_revision.ensure_null(revision_id)
2662
# this old format stores the full history, but this api doesn't
2663
# provide it, so we must generate, and might as well check it's
2665
history = self._lefthand_history(revision_id)
2666
if len(history) != revno:
2667
raise AssertionError('%d != %d' % (len(history), revno))
2668
self._set_revision_history(history)
2670
def _read_last_revision_info(self):
2671
rh = self.revision_history()
2674
return (revno, rh[-1])
2676
return (0, _mod_revision.NULL_REVISION)
2678
@deprecated_method(deprecated_in((2, 4, 0)))
2680
def set_revision_history(self, rev_history):
2681
"""See Branch.set_revision_history."""
2682
self._set_revision_history(rev_history)
2684
def _set_revision_history(self, rev_history):
2685
if 'evil' in debug.debug_flags:
2686
mutter_callsite(3, "set_revision_history scales with history.")
2687
check_not_reserved_id = _mod_revision.check_not_reserved_id
2688
for rev_id in rev_history:
2689
check_not_reserved_id(rev_id)
2690
if Branch.hooks['post_change_branch_tip']:
2691
# Don't calculate the last_revision_info() if there are no hooks
2693
old_revno, old_revid = self.last_revision_info()
2694
if len(rev_history) == 0:
2695
revid = _mod_revision.NULL_REVISION
2697
revid = rev_history[-1]
2698
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2699
self._write_revision_history(rev_history)
2700
self._clear_cached_state()
2701
self._cache_revision_history(rev_history)
2702
for hook in Branch.hooks['set_rh']:
2703
hook(self, rev_history)
2704
if Branch.hooks['post_change_branch_tip']:
2705
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2707
def _write_revision_history(self, history):
2708
"""Factored out of set_revision_history.
2710
This performs the actual writing to disk.
2711
It is intended to be called by set_revision_history."""
2712
self._transport.put_bytes(
2713
'revision-history', '\n'.join(history),
2714
mode=self.bzrdir._get_file_mode())
2716
def _gen_revision_history(self):
2717
history = self._transport.get_bytes('revision-history').split('\n')
2718
if history[-1:] == ['']:
2719
# There shouldn't be a trailing newline, but just in case.
2723
def _synchronize_history(self, destination, revision_id):
2724
if not isinstance(destination, FullHistoryBzrBranch):
2725
super(BzrBranch, self)._synchronize_history(
2726
destination, revision_id)
2728
if revision_id == _mod_revision.NULL_REVISION:
2731
new_history = self.revision_history()
2732
if revision_id is not None and new_history != []:
2734
new_history = new_history[:new_history.index(revision_id) + 1]
2736
rev = self.repository.get_revision(revision_id)
2737
new_history = rev.get_history(self.repository)[1:]
2738
destination._set_revision_history(new_history)
2741
def generate_revision_history(self, revision_id, last_rev=None,
2743
"""Create a new revision history that will finish with revision_id.
2745
:param revision_id: the new tip to use.
2746
:param last_rev: The previous last_revision. If not None, then this
2747
must be a ancestory of revision_id, or DivergedBranches is raised.
2748
:param other_branch: The other branch that DivergedBranches should
2749
raise with respect to.
2751
self._set_revision_history(self._lefthand_history(revision_id,
2752
last_rev, other_branch))
2755
class BzrBranch5(FullHistoryBzrBranch):
2756
"""A format 5 branch. This supports new features over plain branches.
2758
It has support for a master_branch which is the data for bound branches.
2762
class BzrBranch8(BzrBranch):
2646
2763
"""A branch that stores tree-reference locations."""
2648
2765
def _open_hook(self):
2674
2791
self._last_revision_info_cache = None
2675
2792
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
2794
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2795
current_revid = self.last_revision()
2796
last_revision = _mod_revision.ensure_null(current_revid)
2724
2797
if _mod_revision.is_null(last_revision):
2726
if last_revision not in self._lefthand_history(revision_id):
2727
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2799
graph = self.repository.get_graph()
2800
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2801
if lh_ancestor == current_revid:
2803
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2805
def _gen_revision_history(self):
2730
2806
"""Generate the revision history from last revision
3182
3240
raise NotImplementedError(self.push)
3243
def copy_content_into(self, revision_id=None):
3244
"""Copy the content of source into target
3246
revision_id: if not None, the revision history in the new branch will
3247
be truncated to end with revision_id.
3249
raise NotImplementedError(self.copy_content_into)
3252
def fetch(self, stop_revision=None, limit=None):
3255
:param stop_revision: Last revision to fetch
3256
:param limit: Optional rough limit of revisions to fetch
3258
raise NotImplementedError(self.fetch)
3185
3261
class GenericInterBranch(InterBranch):
3186
"""InterBranch implementation that uses public Branch functions.
3190
def _get_branch_formats_to_test():
3191
return BranchFormat._default_format, BranchFormat._default_format
3193
def update_revisions(self, stop_revision=None, overwrite=False,
3195
"""See InterBranch.update_revisions()."""
3262
"""InterBranch implementation that uses public Branch functions."""
3265
def is_compatible(klass, source, target):
3266
# GenericBranch uses the public API, so always compatible
3270
def _get_branch_formats_to_test(klass):
3271
return [(format_registry.get_default(), format_registry.get_default())]
3274
def unwrap_format(klass, format):
3275
if isinstance(format, remote.RemoteBranchFormat):
3276
format._ensure_real()
3277
return format._custom_format
3281
def copy_content_into(self, revision_id=None):
3282
"""Copy the content of source into target
3284
revision_id: if not None, the revision history in the new branch will
3285
be truncated to end with revision_id.
3287
self.source.update_references(self.target)
3288
self.source._synchronize_history(self.target, revision_id)
3290
parent = self.source.get_parent()
3291
except errors.InaccessibleParent, e:
3292
mutter('parent was not accessible to copy: %s', e)
3295
self.target.set_parent(parent)
3296
if self.source._push_should_merge_tags():
3297
self.source.tags.merge_to(self.target.tags)
3300
def fetch(self, stop_revision=None, limit=None):
3302
if self.target.base == self.source.base:
3196
3304
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)
3306
fetch_spec_factory = fetch.FetchSpecFactory()
3307
fetch_spec_factory.source_branch = self.source
3308
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3309
fetch_spec_factory.source_repo = self.source.repository
3310
fetch_spec_factory.target_repo = self.target.repository
3311
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3312
fetch_spec_factory.limit = limit
3313
fetch_spec = fetch_spec_factory.make_fetch_spec()
3314
return self.target.repository.fetch(self.source.repository,
3315
fetch_spec=fetch_spec)
3234
3317
self.source.unlock()
3320
def _update_revisions(self, stop_revision=None, overwrite=False,
3322
other_revno, other_last_revision = self.source.last_revision_info()
3323
stop_revno = None # unknown
3324
if stop_revision is None:
3325
stop_revision = other_last_revision
3326
if _mod_revision.is_null(stop_revision):
3327
# if there are no commits, we're done.
3329
stop_revno = other_revno
3331
# what's the current last revision, before we fetch [and change it
3333
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3334
# we fetch here so that we don't process data twice in the common
3335
# case of having something to pull, and so that the check for
3336
# already merged can operate on the just fetched graph, which will
3337
# be cached in memory.
3338
self.fetch(stop_revision=stop_revision)
3339
# Check to see if one is an ancestor of the other
3342
graph = self.target.repository.get_graph()
3343
if self.target._check_if_descendant_or_diverged(
3344
stop_revision, last_rev, graph, self.source):
3345
# stop_revision is a descendant of last_rev, but we aren't
3346
# overwriting, so we're done.
3348
if stop_revno is None:
3350
graph = self.target.repository.get_graph()
3351
this_revno, this_last_revision = \
3352
self.target.last_revision_info()
3353
stop_revno = graph.find_distance_to_null(stop_revision,
3354
[(other_last_revision, other_revno),
3355
(this_last_revision, this_revno)])
3356
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3359
def pull(self, overwrite=False, stop_revision=None,
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3360
possible_transports=None, run_hooks=True,
3238
3361
_override_hook_target=None, local=False):
3362
"""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
3364
:param run_hooks: Private parameter - if false, this branch
3244
3365
is being called because it's the master of the primary branch,
3245
3366
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.
3368
bound_location = self.target.get_bound_location()
3369
if local and not bound_location:
3252
3370
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()
3371
master_branch = None
3372
source_is_master = (self.source.user_url == bound_location)
3373
if not local and bound_location and not source_is_master:
3374
# not pulling from master, so we need to update master.
3375
master_branch = self.target.get_master_branch(possible_transports)
3376
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']:
3379
# pull from source into master.
3380
master_branch.pull(self.source, overwrite, stop_revision,
3382
return self._pull(overwrite,
3383
stop_revision, _hook_master=master_branch,
3384
run_hooks=run_hooks,
3385
_override_hook_target=_override_hook_target,
3386
merge_tags_to_master=not source_is_master)
3288
self.source.unlock()
3389
master_branch.unlock()
3291
def push(self, overwrite=False, stop_revision=None,
3391
def push(self, overwrite=False, stop_revision=None, lossy=False,
3292
3392
_override_hook_source_branch=None):
3293
3393
"""See InterBranch.push.
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.
3480
def _pull(self, overwrite=False, stop_revision=None,
3481
possible_transports=None, _hook_master=None, run_hooks=True,
3482
_override_hook_target=None, local=False,
3483
merge_tags_to_master=True):
3486
This function is the core worker, used by GenericInterBranch.pull to
3487
avoid duplication when pulling source->master and source->local.
3489
:param _hook_master: Private parameter - set the branch to
3490
be supplied as the master to pull hooks.
3374
3491
:param run_hooks: Private parameter - if false, this branch
3375
3492
is being called because it's the master of the primary branch,
3376
3493
so it should not run its hooks.
3494
is being called because it's the master of the primary branch,
3495
so it should not run its hooks.
3496
:param _override_hook_target: Private parameter - set the branch to be
3497
supplied as the target_branch to pull hooks.
3498
: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:
3500
# This type of branch can't be bound.
3380
3502
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()
3503
result = PullResult()
3504
result.source_branch = self.source
3505
if _override_hook_target is None:
3506
result.target_branch = self.target
3508
result.target_branch = _override_hook_target
3509
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)
3511
# We assume that during 'pull' the target repository is closer than
3513
self.source.update_references(self.target)
3514
graph = self.target.repository.get_graph(self.source.repository)
3515
# TODO: Branch formats should have a flag that indicates
3516
# that revno's are expensive, and pull() should honor that flag.
3518
result.old_revno, result.old_revid = \
3519
self.target.last_revision_info()
3520
self._update_revisions(stop_revision, overwrite=overwrite,
3522
# TODO: The old revid should be specified when merging tags,
3523
# so a tags implementation that versions tags can only
3524
# pull in the most recent changes. -- JRV20090506
3525
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3526
overwrite, ignore_master=not merge_tags_to_master)
3527
result.new_revno, result.new_revid = self.target.last_revision_info()
3529
result.master_branch = _hook_master
3530
result.local_branch = result.target_branch
3532
result.master_branch = result.target_branch
3533
result.local_branch = None
3535
for hook in Branch.hooks['post_pull']:
3397
master_branch.unlock()
3538
self.source.unlock()
3400
3542
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
