782
877
old_repository = self.repository
783
878
if len(old_repository._fallback_repositories) != 1:
784
879
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
880
"of %r (fallbacks: %r)" % (old_repository,
881
old_repository._fallback_repositories))
882
# Open the new repository object.
883
# Repositories don't offer an interface to remove fallback
884
# repositories today; take the conceptually simpler option and just
885
# reopen it. We reopen it starting from the URL so that we
886
# get a separate connection for RemoteRepositories and can
887
# stream from one of them to the other. This does mean doing
888
# separate SSH connection setup, but unstacking is not a
889
# common operation so it's tolerable.
890
new_bzrdir = controldir.ControlDir.open(
891
self.bzrdir.root_transport.base)
892
new_repository = new_bzrdir.find_repository()
893
if new_repository._fallback_repositories:
894
raise AssertionError("didn't expect %r to have "
895
"fallback_repositories"
896
% (self.repository,))
897
# Replace self.repository with the new repository.
898
# Do our best to transfer the lock state (i.e. lock-tokens and
899
# lock count) of self.repository to the new repository.
900
lock_token = old_repository.lock_write().repository_token
901
self.repository = new_repository
902
if isinstance(self, remote.RemoteBranch):
903
# Remote branches can have a second reference to the old
904
# repository that need to be replaced.
905
if self._real_branch is not None:
906
self._real_branch.repository = new_repository
907
self.repository.lock_write(token=lock_token)
908
if lock_token is not None:
909
old_repository.leave_lock_in_place()
787
910
old_repository.unlock()
911
if lock_token is not None:
912
# XXX: self.repository.leave_lock_in_place() before this
913
# function will not be preserved. Fortunately that doesn't
914
# affect the current default format (2a), and would be a
915
# corner-case anyway.
916
# - Andrew Bennetts, 2010/06/30
917
self.repository.dont_leave_lock_in_place()
921
old_repository.unlock()
922
except errors.LockNotHeld:
925
if old_lock_count == 0:
926
raise AssertionError(
927
'old_repository should have been locked at least once.')
928
for i in range(old_lock_count-1):
929
self.repository.lock_write()
930
# Fetch from the old repository into the new.
788
931
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
933
# XXX: If you unstack a branch while it has a working tree
809
934
# with a pending merge, the pending-merged revisions will no
810
935
# 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(),
937
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
938
except errors.TagsNotSupported:
939
tags_to_fetch = set()
940
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
941
old_repository, required_ids=[self.last_revision()],
942
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
943
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
945
old_repository.unlock()
917
1054
:return: A tuple (revno, revision_id).
919
1056
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1057
self._last_revision_info_cache = self._read_last_revision_info()
921
1058
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,
1060
def _read_last_revision_info(self):
1061
raise NotImplementedError(self._read_last_revision_info)
1063
@deprecated_method(deprecated_in((2, 4, 0)))
970
1064
def import_last_revision_info(self, source_repo, revno, revid):
971
1065
"""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
1067
:param source_repo: Source repository to optionally fetch from
977
1068
:param revno: Revision number of the new tip
978
1069
:param revid: Revision id of the new tip
1505
1606
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)
1609
def find_format(klass, controldir, name=None):
1610
"""Return the format for the branch object in controldir."""
1612
transport = controldir.get_branch_transport(None, name=name)
1613
except errors.NoSuchFile:
1614
raise errors.NotBranchError(path=name, bzrdir=controldir)
1512
1616
format_string = transport.get_bytes("format")
1513
return klass._formats[format_string]
1617
return format_registry.get(format_string)
1514
1618
except errors.NoSuchFile:
1515
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1619
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1516
1620
except KeyError:
1517
1621
raise errors.UnknownFormatError(format=format_string, kind='branch')
1624
@deprecated_method(deprecated_in((2, 4, 0)))
1520
1625
def get_default_format(klass):
1521
1626
"""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.
1627
return format_registry.get_default()
1630
@deprecated_method(deprecated_in((2, 4, 0)))
1631
def get_formats(klass):
1632
"""Get all the known formats.
1634
Warning: This triggers a load of all lazy registered formats: do not
1635
use except when that is desireed.
1637
return format_registry._get_all()
1639
def get_reference(self, controldir, name=None):
1640
"""Get the target reference of the branch in controldir.
1527
1642
format probing must have been completed before calling
1528
1643
this method - it is assumed that the format of the branch
1529
in a_bzrdir is correct.
1644
in controldir is correct.
1531
:param a_bzrdir: The bzrdir to get the branch data from.
1646
:param controldir: The controldir to get the branch data from.
1647
:param name: Name of the colocated branch to fetch
1532
1648
: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.
1653
def set_reference(self, controldir, name, to_branch):
1654
"""Set the target reference of the branch in controldir.
1540
1656
format probing must have been completed before calling
1541
1657
this method - it is assumed that the format of the branch
1542
in a_bzrdir is correct.
1658
in controldir is correct.
1544
:param a_bzrdir: The bzrdir to set the branch reference for.
1660
:param controldir: The controldir to set the branch reference for.
1661
:param name: Name of colocated branch to set, None for default
1545
1662
:param to_branch: branch that the checkout is to reference
1547
1664
raise NotImplementedError(self.set_reference)
1554
1671
"""Return the short format description for this format."""
1555
1672
raise NotImplementedError(self.get_format_description)
1557
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1674
def _run_post_branch_init_hooks(self, controldir, name, branch):
1558
1675
hooks = Branch.hooks['post_branch_init']
1561
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1678
params = BranchInitHookParams(self, controldir, name, branch)
1562
1679
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.
1682
def initialize(self, controldir, name=None, repository=None,
1683
append_revisions_only=None):
1684
"""Create a branch of this format in controldir.
1613
1686
:param name: Name of the colocated branch to create.
1615
1688
raise NotImplementedError(self.initialize)
1731
1849
"basis revision. hooks MUST NOT modify this delta. "
1732
1850
" future_tree is an in-memory tree obtained from "
1733
1851
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1853
self.add_hook('post_commit',
1736
1854
"Called in the bzr client after a commit has completed. "
1737
1855
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1856
"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',
1857
"commit to a branch.", (0, 15))
1858
self.add_hook('post_uncommit',
1741
1859
"Called in the bzr client after an uncommit completes. "
1742
1860
"post_uncommit is called with (local, master, old_revno, "
1743
1861
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1862
"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',
1863
"receives new_revno of 0, new_revid of None.", (0, 15))
1864
self.add_hook('pre_change_branch_tip',
1747
1865
"Called in bzr client and server before a change to the tip of a "
1748
1866
"branch is made. pre_change_branch_tip is called with a "
1749
1867
"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',
1868
"commit, uncommit will all trigger this hook.", (1, 6))
1869
self.add_hook('post_change_branch_tip',
1752
1870
"Called in bzr client and server after a change to the tip of a "
1753
1871
"branch is made. post_change_branch_tip is called with a "
1754
1872
"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',
1873
"commit, uncommit will all trigger this hook.", (1, 4))
1874
self.add_hook('transform_fallback_location',
1757
1875
"Called when a stacked branch is activating its fallback "
1758
1876
"locations. transform_fallback_location is called with (branch, "
1759
1877
"url), and should return a new url. Returning the same url "
2387
2559
"""See Branch.print_file."""
2388
2560
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
2562
@needs_write_lock
2454
2563
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
2564
if not revision_id or not isinstance(revision_id, basestring):
2565
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2566
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))
2567
old_revno, old_revid = self.last_revision_info()
2568
if self.get_append_revisions_only():
2569
self._check_history_violation(revision_id)
2570
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2571
self._write_last_revision_info(revno, revision_id)
2572
self._clear_cached_state()
2573
self._last_revision_info_cache = revno, revision_id
2574
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2576
def basis_tree(self):
2496
2577
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2698
def _read_last_revision_info(self):
2699
revision_string = self._transport.get_bytes('last-revision')
2700
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2701
revision_id = cache_utf8.get_cached_utf8(revision_id)
2703
return revno, revision_id
2705
def _write_last_revision_info(self, revno, revision_id):
2706
"""Simply write out the revision id, with no checks.
2708
Use set_last_revision_info to perform this safely.
2710
Does not update the revision_history cache.
2712
revision_id = _mod_revision.ensure_null(revision_id)
2713
out_string = '%d %s\n' % (revno, revision_id)
2714
self._transport.put_bytes('last-revision', out_string,
2715
mode=self.bzrdir._get_file_mode())
2718
class FullHistoryBzrBranch(BzrBranch):
2719
"""Bzr branch which contains the full revision history."""
2722
def set_last_revision_info(self, revno, revision_id):
2723
if not revision_id or not isinstance(revision_id, basestring):
2724
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2725
revision_id = _mod_revision.ensure_null(revision_id)
2726
# this old format stores the full history, but this api doesn't
2727
# provide it, so we must generate, and might as well check it's
2729
history = self._lefthand_history(revision_id)
2730
if len(history) != revno:
2731
raise AssertionError('%d != %d' % (len(history), revno))
2732
self._set_revision_history(history)
2734
def _read_last_revision_info(self):
2735
rh = self._revision_history()
2738
return (revno, rh[-1])
2740
return (0, _mod_revision.NULL_REVISION)
2742
@deprecated_method(deprecated_in((2, 4, 0)))
2744
def set_revision_history(self, rev_history):
2745
"""See Branch.set_revision_history."""
2746
self._set_revision_history(rev_history)
2748
def _set_revision_history(self, rev_history):
2749
if 'evil' in debug.debug_flags:
2750
mutter_callsite(3, "set_revision_history scales with history.")
2751
check_not_reserved_id = _mod_revision.check_not_reserved_id
2752
for rev_id in rev_history:
2753
check_not_reserved_id(rev_id)
2754
if Branch.hooks['post_change_branch_tip']:
2755
# Don't calculate the last_revision_info() if there are no hooks
2757
old_revno, old_revid = self.last_revision_info()
2758
if len(rev_history) == 0:
2759
revid = _mod_revision.NULL_REVISION
2761
revid = rev_history[-1]
2762
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2763
self._write_revision_history(rev_history)
2764
self._clear_cached_state()
2765
self._cache_revision_history(rev_history)
2766
for hook in Branch.hooks['set_rh']:
2767
hook(self, rev_history)
2768
if Branch.hooks['post_change_branch_tip']:
2769
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2771
def _write_revision_history(self, history):
2772
"""Factored out of set_revision_history.
2774
This performs the actual writing to disk.
2775
It is intended to be called by set_revision_history."""
2776
self._transport.put_bytes(
2777
'revision-history', '\n'.join(history),
2778
mode=self.bzrdir._get_file_mode())
2780
def _gen_revision_history(self):
2781
history = self._transport.get_bytes('revision-history').split('\n')
2782
if history[-1:] == ['']:
2783
# There shouldn't be a trailing newline, but just in case.
2787
def _synchronize_history(self, destination, revision_id):
2788
if not isinstance(destination, FullHistoryBzrBranch):
2789
super(BzrBranch, self)._synchronize_history(
2790
destination, revision_id)
2792
if revision_id == _mod_revision.NULL_REVISION:
2795
new_history = self._revision_history()
2796
if revision_id is not None and new_history != []:
2798
new_history = new_history[:new_history.index(revision_id) + 1]
2800
rev = self.repository.get_revision(revision_id)
2801
new_history = rev.get_history(self.repository)[1:]
2802
destination._set_revision_history(new_history)
2805
def generate_revision_history(self, revision_id, last_rev=None,
2807
"""Create a new revision history that will finish with revision_id.
2809
:param revision_id: the new tip to use.
2810
:param last_rev: The previous last_revision. If not None, then this
2811
must be a ancestory of revision_id, or DivergedBranches is raised.
2812
:param other_branch: The other branch that DivergedBranches should
2813
raise with respect to.
2815
self._set_revision_history(self._lefthand_history(revision_id,
2816
last_rev, other_branch))
2819
class BzrBranch5(FullHistoryBzrBranch):
2820
"""A format 5 branch. This supports new features over plain branches.
2822
It has support for a master_branch which is the data for bound branches.
2826
class BzrBranch8(BzrBranch):
2646
2827
"""A branch that stores tree-reference locations."""
2648
def _open_hook(self):
2829
def _open_hook(self, possible_transports=None):
2649
2830
if self._ignore_fallbacks:
2832
if possible_transports is None:
2833
possible_transports = [self.bzrdir.root_transport]
2652
2835
url = self.get_stacked_on_url()
2653
2836
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2674
2858
self._last_revision_info_cache = None
2675
2859
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
2861
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2862
current_revid = self.last_revision()
2863
last_revision = _mod_revision.ensure_null(current_revid)
2724
2864
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)
2866
graph = self.repository.get_graph()
2867
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2868
if lh_ancestor == current_revid:
2870
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2872
def _gen_revision_history(self):
2730
2873
"""Generate the revision history from last revision
3182
3295
raise NotImplementedError(self.push)
3298
def copy_content_into(self, revision_id=None):
3299
"""Copy the content of source into target
3301
revision_id: if not None, the revision history in the new branch will
3302
be truncated to end with revision_id.
3304
raise NotImplementedError(self.copy_content_into)
3307
def fetch(self, stop_revision=None, limit=None):
3310
:param stop_revision: Last revision to fetch
3311
:param limit: Optional rough limit of revisions to fetch
3313
raise NotImplementedError(self.fetch)
3185
3316
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()."""
3317
"""InterBranch implementation that uses public Branch functions."""
3320
def is_compatible(klass, source, target):
3321
# GenericBranch uses the public API, so always compatible
3325
def _get_branch_formats_to_test(klass):
3326
return [(format_registry.get_default(), format_registry.get_default())]
3329
def unwrap_format(klass, format):
3330
if isinstance(format, remote.RemoteBranchFormat):
3331
format._ensure_real()
3332
return format._custom_format
3336
def copy_content_into(self, revision_id=None):
3337
"""Copy the content of source into target
3339
revision_id: if not None, the revision history in the new branch will
3340
be truncated to end with revision_id.
3342
self.source.update_references(self.target)
3343
self.source._synchronize_history(self.target, revision_id)
3345
parent = self.source.get_parent()
3346
except errors.InaccessibleParent, e:
3347
mutter('parent was not accessible to copy: %s', e)
3350
self.target.set_parent(parent)
3351
if self.source._push_should_merge_tags():
3352
self.source.tags.merge_to(self.target.tags)
3355
def fetch(self, stop_revision=None, limit=None):
3356
if self.target.base == self.source.base:
3196
3358
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)
3360
fetch_spec_factory = fetch.FetchSpecFactory()
3361
fetch_spec_factory.source_branch = self.source
3362
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3363
fetch_spec_factory.source_repo = self.source.repository
3364
fetch_spec_factory.target_repo = self.target.repository
3365
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3366
fetch_spec_factory.limit = limit
3367
fetch_spec = fetch_spec_factory.make_fetch_spec()
3368
return self.target.repository.fetch(self.source.repository,
3369
fetch_spec=fetch_spec)
3234
3371
self.source.unlock()
3374
def _update_revisions(self, stop_revision=None, overwrite=False,
3376
other_revno, other_last_revision = self.source.last_revision_info()
3377
stop_revno = None # unknown
3378
if stop_revision is None:
3379
stop_revision = other_last_revision
3380
if _mod_revision.is_null(stop_revision):
3381
# if there are no commits, we're done.
3383
stop_revno = other_revno
3385
# what's the current last revision, before we fetch [and change it
3387
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3388
# we fetch here so that we don't process data twice in the common
3389
# case of having something to pull, and so that the check for
3390
# already merged can operate on the just fetched graph, which will
3391
# be cached in memory.
3392
self.fetch(stop_revision=stop_revision)
3393
# Check to see if one is an ancestor of the other
3396
graph = self.target.repository.get_graph()
3397
if self.target._check_if_descendant_or_diverged(
3398
stop_revision, last_rev, graph, self.source):
3399
# stop_revision is a descendant of last_rev, but we aren't
3400
# overwriting, so we're done.
3402
if stop_revno is None:
3404
graph = self.target.repository.get_graph()
3405
this_revno, this_last_revision = \
3406
self.target.last_revision_info()
3407
stop_revno = graph.find_distance_to_null(stop_revision,
3408
[(other_last_revision, other_revno),
3409
(this_last_revision, this_revno)])
3410
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3413
def pull(self, overwrite=False, stop_revision=None,
3414
possible_transports=None, run_hooks=True,
3415
_override_hook_target=None, local=False):
3416
"""Pull from source into self, updating my master if any.
3418
:param run_hooks: Private parameter - if false, this branch
3419
is being called because it's the master of the primary branch,
3420
so it should not run its hooks.
3422
bound_location = self.target.get_bound_location()
3423
if local and not bound_location:
3424
raise errors.LocalRequiresBoundBranch()
3425
master_branch = None
3426
source_is_master = False
3428
# bound_location comes from a config file, some care has to be
3429
# taken to relate it to source.user_url
3430
normalized = urlutils.normalize_url(bound_location)
3432
relpath = self.source.user_transport.relpath(normalized)
3433
source_is_master = (relpath == '')
3434
except (errors.PathNotChild, errors.InvalidURL):
3435
source_is_master = False
3436
if not local and bound_location and not source_is_master:
3437
# not pulling from master, so we need to update master.
3438
master_branch = self.target.get_master_branch(possible_transports)
3439
master_branch.lock_write()
3442
# pull from source into master.
3443
master_branch.pull(self.source, overwrite, stop_revision,
3445
return self._pull(overwrite,
3446
stop_revision, _hook_master=master_branch,
3447
run_hooks=run_hooks,
3448
_override_hook_target=_override_hook_target,
3449
merge_tags_to_master=not source_is_master)
3452
master_branch.unlock()
3454
def push(self, overwrite=False, stop_revision=None, lossy=False,
3455
_override_hook_source_branch=None):
3456
"""See InterBranch.push.
3458
This is the basic concrete implementation of push()
3460
:param _override_hook_source_branch: If specified, run the hooks
3461
passing this Branch as the source, rather than self. This is for
3462
use of RemoteBranch, where push is delegated to the underlying
3466
raise errors.LossyPushToSameVCS(self.source, self.target)
3467
# TODO: Public option to disable running hooks - should be trivial but
3470
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3471
op.add_cleanup(self.source.lock_read().unlock)
3472
op.add_cleanup(self.target.lock_write().unlock)
3473
return op.run(overwrite, stop_revision,
3474
_override_hook_source_branch=_override_hook_source_branch)
3476
def _basic_push(self, overwrite, stop_revision):
3477
"""Basic implementation of push without bound branches or hooks.
3479
Must be called with source read locked and target write locked.
3481
result = BranchPushResult()
3482
result.source_branch = self.source
3483
result.target_branch = self.target
3484
result.old_revno, result.old_revid = self.target.last_revision_info()
3485
self.source.update_references(self.target)
3486
if result.old_revid != stop_revision:
3487
# We assume that during 'push' this repository is closer than
3489
graph = self.source.repository.get_graph(self.target.repository)
3490
self._update_revisions(stop_revision, overwrite=overwrite,
3492
if self.source._push_should_merge_tags():
3493
result.tag_updates, result.tag_conflicts = (
3494
self.source.tags.merge_to(self.target.tags, overwrite))
3495
result.new_revno, result.new_revid = self.target.last_revision_info()
3498
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3499
_override_hook_source_branch=None):
3500
"""Push from source into target, and into target's master if any.
3503
if _override_hook_source_branch:
3504
result.source_branch = _override_hook_source_branch
3505
for hook in Branch.hooks['post_push']:
3508
bound_location = self.target.get_bound_location()
3509
if bound_location and self.target.base != bound_location:
3510
# there is a master branch.
3512
# XXX: Why the second check? Is it even supported for a branch to
3513
# be bound to itself? -- mbp 20070507
3514
master_branch = self.target.get_master_branch()
3515
master_branch.lock_write()
3516
operation.add_cleanup(master_branch.unlock)
3517
# push into the master from the source branch.
3518
master_inter = InterBranch.get(self.source, master_branch)
3519
master_inter._basic_push(overwrite, stop_revision)
3520
# and push into the target branch from the source. Note that
3521
# we push from the source branch again, because it's considered
3522
# the highest bandwidth repository.
3523
result = self._basic_push(overwrite, stop_revision)
3524
result.master_branch = master_branch
3525
result.local_branch = self.target
3527
master_branch = None
3529
result = self._basic_push(overwrite, stop_revision)
3530
# TODO: Why set master_branch and local_branch if there's no
3531
# binding? Maybe cleaner to just leave them unset? -- mbp
3533
result.master_branch = self.target
3534
result.local_branch = None
3538
def _pull(self, overwrite=False, stop_revision=None,
3237
3539
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3540
_override_hook_target=None, local=False,
3541
merge_tags_to_master=True):
3239
3542
"""See Branch.pull.
3544
This function is the core worker, used by GenericInterBranch.pull to
3545
avoid duplication when pulling source->master and source->local.
3241
3547
:param _hook_master: Private parameter - set the branch to
3242
3548
be supplied as the master to pull hooks.
3243
3549
:param run_hooks: Private parameter - if false, this branch
3244
3550
is being called because it's the master of the primary branch,
3245
3551
so it should not run its hooks.
3552
is being called because it's the master of the primary branch,
3553
so it should not run its hooks.
3246
3554
:param _override_hook_target: Private parameter - set the branch to be
3247
3555
supplied as the target_branch to pull hooks.
3248
3556
:param local: Only update the local branch, and not the bound branch.
3288
3597
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
3601
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
