782
873
old_repository = self.repository
783
874
if len(old_repository._fallback_repositories) != 1:
784
875
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
876
"of %r (fallbacks: %r)" % (old_repository,
877
old_repository._fallback_repositories))
878
# Open the new repository object.
879
# Repositories don't offer an interface to remove fallback
880
# repositories today; take the conceptually simpler option and just
881
# reopen it. We reopen it starting from the URL so that we
882
# get a separate connection for RemoteRepositories and can
883
# stream from one of them to the other. This does mean doing
884
# separate SSH connection setup, but unstacking is not a
885
# common operation so it's tolerable.
886
new_bzrdir = controldir.ControlDir.open(
887
self.bzrdir.root_transport.base)
888
new_repository = new_bzrdir.find_repository()
889
if new_repository._fallback_repositories:
890
raise AssertionError("didn't expect %r to have "
891
"fallback_repositories"
892
% (self.repository,))
893
# Replace self.repository with the new repository.
894
# Do our best to transfer the lock state (i.e. lock-tokens and
895
# lock count) of self.repository to the new repository.
896
lock_token = old_repository.lock_write().repository_token
897
self.repository = new_repository
898
if isinstance(self, remote.RemoteBranch):
899
# Remote branches can have a second reference to the old
900
# repository that need to be replaced.
901
if self._real_branch is not None:
902
self._real_branch.repository = new_repository
903
self.repository.lock_write(token=lock_token)
904
if lock_token is not None:
905
old_repository.leave_lock_in_place()
787
906
old_repository.unlock()
907
if lock_token is not None:
908
# XXX: self.repository.leave_lock_in_place() before this
909
# function will not be preserved. Fortunately that doesn't
910
# affect the current default format (2a), and would be a
911
# corner-case anyway.
912
# - Andrew Bennetts, 2010/06/30
913
self.repository.dont_leave_lock_in_place()
917
old_repository.unlock()
918
except errors.LockNotHeld:
921
if old_lock_count == 0:
922
raise AssertionError(
923
'old_repository should have been locked at least once.')
924
for i in range(old_lock_count-1):
925
self.repository.lock_write()
926
# Fetch from the old repository into the new.
788
927
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
929
# XXX: If you unstack a branch while it has a working tree
809
930
# with a pending merge, the pending-merged revisions will no
810
931
# 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(),
933
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
934
except errors.TagsNotSupported:
935
tags_to_fetch = set()
936
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
937
old_repository, required_ids=[self.last_revision()],
938
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
939
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
941
old_repository.unlock()
917
1046
:return: A tuple (revno, revision_id).
919
1048
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1049
self._last_revision_info_cache = self._read_last_revision_info()
921
1050
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,
1052
def _read_last_revision_info(self):
1053
raise NotImplementedError(self._read_last_revision_info)
1055
@deprecated_method(deprecated_in((2, 4, 0)))
970
1056
def import_last_revision_info(self, source_repo, revno, revid):
971
1057
"""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
1059
:param source_repo: Source repository to optionally fetch from
977
1060
:param revno: Revision number of the new tip
978
1061
:param revid: Revision id of the new tip
1505
1598
return not (self == other)
1508
def find_format(klass, a_bzrdir, name=None):
1509
"""Return the format for the branch object in a_bzrdir."""
1601
def find_format(klass, controldir, name=None):
1602
"""Return the format for the branch object in controldir."""
1511
transport = a_bzrdir.get_branch_transport(None, name=name)
1604
transport = controldir.get_branch_transport(None, name=name)
1512
1605
format_string = transport.get_bytes("format")
1513
return klass._formats[format_string]
1606
return format_registry.get(format_string)
1514
1607
except errors.NoSuchFile:
1515
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1608
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1516
1609
except KeyError:
1517
1610
raise errors.UnknownFormatError(format=format_string, kind='branch')
1613
@deprecated_method(deprecated_in((2, 4, 0)))
1520
1614
def get_default_format(klass):
1521
1615
"""Return the current default format."""
1522
return klass._default_format
1524
def get_reference(self, a_bzrdir):
1525
"""Get the target reference of the branch in a_bzrdir.
1616
return format_registry.get_default()
1619
@deprecated_method(deprecated_in((2, 4, 0)))
1620
def get_formats(klass):
1621
"""Get all the known formats.
1623
Warning: This triggers a load of all lazy registered formats: do not
1624
use except when that is desireed.
1626
return format_registry._get_all()
1628
def get_reference(self, controldir, name=None):
1629
"""Get the target reference of the branch in controldir.
1527
1631
format probing must have been completed before calling
1528
1632
this method - it is assumed that the format of the branch
1529
in a_bzrdir is correct.
1633
in controldir is correct.
1531
:param a_bzrdir: The bzrdir to get the branch data from.
1635
:param controldir: The controldir to get the branch data from.
1636
:param name: Name of the colocated branch to fetch
1532
1637
:return: None if the branch is not a reference branch.
1537
def set_reference(self, a_bzrdir, to_branch):
1538
"""Set the target reference of the branch in a_bzrdir.
1642
def set_reference(self, controldir, name, to_branch):
1643
"""Set the target reference of the branch in controldir.
1540
1645
format probing must have been completed before calling
1541
1646
this method - it is assumed that the format of the branch
1542
in a_bzrdir is correct.
1647
in controldir is correct.
1544
:param a_bzrdir: The bzrdir to set the branch reference for.
1649
:param controldir: The controldir to set the branch reference for.
1650
:param name: Name of colocated branch to set, None for default
1545
1651
:param to_branch: branch that the checkout is to reference
1547
1653
raise NotImplementedError(self.set_reference)
1554
1660
"""Return the short format description for this format."""
1555
1661
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1663
def _run_post_branch_init_hooks(self, controldir, name, branch):
1558
1664
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1667
params = BranchInitHookParams(self, controldir, name, branch)
1562
1668
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):
1611
"""Create a branch of this format in a_bzrdir.
1671
def initialize(self, controldir, name=None, repository=None,
1672
append_revisions_only=None):
1673
"""Create a branch of this format in controldir.
1613
1675
:param name: Name of the colocated branch to create.
1615
1677
raise NotImplementedError(self.initialize)
1731
1838
"basis revision. hooks MUST NOT modify this delta. "
1732
1839
" future_tree is an in-memory tree obtained from "
1733
1840
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1842
self.add_hook('post_commit',
1736
1843
"Called in the bzr client after a commit has completed. "
1737
1844
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1845
"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',
1846
"commit to a branch.", (0, 15))
1847
self.add_hook('post_uncommit',
1741
1848
"Called in the bzr client after an uncommit completes. "
1742
1849
"post_uncommit is called with (local, master, old_revno, "
1743
1850
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1851
"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',
1852
"receives new_revno of 0, new_revid of None.", (0, 15))
1853
self.add_hook('pre_change_branch_tip',
1747
1854
"Called in bzr client and server before a change to the tip of a "
1748
1855
"branch is made. pre_change_branch_tip is called with a "
1749
1856
"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',
1857
"commit, uncommit will all trigger this hook.", (1, 6))
1858
self.add_hook('post_change_branch_tip',
1752
1859
"Called in bzr client and server after a change to the tip of a "
1753
1860
"branch is made. post_change_branch_tip is called with a "
1754
1861
"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',
1862
"commit, uncommit will all trigger this hook.", (1, 4))
1863
self.add_hook('transform_fallback_location',
1757
1864
"Called when a stacked branch is activating its fallback "
1758
1865
"locations. transform_fallback_location is called with (branch, "
1759
1866
"url), and should return a new url. Returning the same url "
2387
2541
"""See Branch.print_file."""
2388
2542
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
2544
@needs_write_lock
2454
2545
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
2546
if not revision_id or not isinstance(revision_id, basestring):
2547
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2548
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))
2549
old_revno, old_revid = self.last_revision_info()
2550
if self.get_append_revisions_only():
2551
self._check_history_violation(revision_id)
2552
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2553
self._write_last_revision_info(revno, revision_id)
2554
self._clear_cached_state()
2555
self._last_revision_info_cache = revno, revision_id
2556
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2558
def basis_tree(self):
2496
2559
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2680
def _read_last_revision_info(self):
2681
revision_string = self._transport.get_bytes('last-revision')
2682
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2683
revision_id = cache_utf8.get_cached_utf8(revision_id)
2685
return revno, revision_id
2687
def _write_last_revision_info(self, revno, revision_id):
2688
"""Simply write out the revision id, with no checks.
2690
Use set_last_revision_info to perform this safely.
2692
Does not update the revision_history cache.
2694
revision_id = _mod_revision.ensure_null(revision_id)
2695
out_string = '%d %s\n' % (revno, revision_id)
2696
self._transport.put_bytes('last-revision', out_string,
2697
mode=self.bzrdir._get_file_mode())
2700
class FullHistoryBzrBranch(BzrBranch):
2701
"""Bzr branch which contains the full revision history."""
2704
def set_last_revision_info(self, revno, revision_id):
2705
if not revision_id or not isinstance(revision_id, basestring):
2706
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2707
revision_id = _mod_revision.ensure_null(revision_id)
2708
# this old format stores the full history, but this api doesn't
2709
# provide it, so we must generate, and might as well check it's
2711
history = self._lefthand_history(revision_id)
2712
if len(history) != revno:
2713
raise AssertionError('%d != %d' % (len(history), revno))
2714
self._set_revision_history(history)
2716
def _read_last_revision_info(self):
2717
rh = self.revision_history()
2720
return (revno, rh[-1])
2722
return (0, _mod_revision.NULL_REVISION)
2724
@deprecated_method(deprecated_in((2, 4, 0)))
2726
def set_revision_history(self, rev_history):
2727
"""See Branch.set_revision_history."""
2728
self._set_revision_history(rev_history)
2730
def _set_revision_history(self, rev_history):
2731
if 'evil' in debug.debug_flags:
2732
mutter_callsite(3, "set_revision_history scales with history.")
2733
check_not_reserved_id = _mod_revision.check_not_reserved_id
2734
for rev_id in rev_history:
2735
check_not_reserved_id(rev_id)
2736
if Branch.hooks['post_change_branch_tip']:
2737
# Don't calculate the last_revision_info() if there are no hooks
2739
old_revno, old_revid = self.last_revision_info()
2740
if len(rev_history) == 0:
2741
revid = _mod_revision.NULL_REVISION
2743
revid = rev_history[-1]
2744
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2745
self._write_revision_history(rev_history)
2746
self._clear_cached_state()
2747
self._cache_revision_history(rev_history)
2748
for hook in Branch.hooks['set_rh']:
2749
hook(self, rev_history)
2750
if Branch.hooks['post_change_branch_tip']:
2751
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2753
def _write_revision_history(self, history):
2754
"""Factored out of set_revision_history.
2756
This performs the actual writing to disk.
2757
It is intended to be called by set_revision_history."""
2758
self._transport.put_bytes(
2759
'revision-history', '\n'.join(history),
2760
mode=self.bzrdir._get_file_mode())
2762
def _gen_revision_history(self):
2763
history = self._transport.get_bytes('revision-history').split('\n')
2764
if history[-1:] == ['']:
2765
# There shouldn't be a trailing newline, but just in case.
2769
def _synchronize_history(self, destination, revision_id):
2770
if not isinstance(destination, FullHistoryBzrBranch):
2771
super(BzrBranch, self)._synchronize_history(
2772
destination, revision_id)
2774
if revision_id == _mod_revision.NULL_REVISION:
2777
new_history = self.revision_history()
2778
if revision_id is not None and new_history != []:
2780
new_history = new_history[:new_history.index(revision_id) + 1]
2782
rev = self.repository.get_revision(revision_id)
2783
new_history = rev.get_history(self.repository)[1:]
2784
destination._set_revision_history(new_history)
2787
def generate_revision_history(self, revision_id, last_rev=None,
2789
"""Create a new revision history that will finish with revision_id.
2791
:param revision_id: the new tip to use.
2792
:param last_rev: The previous last_revision. If not None, then this
2793
must be a ancestory of revision_id, or DivergedBranches is raised.
2794
:param other_branch: The other branch that DivergedBranches should
2795
raise with respect to.
2797
self._set_revision_history(self._lefthand_history(revision_id,
2798
last_rev, other_branch))
2801
class BzrBranch5(FullHistoryBzrBranch):
2802
"""A format 5 branch. This supports new features over plain branches.
2804
It has support for a master_branch which is the data for bound branches.
2808
class BzrBranch8(BzrBranch):
2646
2809
"""A branch that stores tree-reference locations."""
2648
2811
def _open_hook(self):
2674
2837
self._last_revision_info_cache = None
2675
2838
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
2840
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2841
current_revid = self.last_revision()
2842
last_revision = _mod_revision.ensure_null(current_revid)
2724
2843
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)
2845
graph = self.repository.get_graph()
2846
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2847
if lh_ancestor == current_revid:
2849
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2851
def _gen_revision_history(self):
2730
2852
"""Generate the revision history from last revision
3182
3272
raise NotImplementedError(self.push)
3275
def copy_content_into(self, revision_id=None):
3276
"""Copy the content of source into target
3278
revision_id: if not None, the revision history in the new branch will
3279
be truncated to end with revision_id.
3281
raise NotImplementedError(self.copy_content_into)
3284
def fetch(self, stop_revision=None, limit=None):
3287
:param stop_revision: Last revision to fetch
3288
:param limit: Optional rough limit of revisions to fetch
3290
raise NotImplementedError(self.fetch)
3185
3293
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()."""
3294
"""InterBranch implementation that uses public Branch functions."""
3297
def is_compatible(klass, source, target):
3298
# GenericBranch uses the public API, so always compatible
3302
def _get_branch_formats_to_test(klass):
3303
return [(format_registry.get_default(), format_registry.get_default())]
3306
def unwrap_format(klass, format):
3307
if isinstance(format, remote.RemoteBranchFormat):
3308
format._ensure_real()
3309
return format._custom_format
3313
def copy_content_into(self, revision_id=None):
3314
"""Copy the content of source into target
3316
revision_id: if not None, the revision history in the new branch will
3317
be truncated to end with revision_id.
3319
self.source.update_references(self.target)
3320
self.source._synchronize_history(self.target, revision_id)
3322
parent = self.source.get_parent()
3323
except errors.InaccessibleParent, e:
3324
mutter('parent was not accessible to copy: %s', e)
3327
self.target.set_parent(parent)
3328
if self.source._push_should_merge_tags():
3329
self.source.tags.merge_to(self.target.tags)
3332
def fetch(self, stop_revision=None, limit=None):
3333
if self.target.base == self.source.base:
3196
3335
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)
3337
fetch_spec_factory = fetch.FetchSpecFactory()
3338
fetch_spec_factory.source_branch = self.source
3339
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3340
fetch_spec_factory.source_repo = self.source.repository
3341
fetch_spec_factory.target_repo = self.target.repository
3342
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3343
fetch_spec_factory.limit = limit
3344
fetch_spec = fetch_spec_factory.make_fetch_spec()
3345
return self.target.repository.fetch(self.source.repository,
3346
fetch_spec=fetch_spec)
3234
3348
self.source.unlock()
3351
def _update_revisions(self, stop_revision=None, overwrite=False,
3353
other_revno, other_last_revision = self.source.last_revision_info()
3354
stop_revno = None # unknown
3355
if stop_revision is None:
3356
stop_revision = other_last_revision
3357
if _mod_revision.is_null(stop_revision):
3358
# if there are no commits, we're done.
3360
stop_revno = other_revno
3362
# what's the current last revision, before we fetch [and change it
3364
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3365
# we fetch here so that we don't process data twice in the common
3366
# case of having something to pull, and so that the check for
3367
# already merged can operate on the just fetched graph, which will
3368
# be cached in memory.
3369
self.fetch(stop_revision=stop_revision)
3370
# Check to see if one is an ancestor of the other
3373
graph = self.target.repository.get_graph()
3374
if self.target._check_if_descendant_or_diverged(
3375
stop_revision, last_rev, graph, self.source):
3376
# stop_revision is a descendant of last_rev, but we aren't
3377
# overwriting, so we're done.
3379
if stop_revno is None:
3381
graph = self.target.repository.get_graph()
3382
this_revno, this_last_revision = \
3383
self.target.last_revision_info()
3384
stop_revno = graph.find_distance_to_null(stop_revision,
3385
[(other_last_revision, other_revno),
3386
(this_last_revision, this_revno)])
3387
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3390
def pull(self, overwrite=False, stop_revision=None,
3391
possible_transports=None, run_hooks=True,
3392
_override_hook_target=None, local=False):
3393
"""Pull from source into self, updating my master if any.
3395
:param run_hooks: Private parameter - if false, this branch
3396
is being called because it's the master of the primary branch,
3397
so it should not run its hooks.
3399
bound_location = self.target.get_bound_location()
3400
if local and not bound_location:
3401
raise errors.LocalRequiresBoundBranch()
3402
master_branch = None
3403
source_is_master = False
3405
# bound_location comes from a config file, some care has to be
3406
# taken to relate it to source.user_url
3407
normalized = urlutils.normalize_url(bound_location)
3409
relpath = self.source.user_transport.relpath(normalized)
3410
source_is_master = (relpath == '')
3411
except (errors.PathNotChild, errors.InvalidURL):
3412
source_is_master = False
3413
if not local and bound_location and not source_is_master:
3414
# not pulling from master, so we need to update master.
3415
master_branch = self.target.get_master_branch(possible_transports)
3416
master_branch.lock_write()
3419
# pull from source into master.
3420
master_branch.pull(self.source, overwrite, stop_revision,
3422
return self._pull(overwrite,
3423
stop_revision, _hook_master=master_branch,
3424
run_hooks=run_hooks,
3425
_override_hook_target=_override_hook_target,
3426
merge_tags_to_master=not source_is_master)
3429
master_branch.unlock()
3431
def push(self, overwrite=False, stop_revision=None, lossy=False,
3432
_override_hook_source_branch=None):
3433
"""See InterBranch.push.
3435
This is the basic concrete implementation of push()
3437
:param _override_hook_source_branch: If specified, run the hooks
3438
passing this Branch as the source, rather than self. This is for
3439
use of RemoteBranch, where push is delegated to the underlying
3443
raise errors.LossyPushToSameVCS(self.source, self.target)
3444
# TODO: Public option to disable running hooks - should be trivial but
3447
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3448
op.add_cleanup(self.source.lock_read().unlock)
3449
op.add_cleanup(self.target.lock_write().unlock)
3450
return op.run(overwrite, stop_revision,
3451
_override_hook_source_branch=_override_hook_source_branch)
3453
def _basic_push(self, overwrite, stop_revision):
3454
"""Basic implementation of push without bound branches or hooks.
3456
Must be called with source read locked and target write locked.
3458
result = BranchPushResult()
3459
result.source_branch = self.source
3460
result.target_branch = self.target
3461
result.old_revno, result.old_revid = self.target.last_revision_info()
3462
self.source.update_references(self.target)
3463
if result.old_revid != stop_revision:
3464
# We assume that during 'push' this repository is closer than
3466
graph = self.source.repository.get_graph(self.target.repository)
3467
self._update_revisions(stop_revision, overwrite=overwrite,
3469
if self.source._push_should_merge_tags():
3470
result.tag_updates, result.tag_conflicts = (
3471
self.source.tags.merge_to(self.target.tags, overwrite))
3472
result.new_revno, result.new_revid = self.target.last_revision_info()
3475
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3476
_override_hook_source_branch=None):
3477
"""Push from source into target, and into target's master if any.
3480
if _override_hook_source_branch:
3481
result.source_branch = _override_hook_source_branch
3482
for hook in Branch.hooks['post_push']:
3485
bound_location = self.target.get_bound_location()
3486
if bound_location and self.target.base != bound_location:
3487
# there is a master branch.
3489
# XXX: Why the second check? Is it even supported for a branch to
3490
# be bound to itself? -- mbp 20070507
3491
master_branch = self.target.get_master_branch()
3492
master_branch.lock_write()
3493
operation.add_cleanup(master_branch.unlock)
3494
# push into the master from the source branch.
3495
master_inter = InterBranch.get(self.source, master_branch)
3496
master_inter._basic_push(overwrite, stop_revision)
3497
# and push into the target branch from the source. Note that
3498
# we push from the source branch again, because it's considered
3499
# the highest bandwidth repository.
3500
result = self._basic_push(overwrite, stop_revision)
3501
result.master_branch = master_branch
3502
result.local_branch = self.target
3504
master_branch = None
3506
result = self._basic_push(overwrite, stop_revision)
3507
# TODO: Why set master_branch and local_branch if there's no
3508
# binding? Maybe cleaner to just leave them unset? -- mbp
3510
result.master_branch = self.target
3511
result.local_branch = None
3515
def _pull(self, overwrite=False, stop_revision=None,
3237
3516
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3517
_override_hook_target=None, local=False,
3518
merge_tags_to_master=True):
3239
3519
"""See Branch.pull.
3521
This function is the core worker, used by GenericInterBranch.pull to
3522
avoid duplication when pulling source->master and source->local.
3241
3524
:param _hook_master: Private parameter - set the branch to
3242
3525
be supplied as the master to pull hooks.
3243
3526
:param run_hooks: Private parameter - if false, this branch
3244
3527
is being called because it's the master of the primary branch,
3245
3528
so it should not run its hooks.
3529
is being called because it's the master of the primary branch,
3530
so it should not run its hooks.
3246
3531
:param _override_hook_target: Private parameter - set the branch to be
3247
3532
supplied as the target_branch to pull hooks.
3248
3533
:param local: Only update the local branch, and not the bound branch.
3288
3574
self.source.unlock()
3291
def push(self, overwrite=False, stop_revision=None,
3292
_override_hook_source_branch=None):
3293
"""See InterBranch.push.
3295
This is the basic concrete implementation of push()
3297
:param _override_hook_source_branch: If specified, run
3298
the hooks passing this Branch as the source, rather than self.
3299
This is for use of RemoteBranch, where push is delegated to the
3300
underlying vfs-based Branch.
3302
# TODO: Public option to disable running hooks - should be trivial but
3304
self.source.lock_read()
3306
return _run_with_write_locked_target(
3307
self.target, self._push_with_bound_branches, overwrite,
3309
_override_hook_source_branch=_override_hook_source_branch)
3311
self.source.unlock()
3313
def _push_with_bound_branches(self, overwrite, stop_revision,
3314
_override_hook_source_branch=None):
3315
"""Push from source into target, and into target's master if any.
3318
if _override_hook_source_branch:
3319
result.source_branch = _override_hook_source_branch
3320
for hook in Branch.hooks['post_push']:
3323
bound_location = self.target.get_bound_location()
3324
if bound_location and self.target.base != bound_location:
3325
# there is a master branch.
3327
# XXX: Why the second check? Is it even supported for a branch to
3328
# be bound to itself? -- mbp 20070507
3329
master_branch = self.target.get_master_branch()
3330
master_branch.lock_write()
3332
# push into the master from the source branch.
3333
self.source._basic_push(master_branch, overwrite, stop_revision)
3334
# and push into the target branch from the source. Note that we
3335
# push from the source branch again, because its considered the
3336
# highest bandwidth repository.
3337
result = self.source._basic_push(self.target, overwrite,
3339
result.master_branch = master_branch
3340
result.local_branch = self.target
3344
master_branch.unlock()
3347
result = self.source._basic_push(self.target, overwrite,
3349
# TODO: Why set master_branch and local_branch if there's no
3350
# binding? Maybe cleaner to just leave them unset? -- mbp
3352
result.master_branch = self.target
3353
result.local_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.
3374
:param run_hooks: Private parameter - if false, this branch
3375
is being called because it's the master of the primary branch,
3376
so it should not run its hooks.
3378
bound_location = self.target.get_bound_location()
3379
if local and not bound_location:
3380
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()
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)
3397
master_branch.unlock()
3400
3578
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
