860
782
old_repository = self.repository
861
783
if len(old_repository._fallback_repositories) != 1:
862
784
raise AssertionError("can't cope with fallback repositories "
863
"of %r (fallbacks: %r)" % (old_repository,
864
old_repository._fallback_repositories))
865
# Open the new repository object.
866
# Repositories don't offer an interface to remove fallback
867
# repositories today; take the conceptually simpler option and just
868
# reopen it. We reopen it starting from the URL so that we
869
# get a separate connection for RemoteRepositories and can
870
# stream from one of them to the other. This does mean doing
871
# separate SSH connection setup, but unstacking is not a
872
# common operation so it's tolerable.
873
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
874
new_repository = new_bzrdir.find_repository()
875
if new_repository._fallback_repositories:
876
raise AssertionError("didn't expect %r to have "
877
"fallback_repositories"
878
% (self.repository,))
879
# Replace self.repository with the new repository.
880
# Do our best to transfer the lock state (i.e. lock-tokens and
881
# lock count) of self.repository to the new repository.
882
lock_token = old_repository.lock_write().repository_token
883
self.repository = new_repository
884
if isinstance(self, remote.RemoteBranch):
885
# Remote branches can have a second reference to the old
886
# repository that need to be replaced.
887
if self._real_branch is not None:
888
self._real_branch.repository = new_repository
889
self.repository.lock_write(token=lock_token)
890
if lock_token is not None:
891
old_repository.leave_lock_in_place()
785
"of %r" % (self.repository,))
786
# unlock it, including unlocking the fallback
892
787
old_repository.unlock()
893
if lock_token is not None:
894
# XXX: self.repository.leave_lock_in_place() before this
895
# function will not be preserved. Fortunately that doesn't
896
# affect the current default format (2a), and would be a
897
# corner-case anyway.
898
# - Andrew Bennetts, 2010/06/30
899
self.repository.dont_leave_lock_in_place()
903
old_repository.unlock()
904
except errors.LockNotHeld:
907
if old_lock_count == 0:
908
raise AssertionError(
909
'old_repository should have been locked at least once.')
910
for i in range(old_lock_count-1):
788
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
911
807
self.repository.lock_write()
912
# Fetch from the old repository into the new.
913
old_repository.lock_read()
915
808
# XXX: If you unstack a branch while it has a working tree
916
809
# with a pending merge, the pending-merged revisions will no
917
810
# longer be present. You can (probably) revert and remerge.
919
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
920
except errors.TagsNotSupported:
921
tags_to_fetch = set()
922
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
923
old_repository, required_ids=[self.last_revision()],
924
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
925
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
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(),
927
819
old_repository.unlock()
1032
917
:return: A tuple (revno, revision_id).
1034
919
if self._last_revision_info_cache is None:
1035
self._last_revision_info_cache = self._read_last_revision_info()
920
self._last_revision_info_cache = self._last_revision_info()
1036
921
return self._last_revision_info_cache
1038
def _read_last_revision_info(self):
1039
raise NotImplementedError(self._read_last_revision_info)
1041
@deprecated_method(deprecated_in((2, 4, 0)))
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,
1042
970
def import_last_revision_info(self, source_repo, revno, revid):
1043
971
"""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.
1045
976
:param source_repo: Source repository to optionally fetch from
1046
977
:param revno: Revision number of the new tip
1047
978
:param revid: Revision id of the new tip
1818
1731
"basis revision. hooks MUST NOT modify this delta. "
1819
1732
" future_tree is an in-memory tree obtained from "
1820
1733
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1822
self.add_hook('post_commit',
1734
"tree.", (0,91), None))
1735
self.create_hook(HookPoint('post_commit',
1823
1736
"Called in the bzr client after a commit has completed. "
1824
1737
"post_commit is called with (local, master, old_revno, old_revid, "
1825
1738
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1826
"commit to a branch.", (0, 15))
1827
self.add_hook('post_uncommit',
1739
"commit to a branch.", (0, 15), None))
1740
self.create_hook(HookPoint('post_uncommit',
1828
1741
"Called in the bzr client after an uncommit completes. "
1829
1742
"post_uncommit is called with (local, master, old_revno, "
1830
1743
"old_revid, new_revno, new_revid) where local is the local branch "
1831
1744
"or None, master is the target branch, and an empty branch "
1832
"receives new_revno of 0, new_revid of None.", (0, 15))
1833
self.add_hook('pre_change_branch_tip',
1745
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1746
self.create_hook(HookPoint('pre_change_branch_tip',
1834
1747
"Called in bzr client and server before a change to the tip of a "
1835
1748
"branch is made. pre_change_branch_tip is called with a "
1836
1749
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1837
"commit, uncommit will all trigger this hook.", (1, 6))
1838
self.add_hook('post_change_branch_tip',
1750
"commit, uncommit will all trigger this hook.", (1, 6), None))
1751
self.create_hook(HookPoint('post_change_branch_tip',
1839
1752
"Called in bzr client and server after a change to the tip of a "
1840
1753
"branch is made. post_change_branch_tip is called with a "
1841
1754
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1842
"commit, uncommit will all trigger this hook.", (1, 4))
1843
self.add_hook('transform_fallback_location',
1755
"commit, uncommit will all trigger this hook.", (1, 4), None))
1756
self.create_hook(HookPoint('transform_fallback_location',
1844
1757
"Called when a stacked branch is activating its fallback "
1845
1758
"locations. transform_fallback_location is called with (branch, "
1846
1759
"url), and should return a new url. Returning the same url "
2506
2387
"""See Branch.print_file."""
2507
2388
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)
2509
2453
@needs_write_lock
2510
2454
def set_last_revision_info(self, revno, revision_id):
2511
if not revision_id or not isinstance(revision_id, basestring):
2512
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
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
2513
2465
revision_id = _mod_revision.ensure_null(revision_id)
2514
old_revno, old_revid = self.last_revision_info()
2515
if self._get_append_revisions_only():
2516
self._check_history_violation(revision_id)
2517
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2518
self._write_last_revision_info(revno, revision_id)
2519
self._clear_cached_state()
2520
self._last_revision_info_cache = revno, revision_id
2521
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
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))
2523
2495
def basis_tree(self):
2524
2496
"""See Branch.basis_tree."""
2645
def _read_last_revision_info(self):
2646
revision_string = self._transport.get_bytes('last-revision')
2647
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2648
revision_id = cache_utf8.get_cached_utf8(revision_id)
2650
return revno, revision_id
2652
def _write_last_revision_info(self, revno, revision_id):
2653
"""Simply write out the revision id, with no checks.
2655
Use set_last_revision_info to perform this safely.
2657
Does not update the revision_history cache.
2659
revision_id = _mod_revision.ensure_null(revision_id)
2660
out_string = '%d %s\n' % (revno, revision_id)
2661
self._transport.put_bytes('last-revision', out_string,
2662
mode=self.bzrdir._get_file_mode())
2665
class FullHistoryBzrBranch(BzrBranch):
2666
"""Bzr branch which contains the full revision history."""
2669
def set_last_revision_info(self, revno, revision_id):
2670
if not revision_id or not isinstance(revision_id, basestring):
2671
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2672
revision_id = _mod_revision.ensure_null(revision_id)
2673
# this old format stores the full history, but this api doesn't
2674
# provide it, so we must generate, and might as well check it's
2676
history = self._lefthand_history(revision_id)
2677
if len(history) != revno:
2678
raise AssertionError('%d != %d' % (len(history), revno))
2679
self._set_revision_history(history)
2681
def _read_last_revision_info(self):
2682
rh = self.revision_history()
2685
return (revno, rh[-1])
2687
return (0, _mod_revision.NULL_REVISION)
2689
@deprecated_method(deprecated_in((2, 4, 0)))
2691
def set_revision_history(self, rev_history):
2692
"""See Branch.set_revision_history."""
2693
self._set_revision_history(rev_history)
2695
def _set_revision_history(self, rev_history):
2696
if 'evil' in debug.debug_flags:
2697
mutter_callsite(3, "set_revision_history scales with history.")
2698
check_not_reserved_id = _mod_revision.check_not_reserved_id
2699
for rev_id in rev_history:
2700
check_not_reserved_id(rev_id)
2701
if Branch.hooks['post_change_branch_tip']:
2702
# Don't calculate the last_revision_info() if there are no hooks
2704
old_revno, old_revid = self.last_revision_info()
2705
if len(rev_history) == 0:
2706
revid = _mod_revision.NULL_REVISION
2708
revid = rev_history[-1]
2709
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2710
self._write_revision_history(rev_history)
2711
self._clear_cached_state()
2712
self._cache_revision_history(rev_history)
2713
for hook in Branch.hooks['set_rh']:
2714
hook(self, rev_history)
2715
if Branch.hooks['post_change_branch_tip']:
2716
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2718
def _write_revision_history(self, history):
2719
"""Factored out of set_revision_history.
2721
This performs the actual writing to disk.
2722
It is intended to be called by set_revision_history."""
2723
self._transport.put_bytes(
2724
'revision-history', '\n'.join(history),
2725
mode=self.bzrdir._get_file_mode())
2727
def _gen_revision_history(self):
2728
history = self._transport.get_bytes('revision-history').split('\n')
2729
if history[-1:] == ['']:
2730
# There shouldn't be a trailing newline, but just in case.
2734
def _synchronize_history(self, destination, revision_id):
2735
if not isinstance(destination, FullHistoryBzrBranch):
2736
super(BzrBranch, self)._synchronize_history(
2737
destination, revision_id)
2739
if revision_id == _mod_revision.NULL_REVISION:
2742
new_history = self.revision_history()
2743
if revision_id is not None and new_history != []:
2745
new_history = new_history[:new_history.index(revision_id) + 1]
2747
rev = self.repository.get_revision(revision_id)
2748
new_history = rev.get_history(self.repository)[1:]
2749
destination._set_revision_history(new_history)
2752
def generate_revision_history(self, revision_id, last_rev=None,
2754
"""Create a new revision history that will finish with revision_id.
2756
:param revision_id: the new tip to use.
2757
:param last_rev: The previous last_revision. If not None, then this
2758
must be a ancestory of revision_id, or DivergedBranches is raised.
2759
:param other_branch: The other branch that DivergedBranches should
2760
raise with respect to.
2762
self._set_revision_history(self._lefthand_history(revision_id,
2763
last_rev, other_branch))
2766
class BzrBranch5(FullHistoryBzrBranch):
2767
"""A format 5 branch. This supports new features over plain branches.
2769
It has support for a master_branch which is the data for bound branches.
2773
class BzrBranch8(BzrBranch):
2645
class BzrBranch8(BzrBranch5):
2774
2646
"""A branch that stores tree-reference locations."""
2776
2648
def _open_hook(self):
2802
2674
self._last_revision_info_cache = None
2803
2675
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)
2805
2722
def _check_history_violation(self, revision_id):
2806
current_revid = self.last_revision()
2807
last_revision = _mod_revision.ensure_null(current_revid)
2723
last_revision = _mod_revision.ensure_null(self.last_revision())
2808
2724
if _mod_revision.is_null(last_revision):
2810
graph = self.repository.get_graph()
2811
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2812
if lh_ancestor == current_revid:
2814
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2726
if last_revision not in self._lefthand_history(revision_id):
2727
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2816
2729
def _gen_revision_history(self):
2817
2730
"""Generate the revision history from last revision
3222
3182
raise NotImplementedError(self.push)
3225
def copy_content_into(self, revision_id=None):
3226
"""Copy the content of source into target
3228
revision_id: if not None, the revision history in the new branch will
3229
be truncated to end with revision_id.
3231
raise NotImplementedError(self.copy_content_into)
3234
def fetch(self, stop_revision=None, limit=None):
3237
:param stop_revision: Last revision to fetch
3238
:param limit: Optional rough limit of revisions to fetch
3240
raise NotImplementedError(self.fetch)
3243
3185
class GenericInterBranch(InterBranch):
3244
"""InterBranch implementation that uses public Branch functions."""
3247
def is_compatible(klass, source, target):
3248
# GenericBranch uses the public API, so always compatible
3252
def _get_branch_formats_to_test(klass):
3253
return [(format_registry.get_default(), format_registry.get_default())]
3256
def unwrap_format(klass, format):
3257
if isinstance(format, remote.RemoteBranchFormat):
3258
format._ensure_real()
3259
return format._custom_format
3263
def copy_content_into(self, revision_id=None):
3264
"""Copy the content of source into target
3266
revision_id: if not None, the revision history in the new branch will
3267
be truncated to end with revision_id.
3269
self.source.update_references(self.target)
3270
self.source._synchronize_history(self.target, revision_id)
3272
parent = self.source.get_parent()
3273
except errors.InaccessibleParent, e:
3274
mutter('parent was not accessible to copy: %s', e)
3277
self.target.set_parent(parent)
3278
if self.source._push_should_merge_tags():
3279
self.source.tags.merge_to(self.target.tags)
3282
def fetch(self, stop_revision=None, limit=None):
3283
if self.target.base == self.source.base:
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()."""
3285
3196
self.source.lock_read()
3287
fetch_spec_factory = fetch.FetchSpecFactory()
3288
fetch_spec_factory.source_branch = self.source
3289
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3290
fetch_spec_factory.source_repo = self.source.repository
3291
fetch_spec_factory.target_repo = self.target.repository
3292
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3293
fetch_spec_factory.limit = limit
3294
fetch_spec = fetch_spec_factory.make_fetch_spec()
3295
return self.target.repository.fetch(self.source.repository,
3296
fetch_spec=fetch_spec)
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)
3298
3234
self.source.unlock()
3301
def _update_revisions(self, stop_revision=None, overwrite=False,
3303
other_revno, other_last_revision = self.source.last_revision_info()
3304
stop_revno = None # unknown
3305
if stop_revision is None:
3306
stop_revision = other_last_revision
3307
if _mod_revision.is_null(stop_revision):
3308
# if there are no commits, we're done.
3310
stop_revno = other_revno
3312
# what's the current last revision, before we fetch [and change it
3314
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3315
# we fetch here so that we don't process data twice in the common
3316
# case of having something to pull, and so that the check for
3317
# already merged can operate on the just fetched graph, which will
3318
# be cached in memory.
3319
self.fetch(stop_revision=stop_revision)
3320
# Check to see if one is an ancestor of the other
3323
graph = self.target.repository.get_graph()
3324
if self.target._check_if_descendant_or_diverged(
3325
stop_revision, last_rev, graph, self.source):
3326
# stop_revision is a descendant of last_rev, but we aren't
3327
# overwriting, so we're done.
3329
if stop_revno is None:
3331
graph = self.target.repository.get_graph()
3332
this_revno, this_last_revision = \
3333
self.target.last_revision_info()
3334
stop_revno = graph.find_distance_to_null(stop_revision,
3335
[(other_last_revision, other_revno),
3336
(this_last_revision, this_revno)])
3337
self.target.set_last_revision_info(stop_revno, stop_revision)
3340
3236
def pull(self, overwrite=False, stop_revision=None,
3341
possible_transports=None, run_hooks=True,
3342
_override_hook_target=None, local=False):
3343
"""Pull from source into self, updating my master if any.
3345
:param run_hooks: Private parameter - if false, this branch
3346
is being called because it's the master of the primary branch,
3347
so it should not run its hooks.
3349
bound_location = self.target.get_bound_location()
3350
if local and not bound_location:
3351
raise errors.LocalRequiresBoundBranch()
3352
master_branch = None
3353
source_is_master = False
3355
# bound_location comes from a config file, some care has to be
3356
# taken to relate it to source.user_url
3357
normalized = urlutils.normalize_url(bound_location)
3359
relpath = self.source.user_transport.relpath(normalized)
3360
source_is_master = (relpath == '')
3361
except (errors.PathNotChild, errors.InvalidURL):
3362
source_is_master = False
3363
if not local and bound_location and not source_is_master:
3364
# not pulling from master, so we need to update master.
3365
master_branch = self.target.get_master_branch(possible_transports)
3366
master_branch.lock_write()
3369
# pull from source into master.
3370
master_branch.pull(self.source, overwrite, stop_revision,
3372
return self._pull(overwrite,
3373
stop_revision, _hook_master=master_branch,
3374
run_hooks=run_hooks,
3375
_override_hook_target=_override_hook_target,
3376
merge_tags_to_master=not source_is_master)
3379
master_branch.unlock()
3381
def push(self, overwrite=False, stop_revision=None, lossy=False,
3382
_override_hook_source_branch=None):
3383
"""See InterBranch.push.
3385
This is the basic concrete implementation of push()
3387
:param _override_hook_source_branch: If specified, run the hooks
3388
passing this Branch as the source, rather than self. This is for
3389
use of RemoteBranch, where push is delegated to the underlying
3393
raise errors.LossyPushToSameVCS(self.source, self.target)
3394
# TODO: Public option to disable running hooks - should be trivial but
3397
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3398
op.add_cleanup(self.source.lock_read().unlock)
3399
op.add_cleanup(self.target.lock_write().unlock)
3400
return op.run(overwrite, stop_revision,
3401
_override_hook_source_branch=_override_hook_source_branch)
3403
def _basic_push(self, overwrite, stop_revision):
3404
"""Basic implementation of push without bound branches or hooks.
3406
Must be called with source read locked and target write locked.
3408
result = BranchPushResult()
3409
result.source_branch = self.source
3410
result.target_branch = self.target
3411
result.old_revno, result.old_revid = self.target.last_revision_info()
3412
self.source.update_references(self.target)
3413
if result.old_revid != stop_revision:
3414
# We assume that during 'push' this repository is closer than
3416
graph = self.source.repository.get_graph(self.target.repository)
3417
self._update_revisions(stop_revision, overwrite=overwrite,
3419
if self.source._push_should_merge_tags():
3420
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3422
result.new_revno, result.new_revid = self.target.last_revision_info()
3425
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3426
_override_hook_source_branch=None):
3427
"""Push from source into target, and into target's master if any.
3430
if _override_hook_source_branch:
3431
result.source_branch = _override_hook_source_branch
3432
for hook in Branch.hooks['post_push']:
3435
bound_location = self.target.get_bound_location()
3436
if bound_location and self.target.base != bound_location:
3437
# there is a master branch.
3439
# XXX: Why the second check? Is it even supported for a branch to
3440
# be bound to itself? -- mbp 20070507
3441
master_branch = self.target.get_master_branch()
3442
master_branch.lock_write()
3443
operation.add_cleanup(master_branch.unlock)
3444
# push into the master from the source branch.
3445
master_inter = InterBranch.get(self.source, master_branch)
3446
master_inter._basic_push(overwrite, stop_revision)
3447
# and push into the target branch from the source. Note that
3448
# we push from the source branch again, because it's considered
3449
# the highest bandwidth repository.
3450
result = self._basic_push(overwrite, stop_revision)
3451
result.master_branch = master_branch
3452
result.local_branch = self.target
3454
master_branch = None
3456
result = self._basic_push(overwrite, stop_revision)
3457
# TODO: Why set master_branch and local_branch if there's no
3458
# binding? Maybe cleaner to just leave them unset? -- mbp
3460
result.master_branch = self.target
3461
result.local_branch = None
3465
def _pull(self, overwrite=False, stop_revision=None,
3466
3237
possible_transports=None, _hook_master=None, run_hooks=True,
3467
_override_hook_target=None, local=False,
3468
merge_tags_to_master=True):
3238
_override_hook_target=None, local=False):
3469
3239
"""See Branch.pull.
3471
This function is the core worker, used by GenericInterBranch.pull to
3472
avoid duplication when pulling source->master and source->local.
3474
3241
:param _hook_master: Private parameter - set the branch to
3475
3242
be supplied as the master to pull hooks.
3476
3243
:param run_hooks: Private parameter - if false, this branch
3477
3244
is being called because it's the master of the primary branch,
3478
3245
so it should not run its hooks.
3479
is being called because it's the master of the primary branch,
3480
so it should not run its hooks.
3481
3246
:param _override_hook_target: Private parameter - set the branch to be
3482
3247
supplied as the target_branch to pull hooks.
3483
3248
:param local: Only update the local branch, and not the bound branch.
3523
3288
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()
3527
3400
InterBranch.register_optimiser(GenericInterBranch)
3401
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
