190
142
possible_transports)
191
143
return control.open_branch(), relpath
193
def _push_should_merge_tags(self):
194
"""Should _basic_push merge this branch's tags into the target?
196
The default implementation returns False if this branch has no tags,
197
and True the rest of the time. Subclasses may override this.
199
return self.supports_tags() and self.tags.get_tag_dict()
201
145
def get_config(self):
202
146
return BranchConfig(self)
204
def _get_config(self):
205
"""Get the concrete config for just the config in this branch.
207
This is not intended for client use; see Branch.get_config for the
212
:return: An object supporting get_option and set_option.
214
raise NotImplementedError(self._get_config)
216
def _get_fallback_repository(self, url):
217
"""Get the repository we fallback to at url."""
218
url = urlutils.join(self.base, url)
219
a_bzrdir = bzrdir.BzrDir.open(url,
220
possible_transports=[self.bzrdir.root_transport])
221
return a_bzrdir.open_branch().repository
223
def _get_tags_bytes(self):
224
"""Get the bytes of a serialised tags dict.
226
Note that not all branches support tags, nor do all use the same tags
227
logic: this method is specific to BasicTags. Other tag implementations
228
may use the same method name and behave differently, safely, because
229
of the double-dispatch via
230
format.make_tags->tags_instance->get_tags_dict.
232
:return: The bytes of the tags file.
233
:seealso: Branch._set_tags_bytes.
235
return self._transport.get_bytes('tags')
237
def _get_nick(self, local=False, possible_transports=None):
238
config = self.get_config()
239
# explicit overrides master, but don't look for master if local is True
240
if not local and not config.has_explicit_nickname():
242
master = self.get_master_branch(possible_transports)
243
if master is not None:
244
# return the master branch value
246
except errors.BzrError, e:
247
# Silently fall back to local implicit nick if the master is
249
mutter("Could not connect to bound branch, "
250
"falling back to local nick.\n " + str(e))
251
return config.get_nickname()
149
return self.get_config().get_nickname()
253
151
def _set_nick(self, nick):
254
152
self.get_config().set_user_option('nickname', nick, warn_masked=True)
302
173
raise NotImplementedError(self.get_physical_lock_status)
305
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
306
"""Return the revision_id for a dotted revno.
308
:param revno: a tuple like (1,) or (1,1,2)
309
:param _cache_reverse: a private parameter enabling storage
310
of the reverse mapping in a top level cache. (This should
311
only be done in selective circumstances as we want to
312
avoid having the mapping cached multiple times.)
313
:return: the revision_id
314
:raises errors.NoSuchRevision: if the revno doesn't exist
316
rev_id = self._do_dotted_revno_to_revision_id(revno)
318
self._partial_revision_id_to_revno_cache[rev_id] = revno
321
def _do_dotted_revno_to_revision_id(self, revno):
322
"""Worker function for dotted_revno_to_revision_id.
324
Subclasses should override this if they wish to
325
provide a more efficient implementation.
328
return self.get_rev_id(revno[0])
329
revision_id_to_revno = self.get_revision_id_to_revno_map()
330
revision_ids = [revision_id for revision_id, this_revno
331
in revision_id_to_revno.iteritems()
332
if revno == this_revno]
333
if len(revision_ids) == 1:
334
return revision_ids[0]
336
revno_str = '.'.join(map(str, revno))
337
raise errors.NoSuchRevision(self, revno_str)
340
def revision_id_to_dotted_revno(self, revision_id):
341
"""Given a revision id, return its dotted revno.
343
:return: a tuple like (1,) or (400,1,3).
345
return self._do_revision_id_to_dotted_revno(revision_id)
347
def _do_revision_id_to_dotted_revno(self, revision_id):
348
"""Worker function for revision_id_to_revno."""
349
# Try the caches if they are loaded
350
result = self._partial_revision_id_to_revno_cache.get(revision_id)
351
if result is not None:
353
if self._revision_id_to_revno_cache:
354
result = self._revision_id_to_revno_cache.get(revision_id)
356
raise errors.NoSuchRevision(self, revision_id)
357
# Try the mainline as it's optimised
359
revno = self.revision_id_to_revno(revision_id)
361
except errors.NoSuchRevision:
362
# We need to load and use the full revno map after all
363
result = self.get_revision_id_to_revno_map().get(revision_id)
365
raise errors.NoSuchRevision(self, revision_id)
369
176
def get_revision_id_to_revno_map(self):
370
177
"""Return the revision_id => dotted revno map.
396
203
:return: A dictionary mapping revision_id => dotted revno.
205
last_revision = self.last_revision()
206
revision_graph = repository._old_get_graph(self.repository,
208
merge_sorted_revisions = tsort.merge_sort(
398
213
revision_id_to_revno = dict((rev_id, revno)
399
for rev_id, depth, revno, end_of_merge
400
in self.iter_merge_sorted_revisions())
214
for seq_num, rev_id, depth, revno, end_of_merge
215
in merge_sorted_revisions)
401
216
return revision_id_to_revno
404
def iter_merge_sorted_revisions(self, start_revision_id=None,
405
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
406
"""Walk the revisions for a branch in merge sorted order.
408
Merge sorted order is the output from a merge-aware,
409
topological sort, i.e. all parents come before their
410
children going forward; the opposite for reverse.
412
:param start_revision_id: the revision_id to begin walking from.
413
If None, the branch tip is used.
414
:param stop_revision_id: the revision_id to terminate the walk
415
after. If None, the rest of history is included.
416
:param stop_rule: if stop_revision_id is not None, the precise rule
417
to use for termination:
418
* 'exclude' - leave the stop revision out of the result (default)
419
* 'include' - the stop revision is the last item in the result
420
* 'with-merges' - include the stop revision and all of its
421
merged revisions in the result
422
:param direction: either 'reverse' or 'forward':
423
* reverse means return the start_revision_id first, i.e.
424
start at the most recent revision and go backwards in history
425
* forward returns tuples in the opposite order to reverse.
426
Note in particular that forward does *not* do any intelligent
427
ordering w.r.t. depth as some clients of this API may like.
428
(If required, that ought to be done at higher layers.)
430
:return: an iterator over (revision_id, depth, revno, end_of_merge)
433
* revision_id: the unique id of the revision
434
* depth: How many levels of merging deep this node has been
436
* revno_sequence: This field provides a sequence of
437
revision numbers for all revisions. The format is:
438
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
439
branch that the revno is on. From left to right the REVNO numbers
440
are the sequence numbers within that branch of the revision.
441
* end_of_merge: When True the next node (earlier in history) is
442
part of a different merge.
444
# Note: depth and revno values are in the context of the branch so
445
# we need the full graph to get stable numbers, regardless of the
447
if self._merge_sorted_revisions_cache is None:
448
last_revision = self.last_revision()
449
graph = self.repository.get_graph()
450
parent_map = dict(((key, value) for key, value in
451
graph.iter_ancestry([last_revision]) if value is not None))
452
revision_graph = repository._strip_NULL_ghosts(parent_map)
453
revs = tsort.merge_sort(revision_graph, last_revision, None,
455
# Drop the sequence # before caching
456
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
458
filtered = self._filter_merge_sorted_revisions(
459
self._merge_sorted_revisions_cache, start_revision_id,
460
stop_revision_id, stop_rule)
461
if direction == 'reverse':
463
if direction == 'forward':
464
return reversed(list(filtered))
466
raise ValueError('invalid direction %r' % direction)
468
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
469
start_revision_id, stop_revision_id, stop_rule):
470
"""Iterate over an inclusive range of sorted revisions."""
471
rev_iter = iter(merge_sorted_revisions)
472
if start_revision_id is not None:
473
for rev_id, depth, revno, end_of_merge in rev_iter:
474
if rev_id != start_revision_id:
477
# The decision to include the start or not
478
# depends on the stop_rule if a stop is provided
480
iter([(rev_id, depth, revno, end_of_merge)]),
483
if stop_revision_id is None:
484
for rev_id, depth, revno, end_of_merge in rev_iter:
485
yield rev_id, depth, revno, end_of_merge
486
elif stop_rule == 'exclude':
487
for rev_id, depth, revno, end_of_merge in rev_iter:
488
if rev_id == stop_revision_id:
490
yield rev_id, depth, revno, end_of_merge
491
elif stop_rule == 'include':
492
for rev_id, depth, revno, end_of_merge in rev_iter:
493
yield rev_id, depth, revno, end_of_merge
494
if rev_id == stop_revision_id:
496
elif stop_rule == 'with-merges':
497
stop_rev = self.repository.get_revision(stop_revision_id)
498
if stop_rev.parent_ids:
499
left_parent = stop_rev.parent_ids[0]
501
left_parent = _mod_revision.NULL_REVISION
502
for rev_id, depth, revno, end_of_merge in rev_iter:
503
if rev_id == left_parent:
505
yield rev_id, depth, revno, end_of_merge
507
raise ValueError('invalid stop_rule %r' % stop_rule)
509
218
def leave_lock_in_place(self):
510
219
"""Tell this branch object not to release the physical lock when this
511
220
object is unlocked.
513
222
If lock_write doesn't return a token, then this method is not supported.
515
224
self.control_files.leave_in_place()
669
348
:raises UnstackableRepositoryFormat: If the repository does not support
672
if not self._format.supports_stacking():
673
raise errors.UnstackableBranchFormat(self._format, self.base)
674
# XXX: Changing from one fallback repository to another does not check
675
# that all the data you need is present in the new fallback.
676
# Possibly it should.
677
self._check_stackable_repo()
680
old_url = self.get_stacked_on_url()
681
except (errors.NotStacked, errors.UnstackableBranchFormat,
682
errors.UnstackableRepositoryFormat):
686
self._activate_fallback_location(url)
687
# write this out after the repository is stacked to avoid setting a
688
# stacked config that doesn't work.
689
self._set_config_location('stacked_on_location', url)
692
"""Change a branch to be unstacked, copying data as needed.
694
Don't call this directly, use set_stacked_on_url(None).
696
pb = ui.ui_factory.nested_progress_bar()
698
pb.update("Unstacking")
699
# The basic approach here is to fetch the tip of the branch,
700
# including all available ghosts, from the existing stacked
701
# repository into a new repository object without the fallbacks.
703
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
704
# correct for CHKMap repostiories
705
old_repository = self.repository
706
if len(old_repository._fallback_repositories) != 1:
707
raise AssertionError("can't cope with fallback repositories "
708
"of %r" % (self.repository,))
709
# unlock it, including unlocking the fallback
710
old_repository.unlock()
711
old_repository.lock_read()
713
# Repositories don't offer an interface to remove fallback
714
# repositories today; take the conceptually simpler option and just
715
# reopen it. We reopen it starting from the URL so that we
716
# get a separate connection for RemoteRepositories and can
717
# stream from one of them to the other. This does mean doing
718
# separate SSH connection setup, but unstacking is not a
719
# common operation so it's tolerable.
720
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
721
new_repository = new_bzrdir.find_repository()
722
self.repository = new_repository
723
if self.repository._fallback_repositories:
724
raise AssertionError("didn't expect %r to have "
725
"fallback_repositories"
726
% (self.repository,))
727
# this is not paired with an unlock because it's just restoring
728
# the previous state; the lock's released when set_stacked_on_url
730
self.repository.lock_write()
731
# XXX: If you unstack a branch while it has a working tree
732
# with a pending merge, the pending-merged revisions will no
733
# longer be present. You can (probably) revert and remerge.
735
# XXX: This only fetches up to the tip of the repository; it
736
# doesn't bring across any tags. That's fairly consistent
737
# with how branch works, but perhaps not ideal.
738
self.repository.fetch(old_repository,
739
revision_id=self.last_revision(),
742
old_repository.unlock()
746
def _set_tags_bytes(self, bytes):
747
"""Mirror method for _get_tags_bytes.
749
:seealso: Branch._get_tags_bytes.
751
return _run_with_write_locked_target(self, self._transport.put_bytes,
351
raise NotImplementedError(self.set_stacked_on_url)
754
353
def _cache_revision_history(self, rev_history):
755
354
"""Set the cached revision history to rev_history.
887
487
information. This can be None.
890
return InterBranch.get(other, self).update_revisions(stop_revision,
893
def import_last_revision_info(self, source_repo, revno, revid):
894
"""Set the last revision info, importing from another repo if necessary.
896
This is used by the bound branch code to upload a revision to
897
the master branch first before updating the tip of the local branch.
899
:param source_repo: Source repository to optionally fetch from
900
:param revno: Revision number of the new tip
901
:param revid: Revision id of the new tip
903
if not self.repository.has_same_location(source_repo):
904
self.repository.fetch(source_repo, revision_id=revid)
905
self.set_last_revision_info(revno, revid)
492
other_revno, other_last_revision = other.last_revision_info()
493
stop_revno = None # unknown
494
if stop_revision is None:
495
stop_revision = other_last_revision
496
if _mod_revision.is_null(stop_revision):
497
# if there are no commits, we're done.
499
stop_revno = other_revno
501
# what's the current last revision, before we fetch [and change it
503
last_rev = _mod_revision.ensure_null(self.last_revision())
504
# we fetch here so that we don't process data twice in the common
505
# case of having something to pull, and so that the check for
506
# already merged can operate on the just fetched graph, which will
507
# be cached in memory.
508
self.fetch(other, stop_revision)
509
# Check to see if one is an ancestor of the other
512
graph = self.repository.get_graph()
513
if self._check_if_descendant_or_diverged(
514
stop_revision, last_rev, graph, other):
515
# stop_revision is a descendant of last_rev, but we aren't
516
# overwriting, so we're done.
518
if stop_revno is None:
520
graph = self.repository.get_graph()
521
this_revno, this_last_revision = self.last_revision_info()
522
stop_revno = graph.find_distance_to_null(stop_revision,
523
[(other_last_revision, other_revno),
524
(this_last_revision, this_revno)])
525
self.set_last_revision_info(stop_revno, stop_revision)
907
529
def revision_id_to_revno(self, revision_id):
908
530
"""Given a revision id, return its revno"""
914
536
except ValueError:
915
537
raise errors.NoSuchRevision(self, revision_id)
918
539
def get_rev_id(self, revno, history=None):
919
540
"""Find the revision id of the specified revno."""
921
542
return _mod_revision.NULL_REVISION
922
last_revno, last_revid = self.last_revision_info()
923
if revno == last_revno:
925
if revno <= 0 or revno > last_revno:
544
history = self.revision_history()
545
if revno <= 0 or revno > len(history):
926
546
raise errors.NoSuchRevision(self, revno)
927
distance_from_last = last_revno - revno
928
if len(self._partial_revision_history_cache) <= distance_from_last:
929
self._extend_partial_history(distance_from_last)
930
return self._partial_revision_history_cache[distance_from_last]
547
return history[revno - 1]
933
549
def pull(self, source, overwrite=False, stop_revision=None,
934
possible_transports=None, *args, **kwargs):
550
possible_transports=None, _override_hook_target=None):
935
551
"""Mirror source into this branch.
937
553
This branch is considered to be 'local', having low latency.
939
555
:returns: PullResult instance
941
return InterBranch.get(source, self).pull(overwrite=overwrite,
942
stop_revision=stop_revision,
943
possible_transports=possible_transports, *args, **kwargs)
557
raise NotImplementedError(self.pull)
945
def push(self, target, overwrite=False, stop_revision=None, *args,
559
def push(self, target, overwrite=False, stop_revision=None):
947
560
"""Mirror this branch into target.
949
562
This branch is considered to be 'local', having low latency.
951
return InterBranch.get(self, target).push(overwrite, stop_revision,
954
def lossy_push(self, target, stop_revision=None):
955
"""Push deltas into another branch.
957
:note: This does not, like push, retain the revision ids from
958
the source branch and will, rather than adding bzr-specific
959
metadata, push only those semantics of the revision that can be
960
natively represented by this branch' VCS.
962
:param target: Target branch
963
:param stop_revision: Revision to push, defaults to last revision.
964
:return: BranchPushResult with an extra member revidmap:
965
A dictionary mapping revision ids from the target branch
966
to new revision ids in the target branch, for each
967
revision that was pushed.
969
inter = InterBranch.get(self, target)
970
lossy_push = getattr(inter, "lossy_push", None)
971
if lossy_push is None:
972
raise errors.LossyPushToSameVCS(self, target)
973
return lossy_push(stop_revision)
564
raise NotImplementedError(self.push)
975
566
def basis_tree(self):
976
567
"""Return `Tree` object for last revision."""
1148
686
be truncated to end with revision_id.
1150
688
result = to_bzrdir.create_branch()
1153
if repository_policy is not None:
1154
repository_policy.configure_branch(result)
1155
self.copy_content_into(result, revision_id=revision_id)
1156
result.set_parent(self.bzrdir.root_transport.base)
689
self.copy_content_into(result, revision_id=revision_id)
690
result.set_parent(self.bzrdir.root_transport.base)
1161
693
def _synchronize_history(self, destination, revision_id):
1162
694
"""Synchronize last revision and revision history between branches.
1164
696
This version is most efficient when the destination is also a
1165
BzrBranch6, but works for BzrBranch5, as long as the destination's
1166
repository contains all the lefthand ancestors of the intended
1167
last_revision. If not, set_last_revision_info will fail.
697
BzrBranch5, but works for BzrBranch6 as long as the revision
698
history is the true lefthand parent history, and all of the revisions
699
are in the destination's repository. If not, set_revision_history
1169
702
:param destination: The branch to copy the history into
1170
703
:param revision_id: The revision-id to truncate history at. May
1171
704
be None to copy complete history.
1173
source_revno, source_revision_id = self.last_revision_info()
1174
if revision_id is None:
1175
revno, revision_id = source_revno, source_revision_id
706
if revision_id == _mod_revision.NULL_REVISION:
1177
graph = self.repository.get_graph()
709
new_history = self.revision_history()
710
if revision_id is not None and new_history != []:
1179
revno = graph.find_distance_to_null(revision_id,
1180
[(source_revision_id, source_revno)])
1181
except errors.GhostRevisionsHaveNoRevno:
1182
# Default to 1, if we can't find anything else
1184
destination.set_last_revision_info(revno, revision_id)
712
new_history = new_history[:new_history.index(revision_id) + 1]
714
rev = self.repository.get_revision(revision_id)
715
new_history = rev.get_history(self.repository)[1:]
716
destination.set_revision_history(new_history)
1186
718
@needs_read_lock
1187
719
def copy_content_into(self, destination, revision_id=None):
1201
732
destination.set_parent(parent)
1202
if self._push_should_merge_tags():
1203
self.tags.merge_to(destination.tags)
1205
def update_references(self, target):
1206
if not getattr(self._format, 'supports_reference_locations', False):
1208
reference_dict = self._get_all_reference_info()
1209
if len(reference_dict) == 0:
1211
old_base = self.base
1212
new_base = target.base
1213
target_reference_dict = target._get_all_reference_info()
1214
for file_id, (tree_path, branch_location) in (
1215
reference_dict.items()):
1216
branch_location = urlutils.rebase_url(branch_location,
1218
target_reference_dict.setdefault(
1219
file_id, (tree_path, branch_location))
1220
target._set_all_reference_info(target_reference_dict)
733
self.tags.merge_to(destination.tags)
1222
735
@needs_read_lock
1223
def check(self, refs):
1224
737
"""Check consistency of the branch.
1226
739
In particular this checks that revisions given in the revision-history
1227
do actually match up in the revision graph, and that they're all
740
do actually match up in the revision graph, and that they're all
1228
741
present in the repository.
1230
743
Callers will typically also want to check the repository.
1232
:param refs: Calculated refs for this branch as specified by
1233
branch._get_check_refs()
1234
745
:return: A BranchCheckResult.
1236
result = BranchCheckResult(self)
747
mainline_parent_id = None
1237
748
last_revno, last_revision_id = self.last_revision_info()
1238
actual_revno = refs[('lefthand-distance', last_revision_id)]
1239
if actual_revno != last_revno:
1240
result.errors.append(errors.BzrCheckError(
1241
'revno does not match len(mainline) %s != %s' % (
1242
last_revno, actual_revno)))
1243
# TODO: We should probably also check that self.revision_history
1244
# matches the repository for older branch formats.
1245
# If looking for the code that cross-checks repository parents against
1246
# the iter_reverse_revision_history output, that is now a repository
749
real_rev_history = list(self.repository.iter_reverse_revision_history(
751
real_rev_history.reverse()
752
if len(real_rev_history) != last_revno:
753
raise errors.BzrCheckError('revno does not match len(mainline)'
754
' %s != %s' % (last_revno, len(real_rev_history)))
755
# TODO: We should probably also check that real_rev_history actually
756
# matches self.revision_history()
757
for revision_id in real_rev_history:
759
revision = self.repository.get_revision(revision_id)
760
except errors.NoSuchRevision, e:
761
raise errors.BzrCheckError("mainline revision {%s} not in repository"
763
# In general the first entry on the revision history has no parents.
764
# But it's not illegal for it to have parents listed; this can happen
765
# in imports from Arch when the parents weren't reachable.
766
if mainline_parent_id is not None:
767
if mainline_parent_id not in revision.parent_ids:
768
raise errors.BzrCheckError("previous revision {%s} not listed among "
770
% (mainline_parent_id, revision_id))
771
mainline_parent_id = revision_id
772
return BranchCheckResult(self)
1250
774
def _get_checkout_format(self):
1251
775
"""Return the most suitable metadir for a checkout of this branch.
1526
1011
"""Is this format supported?
1528
1013
Supported formats can be initialized and opened.
1529
Unsupported formats may not support initialization or committing or
1014
Unsupported formats may not support initialization or committing or
1530
1015
some other features depending on the reason for not being supported.
1534
def make_tags(self, branch):
1535
"""Create a tags object for branch.
1537
This method is on BranchFormat, because BranchFormats are reflected
1538
over the wire via network_name(), whereas full Branch instances require
1539
multiple VFS method calls to operate at all.
1541
The default implementation returns a disabled-tags instance.
1543
Note that it is normal for branch to be a RemoteBranch when using tags
1546
return DisabledTags(branch)
1548
def network_name(self):
1549
"""A simple byte string uniquely identifying this format for RPC calls.
1551
MetaDir branch formats use their disk format string to identify the
1552
repository over the wire. All in one formats such as bzr < 0.8, and
1553
foreign formats like svn/git and hg should use some marker which is
1554
unique and immutable.
1556
raise NotImplementedError(self.network_name)
1558
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1019
def open(self, a_bzrdir, _found=False):
1559
1020
"""Return the branch object for a_bzrdir
1561
:param a_bzrdir: A BzrDir that contains a branch.
1562
:param _found: a private parameter, do not use it. It is used to
1563
indicate if format probing has already be done.
1564
:param ignore_fallbacks: when set, no fallback branches will be opened
1565
(if there are any). Default is to open fallbacks.
1022
_found is a private parameter, do not use it. It is used to indicate
1023
if format probing has already be done.
1567
1025
raise NotImplementedError(self.open)
1570
1028
def register_format(klass, format):
1571
"""Register a metadir format."""
1572
1029
klass._formats[format.get_format_string()] = format
1573
# Metadir formats have a network name of their format string, and get
1574
# registered as class factories.
1575
network_format_registry.register(format.get_format_string(), format.__class__)
1578
1032
def set_default_format(klass, format):
1579
1033
klass._default_format = format
1581
def supports_set_append_revisions_only(self):
1582
"""True if this format supports set_append_revisions_only."""
1585
1035
def supports_stacking(self):
1586
1036
"""True if this format records a stacked-on branch."""
1614
1064
Hooks.__init__(self)
1615
self.create_hook(HookPoint('set_rh',
1616
"Invoked whenever the revision history has been set via "
1617
"set_revision_history. The api signature is (branch, "
1618
"revision_history), and the branch will be write-locked. "
1619
"The set_rh hook can be expensive for bzr to trigger, a better "
1620
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1621
self.create_hook(HookPoint('open',
1622
"Called with the Branch object that has been opened after a "
1623
"branch is opened.", (1, 8), None))
1624
self.create_hook(HookPoint('post_push',
1625
"Called after a push operation completes. post_push is called "
1626
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1627
"bzr client.", (0, 15), None))
1628
self.create_hook(HookPoint('post_pull',
1629
"Called after a pull operation completes. post_pull is called "
1630
"with a bzrlib.branch.PullResult object and only runs in the "
1631
"bzr client.", (0, 15), None))
1632
self.create_hook(HookPoint('pre_commit',
1633
"Called after a commit is calculated but before it is is "
1634
"completed. pre_commit is called with (local, master, old_revno, "
1635
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1636
"). old_revid is NULL_REVISION for the first commit to a branch, "
1637
"tree_delta is a TreeDelta object describing changes from the "
1638
"basis revision. hooks MUST NOT modify this delta. "
1639
" future_tree is an in-memory tree obtained from "
1640
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1641
"tree.", (0,91), None))
1642
self.create_hook(HookPoint('post_commit',
1643
"Called in the bzr client after a commit has completed. "
1644
"post_commit is called with (local, master, old_revno, old_revid, "
1645
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1646
"commit to a branch.", (0, 15), None))
1647
self.create_hook(HookPoint('post_uncommit',
1648
"Called in the bzr client after an uncommit completes. "
1649
"post_uncommit is called with (local, master, old_revno, "
1650
"old_revid, new_revno, new_revid) where local is the local branch "
1651
"or None, master is the target branch, and an empty branch "
1652
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1653
self.create_hook(HookPoint('pre_change_branch_tip',
1654
"Called in bzr client and server before a change to the tip of a "
1655
"branch is made. pre_change_branch_tip is called with a "
1656
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1657
"commit, uncommit will all trigger this hook.", (1, 6), None))
1658
self.create_hook(HookPoint('post_change_branch_tip',
1659
"Called in bzr client and server after a change to the tip of a "
1660
"branch is made. post_change_branch_tip is called with a "
1661
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1662
"commit, uncommit will all trigger this hook.", (1, 4), None))
1663
self.create_hook(HookPoint('transform_fallback_location',
1664
"Called when a stacked branch is activating its fallback "
1665
"locations. transform_fallback_location is called with (branch, "
1666
"url), and should return a new url. Returning the same url "
1667
"allows it to be used as-is, returning a different one can be "
1668
"used to cause the branch to stack on a closer copy of that "
1669
"fallback_location. Note that the branch cannot have history "
1670
"accessing methods called on it during this hook because the "
1671
"fallback locations have not been activated. When there are "
1672
"multiple hooks installed for transform_fallback_location, "
1673
"all are called with the url returned from the previous hook."
1674
"The order is however undefined.", (1, 9), None))
1065
# Introduced in 0.15:
1066
# invoked whenever the revision history has been set
1067
# with set_revision_history. The api signature is
1068
# (branch, revision_history), and the branch will
1071
# invoked after a push operation completes.
1072
# the api signature is
1074
# containing the members
1075
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1076
# where local is the local target branch or None, master is the target
1077
# master branch, and the rest should be self explanatory. The source
1078
# is read locked and the target branches write locked. Source will
1079
# be the local low-latency branch.
1080
self['post_push'] = []
1081
# invoked after a pull operation completes.
1082
# the api signature is
1084
# containing the members
1085
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1086
# where local is the local branch or None, master is the target
1087
# master branch, and the rest should be self explanatory. The source
1088
# is read locked and the target branches write locked. The local
1089
# branch is the low-latency branch.
1090
self['post_pull'] = []
1091
# invoked before a commit operation takes place.
1092
# the api signature is
1093
# (local, master, old_revno, old_revid, future_revno, future_revid,
1094
# tree_delta, future_tree).
1095
# old_revid is NULL_REVISION for the first commit to a branch
1096
# tree_delta is a TreeDelta object describing changes from the basis
1097
# revision, hooks MUST NOT modify this delta
1098
# future_tree is an in-memory tree obtained from
1099
# CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
1100
self['pre_commit'] = []
1101
# invoked after a commit operation completes.
1102
# the api signature is
1103
# (local, master, old_revno, old_revid, new_revno, new_revid)
1104
# old_revid is NULL_REVISION for the first commit to a branch.
1105
self['post_commit'] = []
1106
# invoked after a uncommit operation completes.
1107
# the api signature is
1108
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1109
# local is the local branch or None, master is the target branch,
1110
# and an empty branch recieves new_revno of 0, new_revid of None.
1111
self['post_uncommit'] = []
1113
# Invoked before the tip of a branch changes.
1114
# the api signature is
1115
# (params) where params is a ChangeBranchTipParams with the members
1116
# (branch, old_revno, new_revno, old_revid, new_revid)
1117
self['pre_change_branch_tip'] = []
1119
# Invoked after the tip of a branch changes.
1120
# the api signature is
1121
# (params) where params is a ChangeBranchTipParams with the members
1122
# (branch, old_revno, new_revno, old_revid, new_revid)
1123
self['post_change_branch_tip'] = []
1677
1126
# install the default hooks into the Branch class.
2213
1569
if Branch.hooks['post_change_branch_tip']:
2214
1570
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2216
def _synchronize_history(self, destination, revision_id):
2217
"""Synchronize last revision and revision history between branches.
2219
This version is most efficient when the destination is also a
2220
BzrBranch5, but works for BzrBranch6 as long as the revision
2221
history is the true lefthand parent history, and all of the revisions
2222
are in the destination's repository. If not, set_revision_history
2225
:param destination: The branch to copy the history into
2226
:param revision_id: The revision-id to truncate history at. May
2227
be None to copy complete history.
2229
if not isinstance(destination._format, BzrBranchFormat5):
2230
super(BzrBranch, self)._synchronize_history(
2231
destination, revision_id)
1572
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1573
"""Run the pre_change_branch_tip hooks."""
1574
hooks = Branch.hooks['pre_change_branch_tip']
2233
if revision_id == _mod_revision.NULL_REVISION:
2236
new_history = self.revision_history()
2237
if revision_id is not None and new_history != []:
1577
old_revno, old_revid = self.last_revision_info()
1578
params = ChangeBranchTipParams(
1579
self, old_revno, new_revno, old_revid, new_revid)
2239
new_history = new_history[:new_history.index(revision_id) + 1]
2241
rev = self.repository.get_revision(revision_id)
2242
new_history = rev.get_history(self.repository)[1:]
2243
destination.set_revision_history(new_history)
1583
except errors.TipChangeRejected:
1586
exc_info = sys.exc_info()
1587
hook_name = Branch.hooks.get_hook_name(hook)
1588
raise errors.HookFailed(
1589
'pre_change_branch_tip', hook_name, exc_info)
1591
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1592
"""Run the post_change_branch_tip hooks."""
1593
hooks = Branch.hooks['post_change_branch_tip']
1596
new_revno, new_revid = self.last_revision_info()
1597
params = ChangeBranchTipParams(
1598
self, old_revno, new_revno, old_revid, new_revid)
2245
1602
@needs_write_lock
2246
1603
def set_last_revision_info(self, revno, revision_id):
2247
1604
"""Set the last revision of this branch.
1728
def push(self, target, overwrite=False, stop_revision=None,
1729
_override_hook_source_branch=None):
1732
This is the basic concrete implementation of push()
1734
:param _override_hook_source_branch: If specified, run
1735
the hooks passing this Branch as the source, rather than self.
1736
This is for use of RemoteBranch, where push is delegated to the
1737
underlying vfs-based Branch.
1739
# TODO: Public option to disable running hooks - should be trivial but
1743
result = self._push_with_bound_branches(target, overwrite,
1745
_override_hook_source_branch=_override_hook_source_branch)
1750
def _push_with_bound_branches(self, target, overwrite,
1752
_override_hook_source_branch=None):
1753
"""Push from self into target, and into target's master if any.
1755
This is on the base BzrBranch class even though it doesn't support
1756
bound branches because the *target* might be bound.
1759
if _override_hook_source_branch:
1760
result.source_branch = _override_hook_source_branch
1761
for hook in Branch.hooks['post_push']:
1764
bound_location = target.get_bound_location()
1765
if bound_location and target.base != bound_location:
1766
# there is a master branch.
1768
# XXX: Why the second check? Is it even supported for a branch to
1769
# be bound to itself? -- mbp 20070507
1770
master_branch = target.get_master_branch()
1771
master_branch.lock_write()
1773
# push into the master from this branch.
1774
self._basic_push(master_branch, overwrite, stop_revision)
1775
# and push into the target branch from this. Note that we push from
1776
# this branch again, because its considered the highest bandwidth
1778
result = self._basic_push(target, overwrite, stop_revision)
1779
result.master_branch = master_branch
1780
result.local_branch = target
1784
master_branch.unlock()
1787
result = self._basic_push(target, overwrite, stop_revision)
1788
# TODO: Why set master_branch and local_branch if there's no
1789
# binding? Maybe cleaner to just leave them unset? -- mbp
1791
result.master_branch = target
1792
result.local_branch = None
2300
1796
def _basic_push(self, target, overwrite, stop_revision):
2301
1797
"""Basic implementation of push without bound branches or hooks.
2303
Must be called with source read locked and target write locked.
1799
Must be called with self read locked and target write locked.
2305
result = BranchPushResult()
1801
result = PushResult()
2306
1802
result.source_branch = self
2307
1803
result.target_branch = target
2308
1804
result.old_revno, result.old_revid = target.last_revision_info()
2309
self.update_references(target)
2310
if result.old_revid != self.last_revision():
2311
# We assume that during 'push' this repository is closer than
2313
graph = self.repository.get_graph(target.repository)
2314
target.update_revisions(self, stop_revision,
2315
overwrite=overwrite, graph=graph)
2316
if self._push_should_merge_tags():
2317
result.tag_conflicts = self.tags.merge_to(target.tags,
1806
# We assume that during 'push' this repository is closer than
1808
graph = self.repository.get_graph(target.repository)
1809
target.update_revisions(self, stop_revision, overwrite=overwrite,
1811
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2319
1812
result.new_revno, result.new_revid = target.last_revision_info()
1815
def get_parent(self):
1816
"""See Branch.get_parent."""
1817
parent = self._get_parent_location()
1820
# This is an old-format absolute path to a local branch
1821
# turn it into a url
1822
if parent.startswith('/'):
1823
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1825
return urlutils.join(self.base[:-1], parent)
1826
except errors.InvalidURLJoin, e:
1827
raise errors.InaccessibleParent(parent, self.base)
2322
1829
def get_stacked_on_url(self):
2323
1830
raise errors.UnstackableBranchFormat(self._format, self.base)
2437
class BzrBranch8(BzrBranch5):
2438
"""A branch that stores tree-reference locations."""
1994
class BzrBranch7(BzrBranch5):
1995
"""A branch with support for a fallback repository."""
1997
def _get_fallback_repository(self, url):
1998
"""Get the repository we fallback to at url."""
1999
url = urlutils.join(self.base, url)
2000
return bzrdir.BzrDir.open(url).open_branch().repository
2002
def _activate_fallback_location(self, url):
2003
"""Activate the branch/repository from url as a fallback repository."""
2004
self.repository.add_fallback_repository(
2005
self._get_fallback_repository(url))
2440
2007
def _open_hook(self):
2441
if self._ignore_fallbacks:
2444
2009
url = self.get_stacked_on_url()
2445
2010
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2446
2011
errors.UnstackableBranchFormat):
2449
for hook in Branch.hooks['transform_fallback_location']:
2450
url = hook(self, url)
2452
hook_name = Branch.hooks.get_hook_name(hook)
2453
raise AssertionError(
2454
"'transform_fallback_location' hook %s returned "
2455
"None, not a URL." % hook_name)
2456
2014
self._activate_fallback_location(url)
2016
def _check_stackable_repo(self):
2017
if not self.repository._format.supports_external_lookups:
2018
raise errors.UnstackableRepositoryFormat(self.repository._format,
2019
self.repository.base)
2458
2021
def __init__(self, *args, **kwargs):
2459
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2460
super(BzrBranch8, self).__init__(*args, **kwargs)
2022
super(BzrBranch7, self).__init__(*args, **kwargs)
2461
2023
self._last_revision_info_cache = None
2462
self._reference_info = None
2024
self._partial_revision_history_cache = []
2464
2026
def _clear_cached_state(self):
2465
super(BzrBranch8, self)._clear_cached_state()
2027
super(BzrBranch7, self)._clear_cached_state()
2466
2028
self._last_revision_info_cache = None
2467
self._reference_info = None
2029
self._partial_revision_history_cache = []
2469
2031
def _last_revision_info(self):
2470
2032
revision_string = self._transport.get_bytes('last-revision')
2551
2130
"""Set the parent branch"""
2552
2131
return self._get_config_location('parent_location')
2555
def _set_all_reference_info(self, info_dict):
2556
"""Replace all reference info stored in a branch.
2558
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2561
writer = rio.RioWriter(s)
2562
for key, (tree_path, branch_location) in info_dict.iteritems():
2563
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2564
branch_location=branch_location)
2565
writer.write_stanza(stanza)
2566
self._transport.put_bytes('references', s.getvalue())
2567
self._reference_info = info_dict
2570
def _get_all_reference_info(self):
2571
"""Return all the reference info stored in a branch.
2573
:return: A dict of {file_id: (tree_path, branch_location)}
2575
if self._reference_info is not None:
2576
return self._reference_info
2577
rio_file = self._transport.get('references')
2579
stanzas = rio.read_stanzas(rio_file)
2580
info_dict = dict((s['file_id'], (s['tree_path'],
2581
s['branch_location'])) for s in stanzas)
2584
self._reference_info = info_dict
2587
def set_reference_info(self, file_id, tree_path, branch_location):
2588
"""Set the branch location to use for a tree reference.
2590
:param file_id: The file-id of the tree reference.
2591
:param tree_path: The path of the tree reference in the tree.
2592
:param branch_location: The location of the branch to retrieve tree
2595
info_dict = self._get_all_reference_info()
2596
info_dict[file_id] = (tree_path, branch_location)
2597
if None in (tree_path, branch_location):
2598
if tree_path is not None:
2599
raise ValueError('tree_path must be None when branch_location'
2601
if branch_location is not None:
2602
raise ValueError('branch_location must be None when tree_path'
2604
del info_dict[file_id]
2605
self._set_all_reference_info(info_dict)
2607
def get_reference_info(self, file_id):
2608
"""Get the tree_path and branch_location for a tree reference.
2610
:return: a tuple of (tree_path, branch_location)
2612
return self._get_all_reference_info().get(file_id, (None, None))
2614
def reference_parent(self, file_id, path, possible_transports=None):
2615
"""Return the parent branch for a tree-reference file_id.
2617
:param file_id: The file_id of the tree reference
2618
:param path: The path of the file_id in the tree
2619
:return: A branch associated with the file_id
2621
branch_location = self.get_reference_info(file_id)[1]
2622
if branch_location is None:
2623
return Branch.reference_parent(self, file_id, path,
2624
possible_transports)
2625
branch_location = urlutils.join(self.base, branch_location)
2626
return Branch.open(branch_location,
2627
possible_transports=possible_transports)
2629
2133
def set_push_location(self, location):
2630
2134
"""See Branch.set_push_location."""
2631
2135
self._set_config_location('push_location', location)
2665
2169
return self._get_bound_location(False)
2667
2171
def get_stacked_on_url(self):
2668
# you can always ask for the URL; but you might not be able to use it
2669
# if the repo can't support stacking.
2670
## self._check_stackable_repo()
2172
self._check_stackable_repo()
2671
2173
stacked_url = self._get_config_location('stacked_on_location')
2672
2174
if stacked_url is None:
2673
2175
raise errors.NotStacked(self)
2674
2176
return stacked_url
2178
def set_append_revisions_only(self, enabled):
2183
self.get_config().set_user_option('append_revisions_only', value,
2186
def set_stacked_on_url(self, url):
2187
self._check_stackable_repo()
2190
old_url = self.get_stacked_on_url()
2191
except (errors.NotStacked, errors.UnstackableBranchFormat,
2192
errors.UnstackableRepositoryFormat):
2195
# repositories don't offer an interface to remove fallback
2196
# repositories today; take the conceptually simpler option and just
2198
self.repository = self.bzrdir.find_repository()
2199
# for every revision reference the branch has, ensure it is pulled
2201
source_repository = self._get_fallback_repository(old_url)
2202
for revision_id in chain([self.last_revision()],
2203
self.tags.get_reverse_tag_dict()):
2204
self.repository.fetch(source_repository, revision_id,
2207
self._activate_fallback_location(url)
2208
# write this out after the repository is stacked to avoid setting a
2209
# stacked config that doesn't work.
2210
self._set_config_location('stacked_on_location', url)
2676
2212
def _get_append_revisions_only(self):
2677
2213
value = self.get_config().get_user_option('append_revisions_only')
2678
2214
return value == 'True'
2216
def _synchronize_history(self, destination, revision_id):
2217
"""Synchronize last revision and revision history between branches.
2219
This version is most efficient when the destination is also a
2220
BzrBranch6, but works for BzrBranch5, as long as the destination's
2221
repository contains all the lefthand ancestors of the intended
2222
last_revision. If not, set_last_revision_info will fail.
2224
:param destination: The branch to copy the history into
2225
:param revision_id: The revision-id to truncate history at. May
2226
be None to copy complete history.
2228
source_revno, source_revision_id = self.last_revision_info()
2229
if revision_id is None:
2230
revno, revision_id = source_revno, source_revision_id
2231
elif source_revision_id == revision_id:
2232
# we know the revno without needing to walk all of history
2233
revno = source_revno
2235
# To figure out the revno for a random revision, we need to build
2236
# the revision history, and count its length.
2237
# We don't care about the order, just how long it is.
2238
# Alternatively, we could start at the current location, and count
2239
# backwards. But there is no guarantee that we will find it since
2240
# it may be a merged revision.
2241
revno = len(list(self.repository.iter_reverse_revision_history(
2243
destination.set_last_revision_info(revno, revision_id)
2245
def _make_tags(self):
2246
return BasicTags(self)
2680
2248
@needs_write_lock
2681
2249
def generate_revision_history(self, revision_id, last_rev=None,
2682
2250
other_branch=None):
2881
2429
branch._set_config_location('stacked_on_location', '')
2882
2430
# update target format
2883
2431
branch._transport.put_bytes('format', format.get_format_string())
2886
class Converter7to8(object):
2887
"""Perform an in-place upgrade of format 6 to format 7"""
2889
def convert(self, branch):
2890
format = BzrBranchFormat8()
2891
branch._transport.put_bytes('references', '')
2892
# update target format
2893
branch._transport.put_bytes('format', format.get_format_string())
2896
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2897
"""Run ``callable(*args, **kwargs)``, write-locking target for the
2900
_run_with_write_locked_target will attempt to release the lock it acquires.
2902
If an exception is raised by callable, then that exception *will* be
2903
propagated, even if the unlock attempt raises its own error. Thus
2904
_run_with_write_locked_target should be preferred to simply doing::
2908
return callable(*args, **kwargs)
2913
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
2914
# should share code?
2917
result = callable(*args, **kwargs)
2919
exc_info = sys.exc_info()
2923
raise exc_info[0], exc_info[1], exc_info[2]
2929
class InterBranch(InterObject):
2930
"""This class represents operations taking place between two branches.
2932
Its instances have methods like pull() and push() and contain
2933
references to the source and target repositories these operations
2934
can be carried out on.
2938
"""The available optimised InterBranch types."""
2941
def _get_branch_formats_to_test():
2942
"""Return a tuple with the Branch formats to use when testing."""
2943
raise NotImplementedError(InterBranch._get_branch_formats_to_test)
2945
def pull(self, overwrite=False, stop_revision=None,
2946
possible_transports=None, local=False):
2947
"""Mirror source into target branch.
2949
The target branch is considered to be 'local', having low latency.
2951
:returns: PullResult instance
2953
raise NotImplementedError(self.pull)
2955
def update_revisions(self, stop_revision=None, overwrite=False,
2957
"""Pull in new perfect-fit revisions.
2959
:param stop_revision: Updated until the given revision
2960
:param overwrite: Always set the branch pointer, rather than checking
2961
to see if it is a proper descendant.
2962
:param graph: A Graph object that can be used to query history
2963
information. This can be None.
2966
raise NotImplementedError(self.update_revisions)
2968
def push(self, overwrite=False, stop_revision=None,
2969
_override_hook_source_branch=None):
2970
"""Mirror the source branch into the target branch.
2972
The source branch is considered to be 'local', having low latency.
2974
raise NotImplementedError(self.push)
2977
class GenericInterBranch(InterBranch):
2978
"""InterBranch implementation that uses public Branch functions.
2982
def _get_branch_formats_to_test():
2983
return BranchFormat._default_format, BranchFormat._default_format
2985
def update_revisions(self, stop_revision=None, overwrite=False,
2987
"""See InterBranch.update_revisions()."""
2988
self.source.lock_read()
2990
other_revno, other_last_revision = self.source.last_revision_info()
2991
stop_revno = None # unknown
2992
if stop_revision is None:
2993
stop_revision = other_last_revision
2994
if _mod_revision.is_null(stop_revision):
2995
# if there are no commits, we're done.
2997
stop_revno = other_revno
2999
# what's the current last revision, before we fetch [and change it
3001
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3002
# we fetch here so that we don't process data twice in the common
3003
# case of having something to pull, and so that the check for
3004
# already merged can operate on the just fetched graph, which will
3005
# be cached in memory.
3006
self.target.fetch(self.source, stop_revision)
3007
# Check to see if one is an ancestor of the other
3010
graph = self.target.repository.get_graph()
3011
if self.target._check_if_descendant_or_diverged(
3012
stop_revision, last_rev, graph, self.source):
3013
# stop_revision is a descendant of last_rev, but we aren't
3014
# overwriting, so we're done.
3016
if stop_revno is None:
3018
graph = self.target.repository.get_graph()
3019
this_revno, this_last_revision = \
3020
self.target.last_revision_info()
3021
stop_revno = graph.find_distance_to_null(stop_revision,
3022
[(other_last_revision, other_revno),
3023
(this_last_revision, this_revno)])
3024
self.target.set_last_revision_info(stop_revno, stop_revision)
3026
self.source.unlock()
3028
def pull(self, overwrite=False, stop_revision=None,
3029
possible_transports=None, _hook_master=None, run_hooks=True,
3030
_override_hook_target=None, local=False):
3033
:param _hook_master: Private parameter - set the branch to
3034
be supplied as the master to pull hooks.
3035
:param run_hooks: Private parameter - if false, this branch
3036
is being called because it's the master of the primary branch,
3037
so it should not run its hooks.
3038
:param _override_hook_target: Private parameter - set the branch to be
3039
supplied as the target_branch to pull hooks.
3040
:param local: Only update the local branch, and not the bound branch.
3042
# This type of branch can't be bound.
3044
raise errors.LocalRequiresBoundBranch()
3045
result = PullResult()
3046
result.source_branch = self.source
3047
if _override_hook_target is None:
3048
result.target_branch = self.target
3050
result.target_branch = _override_hook_target
3051
self.source.lock_read()
3053
# We assume that during 'pull' the target repository is closer than
3055
self.source.update_references(self.target)
3056
graph = self.target.repository.get_graph(self.source.repository)
3057
# TODO: Branch formats should have a flag that indicates
3058
# that revno's are expensive, and pull() should honor that flag.
3060
result.old_revno, result.old_revid = \
3061
self.target.last_revision_info()
3062
self.target.update_revisions(self.source, stop_revision,
3063
overwrite=overwrite, graph=graph)
3064
# TODO: The old revid should be specified when merging tags,
3065
# so a tags implementation that versions tags can only
3066
# pull in the most recent changes. -- JRV20090506
3067
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3069
result.new_revno, result.new_revid = self.target.last_revision_info()
3071
result.master_branch = _hook_master
3072
result.local_branch = result.target_branch
3074
result.master_branch = result.target_branch
3075
result.local_branch = None
3077
for hook in Branch.hooks['post_pull']:
3080
self.source.unlock()
3083
def push(self, overwrite=False, stop_revision=None,
3084
_override_hook_source_branch=None):
3085
"""See InterBranch.push.
3087
This is the basic concrete implementation of push()
3089
:param _override_hook_source_branch: If specified, run
3090
the hooks passing this Branch as the source, rather than self.
3091
This is for use of RemoteBranch, where push is delegated to the
3092
underlying vfs-based Branch.
3094
# TODO: Public option to disable running hooks - should be trivial but
3096
self.source.lock_read()
3098
return _run_with_write_locked_target(
3099
self.target, self._push_with_bound_branches, overwrite,
3101
_override_hook_source_branch=_override_hook_source_branch)
3103
self.source.unlock()
3105
def _push_with_bound_branches(self, overwrite, stop_revision,
3106
_override_hook_source_branch=None):
3107
"""Push from source into target, and into target's master if any.
3110
if _override_hook_source_branch:
3111
result.source_branch = _override_hook_source_branch
3112
for hook in Branch.hooks['post_push']:
3115
bound_location = self.target.get_bound_location()
3116
if bound_location and self.target.base != bound_location:
3117
# there is a master branch.
3119
# XXX: Why the second check? Is it even supported for a branch to
3120
# be bound to itself? -- mbp 20070507
3121
master_branch = self.target.get_master_branch()
3122
master_branch.lock_write()
3124
# push into the master from the source branch.
3125
self.source._basic_push(master_branch, overwrite, stop_revision)
3126
# and push into the target branch from the source. Note that we
3127
# push from the source branch again, because its considered the
3128
# highest bandwidth repository.
3129
result = self.source._basic_push(self.target, overwrite,
3131
result.master_branch = master_branch
3132
result.local_branch = self.target
3136
master_branch.unlock()
3139
result = self.source._basic_push(self.target, overwrite,
3141
# TODO: Why set master_branch and local_branch if there's no
3142
# binding? Maybe cleaner to just leave them unset? -- mbp
3144
result.master_branch = self.target
3145
result.local_branch = None
3150
def is_compatible(self, source, target):
3151
# GenericBranch uses the public API, so always compatible
3155
class InterToBranch5(GenericInterBranch):
3158
def _get_branch_formats_to_test():
3159
return BranchFormat._default_format, BzrBranchFormat5()
3161
def pull(self, overwrite=False, stop_revision=None,
3162
possible_transports=None, run_hooks=True,
3163
_override_hook_target=None, local=False):
3164
"""Pull from source into self, updating my master if any.
3166
:param run_hooks: Private parameter - if false, this branch
3167
is being called because it's the master of the primary branch,
3168
so it should not run its hooks.
3170
bound_location = self.target.get_bound_location()
3171
if local and not bound_location:
3172
raise errors.LocalRequiresBoundBranch()
3173
master_branch = None
3174
if not local and bound_location and self.source.base != bound_location:
3175
# not pulling from master, so we need to update master.
3176
master_branch = self.target.get_master_branch(possible_transports)
3177
master_branch.lock_write()
3180
# pull from source into master.
3181
master_branch.pull(self.source, overwrite, stop_revision,
3183
return super(InterToBranch5, self).pull(overwrite,
3184
stop_revision, _hook_master=master_branch,
3185
run_hooks=run_hooks,
3186
_override_hook_target=_override_hook_target)
3189
master_branch.unlock()
3192
InterBranch.register_optimiser(GenericInterBranch)
3193
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
