782
878
old_repository = self.repository
783
879
if len(old_repository._fallback_repositories) != 1:
784
880
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
881
"of %r (fallbacks: %r)" % (old_repository,
882
old_repository._fallback_repositories))
883
# Open the new repository object.
884
# Repositories don't offer an interface to remove fallback
885
# repositories today; take the conceptually simpler option and just
886
# reopen it. We reopen it starting from the URL so that we
887
# get a separate connection for RemoteRepositories and can
888
# stream from one of them to the other. This does mean doing
889
# separate SSH connection setup, but unstacking is not a
890
# common operation so it's tolerable.
891
new_bzrdir = controldir.ControlDir.open(
892
self.bzrdir.root_transport.base)
893
new_repository = new_bzrdir.find_repository()
894
if new_repository._fallback_repositories:
895
raise AssertionError("didn't expect %r to have "
896
"fallback_repositories"
897
% (self.repository,))
898
# Replace self.repository with the new repository.
899
# Do our best to transfer the lock state (i.e. lock-tokens and
900
# lock count) of self.repository to the new repository.
901
lock_token = old_repository.lock_write().repository_token
902
self.repository = new_repository
903
if isinstance(self, remote.RemoteBranch):
904
# Remote branches can have a second reference to the old
905
# repository that need to be replaced.
906
if self._real_branch is not None:
907
self._real_branch.repository = new_repository
908
self.repository.lock_write(token=lock_token)
909
if lock_token is not None:
910
old_repository.leave_lock_in_place()
787
911
old_repository.unlock()
912
if lock_token is not None:
913
# XXX: self.repository.leave_lock_in_place() before this
914
# function will not be preserved. Fortunately that doesn't
915
# affect the current default format (2a), and would be a
916
# corner-case anyway.
917
# - Andrew Bennetts, 2010/06/30
918
self.repository.dont_leave_lock_in_place()
922
old_repository.unlock()
923
except errors.LockNotHeld:
926
if old_lock_count == 0:
927
raise AssertionError(
928
'old_repository should have been locked at least once.')
929
for i in range(old_lock_count-1):
930
self.repository.lock_write()
931
# Fetch from the old repository into the new.
788
932
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
934
# XXX: If you unstack a branch while it has a working tree
809
935
# with a pending merge, the pending-merged revisions will no
810
936
# 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(),
938
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
939
except errors.TagsNotSupported:
940
tags_to_fetch = set()
941
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
942
old_repository, required_ids=[self.last_revision()],
943
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
944
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
946
old_repository.unlock()
917
1055
:return: A tuple (revno, revision_id).
919
1057
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1058
self._last_revision_info_cache = self._read_last_revision_info()
921
1059
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,
1061
def _read_last_revision_info(self):
1062
raise NotImplementedError(self._read_last_revision_info)
1064
@deprecated_method(deprecated_in((2, 4, 0)))
970
1065
def import_last_revision_info(self, source_repo, revno, revid):
971
1066
"""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
1068
:param source_repo: Source repository to optionally fetch from
977
1069
:param revno: Revision number of the new tip
978
1070
:param revid: Revision id of the new tip
1505
1607
return not (self == other)
1508
def find_format(klass, a_bzrdir, name=None):
1509
"""Return the format for the branch object in a_bzrdir."""
1511
transport = a_bzrdir.get_branch_transport(None, name=name)
1610
def find_format(klass, controldir, name=None):
1611
"""Return the format for the branch object in controldir."""
1613
transport = controldir.get_branch_transport(None, name=name)
1614
except errors.NoSuchFile:
1615
raise errors.NotBranchError(path=name, bzrdir=controldir)
1512
1617
format_string = transport.get_bytes("format")
1513
return klass._formats[format_string]
1618
return format_registry.get(format_string)
1514
1619
except errors.NoSuchFile:
1515
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1620
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1516
1621
except KeyError:
1517
1622
raise errors.UnknownFormatError(format=format_string, kind='branch')
1625
@deprecated_method(deprecated_in((2, 4, 0)))
1520
1626
def get_default_format(klass):
1521
1627
"""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.
1628
return format_registry.get_default()
1631
@deprecated_method(deprecated_in((2, 4, 0)))
1632
def get_formats(klass):
1633
"""Get all the known formats.
1635
Warning: This triggers a load of all lazy registered formats: do not
1636
use except when that is desireed.
1638
return format_registry._get_all()
1640
def get_reference(self, controldir, name=None):
1641
"""Get the target reference of the branch in controldir.
1527
1643
format probing must have been completed before calling
1528
1644
this method - it is assumed that the format of the branch
1529
in a_bzrdir is correct.
1645
in controldir is correct.
1531
:param a_bzrdir: The bzrdir to get the branch data from.
1647
:param controldir: The controldir to get the branch data from.
1648
:param name: Name of the colocated branch to fetch
1532
1649
: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.
1654
def set_reference(self, controldir, name, to_branch):
1655
"""Set the target reference of the branch in controldir.
1540
1657
format probing must have been completed before calling
1541
1658
this method - it is assumed that the format of the branch
1542
in a_bzrdir is correct.
1659
in controldir is correct.
1544
:param a_bzrdir: The bzrdir to set the branch reference for.
1661
:param controldir: The controldir to set the branch reference for.
1662
:param name: Name of colocated branch to set, None for default
1545
1663
:param to_branch: branch that the checkout is to reference
1547
1665
raise NotImplementedError(self.set_reference)
1554
1672
"""Return the short format description for this format."""
1555
1673
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1675
def _run_post_branch_init_hooks(self, controldir, name, branch):
1558
1676
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1679
params = BranchInitHookParams(self, controldir, name, branch)
1562
1680
for hook in hooks:
1565
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1566
lock_type='metadir', set_format=True):
1567
"""Initialize a branch in a bzrdir, with specified files
1569
:param a_bzrdir: The bzrdir to initialize the branch in
1570
:param utf8_files: The files to create as a list of
1571
(filename, content) tuples
1572
:param name: Name of colocated branch to create, if any
1573
:param set_format: If True, set the format with
1574
self.get_format_string. (BzrBranch4 has its format set
1576
:return: a branch in this format
1578
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1579
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1581
'metadir': ('lock', lockdir.LockDir),
1582
'branch4': ('branch-lock', lockable_files.TransportLock),
1584
lock_name, lock_class = lock_map[lock_type]
1585
control_files = lockable_files.LockableFiles(branch_transport,
1586
lock_name, lock_class)
1587
control_files.create_lock()
1589
control_files.lock_write()
1590
except errors.LockContention:
1591
if lock_type != 'branch4':
1597
utf8_files += [('format', self.get_format_string())]
1599
for (filename, content) in utf8_files:
1600
branch_transport.put_bytes(
1602
mode=a_bzrdir._get_file_mode())
1605
control_files.unlock()
1606
branch = self.open(a_bzrdir, name, _found=True)
1607
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1610
def initialize(self, a_bzrdir, name=None):
1611
"""Create a branch of this format in a_bzrdir.
1683
def initialize(self, controldir, name=None, repository=None,
1684
append_revisions_only=None):
1685
"""Create a branch of this format in controldir.
1613
1687
:param name: Name of the colocated branch to create.
1615
1689
raise NotImplementedError(self.initialize)
1731
1850
"basis revision. hooks MUST NOT modify this delta. "
1732
1851
" future_tree is an in-memory tree obtained from "
1733
1852
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1854
self.add_hook('post_commit',
1736
1855
"Called in the bzr client after a commit has completed. "
1737
1856
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1857
"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',
1858
"commit to a branch.", (0, 15))
1859
self.add_hook('post_uncommit',
1741
1860
"Called in the bzr client after an uncommit completes. "
1742
1861
"post_uncommit is called with (local, master, old_revno, "
1743
1862
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1863
"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',
1864
"receives new_revno of 0, new_revid of None.", (0, 15))
1865
self.add_hook('pre_change_branch_tip',
1747
1866
"Called in bzr client and server before a change to the tip of a "
1748
1867
"branch is made. pre_change_branch_tip is called with a "
1749
1868
"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',
1869
"commit, uncommit will all trigger this hook.", (1, 6))
1870
self.add_hook('post_change_branch_tip',
1752
1871
"Called in bzr client and server after a change to the tip of a "
1753
1872
"branch is made. post_change_branch_tip is called with a "
1754
1873
"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',
1874
"commit, uncommit will all trigger this hook.", (1, 4))
1875
self.add_hook('transform_fallback_location',
1757
1876
"Called when a stacked branch is activating its fallback "
1758
1877
"locations. transform_fallback_location is called with (branch, "
1759
1878
"url), and should return a new url. Returning the same url "
2387
2560
"""See Branch.print_file."""
2388
2561
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
2563
@needs_write_lock
2454
2564
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
2565
if not revision_id or not isinstance(revision_id, basestring):
2566
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2567
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))
2568
old_revno, old_revid = self.last_revision_info()
2569
if self.get_append_revisions_only():
2570
self._check_history_violation(revision_id)
2571
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2572
self._write_last_revision_info(revno, revision_id)
2573
self._clear_cached_state()
2574
self._last_revision_info_cache = revno, revision_id
2575
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2577
def basis_tree(self):
2496
2578
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2699
def _read_last_revision_info(self):
2700
revision_string = self._transport.get_bytes('last-revision')
2701
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2702
revision_id = cache_utf8.get_cached_utf8(revision_id)
2704
return revno, revision_id
2706
def _write_last_revision_info(self, revno, revision_id):
2707
"""Simply write out the revision id, with no checks.
2709
Use set_last_revision_info to perform this safely.
2711
Does not update the revision_history cache.
2713
revision_id = _mod_revision.ensure_null(revision_id)
2714
out_string = '%d %s\n' % (revno, revision_id)
2715
self._transport.put_bytes('last-revision', out_string,
2716
mode=self.bzrdir._get_file_mode())
2719
class FullHistoryBzrBranch(BzrBranch):
2720
"""Bzr branch which contains the full revision history."""
2723
def set_last_revision_info(self, revno, revision_id):
2724
if not revision_id or not isinstance(revision_id, basestring):
2725
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2726
revision_id = _mod_revision.ensure_null(revision_id)
2727
# this old format stores the full history, but this api doesn't
2728
# provide it, so we must generate, and might as well check it's
2730
history = self._lefthand_history(revision_id)
2731
if len(history) != revno:
2732
raise AssertionError('%d != %d' % (len(history), revno))
2733
self._set_revision_history(history)
2735
def _read_last_revision_info(self):
2736
rh = self._revision_history()
2739
return (revno, rh[-1])
2741
return (0, _mod_revision.NULL_REVISION)
2743
@deprecated_method(deprecated_in((2, 4, 0)))
2745
def set_revision_history(self, rev_history):
2746
"""See Branch.set_revision_history."""
2747
self._set_revision_history(rev_history)
2749
def _set_revision_history(self, rev_history):
2750
if 'evil' in debug.debug_flags:
2751
mutter_callsite(3, "set_revision_history scales with history.")
2752
check_not_reserved_id = _mod_revision.check_not_reserved_id
2753
for rev_id in rev_history:
2754
check_not_reserved_id(rev_id)
2755
if Branch.hooks['post_change_branch_tip']:
2756
# Don't calculate the last_revision_info() if there are no hooks
2758
old_revno, old_revid = self.last_revision_info()
2759
if len(rev_history) == 0:
2760
revid = _mod_revision.NULL_REVISION
2762
revid = rev_history[-1]
2763
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2764
self._write_revision_history(rev_history)
2765
self._clear_cached_state()
2766
self._cache_revision_history(rev_history)
2767
for hook in Branch.hooks['set_rh']:
2768
hook(self, rev_history)
2769
if Branch.hooks['post_change_branch_tip']:
2770
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2772
def _write_revision_history(self, history):
2773
"""Factored out of set_revision_history.
2775
This performs the actual writing to disk.
2776
It is intended to be called by set_revision_history."""
2777
self._transport.put_bytes(
2778
'revision-history', '\n'.join(history),
2779
mode=self.bzrdir._get_file_mode())
2781
def _gen_revision_history(self):
2782
history = self._transport.get_bytes('revision-history').split('\n')
2783
if history[-1:] == ['']:
2784
# There shouldn't be a trailing newline, but just in case.
2788
def _synchronize_history(self, destination, revision_id):
2789
if not isinstance(destination, FullHistoryBzrBranch):
2790
super(BzrBranch, self)._synchronize_history(
2791
destination, revision_id)
2793
if revision_id == _mod_revision.NULL_REVISION:
2796
new_history = self._revision_history()
2797
if revision_id is not None and new_history != []:
2799
new_history = new_history[:new_history.index(revision_id) + 1]
2801
rev = self.repository.get_revision(revision_id)
2802
new_history = rev.get_history(self.repository)[1:]
2803
destination._set_revision_history(new_history)
2806
def generate_revision_history(self, revision_id, last_rev=None,
2808
"""Create a new revision history that will finish with revision_id.
2810
:param revision_id: the new tip to use.
2811
:param last_rev: The previous last_revision. If not None, then this
2812
must be a ancestory of revision_id, or DivergedBranches is raised.
2813
:param other_branch: The other branch that DivergedBranches should
2814
raise with respect to.
2816
self._set_revision_history(self._lefthand_history(revision_id,
2817
last_rev, other_branch))
2820
class BzrBranch5(FullHistoryBzrBranch):
2821
"""A format 5 branch. This supports new features over plain branches.
2823
It has support for a master_branch which is the data for bound branches.
2827
class BzrBranch8(BzrBranch):
2646
2828
"""A branch that stores tree-reference locations."""
2648
def _open_hook(self):
2830
def _open_hook(self, possible_transports=None):
2649
2831
if self._ignore_fallbacks:
2833
if possible_transports is None:
2834
possible_transports = [self.bzrdir.root_transport]
2652
2836
url = self.get_stacked_on_url()
2653
2837
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2674
2859
self._last_revision_info_cache = None
2675
2860
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
2862
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2863
current_revid = self.last_revision()
2864
last_revision = _mod_revision.ensure_null(current_revid)
2724
2865
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)
2867
graph = self.repository.get_graph()
2868
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2869
if lh_ancestor == current_revid:
2871
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2873
def _gen_revision_history(self):
2730
2874
"""Generate the revision history from last revision
3182
3296
raise NotImplementedError(self.push)
3299
def copy_content_into(self, revision_id=None):
3300
"""Copy the content of source into target
3302
revision_id: if not None, the revision history in the new branch will
3303
be truncated to end with revision_id.
3305
raise NotImplementedError(self.copy_content_into)
3308
def fetch(self, stop_revision=None, limit=None):
3311
:param stop_revision: Last revision to fetch
3312
:param limit: Optional rough limit of revisions to fetch
3314
raise NotImplementedError(self.fetch)
3185
3317
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()."""
3318
"""InterBranch implementation that uses public Branch functions."""
3321
def is_compatible(klass, source, target):
3322
# GenericBranch uses the public API, so always compatible
3326
def _get_branch_formats_to_test(klass):
3327
return [(format_registry.get_default(), format_registry.get_default())]
3330
def unwrap_format(klass, format):
3331
if isinstance(format, remote.RemoteBranchFormat):
3332
format._ensure_real()
3333
return format._custom_format
3337
def copy_content_into(self, revision_id=None):
3338
"""Copy the content of source into target
3340
revision_id: if not None, the revision history in the new branch will
3341
be truncated to end with revision_id.
3343
self.source.update_references(self.target)
3344
self.source._synchronize_history(self.target, revision_id)
3346
parent = self.source.get_parent()
3347
except errors.InaccessibleParent, e:
3348
mutter('parent was not accessible to copy: %s', e)
3351
self.target.set_parent(parent)
3352
if self.source._push_should_merge_tags():
3353
self.source.tags.merge_to(self.target.tags)
3356
def fetch(self, stop_revision=None, limit=None):
3357
if self.target.base == self.source.base:
3196
3359
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)
3361
fetch_spec_factory = fetch.FetchSpecFactory()
3362
fetch_spec_factory.source_branch = self.source
3363
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3364
fetch_spec_factory.source_repo = self.source.repository
3365
fetch_spec_factory.target_repo = self.target.repository
3366
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3367
fetch_spec_factory.limit = limit
3368
fetch_spec = fetch_spec_factory.make_fetch_spec()
3369
return self.target.repository.fetch(self.source.repository,
3370
fetch_spec=fetch_spec)
3234
3372
self.source.unlock()
3375
def _update_revisions(self, stop_revision=None, overwrite=False,
3377
other_revno, other_last_revision = self.source.last_revision_info()
3378
stop_revno = None # unknown
3379
if stop_revision is None:
3380
stop_revision = other_last_revision
3381
if _mod_revision.is_null(stop_revision):
3382
# if there are no commits, we're done.
3384
stop_revno = other_revno
3386
# what's the current last revision, before we fetch [and change it
3388
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3389
# we fetch here so that we don't process data twice in the common
3390
# case of having something to pull, and so that the check for
3391
# already merged can operate on the just fetched graph, which will
3392
# be cached in memory.
3393
self.fetch(stop_revision=stop_revision)
3394
# Check to see if one is an ancestor of the other
3397
graph = self.target.repository.get_graph()
3398
if self.target._check_if_descendant_or_diverged(
3399
stop_revision, last_rev, graph, self.source):
3400
# stop_revision is a descendant of last_rev, but we aren't
3401
# overwriting, so we're done.
3403
if stop_revno is None:
3405
graph = self.target.repository.get_graph()
3406
this_revno, this_last_revision = \
3407
self.target.last_revision_info()
3408
stop_revno = graph.find_distance_to_null(stop_revision,
3409
[(other_last_revision, other_revno),
3410
(this_last_revision, this_revno)])
3411
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3414
def pull(self, overwrite=False, stop_revision=None,
3415
possible_transports=None, run_hooks=True,
3416
_override_hook_target=None, local=False):
3417
"""Pull from source into self, updating my master if any.
3419
:param run_hooks: Private parameter - if false, this branch
3420
is being called because it's the master of the primary branch,
3421
so it should not run its hooks.
3423
bound_location = self.target.get_bound_location()
3424
if local and not bound_location:
3425
raise errors.LocalRequiresBoundBranch()
3426
master_branch = None
3427
source_is_master = False
3429
# bound_location comes from a config file, some care has to be
3430
# taken to relate it to source.user_url
3431
normalized = urlutils.normalize_url(bound_location)
3433
relpath = self.source.user_transport.relpath(normalized)
3434
source_is_master = (relpath == '')
3435
except (errors.PathNotChild, errors.InvalidURL):
3436
source_is_master = False
3437
if not local and bound_location and not source_is_master:
3438
# not pulling from master, so we need to update master.
3439
master_branch = self.target.get_master_branch(possible_transports)
3440
master_branch.lock_write()
3443
# pull from source into master.
3444
master_branch.pull(self.source, overwrite, stop_revision,
3446
return self._pull(overwrite,
3447
stop_revision, _hook_master=master_branch,
3448
run_hooks=run_hooks,
3449
_override_hook_target=_override_hook_target,
3450
merge_tags_to_master=not source_is_master)
3453
master_branch.unlock()
3455
def push(self, overwrite=False, stop_revision=None, lossy=False,
3456
_override_hook_source_branch=None):
3457
"""See InterBranch.push.
3459
This is the basic concrete implementation of push()
3461
:param _override_hook_source_branch: If specified, run the hooks
3462
passing this Branch as the source, rather than self. This is for
3463
use of RemoteBranch, where push is delegated to the underlying
3467
raise errors.LossyPushToSameVCS(self.source, self.target)
3468
# TODO: Public option to disable running hooks - should be trivial but
3471
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3472
op.add_cleanup(self.source.lock_read().unlock)
3473
op.add_cleanup(self.target.lock_write().unlock)
3474
return op.run(overwrite, stop_revision,
3475
_override_hook_source_branch=_override_hook_source_branch)
3477
def _basic_push(self, overwrite, stop_revision):
3478
"""Basic implementation of push without bound branches or hooks.
3480
Must be called with source read locked and target write locked.
3482
result = BranchPushResult()
3483
result.source_branch = self.source
3484
result.target_branch = self.target
3485
result.old_revno, result.old_revid = self.target.last_revision_info()
3486
self.source.update_references(self.target)
3487
if result.old_revid != stop_revision:
3488
# We assume that during 'push' this repository is closer than
3490
graph = self.source.repository.get_graph(self.target.repository)
3491
self._update_revisions(stop_revision, overwrite=overwrite,
3493
if self.source._push_should_merge_tags():
3494
result.tag_updates, result.tag_conflicts = (
3495
self.source.tags.merge_to(self.target.tags, overwrite))
3496
result.new_revno, result.new_revid = self.target.last_revision_info()
3499
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3500
_override_hook_source_branch=None):
3501
"""Push from source into target, and into target's master if any.
3504
if _override_hook_source_branch:
3505
result.source_branch = _override_hook_source_branch
3506
for hook in Branch.hooks['post_push']:
3509
bound_location = self.target.get_bound_location()
3510
if bound_location and self.target.base != bound_location:
3511
# there is a master branch.
3513
# XXX: Why the second check? Is it even supported for a branch to
3514
# be bound to itself? -- mbp 20070507
3515
master_branch = self.target.get_master_branch()
3516
master_branch.lock_write()
3517
operation.add_cleanup(master_branch.unlock)
3518
# push into the master from the source branch.
3519
master_inter = InterBranch.get(self.source, master_branch)
3520
master_inter._basic_push(overwrite, stop_revision)
3521
# and push into the target branch from the source. Note that
3522
# we push from the source branch again, because it's considered
3523
# the highest bandwidth repository.
3524
result = self._basic_push(overwrite, stop_revision)
3525
result.master_branch = master_branch
3526
result.local_branch = self.target
3528
master_branch = None
3530
result = self._basic_push(overwrite, stop_revision)
3531
# TODO: Why set master_branch and local_branch if there's no
3532
# binding? Maybe cleaner to just leave them unset? -- mbp
3534
result.master_branch = self.target
3535
result.local_branch = None
3539
def _pull(self, overwrite=False, stop_revision=None,
3237
3540
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3541
_override_hook_target=None, local=False,
3542
merge_tags_to_master=True):
3239
3543
"""See Branch.pull.
3545
This function is the core worker, used by GenericInterBranch.pull to
3546
avoid duplication when pulling source->master and source->local.
3241
3548
:param _hook_master: Private parameter - set the branch to
3242
3549
be supplied as the master to pull hooks.
3243
3550
:param run_hooks: Private parameter - if false, this branch
3244
3551
is being called because it's the master of the primary branch,
3245
3552
so it should not run its hooks.
3553
is being called because it's the master of the primary branch,
3554
so it should not run its hooks.
3246
3555
:param _override_hook_target: Private parameter - set the branch to be
3247
3556
supplied as the target_branch to pull hooks.
3248
3557
:param local: Only update the local branch, and not the bound branch.
3288
3598
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
3602
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
