1
# Copyright (C) 2005-2012 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
21
from .lazy_import import lazy_import
22
lazy_import(globals(), """
26
config as _mod_config,
31
revision as _mod_revision,
37
from breezy.bzr import (
41
from breezy.i18n import gettext, ngettext
48
from .decorators import (
51
from .hooks import Hooks
52
from .inter import InterObject
53
from .lock import LogicalLockResult
59
from .trace import mutter, mutter_callsite, note, is_quiet
62
class UnstackableBranchFormat(errors.BzrError):
64
_fmt = ("The branch '%(url)s'(%(format)s) is not a stackable format. "
65
"You will need to upgrade the branch to permit branch stacking.")
67
def __init__(self, format, url):
68
errors.BzrError.__init__(self)
73
class Branch(controldir.ControlComponent):
74
"""Branch holding a history of revisions.
77
Base directory/url of the branch; using control_url and
78
control_transport is more standardized.
79
:ivar hooks: An instance of BranchHooks.
80
:ivar _master_branch_cache: cached result of get_master_branch, see
83
# this is really an instance variable - FIXME move it there
88
def control_transport(self):
89
return self._transport
92
def user_transport(self):
93
return self.controldir.user_transport
95
def __init__(self, possible_transports=None):
96
self.tags = self._format.make_tags(self)
97
self._revision_history_cache = None
98
self._revision_id_to_revno_cache = None
99
self._partial_revision_id_to_revno_cache = {}
100
self._partial_revision_history_cache = []
101
self._last_revision_info_cache = None
102
self._master_branch_cache = None
103
self._merge_sorted_revisions_cache = None
104
self._open_hook(possible_transports)
105
hooks = Branch.hooks['open']
109
def _open_hook(self, possible_transports):
110
"""Called by init to allow simpler extension of the base class."""
112
def _activate_fallback_location(self, url, possible_transports):
113
"""Activate the branch/repository from url as a fallback repository."""
114
for existing_fallback_repo in self.repository._fallback_repositories:
115
if existing_fallback_repo.user_url == url:
116
# This fallback is already configured. This probably only
117
# happens because ControlDir.sprout is a horrible mess. To
118
# avoid confusing _unstack we don't add this a second time.
119
mutter('duplicate activation of fallback %r on %r', url, self)
121
repo = self._get_fallback_repository(url, possible_transports)
122
if repo.has_same_location(self.repository):
123
raise errors.UnstackableLocationError(self.user_url, url)
124
self.repository.add_fallback_repository(repo)
126
def break_lock(self):
127
"""Break a lock if one is present from another instance.
129
Uses the ui factory to ask for confirmation if the lock may be from
132
This will probe the repository for its lock as well.
134
self.control_files.break_lock()
135
self.repository.break_lock()
136
master = self.get_master_branch()
137
if master is not None:
140
def _check_stackable_repo(self):
141
if not self.repository._format.supports_external_lookups:
142
raise errors.UnstackableRepositoryFormat(
143
self.repository._format, self.repository.base)
145
def _extend_partial_history(self, stop_index=None, stop_revision=None):
146
"""Extend the partial history to include a given index
148
If a stop_index is supplied, stop when that index has been reached.
149
If a stop_revision is supplied, stop when that revision is
150
encountered. Otherwise, stop when the beginning of history is
153
:param stop_index: The index which should be present. When it is
154
present, history extension will stop.
155
:param stop_revision: The revision id which should be present. When
156
it is encountered, history extension will stop.
158
if len(self._partial_revision_history_cache) == 0:
159
self._partial_revision_history_cache = [self.last_revision()]
160
repository._iter_for_revno(
161
self.repository, self._partial_revision_history_cache,
162
stop_index=stop_index, stop_revision=stop_revision)
163
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
164
self._partial_revision_history_cache.pop()
166
def _get_check_refs(self):
167
"""Get the references needed for check().
171
revid = self.last_revision()
172
return [('revision-existence', revid), ('lefthand-distance', revid)]
175
def open(base, _unsupported=False, possible_transports=None):
176
"""Open the branch rooted at base.
178
For instance, if the branch is at URL/.bzr/branch,
179
Branch.open(URL) -> a Branch instance.
181
control = controldir.ControlDir.open(base,
182
possible_transports=possible_transports, _unsupported=_unsupported)
183
return control.open_branch(unsupported=_unsupported,
184
possible_transports=possible_transports)
187
def open_from_transport(transport, name=None, _unsupported=False,
188
possible_transports=None):
189
"""Open the branch rooted at transport"""
190
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
191
return control.open_branch(name=name, unsupported=_unsupported,
192
possible_transports=possible_transports)
195
def open_containing(url, possible_transports=None):
196
"""Open an existing branch which contains url.
198
This probes for a branch at url, and searches upwards from there.
200
Basically we keep looking up until we find the control directory or
201
run into the root. If there isn't one, raises NotBranchError.
202
If there is one and it is either an unrecognised format or an unsupported
203
format, UnknownFormatError or UnsupportedFormatError are raised.
204
If there is one, it is returned, along with the unused portion of url.
206
control, relpath = controldir.ControlDir.open_containing(url,
208
branch = control.open_branch(possible_transports=possible_transports)
209
return (branch, relpath)
211
def _push_should_merge_tags(self):
212
"""Should _basic_push merge this branch's tags into the target?
214
The default implementation returns False if this branch has no tags,
215
and True the rest of the time. Subclasses may override this.
217
return self.supports_tags() and self.tags.get_tag_dict()
219
def get_config(self):
220
"""Get a breezy.config.BranchConfig for this Branch.
222
This can then be used to get and set configuration options for the
225
:return: A breezy.config.BranchConfig.
227
return _mod_config.BranchConfig(self)
229
def get_config_stack(self):
230
"""Get a breezy.config.BranchStack for this Branch.
232
This can then be used to get and set configuration options for the
235
:return: A breezy.config.BranchStack.
237
return _mod_config.BranchStack(self)
239
def store_uncommitted(self, creator):
240
"""Store uncommitted changes from a ShelfCreator.
242
:param creator: The ShelfCreator containing uncommitted changes, or
243
None to delete any stored changes.
244
:raises: ChangesAlreadyStored if the branch already has changes.
246
raise NotImplementedError(self.store_uncommitted)
248
def get_unshelver(self, tree):
249
"""Return a shelf.Unshelver for this branch and tree.
251
:param tree: The tree to use to construct the Unshelver.
252
:return: an Unshelver or None if no changes are stored.
254
raise NotImplementedError(self.get_unshelver)
256
def _get_fallback_repository(self, url, possible_transports):
257
"""Get the repository we fallback to at url."""
258
url = urlutils.join(self.base, url)
259
a_branch = Branch.open(url, possible_transports=possible_transports)
260
return a_branch.repository
262
def _get_nick(self, local=False, possible_transports=None):
263
config = self.get_config()
264
# explicit overrides master, but don't look for master if local is True
265
if not local and not config.has_explicit_nickname():
267
master = self.get_master_branch(possible_transports)
268
if master and self.user_url == master.user_url:
269
raise errors.RecursiveBind(self.user_url)
270
if master is not None:
271
# return the master branch value
273
except errors.RecursiveBind as e:
275
except errors.BzrError as e:
276
# Silently fall back to local implicit nick if the master is
278
mutter("Could not connect to bound branch, "
279
"falling back to local nick.\n " + str(e))
280
return config.get_nickname()
282
def _set_nick(self, nick):
283
self.get_config().set_user_option('nickname', nick, warn_masked=True)
285
nick = property(_get_nick, _set_nick)
288
raise NotImplementedError(self.is_locked)
290
def _lefthand_history(self, revision_id, last_rev=None,
292
if 'evil' in debug.debug_flags:
293
mutter_callsite(4, "_lefthand_history scales with history.")
294
# stop_revision must be a descendant of last_revision
295
graph = self.repository.get_graph()
296
if last_rev is not None:
297
if not graph.is_ancestor(last_rev, revision_id):
298
# our previous tip is not merged into stop_revision
299
raise errors.DivergedBranches(self, other_branch)
300
# make a new revision history from the graph
301
parents_map = graph.get_parent_map([revision_id])
302
if revision_id not in parents_map:
303
raise errors.NoSuchRevision(self, revision_id)
304
current_rev_id = revision_id
306
check_not_reserved_id = _mod_revision.check_not_reserved_id
307
# Do not include ghosts or graph origin in revision_history
308
while (current_rev_id in parents_map and
309
len(parents_map[current_rev_id]) > 0):
310
check_not_reserved_id(current_rev_id)
311
new_history.append(current_rev_id)
312
current_rev_id = parents_map[current_rev_id][0]
313
parents_map = graph.get_parent_map([current_rev_id])
314
new_history.reverse()
317
def lock_write(self, token=None):
318
"""Lock the branch for write operations.
320
:param token: A token to permit reacquiring a previously held and
322
:return: A BranchWriteLockResult.
324
raise NotImplementedError(self.lock_write)
327
"""Lock the branch for read operations.
329
:return: A breezy.lock.LogicalLockResult.
331
raise NotImplementedError(self.lock_read)
334
raise NotImplementedError(self.unlock)
336
def peek_lock_mode(self):
337
"""Return lock mode for the Branch: 'r', 'w' or None"""
338
raise NotImplementedError(self.peek_lock_mode)
340
def get_physical_lock_status(self):
341
raise NotImplementedError(self.get_physical_lock_status)
343
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
344
"""Return the revision_id for a dotted revno.
346
:param revno: a tuple like (1,) or (1,1,2)
347
:param _cache_reverse: a private parameter enabling storage
348
of the reverse mapping in a top level cache. (This should
349
only be done in selective circumstances as we want to
350
avoid having the mapping cached multiple times.)
351
:return: the revision_id
352
:raises errors.NoSuchRevision: if the revno doesn't exist
354
with self.lock_read():
355
rev_id = self._do_dotted_revno_to_revision_id(revno)
357
self._partial_revision_id_to_revno_cache[rev_id] = revno
360
def _do_dotted_revno_to_revision_id(self, revno):
361
"""Worker function for dotted_revno_to_revision_id.
363
Subclasses should override this if they wish to
364
provide a more efficient implementation.
367
return self.get_rev_id(revno[0])
368
revision_id_to_revno = self.get_revision_id_to_revno_map()
369
revision_ids = [revision_id for revision_id, this_revno
370
in viewitems(revision_id_to_revno)
371
if revno == this_revno]
372
if len(revision_ids) == 1:
373
return revision_ids[0]
375
revno_str = '.'.join(map(str, revno))
376
raise errors.NoSuchRevision(self, revno_str)
378
def revision_id_to_dotted_revno(self, revision_id):
379
"""Given a revision id, return its dotted revno.
381
:return: a tuple like (1,) or (400,1,3).
383
with self.lock_read():
384
return self._do_revision_id_to_dotted_revno(revision_id)
386
def _do_revision_id_to_dotted_revno(self, revision_id):
387
"""Worker function for revision_id_to_revno."""
388
# Try the caches if they are loaded
389
result = self._partial_revision_id_to_revno_cache.get(revision_id)
390
if result is not None:
392
if self._revision_id_to_revno_cache:
393
result = self._revision_id_to_revno_cache.get(revision_id)
395
raise errors.NoSuchRevision(self, revision_id)
396
# Try the mainline as it's optimised
398
revno = self.revision_id_to_revno(revision_id)
400
except errors.NoSuchRevision:
401
# We need to load and use the full revno map after all
402
result = self.get_revision_id_to_revno_map().get(revision_id)
404
raise errors.NoSuchRevision(self, revision_id)
407
def get_revision_id_to_revno_map(self):
408
"""Return the revision_id => dotted revno map.
410
This will be regenerated on demand, but will be cached.
412
:return: A dictionary mapping revision_id => dotted revno.
413
This dictionary should not be modified by the caller.
415
with self.lock_read():
416
if self._revision_id_to_revno_cache is not None:
417
mapping = self._revision_id_to_revno_cache
419
mapping = self._gen_revno_map()
420
self._cache_revision_id_to_revno(mapping)
421
# TODO: jam 20070417 Since this is being cached, should we be returning
423
# I would rather not, and instead just declare that users should not
424
# modify the return value.
427
def _gen_revno_map(self):
428
"""Create a new mapping from revision ids to dotted revnos.
430
Dotted revnos are generated based on the current tip in the revision
432
This is the worker function for get_revision_id_to_revno_map, which
433
just caches the return value.
435
:return: A dictionary mapping revision_id => dotted revno.
437
revision_id_to_revno = dict((rev_id, revno)
438
for rev_id, depth, revno, end_of_merge
439
in self.iter_merge_sorted_revisions())
440
return revision_id_to_revno
442
def iter_merge_sorted_revisions(self, start_revision_id=None,
443
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
444
"""Walk the revisions for a branch in merge sorted order.
446
Merge sorted order is the output from a merge-aware,
447
topological sort, i.e. all parents come before their
448
children going forward; the opposite for reverse.
450
:param start_revision_id: the revision_id to begin walking from.
451
If None, the branch tip is used.
452
:param stop_revision_id: the revision_id to terminate the walk
453
after. If None, the rest of history is included.
454
:param stop_rule: if stop_revision_id is not None, the precise rule
455
to use for termination:
457
* 'exclude' - leave the stop revision out of the result (default)
458
* 'include' - the stop revision is the last item in the result
459
* 'with-merges' - include the stop revision and all of its
460
merged revisions in the result
461
* 'with-merges-without-common-ancestry' - filter out revisions
462
that are in both ancestries
463
:param direction: either 'reverse' or 'forward':
465
* reverse means return the start_revision_id first, i.e.
466
start at the most recent revision and go backwards in history
467
* forward returns tuples in the opposite order to reverse.
468
Note in particular that forward does *not* do any intelligent
469
ordering w.r.t. depth as some clients of this API may like.
470
(If required, that ought to be done at higher layers.)
472
:return: an iterator over (revision_id, depth, revno, end_of_merge)
475
* revision_id: the unique id of the revision
476
* depth: How many levels of merging deep this node has been
478
* revno_sequence: This field provides a sequence of
479
revision numbers for all revisions. The format is:
480
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
481
branch that the revno is on. From left to right the REVNO numbers
482
are the sequence numbers within that branch of the revision.
483
* end_of_merge: When True the next node (earlier in history) is
484
part of a different merge.
486
with self.lock_read():
487
# Note: depth and revno values are in the context of the branch so
488
# we need the full graph to get stable numbers, regardless of the
490
if self._merge_sorted_revisions_cache is None:
491
last_revision = self.last_revision()
492
known_graph = self.repository.get_known_graph_ancestry(
494
self._merge_sorted_revisions_cache = known_graph.merge_sort(
496
filtered = self._filter_merge_sorted_revisions(
497
self._merge_sorted_revisions_cache, start_revision_id,
498
stop_revision_id, stop_rule)
499
# Make sure we don't return revisions that are not part of the
500
# start_revision_id ancestry.
501
filtered = self._filter_start_non_ancestors(filtered)
502
if direction == 'reverse':
504
if direction == 'forward':
505
return reversed(list(filtered))
507
raise ValueError('invalid direction %r' % direction)
509
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
510
start_revision_id, stop_revision_id, stop_rule):
511
"""Iterate over an inclusive range of sorted revisions."""
512
rev_iter = iter(merge_sorted_revisions)
513
if start_revision_id is not None:
514
for node in rev_iter:
516
if rev_id != start_revision_id:
519
# The decision to include the start or not
520
# depends on the stop_rule if a stop is provided
521
# so pop this node back into the iterator
522
rev_iter = itertools.chain(iter([node]), rev_iter)
524
if stop_revision_id is None:
526
for node in rev_iter:
528
yield (rev_id, node.merge_depth, node.revno,
530
elif stop_rule == 'exclude':
531
for node in rev_iter:
533
if rev_id == stop_revision_id:
535
yield (rev_id, node.merge_depth, node.revno,
537
elif stop_rule == 'include':
538
for node in rev_iter:
540
yield (rev_id, node.merge_depth, node.revno,
542
if rev_id == stop_revision_id:
544
elif stop_rule == 'with-merges-without-common-ancestry':
545
# We want to exclude all revisions that are already part of the
546
# stop_revision_id ancestry.
547
graph = self.repository.get_graph()
548
ancestors = graph.find_unique_ancestors(start_revision_id,
550
for node in rev_iter:
552
if rev_id not in ancestors:
554
yield (rev_id, node.merge_depth, node.revno,
556
elif stop_rule == 'with-merges':
557
stop_rev = self.repository.get_revision(stop_revision_id)
558
if stop_rev.parent_ids:
559
left_parent = stop_rev.parent_ids[0]
561
left_parent = _mod_revision.NULL_REVISION
562
# left_parent is the actual revision we want to stop logging at,
563
# since we want to show the merged revisions after the stop_rev too
564
reached_stop_revision_id = False
565
revision_id_whitelist = []
566
for node in rev_iter:
568
if rev_id == left_parent:
569
# reached the left parent after the stop_revision
571
if (not reached_stop_revision_id or
572
rev_id in revision_id_whitelist):
573
yield (rev_id, node.merge_depth, node.revno,
575
if reached_stop_revision_id or rev_id == stop_revision_id:
576
# only do the merged revs of rev_id from now on
577
rev = self.repository.get_revision(rev_id)
579
reached_stop_revision_id = True
580
revision_id_whitelist.extend(rev.parent_ids)
582
raise ValueError('invalid stop_rule %r' % stop_rule)
584
def _filter_start_non_ancestors(self, rev_iter):
585
# If we started from a dotted revno, we want to consider it as a tip
586
# and don't want to yield revisions that are not part of its
587
# ancestry. Given the order guaranteed by the merge sort, we will see
588
# uninteresting descendants of the first parent of our tip before the
590
first = next(rev_iter)
591
(rev_id, merge_depth, revno, end_of_merge) = first
594
# We start at a mainline revision so by definition, all others
595
# revisions in rev_iter are ancestors
596
for node in rev_iter:
601
pmap = self.repository.get_parent_map([rev_id])
602
parents = pmap.get(rev_id, [])
604
whitelist.update(parents)
606
# If there is no parents, there is nothing of interest left
608
# FIXME: It's hard to test this scenario here as this code is never
609
# called in that case. -- vila 20100322
612
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
614
if rev_id in whitelist:
615
pmap = self.repository.get_parent_map([rev_id])
616
parents = pmap.get(rev_id, [])
617
whitelist.remove(rev_id)
618
whitelist.update(parents)
620
# We've reached the mainline, there is nothing left to
624
# A revision that is not part of the ancestry of our
627
yield (rev_id, merge_depth, revno, end_of_merge)
629
def leave_lock_in_place(self):
630
"""Tell this branch object not to release the physical lock when this
633
If lock_write doesn't return a token, then this method is not supported.
635
self.control_files.leave_in_place()
637
def dont_leave_lock_in_place(self):
638
"""Tell this branch object to release the physical lock when this
639
object is unlocked, even if it didn't originally acquire it.
641
If lock_write doesn't return a token, then this method is not supported.
643
self.control_files.dont_leave_in_place()
645
def bind(self, other):
646
"""Bind the local branch the other branch.
648
:param other: The branch to bind to
651
raise errors.UpgradeRequired(self.user_url)
653
def get_append_revisions_only(self):
654
"""Whether it is only possible to append revisions to the history.
656
if not self._format.supports_set_append_revisions_only():
658
return self.get_config_stack().get('append_revisions_only')
660
def set_append_revisions_only(self, enabled):
661
if not self._format.supports_set_append_revisions_only():
662
raise errors.UpgradeRequired(self.user_url)
663
self.get_config_stack().set('append_revisions_only', enabled)
665
def set_reference_info(self, tree_path, branch_location, file_id=None):
666
"""Set the branch location to use for a tree reference."""
667
raise errors.UnsupportedOperation(self.set_reference_info, self)
669
def get_reference_info(self, path):
670
"""Get the tree_path and branch_location for a tree reference."""
671
raise errors.UnsupportedOperation(self.get_reference_info, self)
673
def fetch(self, from_branch, last_revision=None, limit=None):
674
"""Copy revisions from from_branch into this branch.
676
:param from_branch: Where to copy from.
677
:param last_revision: What revision to stop at (None for at the end
679
:param limit: Optional rough limit of revisions to fetch
682
with self.lock_write():
683
return InterBranch.get(from_branch, self).fetch(
684
last_revision, limit=limit)
686
def get_bound_location(self):
687
"""Return the URL of the branch we are bound to.
689
Older format branches cannot bind, please be sure to use a metadir
694
def get_old_bound_location(self):
695
"""Return the URL of the branch we used to be bound to
697
raise errors.UpgradeRequired(self.user_url)
699
def get_commit_builder(self, parents, config_stack=None, timestamp=None,
700
timezone=None, committer=None, revprops=None,
701
revision_id=None, lossy=False):
702
"""Obtain a CommitBuilder for this branch.
704
:param parents: Revision ids of the parents of the new revision.
705
:param config: Optional configuration to use.
706
:param timestamp: Optional timestamp recorded for commit.
707
:param timezone: Optional timezone for timestamp.
708
:param committer: Optional committer to set for commit.
709
:param revprops: Optional dictionary of revision properties.
710
:param revision_id: Optional revision id.
711
:param lossy: Whether to discard data that can not be natively
712
represented, when pushing to a foreign VCS
715
if config_stack is None:
716
config_stack = self.get_config_stack()
718
return self.repository.get_commit_builder(self, parents, config_stack,
719
timestamp, timezone, committer, revprops, revision_id,
722
def get_master_branch(self, possible_transports=None):
723
"""Return the branch we are bound to.
725
:return: Either a Branch, or None
729
def get_stacked_on_url(self):
730
"""Get the URL this branch is stacked against.
732
:raises NotStacked: If the branch is not stacked.
733
:raises UnstackableBranchFormat: If the branch does not support
736
raise NotImplementedError(self.get_stacked_on_url)
738
def set_last_revision_info(self, revno, revision_id):
739
"""Set the last revision of this branch.
741
The caller is responsible for checking that the revno is correct
742
for this revision id.
744
It may be possible to set the branch last revision to an id not
745
present in the repository. However, branches can also be
746
configured to check constraints on history, in which case this may not
749
raise NotImplementedError(self.set_last_revision_info)
751
def generate_revision_history(self, revision_id, last_rev=None,
753
"""See Branch.generate_revision_history"""
754
with self.lock_write():
755
graph = self.repository.get_graph()
756
(last_revno, last_revid) = self.last_revision_info()
757
known_revision_ids = [
758
(last_revid, last_revno),
759
(_mod_revision.NULL_REVISION, 0),
761
if last_rev is not None:
762
if not graph.is_ancestor(last_rev, revision_id):
763
# our previous tip is not merged into stop_revision
764
raise errors.DivergedBranches(self, other_branch)
765
revno = graph.find_distance_to_null(revision_id, known_revision_ids)
766
self.set_last_revision_info(revno, revision_id)
768
def set_parent(self, url):
769
"""See Branch.set_parent."""
770
# TODO: Maybe delete old location files?
771
# URLs should never be unicode, even on the local fs,
772
# FIXUP this and get_parent in a future branch format bump:
773
# read and rewrite the file. RBC 20060125
775
if isinstance(url, text_type):
777
url = url.encode('ascii')
778
except UnicodeEncodeError:
779
raise urlutils.InvalidURL(url,
780
"Urls must be 7-bit ascii, "
781
"use breezy.urlutils.escape")
782
url = urlutils.relative_url(self.base, url)
783
with self.lock_write():
784
self._set_parent_location(url)
786
def set_stacked_on_url(self, url):
787
"""Set the URL this branch is stacked against.
789
:raises UnstackableBranchFormat: If the branch does not support
791
:raises UnstackableRepositoryFormat: If the repository does not support
794
if not self._format.supports_stacking():
795
raise UnstackableBranchFormat(self._format, self.user_url)
796
with self.lock_write():
797
# XXX: Changing from one fallback repository to another does not check
798
# that all the data you need is present in the new fallback.
799
# Possibly it should.
800
self._check_stackable_repo()
803
old_url = self.get_stacked_on_url()
804
except (errors.NotStacked, UnstackableBranchFormat,
805
errors.UnstackableRepositoryFormat):
809
self._activate_fallback_location(url,
810
possible_transports=[self.controldir.root_transport])
811
# write this out after the repository is stacked to avoid setting a
812
# stacked config that doesn't work.
813
self._set_config_location('stacked_on_location', url)
816
"""Change a branch to be unstacked, copying data as needed.
818
Don't call this directly, use set_stacked_on_url(None).
820
with ui.ui_factory.nested_progress_bar() as pb:
821
pb.update(gettext("Unstacking"))
822
# The basic approach here is to fetch the tip of the branch,
823
# including all available ghosts, from the existing stacked
824
# repository into a new repository object without the fallbacks.
826
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
827
# correct for CHKMap repostiories
828
old_repository = self.repository
829
if len(old_repository._fallback_repositories) != 1:
830
raise AssertionError("can't cope with fallback repositories "
831
"of %r (fallbacks: %r)" % (old_repository,
832
old_repository._fallback_repositories))
833
# Open the new repository object.
834
# Repositories don't offer an interface to remove fallback
835
# repositories today; take the conceptually simpler option and just
836
# reopen it. We reopen it starting from the URL so that we
837
# get a separate connection for RemoteRepositories and can
838
# stream from one of them to the other. This does mean doing
839
# separate SSH connection setup, but unstacking is not a
840
# common operation so it's tolerable.
841
new_bzrdir = controldir.ControlDir.open(
842
self.controldir.root_transport.base)
843
new_repository = new_bzrdir.find_repository()
844
if new_repository._fallback_repositories:
845
raise AssertionError("didn't expect %r to have "
846
"fallback_repositories"
847
% (self.repository,))
848
# Replace self.repository with the new repository.
849
# Do our best to transfer the lock state (i.e. lock-tokens and
850
# lock count) of self.repository to the new repository.
851
lock_token = old_repository.lock_write().repository_token
852
self.repository = new_repository
853
if isinstance(self, remote.RemoteBranch):
854
# Remote branches can have a second reference to the old
855
# repository that need to be replaced.
856
if self._real_branch is not None:
857
self._real_branch.repository = new_repository
858
self.repository.lock_write(token=lock_token)
859
if lock_token is not None:
860
old_repository.leave_lock_in_place()
861
old_repository.unlock()
862
if lock_token is not None:
863
# XXX: self.repository.leave_lock_in_place() before this
864
# function will not be preserved. Fortunately that doesn't
865
# affect the current default format (2a), and would be a
866
# corner-case anyway.
867
# - Andrew Bennetts, 2010/06/30
868
self.repository.dont_leave_lock_in_place()
872
old_repository.unlock()
873
except errors.LockNotHeld:
876
if old_lock_count == 0:
877
raise AssertionError(
878
'old_repository should have been locked at least once.')
879
for i in range(old_lock_count-1):
880
self.repository.lock_write()
881
# Fetch from the old repository into the new.
882
with old_repository.lock_read():
883
# XXX: If you unstack a branch while it has a working tree
884
# with a pending merge, the pending-merged revisions will no
885
# longer be present. You can (probably) revert and remerge.
887
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
888
except errors.TagsNotSupported:
889
tags_to_fetch = set()
890
fetch_spec = vf_search.NotInOtherForRevs(self.repository,
891
old_repository, required_ids=[self.last_revision()],
892
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
893
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
895
def _cache_revision_history(self, rev_history):
896
"""Set the cached revision history to rev_history.
898
The revision_history method will use this cache to avoid regenerating
899
the revision history.
901
This API is semi-public; it only for use by subclasses, all other code
902
should consider it to be private.
904
self._revision_history_cache = rev_history
906
def _cache_revision_id_to_revno(self, revision_id_to_revno):
907
"""Set the cached revision_id => revno map to revision_id_to_revno.
909
This API is semi-public; it only for use by subclasses, all other code
910
should consider it to be private.
912
self._revision_id_to_revno_cache = revision_id_to_revno
914
def _clear_cached_state(self):
915
"""Clear any cached data on this branch, e.g. cached revision history.
917
This means the next call to revision_history will need to call
918
_gen_revision_history.
920
This API is semi-public; it is only for use by subclasses, all other
921
code should consider it to be private.
923
self._revision_history_cache = None
924
self._revision_id_to_revno_cache = None
925
self._last_revision_info_cache = None
926
self._master_branch_cache = None
927
self._merge_sorted_revisions_cache = None
928
self._partial_revision_history_cache = []
929
self._partial_revision_id_to_revno_cache = {}
931
def _gen_revision_history(self):
932
"""Return sequence of revision hashes on to this branch.
934
Unlike revision_history, this method always regenerates or rereads the
935
revision history, i.e. it does not cache the result, so repeated calls
938
Concrete subclasses should override this instead of revision_history so
939
that subclasses do not need to deal with caching logic.
941
This API is semi-public; it only for use by subclasses, all other code
942
should consider it to be private.
944
raise NotImplementedError(self._gen_revision_history)
946
def _revision_history(self):
947
if 'evil' in debug.debug_flags:
948
mutter_callsite(3, "revision_history scales with history.")
949
if self._revision_history_cache is not None:
950
history = self._revision_history_cache
952
history = self._gen_revision_history()
953
self._cache_revision_history(history)
957
"""Return current revision number for this branch.
959
That is equivalent to the number of revisions committed to
962
return self.last_revision_info()[0]
965
"""Older format branches cannot bind or unbind."""
966
raise errors.UpgradeRequired(self.user_url)
968
def last_revision(self):
969
"""Return last revision id, or NULL_REVISION."""
970
return self.last_revision_info()[1]
972
def last_revision_info(self):
973
"""Return information about the last revision.
975
:return: A tuple (revno, revision_id).
977
with self.lock_read():
978
if self._last_revision_info_cache is None:
979
self._last_revision_info_cache = self._read_last_revision_info()
980
return self._last_revision_info_cache
982
def _read_last_revision_info(self):
983
raise NotImplementedError(self._read_last_revision_info)
985
def import_last_revision_info_and_tags(self, source, revno, revid,
987
"""Set the last revision info, importing from another repo if necessary.
989
This is used by the bound branch code to upload a revision to
990
the master branch first before updating the tip of the local branch.
991
Revisions referenced by source's tags are also transferred.
993
:param source: Source branch to optionally fetch from
994
:param revno: Revision number of the new tip
995
:param revid: Revision id of the new tip
996
:param lossy: Whether to discard metadata that can not be
998
:return: Tuple with the new revision number and revision id
999
(should only be different from the arguments when lossy=True)
1001
if not self.repository.has_same_location(source.repository):
1002
self.fetch(source, revid)
1003
self.set_last_revision_info(revno, revid)
1004
return (revno, revid)
1006
def revision_id_to_revno(self, revision_id):
1007
"""Given a revision id, return its revno"""
1008
if _mod_revision.is_null(revision_id):
1010
history = self._revision_history()
1012
return history.index(revision_id) + 1
1014
raise errors.NoSuchRevision(self, revision_id)
1016
def get_rev_id(self, revno, history=None):
1017
"""Find the revision id of the specified revno."""
1018
with self.lock_read():
1020
return _mod_revision.NULL_REVISION
1021
last_revno, last_revid = self.last_revision_info()
1022
if revno == last_revno:
1024
if revno <= 0 or revno > last_revno:
1025
raise errors.NoSuchRevision(self, revno)
1026
distance_from_last = last_revno - revno
1027
if len(self._partial_revision_history_cache) <= distance_from_last:
1028
self._extend_partial_history(distance_from_last)
1029
return self._partial_revision_history_cache[distance_from_last]
1031
def pull(self, source, overwrite=False, stop_revision=None,
1032
possible_transports=None, *args, **kwargs):
1033
"""Mirror source into this branch.
1035
This branch is considered to be 'local', having low latency.
1037
:returns: PullResult instance
1039
return InterBranch.get(source, self).pull(overwrite=overwrite,
1040
stop_revision=stop_revision,
1041
possible_transports=possible_transports, *args, **kwargs)
1043
def push(self, target, overwrite=False, stop_revision=None, lossy=False,
1045
"""Mirror this branch into target.
1047
This branch is considered to be 'local', having low latency.
1049
return InterBranch.get(self, target).push(overwrite, stop_revision,
1050
lossy, *args, **kwargs)
1052
def basis_tree(self):
1053
"""Return `Tree` object for last revision."""
1054
return self.repository.revision_tree(self.last_revision())
1056
def get_parent(self):
1057
"""Return the parent location of the branch.
1059
This is the default location for pull/missing. The usual
1060
pattern is that the user can override it by specifying a
1063
parent = self._get_parent_location()
1066
# This is an old-format absolute path to a local branch
1067
# turn it into a url
1068
if parent.startswith('/'):
1069
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1071
return urlutils.join(self.base[:-1], parent)
1072
except urlutils.InvalidURLJoin as e:
1073
raise errors.InaccessibleParent(parent, self.user_url)
1075
def _get_parent_location(self):
1076
raise NotImplementedError(self._get_parent_location)
1078
def _set_config_location(self, name, url, config=None,
1079
make_relative=False):
1081
config = self.get_config_stack()
1085
url = urlutils.relative_url(self.base, url)
1086
config.set(name, url)
1088
def _get_config_location(self, name, config=None):
1090
config = self.get_config_stack()
1091
location = config.get(name)
1096
def get_child_submit_format(self):
1097
"""Return the preferred format of submissions to this branch."""
1098
return self.get_config_stack().get('child_submit_format')
1100
def get_submit_branch(self):
1101
"""Return the submit location of the branch.
1103
This is the default location for bundle. The usual
1104
pattern is that the user can override it by specifying a
1107
return self.get_config_stack().get('submit_branch')
1109
def set_submit_branch(self, location):
1110
"""Return the submit location of the branch.
1112
This is the default location for bundle. The usual
1113
pattern is that the user can override it by specifying a
1116
self.get_config_stack().set('submit_branch', location)
1118
def get_public_branch(self):
1119
"""Return the public location of the branch.
1121
This is used by merge directives.
1123
return self._get_config_location('public_branch')
1125
def set_public_branch(self, location):
1126
"""Return the submit location of the branch.
1128
This is the default location for bundle. The usual
1129
pattern is that the user can override it by specifying a
1132
self._set_config_location('public_branch', location)
1134
def get_push_location(self):
1135
"""Return None or the location to push this branch to."""
1136
return self.get_config_stack().get('push_location')
1138
def set_push_location(self, location):
1139
"""Set a new push location for this branch."""
1140
raise NotImplementedError(self.set_push_location)
1142
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1143
"""Run the post_change_branch_tip hooks."""
1144
hooks = Branch.hooks['post_change_branch_tip']
1147
new_revno, new_revid = self.last_revision_info()
1148
params = ChangeBranchTipParams(
1149
self, old_revno, new_revno, old_revid, new_revid)
1153
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1154
"""Run the pre_change_branch_tip hooks."""
1155
hooks = Branch.hooks['pre_change_branch_tip']
1158
old_revno, old_revid = self.last_revision_info()
1159
params = ChangeBranchTipParams(
1160
self, old_revno, new_revno, old_revid, new_revid)
1165
"""Synchronise this branch with the master branch if any.
1167
:return: None or the last_revision pivoted out during the update.
1171
def check_revno(self, revno):
1173
Check whether a revno corresponds to any revision.
1174
Zero (the NULL revision) is considered valid.
1177
self.check_real_revno(revno)
1179
def check_real_revno(self, revno):
1181
Check whether a revno corresponds to a real revision.
1182
Zero (the NULL revision) is considered invalid
1184
if revno < 1 or revno > self.revno():
1185
raise errors.InvalidRevisionNumber(revno)
1187
def clone(self, to_controldir, revision_id=None, repository_policy=None):
1188
"""Clone this branch into to_controldir preserving all semantic values.
1190
Most API users will want 'create_clone_on_transport', which creates a
1191
new bzrdir and branch on the fly.
1193
revision_id: if not None, the revision history in the new branch will
1194
be truncated to end with revision_id.
1196
result = to_controldir.create_branch()
1197
with self.lock_read(), result.lock_write():
1198
if repository_policy is not None:
1199
repository_policy.configure_branch(result)
1200
self.copy_content_into(result, revision_id=revision_id)
1203
def sprout(self, to_controldir, revision_id=None, repository_policy=None,
1205
"""Create a new line of development from the branch, into to_controldir.
1207
to_controldir controls the branch format.
1209
revision_id: if not None, the revision history in the new branch will
1210
be truncated to end with revision_id.
1212
if (repository_policy is not None and
1213
repository_policy.requires_stacking()):
1214
to_controldir._format.require_stacking(_skip_repo=True)
1215
result = to_controldir.create_branch(repository=repository)
1216
with self.lock_read(), result.lock_write():
1217
if repository_policy is not None:
1218
repository_policy.configure_branch(result)
1219
self.copy_content_into(result, revision_id=revision_id)
1220
master_url = self.get_bound_location()
1221
if master_url is None:
1222
result.set_parent(self.user_url)
1224
result.set_parent(master_url)
1227
def _synchronize_history(self, destination, revision_id):
1228
"""Synchronize last revision and revision history between branches.
1230
This version is most efficient when the destination is also a
1231
BzrBranch6, but works for BzrBranch5, as long as the destination's
1232
repository contains all the lefthand ancestors of the intended
1233
last_revision. If not, set_last_revision_info will fail.
1235
:param destination: The branch to copy the history into
1236
:param revision_id: The revision-id to truncate history at. May
1237
be None to copy complete history.
1239
source_revno, source_revision_id = self.last_revision_info()
1240
if revision_id is None:
1241
revno, revision_id = source_revno, source_revision_id
1243
graph = self.repository.get_graph()
1245
revno = graph.find_distance_to_null(revision_id,
1246
[(source_revision_id, source_revno)])
1247
except errors.GhostRevisionsHaveNoRevno:
1248
# Default to 1, if we can't find anything else
1250
destination.set_last_revision_info(revno, revision_id)
1252
def copy_content_into(self, destination, revision_id=None):
1253
"""Copy the content of self into destination.
1255
revision_id: if not None, the revision history in the new branch will
1256
be truncated to end with revision_id.
1258
return InterBranch.get(self, destination).copy_content_into(
1259
revision_id=revision_id)
1261
def update_references(self, target):
1262
if not getattr(self._format, 'supports_reference_locations', False):
1264
reference_dict = self._get_all_reference_info()
1265
if len(reference_dict) == 0:
1267
old_base = self.base
1268
new_base = target.base
1269
target_reference_dict = target._get_all_reference_info()
1270
for tree_path, (branch_location, file_id) in viewitems(reference_dict):
1271
branch_location = urlutils.rebase_url(branch_location,
1273
target_reference_dict.setdefault(
1274
tree_path, (branch_location, file_id))
1275
target._set_all_reference_info(target_reference_dict)
1277
def check(self, refs):
1278
"""Check consistency of the branch.
1280
In particular this checks that revisions given in the revision-history
1281
do actually match up in the revision graph, and that they're all
1282
present in the repository.
1284
Callers will typically also want to check the repository.
1286
:param refs: Calculated refs for this branch as specified by
1287
branch._get_check_refs()
1288
:return: A BranchCheckResult.
1290
with self.lock_read():
1291
result = BranchCheckResult(self)
1292
last_revno, last_revision_id = self.last_revision_info()
1293
actual_revno = refs[('lefthand-distance', last_revision_id)]
1294
if actual_revno != last_revno:
1295
result.errors.append(errors.BzrCheckError(
1296
'revno does not match len(mainline) %s != %s' % (
1297
last_revno, actual_revno)))
1298
# TODO: We should probably also check that self.revision_history
1299
# matches the repository for older branch formats.
1300
# If looking for the code that cross-checks repository parents against
1301
# the Graph.iter_lefthand_ancestry output, that is now a repository
1305
def _get_checkout_format(self, lightweight=False):
1306
"""Return the most suitable metadir for a checkout of this branch.
1307
Weaves are used if this branch's repository uses weaves.
1309
format = self.repository.controldir.checkout_metadir()
1310
format.set_branch_format(self._format)
1313
def create_clone_on_transport(self, to_transport, revision_id=None,
1314
stacked_on=None, create_prefix=False, use_existing_dir=False,
1316
"""Create a clone of this branch and its bzrdir.
1318
:param to_transport: The transport to clone onto.
1319
:param revision_id: The revision id to use as tip in the new branch.
1320
If None the tip is obtained from this branch.
1321
:param stacked_on: An optional URL to stack the clone on.
1322
:param create_prefix: Create any missing directories leading up to
1324
:param use_existing_dir: Use an existing directory if one exists.
1326
# XXX: Fix the bzrdir API to allow getting the branch back from the
1327
# clone call. Or something. 20090224 RBC/spiv.
1328
# XXX: Should this perhaps clone colocated branches as well,
1329
# rather than just the default branch? 20100319 JRV
1330
if revision_id is None:
1331
revision_id = self.last_revision()
1332
dir_to = self.controldir.clone_on_transport(to_transport,
1333
revision_id=revision_id, stacked_on=stacked_on,
1334
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
1336
return dir_to.open_branch()
1338
def create_checkout(self, to_location, revision_id=None,
1339
lightweight=False, accelerator_tree=None,
1341
"""Create a checkout of a branch.
1343
:param to_location: The url to produce the checkout at
1344
:param revision_id: The revision to check out
1345
:param lightweight: If True, produce a lightweight checkout, otherwise,
1346
produce a bound branch (heavyweight checkout)
1347
:param accelerator_tree: A tree which can be used for retrieving file
1348
contents more quickly than the revision tree, i.e. a workingtree.
1349
The revision tree will be used for cases where accelerator_tree's
1350
content is different.
1351
:param hardlink: If true, hard-link files from accelerator_tree,
1353
:return: The tree of the created checkout
1355
t = transport.get_transport(to_location)
1357
format = self._get_checkout_format(lightweight=lightweight)
1359
checkout = format.initialize_on_transport(t)
1360
except errors.AlreadyControlDirError:
1361
# It's fine if the control directory already exists,
1362
# as long as there is no existing branch and working tree.
1363
checkout = controldir.ControlDir.open_from_transport(t)
1365
checkout.open_branch()
1366
except errors.NotBranchError:
1369
raise errors.AlreadyControlDirError(t.base)
1370
if checkout.control_transport.base == self.controldir.control_transport.base:
1371
# When checking out to the same control directory,
1372
# always create a lightweight checkout
1376
from_branch = checkout.set_branch_reference(target_branch=self)
1378
policy = checkout.determine_repository_policy()
1379
repo = policy.acquire_repository()[0]
1380
checkout_branch = checkout.create_branch()
1381
checkout_branch.bind(self)
1382
# pull up to the specified revision_id to set the initial
1383
# branch tip correctly, and seed it with history.
1384
checkout_branch.pull(self, stop_revision=revision_id)
1386
tree = checkout.create_workingtree(revision_id,
1387
from_branch=from_branch,
1388
accelerator_tree=accelerator_tree,
1390
basis_tree = tree.basis_tree()
1391
with basis_tree.lock_read():
1392
for path, file_id in basis_tree.iter_references():
1393
reference_parent = self.reference_parent(path, file_id)
1394
reference_parent.create_checkout(tree.abspath(path),
1395
basis_tree.get_reference_revision(path, file_id),
1399
def reconcile(self, thorough=True):
1400
"""Make sure the data stored in this branch is consistent."""
1401
from breezy.reconcile import BranchReconciler
1402
with self.lock_write():
1403
reconciler = BranchReconciler(self, thorough=thorough)
1404
reconciler.reconcile()
1407
def reference_parent(self, path, file_id=None, possible_transports=None):
1408
"""Return the parent branch for a tree-reference file_id
1410
:param path: The path of the file_id in the tree
1411
:param file_id: Optional file_id of the tree reference
1412
:return: A branch associated with the file_id
1414
# FIXME should provide multiple branches, based on config
1415
return Branch.open(self.controldir.root_transport.clone(path).base,
1416
possible_transports=possible_transports)
1418
def supports_tags(self):
1419
return self._format.supports_tags()
1421
def automatic_tag_name(self, revision_id):
1422
"""Try to automatically find the tag name for a revision.
1424
:param revision_id: Revision id of the revision.
1425
:return: A tag name or None if no tag name could be determined.
1427
for hook in Branch.hooks['automatic_tag_name']:
1428
ret = hook(self, revision_id)
1433
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1435
"""Ensure that revision_b is a descendant of revision_a.
1437
This is a helper function for update_revisions.
1439
:raises: DivergedBranches if revision_b has diverged from revision_a.
1440
:returns: True if revision_b is a descendant of revision_a.
1442
relation = self._revision_relations(revision_a, revision_b, graph)
1443
if relation == 'b_descends_from_a':
1445
elif relation == 'diverged':
1446
raise errors.DivergedBranches(self, other_branch)
1447
elif relation == 'a_descends_from_b':
1450
raise AssertionError("invalid relation: %r" % (relation,))
1452
def _revision_relations(self, revision_a, revision_b, graph):
1453
"""Determine the relationship between two revisions.
1455
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1457
heads = graph.heads([revision_a, revision_b])
1458
if heads == {revision_b}:
1459
return 'b_descends_from_a'
1460
elif heads == {revision_a, revision_b}:
1461
# These branches have diverged
1463
elif heads == {revision_a}:
1464
return 'a_descends_from_b'
1466
raise AssertionError("invalid heads: %r" % (heads,))
1468
def heads_to_fetch(self):
1469
"""Return the heads that must and that should be fetched to copy this
1470
branch into another repo.
1472
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
1473
set of heads that must be fetched. if_present_fetch is a set of
1474
heads that must be fetched if present, but no error is necessary if
1475
they are not present.
1477
# For bzr native formats must_fetch is just the tip, and
1478
# if_present_fetch are the tags.
1479
must_fetch = {self.last_revision()}
1480
if_present_fetch = set()
1481
if self.get_config_stack().get('branch.fetch_tags'):
1483
if_present_fetch = set(self.tags.get_reverse_tag_dict())
1484
except errors.TagsNotSupported:
1486
must_fetch.discard(_mod_revision.NULL_REVISION)
1487
if_present_fetch.discard(_mod_revision.NULL_REVISION)
1488
return must_fetch, if_present_fetch
1490
def create_memorytree(self):
1491
"""Create a memory tree for this branch.
1493
:return: An in-memory MutableTree instance
1495
return memorytree.MemoryTree.create_on_branch(self)
1498
class BranchFormat(controldir.ControlComponentFormat):
1499
"""An encapsulation of the initialization and open routines for a format.
1501
Formats provide three things:
1502
* An initialization routine,
1503
* a format description
1506
Formats are placed in an dict by their format string for reference
1507
during branch opening. It's not required that these be instances, they
1508
can be classes themselves with class methods - it simply depends on
1509
whether state is needed for a given format or not.
1511
Once a format is deprecated, just deprecate the initialize and open
1512
methods on the format class. Do not deprecate the object, as the
1513
object will be created every time regardless.
1516
def __eq__(self, other):
1517
return self.__class__ is other.__class__
1519
def __ne__(self, other):
1520
return not (self == other)
1522
def get_reference(self, controldir, name=None):
1523
"""Get the target reference of the branch in controldir.
1525
format probing must have been completed before calling
1526
this method - it is assumed that the format of the branch
1527
in controldir is correct.
1529
:param controldir: The controldir to get the branch data from.
1530
:param name: Name of the colocated branch to fetch
1531
:return: None if the branch is not a reference branch.
1536
def set_reference(self, controldir, name, to_branch):
1537
"""Set the target reference of the branch in controldir.
1539
format probing must have been completed before calling
1540
this method - it is assumed that the format of the branch
1541
in controldir is correct.
1543
:param controldir: The controldir to set the branch reference for.
1544
:param name: Name of colocated branch to set, None for default
1545
:param to_branch: branch that the checkout is to reference
1547
raise NotImplementedError(self.set_reference)
1549
def get_format_description(self):
1550
"""Return the short format description for this format."""
1551
raise NotImplementedError(self.get_format_description)
1553
def _run_post_branch_init_hooks(self, controldir, name, branch):
1554
hooks = Branch.hooks['post_branch_init']
1557
params = BranchInitHookParams(self, controldir, name, branch)
1561
def initialize(self, controldir, name=None, repository=None,
1562
append_revisions_only=None):
1563
"""Create a branch of this format in controldir.
1565
:param name: Name of the colocated branch to create.
1567
raise NotImplementedError(self.initialize)
1569
def is_supported(self):
1570
"""Is this format supported?
1572
Supported formats can be initialized and opened.
1573
Unsupported formats may not support initialization or committing or
1574
some other features depending on the reason for not being supported.
1578
def make_tags(self, branch):
1579
"""Create a tags object for branch.
1581
This method is on BranchFormat, because BranchFormats are reflected
1582
over the wire via network_name(), whereas full Branch instances require
1583
multiple VFS method calls to operate at all.
1585
The default implementation returns a disabled-tags instance.
1587
Note that it is normal for branch to be a RemoteBranch when using tags
1590
return _mod_tag.DisabledTags(branch)
1592
def network_name(self):
1593
"""A simple byte string uniquely identifying this format for RPC calls.
1595
MetaDir branch formats use their disk format string to identify the
1596
repository over the wire. All in one formats such as bzr < 0.8, and
1597
foreign formats like svn/git and hg should use some marker which is
1598
unique and immutable.
1600
raise NotImplementedError(self.network_name)
1602
def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
1603
found_repository=None, possible_transports=None):
1604
"""Return the branch object for controldir.
1606
:param controldir: A ControlDir that contains a branch.
1607
:param name: Name of colocated branch to open
1608
:param _found: a private parameter, do not use it. It is used to
1609
indicate if format probing has already be done.
1610
:param ignore_fallbacks: when set, no fallback branches will be opened
1611
(if there are any). Default is to open fallbacks.
1613
raise NotImplementedError(self.open)
1615
def supports_set_append_revisions_only(self):
1616
"""True if this format supports set_append_revisions_only."""
1619
def supports_stacking(self):
1620
"""True if this format records a stacked-on branch."""
1623
def supports_leaving_lock(self):
1624
"""True if this format supports leaving locks in place."""
1625
return False # by default
1628
return self.get_format_description().rstrip()
1630
def supports_tags(self):
1631
"""True if this format supports tags stored in the branch"""
1632
return False # by default
1634
def tags_are_versioned(self):
1635
"""Whether the tag container for this branch versions tags."""
1638
def supports_tags_referencing_ghosts(self):
1639
"""True if tags can reference ghost revisions."""
1642
def supports_store_uncommitted(self):
1643
"""True if uncommitted changes can be stored in this branch."""
1647
class BranchHooks(Hooks):
1648
"""A dictionary mapping hook name to a list of callables for branch hooks.
1650
e.g. ['post_push'] Is the list of items to be called when the
1651
push function is invoked.
1655
"""Create the default hooks.
1657
These are all empty initially, because by default nothing should get
1660
Hooks.__init__(self, "breezy.branch", "Branch.hooks")
1661
self.add_hook('open',
1662
"Called with the Branch object that has been opened after a "
1663
"branch is opened.", (1, 8))
1664
self.add_hook('post_push',
1665
"Called after a push operation completes. post_push is called "
1666
"with a breezy.branch.BranchPushResult object and only runs in the "
1667
"bzr client.", (0, 15))
1668
self.add_hook('post_pull',
1669
"Called after a pull operation completes. post_pull is called "
1670
"with a breezy.branch.PullResult object and only runs in the "
1671
"bzr client.", (0, 15))
1672
self.add_hook('pre_commit',
1673
"Called after a commit is calculated but before it is "
1674
"completed. pre_commit is called with (local, master, old_revno, "
1675
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1676
"). old_revid is NULL_REVISION for the first commit to a branch, "
1677
"tree_delta is a TreeDelta object describing changes from the "
1678
"basis revision. hooks MUST NOT modify this delta. "
1679
" future_tree is an in-memory tree obtained from "
1680
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1682
self.add_hook('post_commit',
1683
"Called in the bzr client after a commit has completed. "
1684
"post_commit is called with (local, master, old_revno, old_revid, "
1685
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1686
"commit to a branch.", (0, 15))
1687
self.add_hook('post_uncommit',
1688
"Called in the bzr client after an uncommit completes. "
1689
"post_uncommit is called with (local, master, old_revno, "
1690
"old_revid, new_revno, new_revid) where local is the local branch "
1691
"or None, master is the target branch, and an empty branch "
1692
"receives new_revno of 0, new_revid of None.", (0, 15))
1693
self.add_hook('pre_change_branch_tip',
1694
"Called in bzr client and server before a change to the tip of a "
1695
"branch is made. pre_change_branch_tip is called with a "
1696
"breezy.branch.ChangeBranchTipParams. Note that push, pull, "
1697
"commit, uncommit will all trigger this hook.", (1, 6))
1698
self.add_hook('post_change_branch_tip',
1699
"Called in bzr client and server after a change to the tip of a "
1700
"branch is made. post_change_branch_tip is called with a "
1701
"breezy.branch.ChangeBranchTipParams. Note that push, pull, "
1702
"commit, uncommit will all trigger this hook.", (1, 4))
1703
self.add_hook('transform_fallback_location',
1704
"Called when a stacked branch is activating its fallback "
1705
"locations. transform_fallback_location is called with (branch, "
1706
"url), and should return a new url. Returning the same url "
1707
"allows it to be used as-is, returning a different one can be "
1708
"used to cause the branch to stack on a closer copy of that "
1709
"fallback_location. Note that the branch cannot have history "
1710
"accessing methods called on it during this hook because the "
1711
"fallback locations have not been activated. When there are "
1712
"multiple hooks installed for transform_fallback_location, "
1713
"all are called with the url returned from the previous hook."
1714
"The order is however undefined.", (1, 9))
1715
self.add_hook('automatic_tag_name',
1716
"Called to determine an automatic tag name for a revision. "
1717
"automatic_tag_name is called with (branch, revision_id) and "
1718
"should return a tag name or None if no tag name could be "
1719
"determined. The first non-None tag name returned will be used.",
1721
self.add_hook('post_branch_init',
1722
"Called after new branch initialization completes. "
1723
"post_branch_init is called with a "
1724
"breezy.branch.BranchInitHookParams. "
1725
"Note that init, branch and checkout (both heavyweight and "
1726
"lightweight) will all trigger this hook.", (2, 2))
1727
self.add_hook('post_switch',
1728
"Called after a checkout switches branch. "
1729
"post_switch is called with a "
1730
"breezy.branch.SwitchHookParams.", (2, 2))
1734
# install the default hooks into the Branch class.
1735
Branch.hooks = BranchHooks()
1738
class ChangeBranchTipParams(object):
1739
"""Object holding parameters passed to `*_change_branch_tip` hooks.
1741
There are 5 fields that hooks may wish to access:
1743
:ivar branch: the branch being changed
1744
:ivar old_revno: revision number before the change
1745
:ivar new_revno: revision number after the change
1746
:ivar old_revid: revision id before the change
1747
:ivar new_revid: revision id after the change
1749
The revid fields are strings. The revno fields are integers.
1752
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1753
"""Create a group of ChangeBranchTip parameters.
1755
:param branch: The branch being changed.
1756
:param old_revno: Revision number before the change.
1757
:param new_revno: Revision number after the change.
1758
:param old_revid: Tip revision id before the change.
1759
:param new_revid: Tip revision id after the change.
1761
self.branch = branch
1762
self.old_revno = old_revno
1763
self.new_revno = new_revno
1764
self.old_revid = old_revid
1765
self.new_revid = new_revid
1767
def __eq__(self, other):
1768
return self.__dict__ == other.__dict__
1771
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1772
self.__class__.__name__, self.branch,
1773
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1776
class BranchInitHookParams(object):
1777
"""Object holding parameters passed to `*_branch_init` hooks.
1779
There are 4 fields that hooks may wish to access:
1781
:ivar format: the branch format
1782
:ivar bzrdir: the ControlDir where the branch will be/has been initialized
1783
:ivar name: name of colocated branch, if any (or None)
1784
:ivar branch: the branch created
1786
Note that for lightweight checkouts, the bzrdir and format fields refer to
1787
the checkout, hence they are different from the corresponding fields in
1788
branch, which refer to the original branch.
1791
def __init__(self, format, controldir, name, branch):
1792
"""Create a group of BranchInitHook parameters.
1794
:param format: the branch format
1795
:param controldir: the ControlDir where the branch will be/has been
1797
:param name: name of colocated branch, if any (or None)
1798
:param branch: the branch created
1800
Note that for lightweight checkouts, the bzrdir and format fields refer
1801
to the checkout, hence they are different from the corresponding fields
1802
in branch, which refer to the original branch.
1804
self.format = format
1805
self.controldir = controldir
1807
self.branch = branch
1809
def __eq__(self, other):
1810
return self.__dict__ == other.__dict__
1813
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1816
class SwitchHookParams(object):
1817
"""Object holding parameters passed to `*_switch` hooks.
1819
There are 4 fields that hooks may wish to access:
1821
:ivar control_dir: ControlDir of the checkout to change
1822
:ivar to_branch: branch that the checkout is to reference
1823
:ivar force: skip the check for local commits in a heavy checkout
1824
:ivar revision_id: revision ID to switch to (or None)
1827
def __init__(self, control_dir, to_branch, force, revision_id):
1828
"""Create a group of SwitchHook parameters.
1830
:param control_dir: ControlDir of the checkout to change
1831
:param to_branch: branch that the checkout is to reference
1832
:param force: skip the check for local commits in a heavy checkout
1833
:param revision_id: revision ID to switch to (or None)
1835
self.control_dir = control_dir
1836
self.to_branch = to_branch
1838
self.revision_id = revision_id
1840
def __eq__(self, other):
1841
return self.__dict__ == other.__dict__
1844
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1845
self.control_dir, self.to_branch,
1849
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
1850
"""Branch format registry."""
1852
def __init__(self, other_registry=None):
1853
super(BranchFormatRegistry, self).__init__(other_registry)
1854
self._default_format = None
1855
self._default_format_key = None
1857
def get_default(self):
1858
"""Return the current default format."""
1859
if (self._default_format_key is not None and
1860
self._default_format is None):
1861
self._default_format = self.get(self._default_format_key)
1862
return self._default_format
1864
def set_default(self, format):
1865
"""Set the default format."""
1866
self._default_format = format
1867
self._default_format_key = None
1869
def set_default_key(self, format_string):
1870
"""Set the default format by its format string."""
1871
self._default_format_key = format_string
1872
self._default_format = None
1875
network_format_registry = registry.FormatRegistry()
1876
"""Registry of formats indexed by their network name.
1878
The network name for a branch format is an identifier that can be used when
1879
referring to formats with smart server operations. See
1880
BranchFormat.network_name() for more detail.
1883
format_registry = BranchFormatRegistry(network_format_registry)
1886
# formats which have no format string are not discoverable
1887
# and not independently creatable, so are not registered.
1888
format_registry.register_lazy(
1889
b"Bazaar-NG branch format 5\n", "breezy.bzr.fullhistory",
1891
format_registry.register_lazy(
1892
b"Bazaar Branch Format 6 (bzr 0.15)\n",
1893
"breezy.bzr.branch", "BzrBranchFormat6")
1894
format_registry.register_lazy(
1895
b"Bazaar Branch Format 7 (needs bzr 1.6)\n",
1896
"breezy.bzr.branch", "BzrBranchFormat7")
1897
format_registry.register_lazy(
1898
b"Bazaar Branch Format 8 (needs bzr 1.15)\n",
1899
"breezy.bzr.branch", "BzrBranchFormat8")
1900
format_registry.register_lazy(
1901
b"Bazaar-NG Branch Reference Format 1\n",
1902
"breezy.bzr.branch", "BranchReferenceFormat")
1904
format_registry.set_default_key(b"Bazaar Branch Format 7 (needs bzr 1.6)\n")
1907
class BranchWriteLockResult(LogicalLockResult):
1908
"""The result of write locking a branch.
1910
:ivar token: The token obtained from the underlying branch lock, or
1912
:ivar unlock: A callable which will unlock the lock.
1916
return "BranchWriteLockResult(%r, %r)" % (self.unlock, self.token)
1919
######################################################################
1920
# results of operations
1923
class _Result(object):
1925
def _show_tag_conficts(self, to_file):
1926
if not getattr(self, 'tag_conflicts', None):
1928
to_file.write('Conflicting tags:\n')
1929
for name, value1, value2 in self.tag_conflicts:
1930
to_file.write(' %s\n' % (name, ))
1933
class PullResult(_Result):
1934
"""Result of a Branch.pull operation.
1936
:ivar old_revno: Revision number before pull.
1937
:ivar new_revno: Revision number after pull.
1938
:ivar old_revid: Tip revision id before pull.
1939
:ivar new_revid: Tip revision id after pull.
1940
:ivar source_branch: Source (local) branch object. (read locked)
1941
:ivar master_branch: Master branch of the target, or the target if no
1943
:ivar local_branch: target branch if there is a Master, else None
1944
:ivar target_branch: Target/destination branch object. (write locked)
1945
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
1946
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
1949
def report(self, to_file):
1950
tag_conflicts = getattr(self, "tag_conflicts", None)
1951
tag_updates = getattr(self, "tag_updates", None)
1953
if self.old_revid != self.new_revid:
1954
to_file.write('Now on revision %d.\n' % self.new_revno)
1956
to_file.write('%d tag(s) updated.\n' % len(tag_updates))
1957
if self.old_revid == self.new_revid and not tag_updates:
1958
if not tag_conflicts:
1959
to_file.write('No revisions or tags to pull.\n')
1961
to_file.write('No revisions to pull.\n')
1962
self._show_tag_conficts(to_file)
1965
class BranchPushResult(_Result):
1966
"""Result of a Branch.push operation.
1968
:ivar old_revno: Revision number (eg 10) of the target before push.
1969
:ivar new_revno: Revision number (eg 12) of the target after push.
1970
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
1972
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
1974
:ivar source_branch: Source branch object that the push was from. This is
1975
read locked, and generally is a local (and thus low latency) branch.
1976
:ivar master_branch: If target is a bound branch, the master branch of
1977
target, or target itself. Always write locked.
1978
:ivar target_branch: The direct Branch where data is being sent (write
1980
:ivar local_branch: If the target is a bound branch this will be the
1981
target, otherwise it will be None.
1984
def report(self, to_file):
1985
# TODO: This function gets passed a to_file, but then
1986
# ignores it and calls note() instead. This is also
1987
# inconsistent with PullResult(), which writes to stdout.
1988
# -- JRV20110901, bug #838853
1989
tag_conflicts = getattr(self, "tag_conflicts", None)
1990
tag_updates = getattr(self, "tag_updates", None)
1992
if self.old_revid != self.new_revid:
1993
note(gettext('Pushed up to revision %d.') % self.new_revno)
1995
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
1996
if self.old_revid == self.new_revid and not tag_updates:
1997
if not tag_conflicts:
1998
note(gettext('No new revisions or tags to push.'))
2000
note(gettext('No new revisions to push.'))
2001
self._show_tag_conficts(to_file)
2004
class BranchCheckResult(object):
2005
"""Results of checking branch consistency.
2010
def __init__(self, branch):
2011
self.branch = branch
2014
def report_results(self, verbose):
2015
"""Report the check results via trace.note.
2017
:param verbose: Requests more detailed display of what was checked,
2020
note(gettext('checked branch {0} format {1}').format(
2021
self.branch.user_url, self.branch._format))
2022
for error in self.errors:
2023
note(gettext('found error:%s'), error)
2026
class InterBranch(InterObject):
2027
"""This class represents operations taking place between two branches.
2029
Its instances have methods like pull() and push() and contain
2030
references to the source and target repositories these operations
2031
can be carried out on.
2035
"""The available optimised InterBranch types."""
2038
def _get_branch_formats_to_test(klass):
2039
"""Return an iterable of format tuples for testing.
2041
:return: An iterable of (from_format, to_format) to use when testing
2042
this InterBranch class. Each InterBranch class should define this
2045
raise NotImplementedError(klass._get_branch_formats_to_test)
2047
def pull(self, overwrite=False, stop_revision=None,
2048
possible_transports=None, local=False):
2049
"""Mirror source into target branch.
2051
The target branch is considered to be 'local', having low latency.
2053
:returns: PullResult instance
2055
raise NotImplementedError(self.pull)
2057
def push(self, overwrite=False, stop_revision=None, lossy=False,
2058
_override_hook_source_branch=None):
2059
"""Mirror the source branch into the target branch.
2061
The source branch is considered to be 'local', having low latency.
2063
raise NotImplementedError(self.push)
2065
def copy_content_into(self, revision_id=None):
2066
"""Copy the content of source into target
2068
revision_id: if not None, the revision history in the new branch will
2069
be truncated to end with revision_id.
2071
raise NotImplementedError(self.copy_content_into)
2073
def fetch(self, stop_revision=None, limit=None):
2076
:param stop_revision: Last revision to fetch
2077
:param limit: Optional rough limit of revisions to fetch
2079
raise NotImplementedError(self.fetch)
2082
def _fix_overwrite_type(overwrite):
2083
if isinstance(overwrite, bool):
2085
return ["history", "tags"]
2091
class GenericInterBranch(InterBranch):
2092
"""InterBranch implementation that uses public Branch functions."""
2095
def is_compatible(klass, source, target):
2096
# GenericBranch uses the public API, so always compatible
2100
def _get_branch_formats_to_test(klass):
2101
return [(format_registry.get_default(), format_registry.get_default())]
2104
def unwrap_format(klass, format):
2105
if isinstance(format, remote.RemoteBranchFormat):
2106
format._ensure_real()
2107
return format._custom_format
2110
def copy_content_into(self, revision_id=None):
2111
"""Copy the content of source into target
2113
revision_id: if not None, the revision history in the new branch will
2114
be truncated to end with revision_id.
2116
with self.source.lock_read(), self.target.lock_write():
2117
self.source.update_references(self.target)
2118
self.source._synchronize_history(self.target, revision_id)
2120
parent = self.source.get_parent()
2121
except errors.InaccessibleParent as e:
2122
mutter('parent was not accessible to copy: %s', e)
2125
self.target.set_parent(parent)
2126
if self.source._push_should_merge_tags():
2127
self.source.tags.merge_to(self.target.tags)
2129
def fetch(self, stop_revision=None, limit=None):
2130
if self.target.base == self.source.base:
2132
with self.source.lock_read(), self.target.lock_write():
2133
fetch_spec_factory = fetch.FetchSpecFactory()
2134
fetch_spec_factory.source_branch = self.source
2135
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
2136
fetch_spec_factory.source_repo = self.source.repository
2137
fetch_spec_factory.target_repo = self.target.repository
2138
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
2139
fetch_spec_factory.limit = limit
2140
fetch_spec = fetch_spec_factory.make_fetch_spec()
2141
return self.target.repository.fetch(
2142
self.source.repository,
2143
fetch_spec=fetch_spec)
2145
def _update_revisions(self, stop_revision=None, overwrite=False,
2147
with self.source.lock_read(), self.target.lock_write():
2148
other_revno, other_last_revision = self.source.last_revision_info()
2149
stop_revno = None # unknown
2150
if stop_revision is None:
2151
stop_revision = other_last_revision
2152
if _mod_revision.is_null(stop_revision):
2153
# if there are no commits, we're done.
2155
stop_revno = other_revno
2157
# what's the current last revision, before we fetch [and change it
2159
last_rev = _mod_revision.ensure_null(self.target.last_revision())
2160
# we fetch here so that we don't process data twice in the common
2161
# case of having something to pull, and so that the check for
2162
# already merged can operate on the just fetched graph, which will
2163
# be cached in memory.
2164
self.fetch(stop_revision=stop_revision)
2165
# Check to see if one is an ancestor of the other
2168
graph = self.target.repository.get_graph()
2169
if self.target._check_if_descendant_or_diverged(
2170
stop_revision, last_rev, graph, self.source):
2171
# stop_revision is a descendant of last_rev, but we aren't
2172
# overwriting, so we're done.
2174
if stop_revno is None:
2176
graph = self.target.repository.get_graph()
2177
this_revno, this_last_revision = \
2178
self.target.last_revision_info()
2179
stop_revno = graph.find_distance_to_null(stop_revision,
2180
[(other_last_revision, other_revno),
2181
(this_last_revision, this_revno)])
2182
self.target.set_last_revision_info(stop_revno, stop_revision)
2184
def pull(self, overwrite=False, stop_revision=None,
2185
possible_transports=None, run_hooks=True,
2186
_override_hook_target=None, local=False):
2187
"""Pull from source into self, updating my master if any.
2189
:param run_hooks: Private parameter - if false, this branch
2190
is being called because it's the master of the primary branch,
2191
so it should not run its hooks.
2193
with self.target.lock_write():
2194
bound_location = self.target.get_bound_location()
2195
if local and not bound_location:
2196
raise errors.LocalRequiresBoundBranch()
2197
master_branch = None
2198
source_is_master = False
2200
# bound_location comes from a config file, some care has to be
2201
# taken to relate it to source.user_url
2202
normalized = urlutils.normalize_url(bound_location)
2204
relpath = self.source.user_transport.relpath(normalized)
2205
source_is_master = (relpath == '')
2206
except (errors.PathNotChild, urlutils.InvalidURL):
2207
source_is_master = False
2208
if not local and bound_location and not source_is_master:
2209
# not pulling from master, so we need to update master.
2210
master_branch = self.target.get_master_branch(possible_transports)
2211
master_branch.lock_write()
2214
# pull from source into master.
2215
master_branch.pull(self.source, overwrite, stop_revision,
2217
return self._pull(overwrite,
2218
stop_revision, _hook_master=master_branch,
2219
run_hooks=run_hooks,
2220
_override_hook_target=_override_hook_target,
2221
merge_tags_to_master=not source_is_master)
2224
master_branch.unlock()
2226
def push(self, overwrite=False, stop_revision=None, lossy=False,
2227
_override_hook_source_branch=None):
2228
"""See InterBranch.push.
2230
This is the basic concrete implementation of push()
2232
:param _override_hook_source_branch: If specified, run the hooks
2233
passing this Branch as the source, rather than self. This is for
2234
use of RemoteBranch, where push is delegated to the underlying
2238
raise errors.LossyPushToSameVCS(self.source, self.target)
2239
# TODO: Public option to disable running hooks - should be trivial but
2242
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
2243
op.add_cleanup(self.source.lock_read().unlock)
2244
op.add_cleanup(self.target.lock_write().unlock)
2245
return op.run(overwrite, stop_revision,
2246
_override_hook_source_branch=_override_hook_source_branch)
2248
def _basic_push(self, overwrite, stop_revision):
2249
"""Basic implementation of push without bound branches or hooks.
2251
Must be called with source read locked and target write locked.
2253
result = BranchPushResult()
2254
result.source_branch = self.source
2255
result.target_branch = self.target
2256
result.old_revno, result.old_revid = self.target.last_revision_info()
2257
self.source.update_references(self.target)
2258
overwrite = _fix_overwrite_type(overwrite)
2259
if result.old_revid != stop_revision:
2260
# We assume that during 'push' this repository is closer than
2262
graph = self.source.repository.get_graph(self.target.repository)
2263
self._update_revisions(stop_revision,
2264
overwrite=("history" in overwrite),
2266
if self.source._push_should_merge_tags():
2267
result.tag_updates, result.tag_conflicts = (
2268
self.source.tags.merge_to(
2269
self.target.tags, "tags" in overwrite))
2270
result.new_revno, result.new_revid = self.target.last_revision_info()
2273
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
2274
_override_hook_source_branch=None):
2275
"""Push from source into target, and into target's master if any.
2278
if _override_hook_source_branch:
2279
result.source_branch = _override_hook_source_branch
2280
for hook in Branch.hooks['post_push']:
2283
bound_location = self.target.get_bound_location()
2284
if bound_location and self.target.base != bound_location:
2285
# there is a master branch.
2287
# XXX: Why the second check? Is it even supported for a branch to
2288
# be bound to itself? -- mbp 20070507
2289
master_branch = self.target.get_master_branch()
2290
master_branch.lock_write()
2291
operation.add_cleanup(master_branch.unlock)
2292
# push into the master from the source branch.
2293
master_inter = InterBranch.get(self.source, master_branch)
2294
master_inter._basic_push(overwrite, stop_revision)
2295
# and push into the target branch from the source. Note that
2296
# we push from the source branch again, because it's considered
2297
# the highest bandwidth repository.
2298
result = self._basic_push(overwrite, stop_revision)
2299
result.master_branch = master_branch
2300
result.local_branch = self.target
2302
master_branch = None
2304
result = self._basic_push(overwrite, stop_revision)
2305
# TODO: Why set master_branch and local_branch if there's no
2306
# binding? Maybe cleaner to just leave them unset? -- mbp
2308
result.master_branch = self.target
2309
result.local_branch = None
2313
def _pull(self, overwrite=False, stop_revision=None,
2314
possible_transports=None, _hook_master=None, run_hooks=True,
2315
_override_hook_target=None, local=False,
2316
merge_tags_to_master=True):
2319
This function is the core worker, used by GenericInterBranch.pull to
2320
avoid duplication when pulling source->master and source->local.
2322
:param _hook_master: Private parameter - set the branch to
2323
be supplied as the master to pull hooks.
2324
:param run_hooks: Private parameter - if false, this branch
2325
is being called because it's the master of the primary branch,
2326
so it should not run its hooks.
2327
is being called because it's the master of the primary branch,
2328
so it should not run its hooks.
2329
:param _override_hook_target: Private parameter - set the branch to be
2330
supplied as the target_branch to pull hooks.
2331
:param local: Only update the local branch, and not the bound branch.
2333
# This type of branch can't be bound.
2335
raise errors.LocalRequiresBoundBranch()
2336
result = PullResult()
2337
result.source_branch = self.source
2338
if _override_hook_target is None:
2339
result.target_branch = self.target
2341
result.target_branch = _override_hook_target
2342
with self.source.lock_read():
2343
# We assume that during 'pull' the target repository is closer than
2345
self.source.update_references(self.target)
2346
graph = self.target.repository.get_graph(self.source.repository)
2347
# TODO: Branch formats should have a flag that indicates
2348
# that revno's are expensive, and pull() should honor that flag.
2350
result.old_revno, result.old_revid = \
2351
self.target.last_revision_info()
2352
overwrite = _fix_overwrite_type(overwrite)
2353
self._update_revisions(stop_revision,
2354
overwrite=("history" in overwrite),
2356
# TODO: The old revid should be specified when merging tags,
2357
# so a tags implementation that versions tags can only
2358
# pull in the most recent changes. -- JRV20090506
2359
result.tag_updates, result.tag_conflicts = (
2360
self.source.tags.merge_to(self.target.tags,
2361
"tags" in overwrite,
2362
ignore_master=not merge_tags_to_master))
2363
result.new_revno, result.new_revid = self.target.last_revision_info()
2365
result.master_branch = _hook_master
2366
result.local_branch = result.target_branch
2368
result.master_branch = result.target_branch
2369
result.local_branch = None
2371
for hook in Branch.hooks['post_pull']:
2376
InterBranch.register_optimiser(GenericInterBranch)
added
removed
breezy/branch.py
