782
854
old_repository = self.repository
783
855
if len(old_repository._fallback_repositories) != 1:
784
856
raise AssertionError("can't cope with fallback repositories "
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
857
"of %r (fallbacks: %r)" % (old_repository,
858
old_repository._fallback_repositories))
859
# Open the new repository object.
860
# Repositories don't offer an interface to remove fallback
861
# repositories today; take the conceptually simpler option and just
862
# reopen it. We reopen it starting from the URL so that we
863
# get a separate connection for RemoteRepositories and can
864
# stream from one of them to the other. This does mean doing
865
# separate SSH connection setup, but unstacking is not a
866
# common operation so it's tolerable.
867
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
868
new_repository = new_bzrdir.find_repository()
869
if new_repository._fallback_repositories:
870
raise AssertionError("didn't expect %r to have "
871
"fallback_repositories"
872
% (self.repository,))
873
# Replace self.repository with the new repository.
874
# Do our best to transfer the lock state (i.e. lock-tokens and
875
# lock count) of self.repository to the new repository.
876
lock_token = old_repository.lock_write().repository_token
877
self.repository = new_repository
878
if isinstance(self, remote.RemoteBranch):
879
# Remote branches can have a second reference to the old
880
# repository that need to be replaced.
881
if self._real_branch is not None:
882
self._real_branch.repository = new_repository
883
self.repository.lock_write(token=lock_token)
884
if lock_token is not None:
885
old_repository.leave_lock_in_place()
787
886
old_repository.unlock()
887
if lock_token is not None:
888
# XXX: self.repository.leave_lock_in_place() before this
889
# function will not be preserved. Fortunately that doesn't
890
# affect the current default format (2a), and would be a
891
# corner-case anyway.
892
# - Andrew Bennetts, 2010/06/30
893
self.repository.dont_leave_lock_in_place()
897
old_repository.unlock()
898
except errors.LockNotHeld:
901
if old_lock_count == 0:
902
raise AssertionError(
903
'old_repository should have been locked at least once.')
904
for i in range(old_lock_count-1):
905
self.repository.lock_write()
906
# Fetch from the old repository into the new.
788
907
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
909
# XXX: If you unstack a branch while it has a working tree
809
910
# with a pending merge, the pending-merged revisions will no
810
911
# 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(),
913
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
914
except errors.TagsNotSupported:
915
tags_to_fetch = set()
916
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
917
old_repository, required_ids=[self.last_revision()],
918
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
919
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
819
921
old_repository.unlock()
917
1026
:return: A tuple (revno, revision_id).
919
1028
if self._last_revision_info_cache is None:
920
self._last_revision_info_cache = self._last_revision_info()
1029
self._last_revision_info_cache = self._read_last_revision_info()
921
1030
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,
1032
def _read_last_revision_info(self):
1033
raise NotImplementedError(self._read_last_revision_info)
1035
@deprecated_method(deprecated_in((2, 4, 0)))
970
1036
def import_last_revision_info(self, source_repo, revno, revid):
971
1037
"""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
1039
:param source_repo: Source repository to optionally fetch from
977
1040
:param revno: Revision number of the new tip
978
1041
:param revid: Revision id of the new tip
1731
1812
"basis revision. hooks MUST NOT modify this delta. "
1732
1813
" future_tree is an in-memory tree obtained from "
1733
1814
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1816
self.add_hook('post_commit',
1736
1817
"Called in the bzr client after a commit has completed. "
1737
1818
"post_commit is called with (local, master, old_revno, old_revid, "
1738
1819
"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',
1820
"commit to a branch.", (0, 15))
1821
self.add_hook('post_uncommit',
1741
1822
"Called in the bzr client after an uncommit completes. "
1742
1823
"post_uncommit is called with (local, master, old_revno, "
1743
1824
"old_revid, new_revno, new_revid) where local is the local branch "
1744
1825
"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',
1826
"receives new_revno of 0, new_revid of None.", (0, 15))
1827
self.add_hook('pre_change_branch_tip',
1747
1828
"Called in bzr client and server before a change to the tip of a "
1748
1829
"branch is made. pre_change_branch_tip is called with a "
1749
1830
"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',
1831
"commit, uncommit will all trigger this hook.", (1, 6))
1832
self.add_hook('post_change_branch_tip',
1752
1833
"Called in bzr client and server after a change to the tip of a "
1753
1834
"branch is made. post_change_branch_tip is called with a "
1754
1835
"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',
1836
"commit, uncommit will all trigger this hook.", (1, 4))
1837
self.add_hook('transform_fallback_location',
1757
1838
"Called when a stacked branch is activating its fallback "
1758
1839
"locations. transform_fallback_location is called with (branch, "
1759
1840
"url), and should return a new url. Returning the same url "
2387
2502
"""See Branch.print_file."""
2388
2503
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
2505
@needs_write_lock
2454
2506
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
2507
if not revision_id or not isinstance(revision_id, basestring):
2508
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2465
2509
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))
2510
old_revno, old_revid = self.last_revision_info()
2511
if self._get_append_revisions_only():
2512
self._check_history_violation(revision_id)
2513
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2514
self._write_last_revision_info(revno, revision_id)
2515
self._clear_cached_state()
2516
self._last_revision_info_cache = revno, revision_id
2517
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2495
2519
def basis_tree(self):
2496
2520
"""See Branch.basis_tree."""
2645
class BzrBranch8(BzrBranch5):
2641
def _read_last_revision_info(self):
2642
revision_string = self._transport.get_bytes('last-revision')
2643
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2644
revision_id = cache_utf8.get_cached_utf8(revision_id)
2646
return revno, revision_id
2648
def _write_last_revision_info(self, revno, revision_id):
2649
"""Simply write out the revision id, with no checks.
2651
Use set_last_revision_info to perform this safely.
2653
Does not update the revision_history cache.
2655
revision_id = _mod_revision.ensure_null(revision_id)
2656
out_string = '%d %s\n' % (revno, revision_id)
2657
self._transport.put_bytes('last-revision', out_string,
2658
mode=self.bzrdir._get_file_mode())
2661
class FullHistoryBzrBranch(BzrBranch):
2662
"""Bzr branch which contains the full revision history."""
2665
def set_last_revision_info(self, revno, revision_id):
2666
if not revision_id or not isinstance(revision_id, basestring):
2667
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2668
revision_id = _mod_revision.ensure_null(revision_id)
2669
# this old format stores the full history, but this api doesn't
2670
# provide it, so we must generate, and might as well check it's
2672
history = self._lefthand_history(revision_id)
2673
if len(history) != revno:
2674
raise AssertionError('%d != %d' % (len(history), revno))
2675
self._set_revision_history(history)
2677
def _read_last_revision_info(self):
2678
rh = self.revision_history()
2681
return (revno, rh[-1])
2683
return (0, _mod_revision.NULL_REVISION)
2685
@deprecated_method(deprecated_in((2, 4, 0)))
2687
def set_revision_history(self, rev_history):
2688
"""See Branch.set_revision_history."""
2689
self._set_revision_history(rev_history)
2691
def _set_revision_history(self, rev_history):
2692
if 'evil' in debug.debug_flags:
2693
mutter_callsite(3, "set_revision_history scales with history.")
2694
check_not_reserved_id = _mod_revision.check_not_reserved_id
2695
for rev_id in rev_history:
2696
check_not_reserved_id(rev_id)
2697
if Branch.hooks['post_change_branch_tip']:
2698
# Don't calculate the last_revision_info() if there are no hooks
2700
old_revno, old_revid = self.last_revision_info()
2701
if len(rev_history) == 0:
2702
revid = _mod_revision.NULL_REVISION
2704
revid = rev_history[-1]
2705
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2706
self._write_revision_history(rev_history)
2707
self._clear_cached_state()
2708
self._cache_revision_history(rev_history)
2709
for hook in Branch.hooks['set_rh']:
2710
hook(self, rev_history)
2711
if Branch.hooks['post_change_branch_tip']:
2712
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2714
def _write_revision_history(self, history):
2715
"""Factored out of set_revision_history.
2717
This performs the actual writing to disk.
2718
It is intended to be called by set_revision_history."""
2719
self._transport.put_bytes(
2720
'revision-history', '\n'.join(history),
2721
mode=self.bzrdir._get_file_mode())
2723
def _gen_revision_history(self):
2724
history = self._transport.get_bytes('revision-history').split('\n')
2725
if history[-1:] == ['']:
2726
# There shouldn't be a trailing newline, but just in case.
2730
def _synchronize_history(self, destination, revision_id):
2731
if not isinstance(destination, FullHistoryBzrBranch):
2732
super(BzrBranch, self)._synchronize_history(
2733
destination, revision_id)
2735
if revision_id == _mod_revision.NULL_REVISION:
2738
new_history = self.revision_history()
2739
if revision_id is not None and new_history != []:
2741
new_history = new_history[:new_history.index(revision_id) + 1]
2743
rev = self.repository.get_revision(revision_id)
2744
new_history = rev.get_history(self.repository)[1:]
2745
destination._set_revision_history(new_history)
2748
def generate_revision_history(self, revision_id, last_rev=None,
2750
"""Create a new revision history that will finish with revision_id.
2752
:param revision_id: the new tip to use.
2753
:param last_rev: The previous last_revision. If not None, then this
2754
must be a ancestory of revision_id, or DivergedBranches is raised.
2755
:param other_branch: The other branch that DivergedBranches should
2756
raise with respect to.
2758
self._set_revision_history(self._lefthand_history(revision_id,
2759
last_rev, other_branch))
2762
class BzrBranch5(FullHistoryBzrBranch):
2763
"""A format 5 branch. This supports new features over plain branches.
2765
It has support for a master_branch which is the data for bound branches.
2769
class BzrBranch8(BzrBranch):
2646
2770
"""A branch that stores tree-reference locations."""
2648
2772
def _open_hook(self):
2674
2798
self._last_revision_info_cache = None
2675
2799
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
2801
def _check_history_violation(self, revision_id):
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2802
current_revid = self.last_revision()
2803
last_revision = _mod_revision.ensure_null(current_revid)
2724
2804
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)
2806
graph = self.repository.get_graph()
2807
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2808
if lh_ancestor == current_revid:
2810
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2729
2812
def _gen_revision_history(self):
2730
2813
"""Generate the revision history from last revision
3182
3218
raise NotImplementedError(self.push)
3221
def copy_content_into(self, revision_id=None):
3222
"""Copy the content of source into target
3224
revision_id: if not None, the revision history in the new branch will
3225
be truncated to end with revision_id.
3227
raise NotImplementedError(self.copy_content_into)
3230
def fetch(self, stop_revision=None, limit=None):
3233
:param stop_revision: Last revision to fetch
3234
:param limit: Optional rough limit of revisions to fetch
3236
raise NotImplementedError(self.fetch)
3185
3239
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()."""
3240
"""InterBranch implementation that uses public Branch functions."""
3243
def is_compatible(klass, source, target):
3244
# GenericBranch uses the public API, so always compatible
3248
def _get_branch_formats_to_test(klass):
3249
return [(format_registry.get_default(), format_registry.get_default())]
3252
def unwrap_format(klass, format):
3253
if isinstance(format, remote.RemoteBranchFormat):
3254
format._ensure_real()
3255
return format._custom_format
3259
def copy_content_into(self, revision_id=None):
3260
"""Copy the content of source into target
3262
revision_id: if not None, the revision history in the new branch will
3263
be truncated to end with revision_id.
3265
self.source.update_references(self.target)
3266
self.source._synchronize_history(self.target, revision_id)
3268
parent = self.source.get_parent()
3269
except errors.InaccessibleParent, e:
3270
mutter('parent was not accessible to copy: %s', e)
3273
self.target.set_parent(parent)
3274
if self.source._push_should_merge_tags():
3275
self.source.tags.merge_to(self.target.tags)
3278
def fetch(self, stop_revision=None, limit=None):
3279
if self.target.base == self.source.base:
3196
3281
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)
3283
fetch_spec_factory = fetch.FetchSpecFactory()
3284
fetch_spec_factory.source_branch = self.source
3285
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3286
fetch_spec_factory.source_repo = self.source.repository
3287
fetch_spec_factory.target_repo = self.target.repository
3288
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3289
fetch_spec_factory.limit = limit
3290
fetch_spec = fetch_spec_factory.make_fetch_spec()
3291
return self.target.repository.fetch(self.source.repository,
3292
fetch_spec=fetch_spec)
3234
3294
self.source.unlock()
3297
def _update_revisions(self, stop_revision=None, overwrite=False,
3299
other_revno, other_last_revision = self.source.last_revision_info()
3300
stop_revno = None # unknown
3301
if stop_revision is None:
3302
stop_revision = other_last_revision
3303
if _mod_revision.is_null(stop_revision):
3304
# if there are no commits, we're done.
3306
stop_revno = other_revno
3308
# what's the current last revision, before we fetch [and change it
3310
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3311
# we fetch here so that we don't process data twice in the common
3312
# case of having something to pull, and so that the check for
3313
# already merged can operate on the just fetched graph, which will
3314
# be cached in memory.
3315
self.fetch(stop_revision=stop_revision)
3316
# Check to see if one is an ancestor of the other
3319
graph = self.target.repository.get_graph()
3320
if self.target._check_if_descendant_or_diverged(
3321
stop_revision, last_rev, graph, self.source):
3322
# stop_revision is a descendant of last_rev, but we aren't
3323
# overwriting, so we're done.
3325
if stop_revno is None:
3327
graph = self.target.repository.get_graph()
3328
this_revno, this_last_revision = \
3329
self.target.last_revision_info()
3330
stop_revno = graph.find_distance_to_null(stop_revision,
3331
[(other_last_revision, other_revno),
3332
(this_last_revision, this_revno)])
3333
self.target.set_last_revision_info(stop_revno, stop_revision)
3236
3336
def pull(self, overwrite=False, stop_revision=None,
3337
possible_transports=None, run_hooks=True,
3338
_override_hook_target=None, local=False):
3339
"""Pull from source into self, updating my master if any.
3341
:param run_hooks: Private parameter - if false, this branch
3342
is being called because it's the master of the primary branch,
3343
so it should not run its hooks.
3345
bound_location = self.target.get_bound_location()
3346
if local and not bound_location:
3347
raise errors.LocalRequiresBoundBranch()
3348
master_branch = None
3349
source_is_master = False
3351
# bound_location comes from a config file, some care has to be
3352
# taken to relate it to source.user_url
3353
normalized = urlutils.normalize_url(bound_location)
3355
relpath = self.source.user_transport.relpath(normalized)
3356
source_is_master = (relpath == '')
3357
except (errors.PathNotChild, errors.InvalidURL):
3358
source_is_master = False
3359
if not local and bound_location and not source_is_master:
3360
# not pulling from master, so we need to update master.
3361
master_branch = self.target.get_master_branch(possible_transports)
3362
master_branch.lock_write()
3365
# pull from source into master.
3366
master_branch.pull(self.source, overwrite, stop_revision,
3368
return self._pull(overwrite,
3369
stop_revision, _hook_master=master_branch,
3370
run_hooks=run_hooks,
3371
_override_hook_target=_override_hook_target,
3372
merge_tags_to_master=not source_is_master)
3375
master_branch.unlock()
3377
def push(self, overwrite=False, stop_revision=None, lossy=False,
3378
_override_hook_source_branch=None):
3379
"""See InterBranch.push.
3381
This is the basic concrete implementation of push()
3383
:param _override_hook_source_branch: If specified, run the hooks
3384
passing this Branch as the source, rather than self. This is for
3385
use of RemoteBranch, where push is delegated to the underlying
3389
raise errors.LossyPushToSameVCS(self.source, self.target)
3390
# TODO: Public option to disable running hooks - should be trivial but
3393
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3394
op.add_cleanup(self.source.lock_read().unlock)
3395
op.add_cleanup(self.target.lock_write().unlock)
3396
return op.run(overwrite, stop_revision,
3397
_override_hook_source_branch=_override_hook_source_branch)
3399
def _basic_push(self, overwrite, stop_revision):
3400
"""Basic implementation of push without bound branches or hooks.
3402
Must be called with source read locked and target write locked.
3404
result = BranchPushResult()
3405
result.source_branch = self.source
3406
result.target_branch = self.target
3407
result.old_revno, result.old_revid = self.target.last_revision_info()
3408
self.source.update_references(self.target)
3409
if result.old_revid != stop_revision:
3410
# We assume that during 'push' this repository is closer than
3412
graph = self.source.repository.get_graph(self.target.repository)
3413
self._update_revisions(stop_revision, overwrite=overwrite,
3415
if self.source._push_should_merge_tags():
3416
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3418
result.new_revno, result.new_revid = self.target.last_revision_info()
3421
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3422
_override_hook_source_branch=None):
3423
"""Push from source into target, and into target's master if any.
3426
if _override_hook_source_branch:
3427
result.source_branch = _override_hook_source_branch
3428
for hook in Branch.hooks['post_push']:
3431
bound_location = self.target.get_bound_location()
3432
if bound_location and self.target.base != bound_location:
3433
# there is a master branch.
3435
# XXX: Why the second check? Is it even supported for a branch to
3436
# be bound to itself? -- mbp 20070507
3437
master_branch = self.target.get_master_branch()
3438
master_branch.lock_write()
3439
operation.add_cleanup(master_branch.unlock)
3440
# push into the master from the source branch.
3441
master_inter = InterBranch.get(self.source, master_branch)
3442
master_inter._basic_push(overwrite, stop_revision)
3443
# and push into the target branch from the source. Note that
3444
# we push from the source branch again, because it's considered
3445
# the highest bandwidth repository.
3446
result = self._basic_push(overwrite, stop_revision)
3447
result.master_branch = master_branch
3448
result.local_branch = self.target
3450
master_branch = None
3452
result = self._basic_push(overwrite, stop_revision)
3453
# TODO: Why set master_branch and local_branch if there's no
3454
# binding? Maybe cleaner to just leave them unset? -- mbp
3456
result.master_branch = self.target
3457
result.local_branch = None
3461
def _pull(self, overwrite=False, stop_revision=None,
3237
3462
possible_transports=None, _hook_master=None, run_hooks=True,
3238
_override_hook_target=None, local=False):
3463
_override_hook_target=None, local=False,
3464
merge_tags_to_master=True):
3239
3465
"""See Branch.pull.
3467
This function is the core worker, used by GenericInterBranch.pull to
3468
avoid duplication when pulling source->master and source->local.
3241
3470
:param _hook_master: Private parameter - set the branch to
3242
3471
be supplied as the master to pull hooks.
3243
3472
:param run_hooks: Private parameter - if false, this branch
3244
3473
is being called because it's the master of the primary branch,
3245
3474
so it should not run its hooks.
3475
is being called because it's the master of the primary branch,
3476
so it should not run its hooks.
3246
3477
:param _override_hook_target: Private parameter - set the branch to be
3247
3478
supplied as the target_branch to pull hooks.
3248
3479
:param local: Only update the local branch, and not the bound branch.
3288
3519
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
3523
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
