782
871
old_repository = self.repository
783
872
if len(old_repository._fallback_repositories) != 1:
784
873
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
874
"of %r (fallbacks: %r)" % (old_repository,
875
old_repository._fallback_repositories))
876
# Open the new repository object.
877
# Repositories don't offer an interface to remove fallback
878
# repositories today; take the conceptually simpler option and just
879
# reopen it. We reopen it starting from the URL so that we
880
# get a separate connection for RemoteRepositories and can
881
# stream from one of them to the other. This does mean doing
882
# separate SSH connection setup, but unstacking is not a
883
# common operation so it's tolerable.
884
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
885
new_repository = new_bzrdir.find_repository()
886
if new_repository._fallback_repositories:
887
raise AssertionError("didn't expect %r to have "
888
"fallback_repositories"
889
% (self.repository,))
890
# Replace self.repository with the new repository.
891
# Do our best to transfer the lock state (i.e. lock-tokens and
892
# lock count) of self.repository to the new repository.
893
lock_token = old_repository.lock_write().repository_token
894
self.repository = new_repository
895
if isinstance(self, remote.RemoteBranch):
896
# Remote branches can have a second reference to the old
897
# repository that need to be replaced.
898
if self._real_branch is not None:
899
self._real_branch.repository = new_repository
900
self.repository.lock_write(token=lock_token)
901
if lock_token is not None:
902
old_repository.leave_lock_in_place()
787
903
old_repository.unlock()
904
if lock_token is not None:
905
# XXX: self.repository.leave_lock_in_place() before this
906
# function will not be preserved. Fortunately that doesn't
907
# affect the current default format (2a), and would be a
908
# corner-case anyway.
909
# - Andrew Bennetts, 2010/06/30
910
self.repository.dont_leave_lock_in_place()
914
old_repository.unlock()
915
except errors.LockNotHeld:
918
if old_lock_count == 0:
919
raise AssertionError(
920
'old_repository should have been locked at least once.')
921
for i in range(old_lock_count-1):
922
self.repository.lock_write()
923
# Fetch from the old repository into the new.
788
924
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
926
# XXX: If you unstack a branch while it has a working tree
809
927
# with a pending merge, the pending-merged revisions will no
810
928
# 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(),
930
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
931
except errors.TagsNotSupported:
932
tags_to_fetch = set()
933
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
934
old_repository, required_ids=[self.last_revision()],
935
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
936
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
938
old_repository.unlock()
917
1043
:return: A tuple (revno, revision_id).
919
1045
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1046
self._last_revision_info_cache = self._read_last_revision_info()
921
1047
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,
1049
def _read_last_revision_info(self):
1050
raise NotImplementedError(self._read_last_revision_info)
1052
@deprecated_method(deprecated_in((2, 4, 0)))
970
1053
def import_last_revision_info(self, source_repo, revno, revid):
971
1054
"""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
1056
:param source_repo: Source repository to optionally fetch from
977
1057
:param revno: Revision number of the new tip
978
1058
:param revid: Revision id of the new tip
1731
1835
"basis revision. hooks MUST NOT modify this delta. "
1732
1836
" future_tree is an in-memory tree obtained from "
1733
1837
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1839
self.add_hook('post_commit',
1736
1840
"Called in the bzr client after a commit has completed. "
1737
1841
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1842
"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',
1843
"commit to a branch.", (0, 15))
1844
self.add_hook('post_uncommit',
1741
1845
"Called in the bzr client after an uncommit completes. "
1742
1846
"post_uncommit is called with (local, master, old_revno, "
1743
1847
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1848
"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',
1849
"receives new_revno of 0, new_revid of None.", (0, 15))
1850
self.add_hook('pre_change_branch_tip',
1747
1851
"Called in bzr client and server before a change to the tip of a "
1748
1852
"branch is made. pre_change_branch_tip is called with a "
1749
1853
"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',
1854
"commit, uncommit will all trigger this hook.", (1, 6))
1855
self.add_hook('post_change_branch_tip',
1752
1856
"Called in bzr client and server after a change to the tip of a "
1753
1857
"branch is made. post_change_branch_tip is called with a "
1754
1858
"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',
1859
"commit, uncommit will all trigger this hook.", (1, 4))
1860
self.add_hook('transform_fallback_location',
1757
1861
"Called when a stacked branch is activating its fallback "
1758
1862
"locations. transform_fallback_location is called with (branch, "
1759
1863
"url), and should return a new url. Returning the same url "
2387
2542
"""See Branch.print_file."""
2388
2543
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
2545
@needs_write_lock
2454
2546
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
2547
if not revision_id or not isinstance(revision_id, basestring):
2548
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2549
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))
2550
old_revno, old_revid = self.last_revision_info()
2551
if self.get_append_revisions_only():
2552
self._check_history_violation(revision_id)
2553
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2554
self._write_last_revision_info(revno, revision_id)
2555
self._clear_cached_state()
2556
self._last_revision_info_cache = revno, revision_id
2557
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2559
def basis_tree(self):
2496
2560
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2681
def _read_last_revision_info(self):
2682
revision_string = self._transport.get_bytes('last-revision')
2683
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2684
revision_id = cache_utf8.get_cached_utf8(revision_id)
2686
return revno, revision_id
2688
def _write_last_revision_info(self, revno, revision_id):
2689
"""Simply write out the revision id, with no checks.
2691
Use set_last_revision_info to perform this safely.
2693
Does not update the revision_history cache.
2695
revision_id = _mod_revision.ensure_null(revision_id)
2696
out_string = '%d %s\n' % (revno, revision_id)
2697
self._transport.put_bytes('last-revision', out_string,
2698
mode=self.bzrdir._get_file_mode())
2701
class FullHistoryBzrBranch(BzrBranch):
2702
"""Bzr branch which contains the full revision history."""
2705
def set_last_revision_info(self, revno, revision_id):
2706
if not revision_id or not isinstance(revision_id, basestring):
2707
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2708
revision_id = _mod_revision.ensure_null(revision_id)
2709
# this old format stores the full history, but this api doesn't
2710
# provide it, so we must generate, and might as well check it's
2712
history = self._lefthand_history(revision_id)
2713
if len(history) != revno:
2714
raise AssertionError('%d != %d' % (len(history), revno))
2715
self._set_revision_history(history)
2717
def _read_last_revision_info(self):
2718
rh = self.revision_history()
2721
return (revno, rh[-1])
2723
return (0, _mod_revision.NULL_REVISION)
2725
@deprecated_method(deprecated_in((2, 4, 0)))
2727
def set_revision_history(self, rev_history):
2728
"""See Branch.set_revision_history."""
2729
self._set_revision_history(rev_history)
2731
def _set_revision_history(self, rev_history):
2732
if 'evil' in debug.debug_flags:
2733
mutter_callsite(3, "set_revision_history scales with history.")
2734
check_not_reserved_id = _mod_revision.check_not_reserved_id
2735
for rev_id in rev_history:
2736
check_not_reserved_id(rev_id)
2737
if Branch.hooks['post_change_branch_tip']:
2738
# Don't calculate the last_revision_info() if there are no hooks
2740
old_revno, old_revid = self.last_revision_info()
2741
if len(rev_history) == 0:
2742
revid = _mod_revision.NULL_REVISION
2744
revid = rev_history[-1]
2745
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2746
self._write_revision_history(rev_history)
2747
self._clear_cached_state()
2748
self._cache_revision_history(rev_history)
2749
for hook in Branch.hooks['set_rh']:
2750
hook(self, rev_history)
2751
if Branch.hooks['post_change_branch_tip']:
2752
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2754
def _write_revision_history(self, history):
2755
"""Factored out of set_revision_history.
2757
This performs the actual writing to disk.
2758
It is intended to be called by set_revision_history."""
2759
self._transport.put_bytes(
2760
'revision-history', '\n'.join(history),
2761
mode=self.bzrdir._get_file_mode())
2763
def _gen_revision_history(self):
2764
history = self._transport.get_bytes('revision-history').split('\n')
2765
if history[-1:] == ['']:
2766
# There shouldn't be a trailing newline, but just in case.
2770
def _synchronize_history(self, destination, revision_id):
2771
if not isinstance(destination, FullHistoryBzrBranch):
2772
super(BzrBranch, self)._synchronize_history(
2773
destination, revision_id)
2775
if revision_id == _mod_revision.NULL_REVISION:
2778
new_history = self.revision_history()
2779
if revision_id is not None and new_history != []:
2781
new_history = new_history[:new_history.index(revision_id) + 1]
2783
rev = self.repository.get_revision(revision_id)
2784
new_history = rev.get_history(self.repository)[1:]
2785
destination._set_revision_history(new_history)
2788
def generate_revision_history(self, revision_id, last_rev=None,
2790
"""Create a new revision history that will finish with revision_id.
2792
:param revision_id: the new tip to use.
2793
:param last_rev: The previous last_revision. If not None, then this
2794
must be a ancestory of revision_id, or DivergedBranches is raised.
2795
:param other_branch: The other branch that DivergedBranches should
2796
raise with respect to.
2798
self._set_revision_history(self._lefthand_history(revision_id,
2799
last_rev, other_branch))
2802
class BzrBranch5(FullHistoryBzrBranch):
2803
"""A format 5 branch. This supports new features over plain branches.
2805
It has support for a master_branch which is the data for bound branches.
2809
class BzrBranch8(BzrBranch):
2646
2810
"""A branch that stores tree-reference locations."""
2648
2812
def _open_hook(self):
2674
2838
self._last_revision_info_cache = None
2675
2839
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
2841
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2842
current_revid = self.last_revision()
2843
last_revision = _mod_revision.ensure_null(current_revid)
2724
2844
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)
2846
graph = self.repository.get_graph()
2847
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2848
if lh_ancestor == current_revid:
2850
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2852
def _gen_revision_history(self):
2730
2853
"""Generate the revision history from last revision
3182
3273
raise NotImplementedError(self.push)
3276
def copy_content_into(self, revision_id=None):
3277
"""Copy the content of source into target
3279
revision_id: if not None, the revision history in the new branch will
3280
be truncated to end with revision_id.
3282
raise NotImplementedError(self.copy_content_into)
3285
def fetch(self, stop_revision=None, limit=None):
3288
:param stop_revision: Last revision to fetch
3289
:param limit: Optional rough limit of revisions to fetch
3291
raise NotImplementedError(self.fetch)
3185
3294
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()."""
3295
"""InterBranch implementation that uses public Branch functions."""
3298
def is_compatible(klass, source, target):
3299
# GenericBranch uses the public API, so always compatible
3303
def _get_branch_formats_to_test(klass):
3304
return [(format_registry.get_default(), format_registry.get_default())]
3307
def unwrap_format(klass, format):
3308
if isinstance(format, remote.RemoteBranchFormat):
3309
format._ensure_real()
3310
return format._custom_format
3314
def copy_content_into(self, revision_id=None):
3315
"""Copy the content of source into target
3317
revision_id: if not None, the revision history in the new branch will
3318
be truncated to end with revision_id.
3320
self.source.update_references(self.target)
3321
self.source._synchronize_history(self.target, revision_id)
3323
parent = self.source.get_parent()
3324
except errors.InaccessibleParent, e:
3325
mutter('parent was not accessible to copy: %s', e)
3328
self.target.set_parent(parent)
3329
if self.source._push_should_merge_tags():
3330
self.source.tags.merge_to(self.target.tags)
3333
def fetch(self, stop_revision=None, limit=None):
3334
if self.target.base == self.source.base:
3196
3336
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)
3338
fetch_spec_factory = fetch.FetchSpecFactory()
3339
fetch_spec_factory.source_branch = self.source
3340
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3341
fetch_spec_factory.source_repo = self.source.repository
3342
fetch_spec_factory.target_repo = self.target.repository
3343
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3344
fetch_spec_factory.limit = limit
3345
fetch_spec = fetch_spec_factory.make_fetch_spec()
3346
return self.target.repository.fetch(self.source.repository,
3347
fetch_spec=fetch_spec)
3234
3349
self.source.unlock()
3352
def _update_revisions(self, stop_revision=None, overwrite=False,
3354
other_revno, other_last_revision = self.source.last_revision_info()
3355
stop_revno = None # unknown
3356
if stop_revision is None:
3357
stop_revision = other_last_revision
3358
if _mod_revision.is_null(stop_revision):
3359
# if there are no commits, we're done.
3361
stop_revno = other_revno
3363
# what's the current last revision, before we fetch [and change it
3365
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3366
# we fetch here so that we don't process data twice in the common
3367
# case of having something to pull, and so that the check for
3368
# already merged can operate on the just fetched graph, which will
3369
# be cached in memory.
3370
self.fetch(stop_revision=stop_revision)
3371
# Check to see if one is an ancestor of the other
3374
graph = self.target.repository.get_graph()
3375
if self.target._check_if_descendant_or_diverged(
3376
stop_revision, last_rev, graph, self.source):
3377
# stop_revision is a descendant of last_rev, but we aren't
3378
# overwriting, so we're done.
3380
if stop_revno is None:
3382
graph = self.target.repository.get_graph()
3383
this_revno, this_last_revision = \
3384
self.target.last_revision_info()
3385
stop_revno = graph.find_distance_to_null(stop_revision,
3386
[(other_last_revision, other_revno),
3387
(this_last_revision, this_revno)])
3388
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3391
def pull(self, overwrite=False, stop_revision=None,
3392
possible_transports=None, run_hooks=True,
3393
_override_hook_target=None, local=False):
3394
"""Pull from source into self, updating my master if any.
3396
:param run_hooks: Private parameter - if false, this branch
3397
is being called because it's the master of the primary branch,
3398
so it should not run its hooks.
3400
bound_location = self.target.get_bound_location()
3401
if local and not bound_location:
3402
raise errors.LocalRequiresBoundBranch()
3403
master_branch = None
3404
source_is_master = False
3406
# bound_location comes from a config file, some care has to be
3407
# taken to relate it to source.user_url
3408
normalized = urlutils.normalize_url(bound_location)
3410
relpath = self.source.user_transport.relpath(normalized)
3411
source_is_master = (relpath == '')
3412
except (errors.PathNotChild, errors.InvalidURL):
3413
source_is_master = False
3414
if not local and bound_location and not source_is_master:
3415
# not pulling from master, so we need to update master.
3416
master_branch = self.target.get_master_branch(possible_transports)
3417
master_branch.lock_write()
3420
# pull from source into master.
3421
master_branch.pull(self.source, overwrite, stop_revision,
3423
return self._pull(overwrite,
3424
stop_revision, _hook_master=master_branch,
3425
run_hooks=run_hooks,
3426
_override_hook_target=_override_hook_target,
3427
merge_tags_to_master=not source_is_master)
3430
master_branch.unlock()
3432
def push(self, overwrite=False, stop_revision=None, lossy=False,
3433
_override_hook_source_branch=None):
3434
"""See InterBranch.push.
3436
This is the basic concrete implementation of push()
3438
:param _override_hook_source_branch: If specified, run the hooks
3439
passing this Branch as the source, rather than self. This is for
3440
use of RemoteBranch, where push is delegated to the underlying
3444
raise errors.LossyPushToSameVCS(self.source, self.target)
3445
# TODO: Public option to disable running hooks - should be trivial but
3448
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3449
op.add_cleanup(self.source.lock_read().unlock)
3450
op.add_cleanup(self.target.lock_write().unlock)
3451
return op.run(overwrite, stop_revision,
3452
_override_hook_source_branch=_override_hook_source_branch)
3454
def _basic_push(self, overwrite, stop_revision):
3455
"""Basic implementation of push without bound branches or hooks.
3457
Must be called with source read locked and target write locked.
3459
result = BranchPushResult()
3460
result.source_branch = self.source
3461
result.target_branch = self.target
3462
result.old_revno, result.old_revid = self.target.last_revision_info()
3463
self.source.update_references(self.target)
3464
if result.old_revid != stop_revision:
3465
# We assume that during 'push' this repository is closer than
3467
graph = self.source.repository.get_graph(self.target.repository)
3468
self._update_revisions(stop_revision, overwrite=overwrite,
3470
if self.source._push_should_merge_tags():
3471
result.tag_updates, result.tag_conflicts = (
3472
self.source.tags.merge_to(self.target.tags, overwrite))
3473
result.new_revno, result.new_revid = self.target.last_revision_info()
3476
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3477
_override_hook_source_branch=None):
3478
"""Push from source into target, and into target's master if any.
3481
if _override_hook_source_branch:
3482
result.source_branch = _override_hook_source_branch
3483
for hook in Branch.hooks['post_push']:
3486
bound_location = self.target.get_bound_location()
3487
if bound_location and self.target.base != bound_location:
3488
# there is a master branch.
3490
# XXX: Why the second check? Is it even supported for a branch to
3491
# be bound to itself? -- mbp 20070507
3492
master_branch = self.target.get_master_branch()
3493
master_branch.lock_write()
3494
operation.add_cleanup(master_branch.unlock)
3495
# push into the master from the source branch.
3496
master_inter = InterBranch.get(self.source, master_branch)
3497
master_inter._basic_push(overwrite, stop_revision)
3498
# and push into the target branch from the source. Note that
3499
# we push from the source branch again, because it's considered
3500
# the highest bandwidth repository.
3501
result = self._basic_push(overwrite, stop_revision)
3502
result.master_branch = master_branch
3503
result.local_branch = self.target
3505
master_branch = None
3507
result = self._basic_push(overwrite, stop_revision)
3508
# TODO: Why set master_branch and local_branch if there's no
3509
# binding? Maybe cleaner to just leave them unset? -- mbp
3511
result.master_branch = self.target
3512
result.local_branch = None
3516
def _pull(self, overwrite=False, stop_revision=None,
3237
3517
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3518
_override_hook_target=None, local=False,
3519
merge_tags_to_master=True):
3239
3520
"""See Branch.pull.
3522
This function is the core worker, used by GenericInterBranch.pull to
3523
avoid duplication when pulling source->master and source->local.
3241
3525
:param _hook_master: Private parameter - set the branch to
3242
3526
be supplied as the master to pull hooks.
3243
3527
:param run_hooks: Private parameter - if false, this branch
3244
3528
is being called because it's the master of the primary branch,
3245
3529
so it should not run its hooks.
3530
is being called because it's the master of the primary branch,
3531
so it should not run its hooks.
3246
3532
:param _override_hook_target: Private parameter - set the branch to be
3247
3533
supplied as the target_branch to pull hooks.
3248
3534
:param local: Only update the local branch, and not the bound branch.
3288
3575
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
3579
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
